MdePkg: 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>

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index 4f7bd4449c3642688e5b514ba5fde15cb9f93791..523192fd79fc945c1ac122ae06da72aab3067972 100644 (file)
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -6,7 +6,7 @@
   environment. There are a set of base libraries in the Mde Package that can\r
   be used to implement base modules.\r
 \r
   environment. There are a set of base libraries in the Mde Package that can\r
   be used to implement base modules.\r
 \r

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

 Portions copyright (c) 2008 - 2009, Apple 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
 Portions copyright (c) 2008 - 2009, Apple 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


@@ -65,8 +65,8 @@ VERIFY_SIZE_OF (CHAR16, 2);
 \r
 //\r
 // The following three enum types are used to verify that the compiler\r
 \r
 //\r
 // The following three enum types are used to verify that the compiler\r

-// configuration for enum types is compliant with Section 2.3.1 of the \r
-// UEFI 2.3 Specification. These enum types and enum values are not \r
+// configuration for enum types is compliant with Section 2.3.1 of the\r
+// UEFI 2.3 Specification. These enum types and enum values are not\r

 // intended to be used. A prefix of '__' is used avoid conflicts with\r
 // other types.\r
 //\r
 // intended to be used. A prefix of '__' is used avoid conflicts with\r
 // other types.\r
 //\r


@@ -785,7 +785,7 @@ typedef CHAR8 *VA_LIST;
 \r
   This macro initializes Dest as a copy of Start, as if the VA_START macro had been applied to Dest\r
   followed by the same sequence of uses of the VA_ARG macro as had previously been used to reach\r
 \r
   This macro initializes Dest as a copy of Start, as if the VA_START macro had been applied to Dest\r
   followed by the same sequence of uses of the VA_ARG macro as had previously been used to reach\r

-  the present state of Start. \r
+  the present state of Start.\r

 \r
   @param   Dest   VA_LIST used to traverse the list of arguments.\r
   @param   Start  VA_LIST used to traverse the list of arguments.\r
 \r
   @param   Dest   VA_LIST used to traverse the list of arguments.\r
   @param   Start  VA_LIST used to traverse the list of arguments.\r

diff --git a/MdePkg/Include/Ebc/ProcessorBind.h b/MdePkg/Include/Ebc/ProcessorBind.h
index ed41648913284cb8b0befa18b268e82b48d056bb..5217cfd97eac2e469be021576e83b41d8fc42f41 100644 (file)
--- a/MdePkg/Include/Ebc/ProcessorBind.h
+++ b/MdePkg/Include/Ebc/ProcessorBind.h
@@ -4,14 +4,14 @@
   We currently only have one EBC compiler so there may be some Intel compiler\r
   specific functions in this file.\r
 \r
   We currently only have one EBC compiler so there may be some Intel compiler\r
   specific functions in this file.\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
-    \r
-THE PROGRAM 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


@@ -135,14 +135,14 @@ typedef unsigned long         UINTN;
   /// If EFIAPI is already defined, then we use that definition.\r
   ///\r
 #else\r
   /// If EFIAPI is already defined, then we use that definition.\r
   ///\r
 #else\r

-#define EFIAPI    \r
+#define EFIAPI\r

 #endif\r
 \r
 /**\r
   Return the pointer to the first instruction of a function given a function pointer.\r
 #endif\r
 \r
 /**\r
   Return the pointer to the first instruction of a function given a function pointer.\r

-  On EBC architectures, these two pointer values are the same, \r
+  On EBC architectures, these two pointer values are the same,\r

   so the implementation of this macro is very simple.\r
   so the implementation of this macro is very simple.\r

-  \r
+\r

   @param  FunctionPointer   A pointer to a function.\r
 \r
   @return The pointer to the first instruction of a function given a function pointer.\r
   @param  FunctionPointer   A pointer to a function.\r
 \r
   @return The pointer to the first instruction of a function given a function pointer.\r


@@ -153,5 +153,5 @@ typedef unsigned long         UINTN;
 #define __USER_LABEL_PREFIX__\r
 #endif\r
 \r
 #define __USER_LABEL_PREFIX__\r
 #endif\r
 \r

-#endif \r
+#endif\r

 \r
 \r

diff --git a/MdePkg/Include/Guid/Acpi.h b/MdePkg/Include/Guid/Acpi.h
index f7f94d946225a4a3376ae675444bfb562c7351c1..d7b39011bd3a81b089324aa764324274adab8fda 100644 (file)
--- a/MdePkg/Include/Guid/Acpi.h
+++ b/MdePkg/Include/Guid/Acpi.h
@@ -2,17 +2,17 @@
   GUIDs used for ACPI entries in the EFI system table\r
 \r
   These GUIDs point the ACPI tables as defined in the ACPI specifications.\r
   GUIDs used for ACPI entries in the EFI system table\r
 \r
   These GUIDs point the ACPI tables as defined in the ACPI specifications.\r

-  ACPI 2.0 specification defines the ACPI 2.0 GUID. UEFI 2.0 defines the \r
+  ACPI 2.0 specification defines the ACPI 2.0 GUID. UEFI 2.0 defines the\r

   ACPI 2.0 Table GUID and ACPI Table GUID.\r
 \r
   ACPI 2.0 Table GUID and ACPI Table GUID.\r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.0 spec.\r
 \r
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.0 spec.\r

diff --git a/MdePkg/Include/Guid/Apriori.h b/MdePkg/Include/Guid/Apriori.h
index 70825f94ba2c8a75f4f8371eb5503c68b225bce8..4923ff66c69fed7cee8c6ab3cb965339a50b00b7 100644 (file)
--- a/MdePkg/Include/Guid/Apriori.h
+++ b/MdePkg/Include/Guid/Apriori.h
@@ -3,14 +3,14 @@
   list of FV filenames that the DXE dispatcher will schedule reguardless of\r
   the dependency grammar.\r
 \r
   list of FV filenames that the DXE dispatcher will schedule reguardless of\r
   the dependency grammar.\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
   @par Revision Reference:\r
   GUID introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   GUID introduced in PI Version 1.0.\r

diff --git a/MdePkg/Include/Guid/AprioriFileName.h b/MdePkg/Include/Guid/AprioriFileName.h
index 6458ad0370c249eaacedc00a7fa3b832ba20cc77..65a445e7d6a48d2973c92a3d745650b045843365 100644 (file)
--- a/MdePkg/Include/Guid/AprioriFileName.h
+++ b/MdePkg/Include/Guid/AprioriFileName.h
@@ -3,14 +3,14 @@
   name of the PEI a priori file that is stored in a firmware\r
   volume.\r
 \r
   name of the PEI a priori file that is stored in a firmware\r
   volume.\r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference:\r
   GUID introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   GUID introduced in PI Version 1.0.\r


@@ -24,7 +24,7 @@
   { 0x1b45cc0a, 0x156a, 0x428a, { 0x62, 0XAF, 0x49, 0x86, 0x4d, 0xa0, 0xe6, 0xe6 } }\r
 \r
 \r
   { 0x1b45cc0a, 0x156a, 0x428a, { 0x62, 0XAF, 0x49, 0x86, 0x4d, 0xa0, 0xe6, 0xe6 } }\r
 \r
 \r

-///   \r
+///\r

 ///  This file must be of type EFI_FV_FILETYPE_FREEFORM and must\r
 ///  contain a single section of type EFI_SECTION_RAW. For details on\r
 ///  firmware volumes, firmware file types, and firmware file section\r
 ///  This file must be of type EFI_FV_FILETYPE_FREEFORM and must\r
 ///  contain a single section of type EFI_SECTION_RAW. For details on\r
 ///  firmware volumes, firmware file types, and firmware file section\r


@@ -33,7 +33,7 @@
 typedef struct {\r
   ///\r
   /// An array of zero or more EFI_GUID type entries that match the file names of PEIM\r
 typedef struct {\r
   ///\r
   /// An array of zero or more EFI_GUID type entries that match the file names of PEIM\r

-  /// modules in the same Firmware Volume. The maximum number of entries. \r
+  /// modules in the same Firmware Volume. The maximum number of entries.\r

   ///\r
   EFI_GUID  FileNamesWithinVolume[1];\r
 } PEI_APRIORI_FILE_CONTENTS;\r
   ///\r
   EFI_GUID  FileNamesWithinVolume[1];\r
 } PEI_APRIORI_FILE_CONTENTS;\r

diff --git a/MdePkg/Include/Guid/CapsuleReport.h b/MdePkg/Include/Guid/CapsuleReport.h
index 23c124df25ed382cd8bc77c6904857519322df71..d1d841866469ebadbe45776e6ee37fd86da285e9 100644 (file)
--- a/MdePkg/Include/Guid/CapsuleReport.h
+++ b/MdePkg/Include/Guid/CapsuleReport.h
@@ -1,7 +1,7 @@
 /** @file\r
   Guid & data structure used for Capsule process result variables\r
 /** @file\r
   Guid & data structure used for Capsule process result variables\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


@@ -84,14 +84,14 @@ typedef struct {
 \r
   ///\r
   /// In case of capsule loaded from disk, the zero-terminated array containing file name of capsule that was processed.\r
 \r
   ///\r
   /// In case of capsule loaded from disk, the zero-terminated array containing file name of capsule that was processed.\r

-  /// In case of capsule submitted directly to UpdateCapsule() there is no file name, and this field is required to contain a single 16-bit zero character \r
+  /// In case of capsule submitted directly to UpdateCapsule() there is no file name, and this field is required to contain a single 16-bit zero character\r

   ///  which is included in VariableTotalSize.\r
   ///\r
   /// CHAR16 CapsuleFileName[];\r
   ///\r
 \r
   ///\r
   ///  which is included in VariableTotalSize.\r
   ///\r
   /// CHAR16 CapsuleFileName[];\r
   ///\r
 \r
   ///\r

-  /// This field will contain a zero-terminated CHAR16 string containing the text representation of the device path of device publishing Firmware Management Protocol  \r
+  /// This field will contain a zero-terminated CHAR16 string containing the text representation of the device path of device publishing Firmware Management Protocol\r

   /// (if present). In case where device path is not present and the target is not otherwise known to firmware, or when payload was blocked by policy, or skipped,\r
   /// this field is required to contain a single 16-bit zero character which is included in VariableTotalSize.\r
   ///\r
   /// (if present). In case where device path is not present and the target is not otherwise known to firmware, or when payload was blocked by policy, or skipped,\r
   /// this field is required to contain a single 16-bit zero character which is included in VariableTotalSize.\r
   ///\r

diff --git a/MdePkg/Include/Guid/DebugImageInfoTable.h b/MdePkg/Include/Guid/DebugImageInfoTable.h
index 4ead8b491d6b344cc684055c19a1901eeb3955fc..834936823c14ae4aee0cd73777121797c8272156 100644 (file)
--- a/MdePkg/Include/Guid/DebugImageInfoTable.h
+++ b/MdePkg/Include/Guid/DebugImageInfoTable.h
@@ -1,14 +1,14 @@
 /** @file\r
   GUID and related data structures used with the Debug Image Info Table.\r
 \r
 /** @file\r
   GUID and related data structures used with the Debug Image Info Table.\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
+  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
   @par Revision Reference:\r
   GUID defined in UEFI 2.0 spec.\r
 \r
   @par Revision Reference:\r
   GUID defined in UEFI 2.0 spec.\r


@@ -35,7 +35,7 @@
 \r
 typedef struct {\r
   UINT64                Signature;          ///< A constant UINT64 that has the value EFI_SYSTEM_TABLE_SIGNATURE\r
 \r
 typedef struct {\r
   UINT64                Signature;          ///< A constant UINT64 that has the value EFI_SYSTEM_TABLE_SIGNATURE\r

-  EFI_PHYSICAL_ADDRESS  EfiSystemTableBase; ///< The physical address of the EFI system table. \r
+  EFI_PHYSICAL_ADDRESS  EfiSystemTableBase; ///< The physical address of the EFI system table.\r

   UINT32                Crc32;              ///< A 32-bit CRC value that is used to verify the EFI_SYSTEM_TABLE_POINTER structure is valid.\r
 } EFI_SYSTEM_TABLE_POINTER;\r
 \r
   UINT32                Crc32;              ///< A 32-bit CRC value that is used to verify the EFI_SYSTEM_TABLE_POINTER structure is valid.\r
 } EFI_SYSTEM_TABLE_POINTER;\r
 \r

diff --git a/MdePkg/Include/Guid/DxeServices.h b/MdePkg/Include/Guid/DxeServices.h
index 21908418ba7fb8853cee876337edb99d27bb2ed1..a44295cd074d6086e9998cd662ed0ba223057ebe 100644 (file)
--- a/MdePkg/Include/Guid/DxeServices.h
+++ b/MdePkg/Include/Guid/DxeServices.h
@@ -1,14 +1,14 @@
 /** @file\r
   GUID used to identify the DXE Services Table\r
 \r
 /** @file\r
   GUID used to identify the DXE Services Table\r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference:\r
   GUID introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   GUID introduced in PI Version 1.0.\r

diff --git a/MdePkg/Include/Guid/EventGroup.h b/MdePkg/Include/Guid/EventGroup.h
index 831465d0aae243c07210301fd1a55a3143d7920f..a833a9c8fe4135b811e65f06a77a2cb0d0f25a50 100644 (file)
--- a/MdePkg/Include/Guid/EventGroup.h
+++ b/MdePkg/Include/Guid/EventGroup.h
@@ -1,21 +1,21 @@
 /** @file\r
   GUIDs for gBS->CreateEventEx Event Groups. Defined in UEFI spec 2.0 and PI 1.2.1.\r
 \r
 /** @file\r
   GUIDs for gBS->CreateEventEx Event Groups. Defined in UEFI spec 2.0 and PI 1.2.1.\r
 \r

-Copyright (c) 2006 - 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) 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
-    \r
-THE PROGRAM 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
 #ifndef __EVENT_GROUP_GUID__\r
 #define __EVENT_GROUP_GUID__\r
 \r
 \r
 **/\r
 \r
 #ifndef __EVENT_GROUP_GUID__\r
 #define __EVENT_GROUP_GUID__\r
 \r

-                                             \r
+\r

 #define EFI_EVENT_GROUP_EXIT_BOOT_SERVICES \\r
   { 0x27abf055, 0xb1b8, 0x4c26, { 0x80, 0x48, 0x74, 0x8f, 0x37, 0xba, 0xa2, 0xdf } }\r
 \r
 #define EFI_EVENT_GROUP_EXIT_BOOT_SERVICES \\r
   { 0x27abf055, 0xb1b8, 0x4c26, { 0x80, 0x48, 0x74, 0x8f, 0x37, 0xba, 0xa2, 0xdf } }\r
 \r

diff --git a/MdePkg/Include/Guid/EventLegacyBios.h b/MdePkg/Include/Guid/EventLegacyBios.h
index 1221b53e2d577b3b7baada213df60ee23ea6457a..93879df42fe12021ec6bd869867b3e6acd7e3831 100644 (file)
--- a/MdePkg/Include/Guid/EventLegacyBios.h
+++ b/MdePkg/Include/Guid/EventLegacyBios.h
@@ -1,16 +1,16 @@
 /** @file\r
 /** @file\r

-  GUID is the name of events used with CreateEventEx in order to be notified \r
+  GUID is the name of events used with CreateEventEx in order to be notified\r

   when the EFI boot manager is about to boot a legacy boot option.\r
   when the EFI boot manager is about to boot a legacy boot option.\r

-  Events of this type are notificated just before Int19h is invoked. \r
+  Events of this type are notificated just before Int19h is invoked.\r

 \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
+  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
   @par Revision Reference:\r
   GUID introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   GUID introduced in PI Version 1.0.\r

diff --git a/MdePkg/Include/Guid/FileInfo.h b/MdePkg/Include/Guid/FileInfo.h
index 4c3fd9adf8b268655a7da38f06ed1320efb3fe5d..9f118a38c8970e83833595cd74c5592b8a896feb 100644 (file)
--- a/MdePkg/Include/Guid/FileInfo.h
+++ b/MdePkg/Include/Guid/FileInfo.h
@@ -3,14 +3,14 @@
   and EFI_FILE_PROTOCOL.GetInfo() to set or get generic file information.\r
   This GUID is defined in UEFI specification.\r
 \r
   and EFI_FILE_PROTOCOL.GetInfo() to set or get generic file information.\r
   This GUID is defined in UEFI specification.\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
-    \r
-THE PROGRAM 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

diff --git a/MdePkg/Include/Guid/FileSystemInfo.h b/MdePkg/Include/Guid/FileSystemInfo.h
index f037f895b0f51e46fa4cb6dd01620743549fb552..887c081bd5397b5b1fd7e506c36691b50fc996d2 100644 (file)
--- a/MdePkg/Include/Guid/FileSystemInfo.h
+++ b/MdePkg/Include/Guid/FileSystemInfo.h
@@ -3,14 +3,14 @@
   or EFI_FILE_PROTOCOL.SetInfo() to get or set information about the system's volume.\r
   This GUID is defined in UEFI specification.\r
 \r
   or EFI_FILE_PROTOCOL.SetInfo() to get or set information about the system's volume.\r
   This GUID is defined in UEFI specification.\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
-    \r
-THE PROGRAM 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

diff --git a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
index 7bd090eeaff99a4375dbbb9b870a1090f71f0ce7..7d312d655ad60d63d5dca60c059afd73e6c95c3a 100644 (file)
--- a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
+++ b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
@@ -3,14 +3,14 @@
   or EFI_FILE_PROTOCOL.SetInfo() to get or set the system's volume label.\r
   This GUID is defined in UEFI specification.\r
 \r
   or EFI_FILE_PROTOCOL.SetInfo() to get or set the system's volume label.\r
   This GUID is defined in UEFI specification.\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/MdePkg/Include/Guid/FirmwareContentsSigned.h b/MdePkg/Include/Guid/FirmwareContentsSigned.h
index 5f9d2470524f812083cd4a57fa0a341a55d28889..f3bdefbcdbdf78d400697ad13ea76c574ebf7111 100644 (file)
--- a/MdePkg/Include/Guid/FirmwareContentsSigned.h
+++ b/MdePkg/Include/Guid/FirmwareContentsSigned.h
@@ -1,14 +1,14 @@
 /** @file\r
   GUID is used to define the signed section.\r
 \r
 /** @file\r
   GUID is used to define the signed section.\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
   @par Revision Reference:\r
   GUID introduced in PI Version 1.2.1.\r
 \r
   @par Revision Reference:\r
   GUID introduced in PI Version 1.2.1.\r

diff --git a/MdePkg/Include/Guid/FirmwareFileSystem2.h b/MdePkg/Include/Guid/FirmwareFileSystem2.h
index a70e4736d696f49def3037c74d76b2ebce4ad588..c30e186ef63067f17853aaef992454e7c07b78b8 100644 (file)
--- a/MdePkg/Include/Guid/FirmwareFileSystem2.h
+++ b/MdePkg/Include/Guid/FirmwareFileSystem2.h
@@ -1,14 +1,14 @@
 /** @file\r
   Guid used to define the Firmware File System 2.\r
 \r
 /** @file\r
   Guid used to define the Firmware File System 2.\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
+  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
   @par Revision Reference:\r
   GUIDs introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   GUIDs introduced in PI Version 1.0.\r


@@ -18,18 +18,18 @@
 #ifndef __FIRMWARE_FILE_SYSTEM2_GUID_H__\r
 #define __FIRMWARE_FILE_SYSTEM2_GUID_H__\r
 \r
 #ifndef __FIRMWARE_FILE_SYSTEM2_GUID_H__\r
 #define __FIRMWARE_FILE_SYSTEM2_GUID_H__\r
 \r

-/// \r
-/// The firmware volume header contains a data field for \r
+///\r
+/// The firmware volume header contains a data field for\r

 /// the file system GUID\r
 /// the file system GUID\r

-/// \r
+///\r

 #define EFI_FIRMWARE_FILE_SYSTEM2_GUID \\r
   { 0x8c8ce578, 0x8a3d, 0x4f1c, { 0x99, 0x35, 0x89, 0x61, 0x85, 0xc3, 0x2d, 0xd3 } }\r
 \r
 ///\r
 #define EFI_FIRMWARE_FILE_SYSTEM2_GUID \\r
   { 0x8c8ce578, 0x8a3d, 0x4f1c, { 0x99, 0x35, 0x89, 0x61, 0x85, 0xc3, 0x2d, 0xd3 } }\r
 \r
 ///\r

-/// A Volume Top File (VTF) is a file that must be \r
-/// located such that the last byte of the file is \r
+/// A Volume Top File (VTF) is a file that must be\r
+/// located such that the last byte of the file is\r

 /// also the last byte of the firmware volume\r
 /// also the last byte of the firmware volume\r

-/// \r
+///\r

 #define EFI_FFS_VOLUME_TOP_FILE_GUID \\r
   { 0x1BA0062E, 0xC779, 0x4582, { 0x85, 0x66, 0x33, 0x6A, 0xE8, 0xF7, 0x8F, 0x9 } }\r
 \r
 #define EFI_FFS_VOLUME_TOP_FILE_GUID \\r
   { 0x1BA0062E, 0xC779, 0x4582, { 0x85, 0x66, 0x33, 0x6A, 0xE8, 0xF7, 0x8F, 0x9 } }\r
 \r

diff --git a/MdePkg/Include/Guid/FirmwareFileSystem3.h b/MdePkg/Include/Guid/FirmwareFileSystem3.h
index b76058724e28025c2a3f6f270fbde2380dfc8ee4..b61bf7dd860269ca7d55e3c50d1b3ee88d56b4cd 100644 (file)
--- a/MdePkg/Include/Guid/FirmwareFileSystem3.h
+++ b/MdePkg/Include/Guid/FirmwareFileSystem3.h
@@ -1,14 +1,14 @@
 /** @file\r
   Guid used to define the Firmware File System 3.\r
 \r
 /** @file\r
   Guid used to define the Firmware File System 3.\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
+  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
   @par Revision Reference:\r
   GUIDs introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   GUIDs introduced in PI Version 1.0.\r


@@ -18,7 +18,7 @@
 #ifndef __FIRMWARE_FILE_SYSTEM3_GUID_H__\r
 #define __FIRMWARE_FILE_SYSTEM3_GUID_H__\r
 \r
 #ifndef __FIRMWARE_FILE_SYSTEM3_GUID_H__\r
 #define __FIRMWARE_FILE_SYSTEM3_GUID_H__\r
 \r

-/// \r
+///\r

 /// The firmware volume header contains a data field for the file system GUID\r
 /// {5473C07A-3DCB-4dca-BD6F-1E9689E7349A}\r
 ///\r
 /// The firmware volume header contains a data field for the file system GUID\r
 /// {5473C07A-3DCB-4dca-BD6F-1E9689E7349A}\r
 ///\r

diff --git a/MdePkg/Include/Guid/GlobalVariable.h b/MdePkg/Include/Guid/GlobalVariable.h
index 08042369a365f086d39fa922d20700dbff49cdcd..41f397cd514a85d02a9d17b65e5b9e228431e118 100644 (file)
--- a/MdePkg/Include/Guid/GlobalVariable.h
+++ b/MdePkg/Include/Guid/GlobalVariable.h
@@ -1,14 +1,14 @@
 /** @file\r
   GUID for EFI (NVRAM) Variables.\r
 \r
 /** @file\r
   GUID for EFI (NVRAM) Variables.\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
   @par Revision Reference:\r
   GUID defined in UEFI 2.1\r
 \r
   @par Revision Reference:\r
   GUID defined in UEFI 2.1\r

diff --git a/MdePkg/Include/Guid/Gpt.h b/MdePkg/Include/Guid/Gpt.h
index b43b7c4e963995eeac2bc6111e94821613dfda15..e7828498680ea1e18482e1713cb86f93db7c69a8 100644 (file)
--- a/MdePkg/Include/Guid/Gpt.h
+++ b/MdePkg/Include/Guid/Gpt.h
@@ -1,17 +1,17 @@
 /** @file\r
   Guids used for the GPT (GUID Partition Table)\r
 \r
 /** @file\r
   Guids used for the GPT (GUID Partition Table)\r
 \r

-  GPT defines a new disk partitioning scheme and also describes \r
-  usage of the legacy Master Boot Record (MBR) partitioning scheme. \r
+  GPT defines a new disk partitioning scheme and also describes\r
+  usage of the legacy Master Boot Record (MBR) partitioning scheme.\r

 \r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.1 spec.\r
 \r
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.1 spec.\r

diff --git a/MdePkg/Include/Guid/HiiFormMapMethodGuid.h b/MdePkg/Include/Guid/HiiFormMapMethodGuid.h
index edd8e789f17f632717362a708c8308f988d100ff..f1fb20f84ce57c0d0969d4c900b37b595c29ade1 100644 (file)
--- a/MdePkg/Include/Guid/HiiFormMapMethodGuid.h
+++ b/MdePkg/Include/Guid/HiiFormMapMethodGuid.h
@@ -1,14 +1,14 @@
 /** @file\r
   Guid used to identify HII FormMap configuration method.\r
 \r
 /** @file\r
   Guid used to identify HII FormMap configuration method.\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
+  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
 \r

-  THE PROGRAM 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
   @par Revision Reference:\r
   GUID defined in UEFI 2.2 spec.\r
 \r
   @par Revision Reference:\r
   GUID defined in UEFI 2.2 spec.\r

diff --git a/MdePkg/Include/Guid/HiiKeyBoardLayout.h b/MdePkg/Include/Guid/HiiKeyBoardLayout.h
index aed625167f61770c57d7ec806522de3bd862748a..3e1812f675b4fedb07d97ebe15251930f97387d7 100644 (file)
--- a/MdePkg/Include/Guid/HiiKeyBoardLayout.h
+++ b/MdePkg/Include/Guid/HiiKeyBoardLayout.h
@@ -1,15 +1,15 @@
 /** @file\r
 \r
   HII keyboard layout GUID as defined in UEFI2.1 specification\r
 /** @file\r
 \r
   HII keyboard layout GUID as defined in UEFI2.1 specification\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
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.1 spec.\r
 \r
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.1 spec.\r

diff --git a/MdePkg/Include/Guid/HiiPlatformSetupFormset.h b/MdePkg/Include/Guid/HiiPlatformSetupFormset.h
index b64f158247b958f1ad2e742ed720367a000ea150..eddf9bc7c8152dfe8143293194559fc21c5c4f37 100644 (file)
--- a/MdePkg/Include/Guid/HiiPlatformSetupFormset.h
+++ b/MdePkg/Include/Guid/HiiPlatformSetupFormset.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  GUID indicates that the form set contains forms designed to be used \r
+  GUID indicates that the form set contains forms designed to be used\r

   for platform configuration and this form set will be displayed.\r
 \r
   for platform configuration and this form set will be displayed.\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
-    \r
-THE PROGRAM 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
   @par Revision Reference:\r
   GUID defined in UEFI 2.1.\r
 \r
   @par Revision Reference:\r
   GUID defined in UEFI 2.1.\r

diff --git a/MdePkg/Include/Guid/HobList.h b/MdePkg/Include/Guid/HobList.h
index a4c377ed3e9a36303b09815ae851a67149c74f7c..c490f714dde4c9bd634ca952ddd03e37a31e0b9c 100644 (file)
--- a/MdePkg/Include/Guid/HobList.h
+++ b/MdePkg/Include/Guid/HobList.h
@@ -3,14 +3,14 @@
 \r
   These GUIDs point the HOB List passed from PEI to DXE.\r
 \r
 \r
   These GUIDs point the HOB List passed from PEI to DXE.\r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference:\r
   GUID introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   GUID introduced in PI Version 1.0.\r

diff --git a/MdePkg/Include/Guid/ImageAuthentication.h b/MdePkg/Include/Guid/ImageAuthentication.h
index 3b3b7b5f40dea3730d17c77a4e6816fa12a845dd..eb58cfc1e7684b43ffdd0ceecf23aa4f9bd4a19b 100644 (file)
--- a/MdePkg/Include/Guid/ImageAuthentication.h
+++ b/MdePkg/Include/Guid/ImageAuthentication.h
@@ -1,7 +1,7 @@
 /** @file\r
   Image signature database are defined for the signed image validation.\r
 \r
 /** @file\r
   Image signature database are defined for the signed image validation.\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


@@ -319,7 +319,7 @@ typedef struct {
   /// Zero or more image signatures. If the image contained no signatures,\r
   /// then this field is empty.\r
   /// EFI_SIGNATURE_LIST            Signature;\r
   /// Zero or more image signatures. If the image contained no signatures,\r
   /// then this field is empty.\r
   /// EFI_SIGNATURE_LIST            Signature;\r

-  /// \r
+  ///\r

 } EFI_IMAGE_EXECUTION_INFO;\r
 \r
 \r
 } EFI_IMAGE_EXECUTION_INFO;\r
 \r
 \r

diff --git a/MdePkg/Include/Guid/MdePkgTokenSpace.h b/MdePkg/Include/Guid/MdePkgTokenSpace.h
index 030e85ccbc8847f25ca788d7126483a796939718..ac78335e06c771087fb755b97a48e147312a0f6a 100644 (file)
--- a/MdePkg/Include/Guid/MdePkgTokenSpace.h
+++ b/MdePkg/Include/Guid/MdePkgTokenSpace.h
@@ -1,7 +1,7 @@
 /** @file\r
 /** @file\r

-  GUID for MdePkg PCD Token Space \r
+  GUID for MdePkg PCD Token Space\r

 \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

diff --git a/MdePkg/Include/Guid/MemoryAllocationHob.h b/MdePkg/Include/Guid/MemoryAllocationHob.h
index 0ca5d5d0c72a7014501305829c3721d4eb1f0548..1ba7db703713efb0f5aae4ae195b8bd2e8bb2e60 100644 (file)
--- a/MdePkg/Include/Guid/MemoryAllocationHob.h
+++ b/MdePkg/Include/Guid/MemoryAllocationHob.h
@@ -1,14 +1,14 @@
 /** @file\r
   GUIDs for HOBs used in memory allcation\r
 \r
 /** @file\r
   GUIDs for HOBs used in memory allcation\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
   @par Revision Reference:\r
   GUIDs introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   GUIDs introduced in PI Version 1.0.\r

diff --git a/MdePkg/Include/Guid/MemoryOverwriteControl.h b/MdePkg/Include/Guid/MemoryOverwriteControl.h
index 2903c83f723641b104a5627880160dbb87dd5738..29320f5c24ce25617ffdc5cb56de24cbbe23d832 100644 (file)
--- a/MdePkg/Include/Guid/MemoryOverwriteControl.h
+++ b/MdePkg/Include/Guid/MemoryOverwriteControl.h
@@ -1,20 +1,20 @@
 /** @file\r
 /** @file\r

-  GUID used for MemoryOverwriteRequestControl UEFI variable defined in \r
+  GUID used for MemoryOverwriteRequestControl UEFI variable defined in\r

   TCG Platform Reset Attack Mitigation Specification 1.00.\r
   See http://trustedcomputinggroup.org for the latest specification\r
 \r
   TCG Platform Reset Attack Mitigation Specification 1.00.\r
   See http://trustedcomputinggroup.org for the latest specification\r
 \r

-  The purpose of the MemoryOverwriteRequestControl UEFI variable is to give users (e.g., OS, loader) the ability to \r
-  indicate to the platform that secrets are present in memory and that the platform firmware must clear memory upon \r
-  a restart. The OS loader should not create the variable. Rather, the  firmware is required to create it. \r
+  The purpose of the MemoryOverwriteRequestControl UEFI variable is to give users (e.g., OS, loader) the ability to\r
+  indicate to the platform that secrets are present in memory and that the platform firmware must clear memory upon\r
+  a restart. The OS loader should not create the variable. Rather, the  firmware is required to create it.\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
+  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
 \r

-  THE PROGRAM 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,17 +27,17 @@
   }\r
 \r
 ///\r
   }\r
 \r
 ///\r

-///  Variable name is "MemoryOverwriteRequestControl" and it is a 1 byte unsigned value. \r
-///  The attributes should be: \r
-///  EFI_VARIABLE_NON_VOLATILE | \r
-///  EFI_VARIABLE_BOOTSERVICE_ACCESS | \r
-///  EFI_VARIABLE_RUNTIME_ACCESS \r
+///  Variable name is "MemoryOverwriteRequestControl" and it is a 1 byte unsigned value.\r
+///  The attributes should be:\r
+///  EFI_VARIABLE_NON_VOLATILE |\r
+///  EFI_VARIABLE_BOOTSERVICE_ACCESS |\r
+///  EFI_VARIABLE_RUNTIME_ACCESS\r

 ///\r
 #define MEMORY_OVERWRITE_REQUEST_VARIABLE_NAME L"MemoryOverwriteRequestControl"\r
 \r
 ///\r
 /// 0 = Firmware MUST clear the MOR bit\r
 ///\r
 #define MEMORY_OVERWRITE_REQUEST_VARIABLE_NAME L"MemoryOverwriteRequestControl"\r
 \r
 ///\r
 /// 0 = Firmware MUST clear the MOR bit\r

-/// 1 = Firmware MUST set the MOR bit \r
+/// 1 = Firmware MUST set the MOR bit\r

 ///\r
 #define MOR_CLEAR_MEMORY_BIT_MASK        0x01\r
 \r
 ///\r
 #define MOR_CLEAR_MEMORY_BIT_MASK        0x01\r
 \r

diff --git a/MdePkg/Include/Guid/Mps.h b/MdePkg/Include/Guid/Mps.h
index 492f931a06ee2cf4517dd4d79bcb107827312eec..8dad27da9d44fe15ca2093a854b5a3c1740cec50 100644 (file)
--- a/MdePkg/Include/Guid/Mps.h
+++ b/MdePkg/Include/Guid/Mps.h
@@ -3,14 +3,14 @@
   ACPI is the primary means of exporting MPS information to the OS. MPS only was\r
   included to support Itanium-based platform power on. So don't use it if you don't have too.\r
 \r
   ACPI is the primary means of exporting MPS information to the OS. MPS only was\r
   included to support Itanium-based platform power on. So don't use it if you don't have too.\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
+  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
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.0 spec.\r
 \r
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.0 spec.\r

diff --git a/MdePkg/Include/Guid/PcAnsi.h b/MdePkg/Include/Guid/PcAnsi.h
index e576fd3a63d9065e6a876667f8dc61e3429eab1f..bbf9ba3a0791fc521cc22fe3092f0d8d08d18a9b 100644 (file)
--- a/MdePkg/Include/Guid/PcAnsi.h
+++ b/MdePkg/Include/Guid/PcAnsi.h
@@ -1,14 +1,14 @@
 /** @file\r
   Terminal Device Path Vendor Guid.\r
 \r
 /** @file\r
   Terminal Device Path Vendor Guid.\r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.0 spec.\r
 \r
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.0 spec.\r


@@ -42,7 +42,7 @@
   { \\r
     0x37499a9d, 0x542f, 0x4c89, {0xa0, 0x26, 0x35, 0xda, 0x14, 0x20, 0x94, 0xe4 } \\r
   }\r
   { \\r
     0x37499a9d, 0x542f, 0x4c89, {0xa0, 0x26, 0x35, 0xda, 0x14, 0x20, 0x94, 0xe4 } \\r
   }\r

-  \r
+\r

 #define EFI_SAS_DEVICE_PATH_GUID \\r
   { \\r
     0xd487ddb4, 0x008b, 0x11d9, {0xaf, 0xdc, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d } \\r
 #define EFI_SAS_DEVICE_PATH_GUID \\r
   { \\r
     0xd487ddb4, 0x008b, 0x11d9, {0xaf, 0xdc, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d } \\r

diff --git a/MdePkg/Include/Guid/SalSystemTable.h b/MdePkg/Include/Guid/SalSystemTable.h
index d5e76f2bad3c3dae7223ca57b846a7d0d4edbe2e..31bebb7c2d5154c4847cfe26021840791b5424ba 100644 (file)
--- a/MdePkg/Include/Guid/SalSystemTable.h
+++ b/MdePkg/Include/Guid/SalSystemTable.h
@@ -4,14 +4,14 @@
   SAL System Table contains Itanium-based processor centric information about\r
   the system.\r
 \r
   SAL System Table contains Itanium-based processor centric information about\r
   the system.\r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.0 spec.\r
 \r
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.0 spec.\r

diff --git a/MdePkg/Include/Guid/SmBios.h b/MdePkg/Include/Guid/SmBios.h
index 430028808ecdc8963dff542bfc2187094bca6abf..5a8d946c2b5100a34d4972f3fc71dae1293337dc 100644 (file)
--- a/MdePkg/Include/Guid/SmBios.h
+++ b/MdePkg/Include/Guid/SmBios.h
@@ -5,14 +5,14 @@
   locate the SMBIOS tables. Do not search the 0xF0000 segment to find SMBIOS\r
   tables.\r
 \r
   locate the SMBIOS tables. Do not search the 0xF0000 segment to find SMBIOS\r
   tables.\r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.5 spec.\r
 \r
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.5 spec.\r

diff --git a/MdePkg/Include/Guid/StatusCodeDataTypeId.h b/MdePkg/Include/Guid/StatusCodeDataTypeId.h
index 21d6359e69e9cbcb9ce5ec392596914081c818c4..22cf8e5aae0737794f1455dc3b64092ed2117087 100644 (file)
--- a/MdePkg/Include/Guid/StatusCodeDataTypeId.h
+++ b/MdePkg/Include/Guid/StatusCodeDataTypeId.h
@@ -1,7 +1,7 @@
 /** @file\r
   GUID used to identify id for the caller who is initiating the Status Code.\r
 \r
 /** @file\r
   GUID used to identify id for the caller who is initiating the Status Code.\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


@@ -11,7 +11,7 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  These GUIDs and structures are defined in UEFI Platform Initialization Specification 1.2 \r
+  These GUIDs and structures are defined in UEFI Platform Initialization Specification 1.2\r

   Volume 3: Shared Architectural Elements\r
 \r
 **/\r
   Volume 3: Shared Architectural Elements\r
 \r
 **/\r


@@ -38,12 +38,12 @@ typedef enum {
   ///\r
   EfiStringUnicode,\r
   ///\r
   ///\r
   EfiStringUnicode,\r
   ///\r

-  /// An EFI_STATUS_CODE_STRING_TOKEN representing the string.  The actual \r
+  /// An EFI_STATUS_CODE_STRING_TOKEN representing the string.  The actual\r

   /// string can be obtained by querying the HII Database\r
   ///\r
   EfiStringToken\r
 } EFI_STRING_TYPE;\r
   /// string can be obtained by querying the HII Database\r
   ///\r
   EfiStringToken\r
 } EFI_STRING_TYPE;\r

- \r
+\r

 ///\r
 /// Specifies the format of the data in EFI_STATUS_CODE_STRING_DATA.String.\r
 ///\r
 ///\r
 /// Specifies the format of the data in EFI_STATUS_CODE_STRING_DATA.String.\r
 ///\r


@@ -60,7 +60,7 @@ typedef struct {
   ///\r
   EFI_STRING_ID   Token;\r
 } EFI_STATUS_CODE_STRING_TOKEN;\r
   ///\r
   EFI_STRING_ID   Token;\r
 } EFI_STATUS_CODE_STRING_TOKEN;\r

- \r
+\r

 typedef union {\r
   ///\r
   /// ASCII formatted string.\r
 typedef union {\r
   ///\r
   /// ASCII formatted string.\r


@@ -75,11 +75,11 @@ typedef union {
   ///\r
   EFI_STATUS_CODE_STRING_TOKEN  Hii;\r
 } EFI_STATUS_CODE_STRING;\r
   ///\r
   EFI_STATUS_CODE_STRING_TOKEN  Hii;\r
 } EFI_STATUS_CODE_STRING;\r

- \r
+\r

 ///\r
 ///\r

-/// This data type defines a string type of extended data. A string can accompany \r
-/// any status code. The string can provide additional information about the \r
-/// status code. The string can be ASCII, Unicode, or a Human Interface Infrastructure \r
+/// This data type defines a string type of extended data. A string can accompany\r
+/// any status code. The string can provide additional information about the\r
+/// status code. The string can be ASCII, Unicode, or a Human Interface Infrastructure\r

 /// (HII) token/GUID pair.\r
 ///\r
 typedef struct {\r
 /// (HII) token/GUID pair.\r
 ///\r
 typedef struct {\r


@@ -89,14 +89,14 @@ typedef struct {
   /// sizeof (EFI_STATUS_CODE_STRING_DATA) - HeaderSize, and\r
   /// DataHeader.Type should be\r
   /// EFI_STATUS_CODE_DATA_TYPE_STRING_GUID.\r
   /// sizeof (EFI_STATUS_CODE_STRING_DATA) - HeaderSize, and\r
   /// DataHeader.Type should be\r
   /// EFI_STATUS_CODE_DATA_TYPE_STRING_GUID.\r

-  /// \r
-  EFI_STATUS_CODE_DATA           DataHeader; \r
+  ///\r
+  EFI_STATUS_CODE_DATA           DataHeader;\r

   ///\r
   /// Specifies the format of the data in String.\r
   ///\r
   EFI_STRING_TYPE                StringType;\r
   ///\r
   ///\r
   /// Specifies the format of the data in String.\r
   ///\r
   EFI_STRING_TYPE                StringType;\r
   ///\r

-  /// A pointer to the extended data. The data follows the format specified by \r
+  /// A pointer to the extended data. The data follows the format specified by\r

   /// StringType.\r
   ///\r
   EFI_STATUS_CODE_STRING         String;\r
   /// StringType.\r
   ///\r
   EFI_STATUS_CODE_STRING         String;\r


@@ -123,7 +123,7 @@ extern EFI_GUID gEfiStatusCodeDataTypeStringGuid;
   { 0x335984bd, 0xe805, 0x409a, { 0xb8, 0xf8, 0xd2, 0x7e, 0xce, 0x5f, 0xf7, 0xa6 } }\r
 \r
 ///\r
   { 0x335984bd, 0xe805, 0x409a, { 0xb8, 0xf8, 0xd2, 0x7e, 0xce, 0x5f, 0xf7, 0xa6 } }\r
 \r
 ///\r

-/// Extended data about the device path, which is used for many errors and \r
+/// Extended data about the device path, which is used for many errors and\r

 /// progress codes to point to the device.\r
 ///\r
 /// The device path is used to point to the physical device in case there is more than one device\r
 /// progress codes to point to the device.\r
 ///\r
 /// The device path is used to point to the physical device in case there is more than one device\r


@@ -148,7 +148,7 @@ typedef struct {
   ///\r
   EFI_STATUS_CODE_DATA                 DataHeader;\r
   ///\r
   ///\r
   EFI_STATUS_CODE_DATA                 DataHeader;\r
   ///\r

-  /// The device path to the controller or the hardware device. Note that this parameter is a \r
+  /// The device path to the controller or the hardware device. Note that this parameter is a\r

   /// variable-length device path structure and not a pointer to such a structure. This structure is\r
   /// populated only if it is a physical device. For virtual devices, the Size field in DataHeader\r
   /// is set to zero and this field is not populated.\r
   /// variable-length device path structure and not a pointer to such a structure. This structure is\r
   /// populated only if it is a physical device. For virtual devices, the Size field in DataHeader\r
   /// is set to zero and this field is not populated.\r


@@ -183,7 +183,7 @@ typedef struct {
 ///\r
 /// This structure defines extended data describing a PCI resource allocation error.\r
 ///\r
 ///\r
 /// This structure defines extended data describing a PCI resource allocation error.\r
 ///\r

-/// @par Note: \r
+/// @par Note:\r

 ///   The following structure contains variable-length fields and cannot be defined as a C-style\r
 ///   structure.\r
 ///\r
 ///   The following structure contains variable-length fields and cannot be defined as a C-style\r
 ///   structure.\r
 ///\r


@@ -209,7 +209,7 @@ typedef struct {
   ///\r
   /// DevicePathSize should be zero if it is a virtual device that is not associated with\r
   /// a device path. Otherwise, this parameter is the length of the variable-length\r
   ///\r
   /// DevicePathSize should be zero if it is a virtual device that is not associated with\r
   /// a device path. Otherwise, this parameter is the length of the variable-length\r

-  /// DevicePath. \r
+  /// DevicePath.\r

   ///\r
   UINT16                             DevicePathSize;\r
   ///\r
   ///\r
   UINT16                             DevicePathSize;\r
   ///\r


@@ -223,9 +223,9 @@ typedef struct {
   ///\r
   UINT16                             AllocResSize;\r
   ///\r
   ///\r
   UINT16                             AllocResSize;\r
   ///\r

-  /// The device path to the controller or the hardware device that did not get the requested \r
-  /// resources. Note that this parameter is the variable-length device path structure and not \r
-  /// a pointer to this structure. \r
+  /// The device path to the controller or the hardware device that did not get the requested\r
+  /// resources. Note that this parameter is the variable-length device path structure and not\r
+  /// a pointer to this structure.\r

   ///\r
   //  EFI_DEVICE_PATH_PROTOCOL       DevicePath;\r
   ///\r
   ///\r
   //  EFI_DEVICE_PATH_PROTOCOL       DevicePath;\r
   ///\r


@@ -234,7 +234,7 @@ typedef struct {
   ///\r
   //  UINT8                          ReqRes[];\r
   ///\r
   ///\r
   //  UINT8                          ReqRes[];\r
   ///\r

-  /// The allocated resources in the format of an ACPI 2.0 resource descriptor. This \r
+  /// The allocated resources in the format of an ACPI 2.0 resource descriptor. This\r

   /// parameter is not a pointer; it is the complete resource descriptor.\r
   ///\r
   //  UINT8                          AllocRes[];\r
   /// parameter is not a pointer; it is the complete resource descriptor.\r
   ///\r
   //  UINT8                          AllocRes[];\r


@@ -244,7 +244,7 @@ typedef struct {
 /// This structure provides a calculation for base-10 representations.\r
 ///\r
 /// Not consistent with PI 1.2 Specification.\r
 /// This structure provides a calculation for base-10 representations.\r
 ///\r
 /// Not consistent with PI 1.2 Specification.\r

-/// This data type is not defined in the PI 1.2 Specification, but is \r
+/// This data type is not defined in the PI 1.2 Specification, but is\r

 /// required by several of the other data structures in this file.\r
 ///\r
 typedef struct {\r
 /// required by several of the other data structures in this file.\r
 ///\r
 typedef struct {\r


@@ -253,16 +253,16 @@ typedef struct {
   ///\r
   INT16                            Value;\r
   ///\r
   ///\r
   INT16                            Value;\r
   ///\r

-  /// The INT16 number by which to raise the base-2 calculation. \r
+  /// The INT16 number by which to raise the base-2 calculation.\r

   ///\r
   INT16                            Exponent;\r
 } EFI_EXP_BASE10_DATA;\r
 \r
 ///\r
   ///\r
   INT16                            Exponent;\r
 } EFI_EXP_BASE10_DATA;\r
 \r
 ///\r

-/// This structure provides the voltage at the time of error. It also provides \r
-/// the threshold value indicating the minimum or maximum voltage that is considered \r
-/// an error. If the voltage is less then the threshold, the error indicates that the \r
-/// voltage fell below the minimum acceptable value. If the voltage is greater then the threshold, \r
+/// This structure provides the voltage at the time of error. It also provides\r
+/// the threshold value indicating the minimum or maximum voltage that is considered\r
+/// an error. If the voltage is less then the threshold, the error indicates that the\r
+/// voltage fell below the minimum acceptable value. If the voltage is greater then the threshold,\r

 /// the error indicates that the voltage rose above the maximum acceptable value.\r
 ///\r
 typedef struct {\r
 /// the error indicates that the voltage rose above the maximum acceptable value.\r
 ///\r
 typedef struct {\r


@@ -312,7 +312,7 @@ typedef struct {
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_COMPUTING_UNIT_TIMER_EXPIRED_ERROR_DATA) -\r
   /// HeaderSize, and DataHeader.Type should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_COMPUTING_UNIT_TIMER_EXPIRED_ERROR_DATA) -\r
   /// HeaderSize, and DataHeader.Type should be\r

-  /// EFI_STATUS_CODE_SPECIFIC_DATA_GUID.  \r
+  /// EFI_STATUS_CODE_SPECIFIC_DATA_GUID.\r

   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r
   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r


@@ -341,11 +341,11 @@ typedef struct {
 ///\r
 /// This structure defines extended data for processor mismatch errors.\r
 ///\r
 ///\r
 /// This structure defines extended data for processor mismatch errors.\r
 ///\r

-/// This provides information to indicate which processors mismatch, and how they mismatch. The \r
-/// status code contains the instance number of the processor that is in error. This structure's \r
-/// Instance indicates the second processor that does not match. This differentiation allows the \r
-/// consumer to determine which two processors do not match. The Attributes indicate what \r
-/// mismatch is being reported. Because Attributes is a bit field, more than one mismatch can be \r
+/// This provides information to indicate which processors mismatch, and how they mismatch. The\r
+/// status code contains the instance number of the processor that is in error. This structure's\r
+/// Instance indicates the second processor that does not match. This differentiation allows the\r
+/// consumer to determine which two processors do not match. The Attributes indicate what\r
+/// mismatch is being reported. Because Attributes is a bit field, more than one mismatch can be\r

 /// reported with one error code.\r
 ///\r
 typedef struct {\r
 /// reported with one error code.\r
 ///\r
 typedef struct {\r


@@ -354,23 +354,23 @@ typedef struct {
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_ HOST_PROCESSOR_MISMATCH_ERROR_DATA) -\r
   /// HeaderSize , and DataHeader.Type should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_ HOST_PROCESSOR_MISMATCH_ERROR_DATA) -\r
   /// HeaderSize , and DataHeader.Type should be\r

-  /// EFI_STATUS_CODE_SPECIFIC_DATA_GUID.  \r
+  /// EFI_STATUS_CODE_SPECIFIC_DATA_GUID.\r

   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r
   /// The unit number of the computing unit that does not match.\r
   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r
   /// The unit number of the computing unit that does not match.\r

-  ///  \r
+  ///\r

   UINT32                Instance;\r
   UINT32                Instance;\r

-  /// \r
-  /// The attributes describing the failure. \r
-  ///  \r
+  ///\r
+  /// The attributes describing the failure.\r
+  ///\r

   UINT16                Attributes;\r
 } EFI_HOST_PROCESSOR_MISMATCH_ERROR_DATA;\r
 \r
 ///\r
 /// This structure provides details about the computing unit thermal failure.\r
 ///\r
   UINT16                Attributes;\r
 } EFI_HOST_PROCESSOR_MISMATCH_ERROR_DATA;\r
 \r
 ///\r
 /// This structure provides details about the computing unit thermal failure.\r
 ///\r

-/// This structure provides the temperature at the time of error. It also provides the threshold value \r
+/// This structure provides the temperature at the time of error. It also provides the threshold value\r

 /// indicating the minimum temperature that is considered an error.\r
 ///\r
 typedef struct {\r
 /// indicating the minimum temperature that is considered an error.\r
 ///\r
 typedef struct {\r


@@ -379,7 +379,7 @@ typedef struct {
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_COMPUTING_UNIT_THERMAL_ERROR_DATA) -\r
   /// HeaderSize , and DataHeader.Type should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_COMPUTING_UNIT_THERMAL_ERROR_DATA) -\r
   /// HeaderSize , and DataHeader.Type should be\r

-  /// EFI_STATUS_CODE_SPECIFIC_DATA_GUID.  \r
+  /// EFI_STATUS_CODE_SPECIFIC_DATA_GUID.\r

   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r
   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r


@@ -429,7 +429,7 @@ typedef struct {
 typedef UINT32  EFI_CPU_STATE_CHANGE_CAUSE;\r
 \r
 ///\r
 typedef UINT32  EFI_CPU_STATE_CHANGE_CAUSE;\r
 \r
 ///\r

-/// The reasons that the processor is disabled.  \r
+/// The reasons that the processor is disabled.\r

 /// Used to fill in EFI_COMPUTING_UNIT_CPU_DISABLED_ERROR_DATA.Cause.\r
 ///\r
 ///@{\r
 /// Used to fill in EFI_COMPUTING_UNIT_CPU_DISABLED_ERROR_DATA.Cause.\r
 ///\r
 ///@{\r


@@ -447,8 +447,8 @@ typedef UINT32  EFI_CPU_STATE_CHANGE_CAUSE;
 ///\r
 /// This structure provides information about the disabled computing unit.\r
 ///\r
 ///\r
 /// This structure provides information about the disabled computing unit.\r
 ///\r

-/// This structure provides details as to why and how the computing unit was disabled. The causes \r
-/// should cover the typical reasons a processor would be disabled. How the processor was disabled is \r
+/// This structure provides details as to why and how the computing unit was disabled. The causes\r
+/// should cover the typical reasons a processor would be disabled. How the processor was disabled is\r

 /// important because there are distinct differences between hardware and software disabling.\r
 ///\r
 typedef struct {\r
 /// important because there are distinct differences between hardware and software disabling.\r
 ///\r
 typedef struct {\r


@@ -461,12 +461,12 @@ typedef struct {
   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r
   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r

-  /// The reason for disabling the processor. \r
-  /// \r
+  /// The reason for disabling the processor.\r
+  ///\r

   UINT32                Cause;\r
   ///\r
   UINT32                Cause;\r
   ///\r

-  /// TRUE if the processor is disabled via software means such as not listing it in the ACPI tables. \r
-  /// Such a processor will respond to Interprocessor Interrupts (IPIs). FALSE if the processor is hardware \r
+  /// TRUE if the processor is disabled via software means such as not listing it in the ACPI tables.\r
+  /// Such a processor will respond to Interprocessor Interrupts (IPIs). FALSE if the processor is hardware\r

   /// disabled, which means it is invisible to software and will not respond to IPIs.\r
   ///\r
   BOOLEAN               SoftwareDisabled;\r
   /// disabled, which means it is invisible to software and will not respond to IPIs.\r
   ///\r
   BOOLEAN               SoftwareDisabled;\r


@@ -504,8 +504,8 @@ typedef UINT8 EFI_MEMORY_ERROR_OPERATION;
 ///@}\r
 \r
 ///\r
 ///@}\r
 \r
 ///\r

-/// This structure provides specific details about the memory error that was detected. It provides \r
-/// enough information so that consumers can identify the exact failure and provides enough \r
+/// This structure provides specific details about the memory error that was detected. It provides\r
+/// enough information so that consumers can identify the exact failure and provides enough\r

 /// information to enable corrective action if necessary.\r
 ///\r
 typedef struct {\r
 /// information to enable corrective action if necessary.\r
 ///\r
 typedef struct {\r


@@ -513,7 +513,7 @@ typedef struct {
   /// The data header identifying the data. DataHeader.HeaderSize should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_MEMORY_EXTENDED_ERROR_DATA) - HeaderSize, and\r
   /// The data header identifying the data. DataHeader.HeaderSize should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_MEMORY_EXTENDED_ERROR_DATA) - HeaderSize, and\r

-  /// DataHeader.Type should be EFI_STATUS_CODE_SPECIFIC_DATA_GUID.  \r
+  /// DataHeader.Type should be EFI_STATUS_CODE_SPECIFIC_DATA_GUID.\r

   ///\r
   EFI_STATUS_CODE_DATA          DataHeader;\r
   ///\r
   ///\r
   EFI_STATUS_CODE_DATA          DataHeader;\r
   ///\r


@@ -521,18 +521,18 @@ typedef struct {
   ///\r
   EFI_MEMORY_ERROR_GRANULARITY  Granularity;\r
   ///\r
   ///\r
   EFI_MEMORY_ERROR_GRANULARITY  Granularity;\r
   ///\r

-  /// The operation that resulted in the error being detected. \r
+  /// The operation that resulted in the error being detected.\r

   ///\r
   EFI_MEMORY_ERROR_OPERATION    Operation;\r
   ///\r
   ///\r
   EFI_MEMORY_ERROR_OPERATION    Operation;\r
   ///\r

-  /// The error syndrome, vendor-specific ECC syndrome, or CRC data associated with \r
+  /// The error syndrome, vendor-specific ECC syndrome, or CRC data associated with\r

   /// the error.  If unknown, should be initialized to 0.\r
   /// the error.  If unknown, should be initialized to 0.\r

-  /// Inconsistent with specification here:  \r
+  /// Inconsistent with specification here:\r

   /// This field in StatusCodes spec0.9 is defined as UINT32, keep code unchanged.\r
   ///\r
   UINTN                         Syndrome;\r
   ///\r
   /// This field in StatusCodes spec0.9 is defined as UINT32, keep code unchanged.\r
   ///\r
   UINTN                         Syndrome;\r
   ///\r

-  /// The physical address of the error. \r
+  /// The physical address of the error.\r

   ///\r
   EFI_PHYSICAL_ADDRESS          Address;\r
   ///\r
   ///\r
   EFI_PHYSICAL_ADDRESS          Address;\r
   ///\r


@@ -543,31 +543,31 @@ typedef struct {
 \r
 ///\r
 /// A definition to describe that the operation is performed on multiple devices within the array.\r
 \r
 ///\r
 /// A definition to describe that the operation is performed on multiple devices within the array.\r

-/// May be used for EFI_STATUS_CODE_DIMM_NUMBER.Array and EFI_STATUS_CODE_DIMM_NUMBER.Device. \r
+/// May be used for EFI_STATUS_CODE_DIMM_NUMBER.Array and EFI_STATUS_CODE_DIMM_NUMBER.Device.\r

 ///\r
 #define EFI_MULTIPLE_MEMORY_DEVICE_OPERATION 0xfffe\r
 \r
 ///\r
 /// A definition to describe that the operation is performed on all devices within the array.\r
 ///\r
 #define EFI_MULTIPLE_MEMORY_DEVICE_OPERATION 0xfffe\r
 \r
 ///\r
 /// A definition to describe that the operation is performed on all devices within the array.\r

-/// May be used for EFI_STATUS_CODE_DIMM_NUMBER.Array and EFI_STATUS_CODE_DIMM_NUMBER.Device. \r
+/// May be used for EFI_STATUS_CODE_DIMM_NUMBER.Array and EFI_STATUS_CODE_DIMM_NUMBER.Device.\r

 ///\r
 #define EFI_ALL_MEMORY_DEVICE_OPERATION 0xffff\r
 \r
 ///\r
 /// A definition to describe that the operation is performed on multiple arrays.\r
 ///\r
 #define EFI_ALL_MEMORY_DEVICE_OPERATION 0xffff\r
 \r
 ///\r
 /// A definition to describe that the operation is performed on multiple arrays.\r

-/// May be used for EFI_STATUS_CODE_DIMM_NUMBER.Array and EFI_STATUS_CODE_DIMM_NUMBER.Device. \r
+/// May be used for EFI_STATUS_CODE_DIMM_NUMBER.Array and EFI_STATUS_CODE_DIMM_NUMBER.Device.\r

 ///\r
 #define EFI_MULTIPLE_MEMORY_ARRAY_OPERATION 0xfffe\r
 \r
 ///\r
 /// A definition to describe that the operation is performed on all the arrays.\r
 ///\r
 #define EFI_MULTIPLE_MEMORY_ARRAY_OPERATION 0xfffe\r
 \r
 ///\r
 /// A definition to describe that the operation is performed on all the arrays.\r

-/// May be used for EFI_STATUS_CODE_DIMM_NUMBER.Array and EFI_STATUS_CODE_DIMM_NUMBER.Device. \r
+/// May be used for EFI_STATUS_CODE_DIMM_NUMBER.Array and EFI_STATUS_CODE_DIMM_NUMBER.Device.\r

 ///\r
 #define EFI_ALL_MEMORY_ARRAY_OPERATION 0xffff\r
 \r
 ///\r
 ///\r
 #define EFI_ALL_MEMORY_ARRAY_OPERATION 0xffff\r
 \r
 ///\r

-/// This extended data provides some context that consumers can use to locate a DIMM within the \r
-/// overall memory scheme.  \r
+/// This extended data provides some context that consumers can use to locate a DIMM within the\r
+/// overall memory scheme.\r

 ///\r
 /// This extended data provides some context that consumers can use to locate a DIMM within the\r
 /// overall memory scheme. The Array and Device numbers may indicate a specific DIMM, or they\r
 ///\r
 /// This extended data provides some context that consumers can use to locate a DIMM within the\r
 /// overall memory scheme. The Array and Device numbers may indicate a specific DIMM, or they\r


@@ -595,7 +595,7 @@ typedef struct {
 /// This structure defines extended data describing memory modules that do not match.\r
 ///\r
 /// This extended data may be used to convey the specifics of memory modules that do not match.\r
 /// This structure defines extended data describing memory modules that do not match.\r
 ///\r
 /// This extended data may be used to convey the specifics of memory modules that do not match.\r

-/// \r
+///\r

 typedef struct {\r
   ///\r
   /// The data header identifying the data. DataHeader.HeaderSize should be\r
 typedef struct {\r
   ///\r
   /// The data header identifying the data. DataHeader.HeaderSize should be\r


@@ -606,7 +606,7 @@ typedef struct {
   ///\r
   EFI_STATUS_CODE_DATA         DataHeader;\r
   ///\r
   ///\r
   EFI_STATUS_CODE_DATA         DataHeader;\r
   ///\r

-  /// The instance number of the memory module that does not match. \r
+  /// The instance number of the memory module that does not match.\r

   ///\r
   EFI_STATUS_CODE_DIMM_NUMBER  Instance;\r
 } EFI_MEMORY_MODULE_MISMATCH_ERROR_DATA;\r
   ///\r
   EFI_STATUS_CODE_DIMM_NUMBER  Instance;\r
 } EFI_MEMORY_MODULE_MISMATCH_ERROR_DATA;\r


@@ -614,7 +614,7 @@ typedef struct {
 ///\r
 /// This structure defines extended data describing a memory range.\r
 ///\r
 ///\r
 /// This structure defines extended data describing a memory range.\r
 ///\r

-/// This extended data may be used to convey the specifics of a memory range.  Ranges are specified \r
+/// This extended data may be used to convey the specifics of a memory range.  Ranges are specified\r

 /// with a start address and a length.\r
 ///\r
 typedef struct {\r
 /// with a start address and a length.\r
 ///\r
 typedef struct {\r


@@ -622,11 +622,11 @@ typedef struct {
   /// The data header identifying the data. DataHeader.HeaderSize should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_MEMORY_RANGE_EXTENDED_DATA) - HeaderSize, and\r
   /// The data header identifying the data. DataHeader.HeaderSize should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_MEMORY_RANGE_EXTENDED_DATA) - HeaderSize, and\r

-  /// DataHeader.Type should be EFI_STATUS_CODE_SPECIFIC_DATA_GUID.  \r
+  /// DataHeader.Type should be EFI_STATUS_CODE_SPECIFIC_DATA_GUID.\r

   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r
   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r

-  /// The starting address of the memory range. \r
+  /// The starting address of the memory range.\r

   ///\r
   EFI_PHYSICAL_ADDRESS  Start;\r
   ///\r
   ///\r
   EFI_PHYSICAL_ADDRESS  Start;\r
   ///\r


@@ -647,7 +647,7 @@ typedef struct {
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_DEBUG_ASSERT_DATA) - HeaderSize , and\r
   /// DataHeader.Type should be EFI_STATUS_CODE_SPECIFIC_DATA_GUID.\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_DEBUG_ASSERT_DATA) - HeaderSize , and\r
   /// DataHeader.Type should be EFI_STATUS_CODE_SPECIFIC_DATA_GUID.\r

-  /// \r
+  ///\r

   EFI_STATUS_CODE_DATA         DataHeader;\r
   ///\r
   /// The line number of the source file where the fault was generated.\r
   EFI_STATUS_CODE_DATA         DataHeader;\r
   ///\r
   /// The line number of the source file where the fault was generated.\r


@@ -658,7 +658,7 @@ typedef struct {
   ///\r
   UINT32                       FileNameSize;\r
   ///\r
   ///\r
   UINT32                       FileNameSize;\r
   ///\r

-  /// A pointer to a NULL-terminated ASCII or Unicode string that represents \r
+  /// A pointer to a NULL-terminated ASCII or Unicode string that represents\r

   /// the file name of the source file where the fault was generated.\r
   ///\r
   EFI_STATUS_CODE_STRING_DATA  *FileName;\r
   /// the file name of the source file where the fault was generated.\r
   ///\r
   EFI_STATUS_CODE_STRING_DATA  *FileName;\r


@@ -691,7 +691,7 @@ typedef union {
   /// EFI_SYSTEM_CONTEXT_X64 is defined in the\r
   /// EFI_DEBUG_SUPPORT_PROTOCOL in the UEFI Specification.\r
   ///\r
   /// EFI_SYSTEM_CONTEXT_X64 is defined in the\r
   /// EFI_DEBUG_SUPPORT_PROTOCOL in the UEFI Specification.\r
   ///\r

-  EFI_SYSTEM_CONTEXT_X64  SystemContextX64; \r
+  EFI_SYSTEM_CONTEXT_X64  SystemContextX64;\r

   ///\r
   /// The context of the ARM processor when the exception was generated. Type\r
   /// EFI_SYSTEM_CONTEXT_ARM is defined in the\r
   ///\r
   /// The context of the ARM processor when the exception was generated. Type\r
   /// EFI_SYSTEM_CONTEXT_ARM is defined in the\r


@@ -713,11 +713,11 @@ typedef struct {
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_STATUS_CODE_EXCEP_EXTENDED_DATA) - HeaderSize,\r
   /// and DataHeader.Type should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_STATUS_CODE_EXCEP_EXTENDED_DATA) - HeaderSize,\r
   /// and DataHeader.Type should be\r

-  /// EFI_STATUS_CODE_SPECIFIC_DATA_GUID.  \r
+  /// EFI_STATUS_CODE_SPECIFIC_DATA_GUID.\r

   ///\r
   EFI_STATUS_CODE_DATA                  DataHeader;\r
   ///\r
   ///\r
   EFI_STATUS_CODE_DATA                  DataHeader;\r
   ///\r

-  /// The system context. \r
+  /// The system context.\r

   ///\r
   EFI_STATUS_CODE_EXCEP_SYSTEM_CONTEXT  Context;\r
 } EFI_STATUS_CODE_EXCEP_EXTENDED_DATA;\r
   ///\r
   EFI_STATUS_CODE_EXCEP_SYSTEM_CONTEXT  Context;\r
 } EFI_STATUS_CODE_EXCEP_EXTENDED_DATA;\r


@@ -729,33 +729,33 @@ typedef struct {
 /// the UEFI Driver Binding Protocol.\r
 ///\r
 typedef struct {\r
 /// the UEFI Driver Binding Protocol.\r
 ///\r
 typedef struct {\r

-  /// \r
+  ///\r

   /// The data header identifying the data. DataHeader.HeaderSize should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_STATUS_CODE_START_EXTENDED_DATA) - HeaderSize,\r
   /// and DataHeader.Type should be\r
   /// The data header identifying the data. DataHeader.HeaderSize should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_STATUS_CODE_START_EXTENDED_DATA) - HeaderSize,\r
   /// and DataHeader.Type should be\r

-  /// EFI_STATUS_CODE_SPECIFIC_DATA_GUID.  \r
+  /// EFI_STATUS_CODE_SPECIFIC_DATA_GUID.\r

   ///\r
   EFI_STATUS_CODE_DATA           DataHeader;\r
   ///\r
   ///\r
   EFI_STATUS_CODE_DATA           DataHeader;\r
   ///\r

-  /// The controller handle. \r
+  /// The controller handle.\r

   ///\r
   EFI_HANDLE                     ControllerHandle;\r
   ///\r
   /// The driver binding handle.\r
   ///\r
   EFI_HANDLE                     DriverBindingHandle;\r
   ///\r
   EFI_HANDLE                     ControllerHandle;\r
   ///\r
   /// The driver binding handle.\r
   ///\r
   EFI_HANDLE                     DriverBindingHandle;\r

-  /// \r
-  /// The size of the RemainingDevicePath. It is zero if the Start() function is \r
+  ///\r
+  /// The size of the RemainingDevicePath. It is zero if the Start() function is\r

   /// called with RemainingDevicePath = NULL.  The UEFI Specification allows\r
   /// that the Start() function of bus drivers can be called in this way.\r
   ///\r
   UINT16                         DevicePathSize;\r
   ///\r
   /// called with RemainingDevicePath = NULL.  The UEFI Specification allows\r
   /// that the Start() function of bus drivers can be called in this way.\r
   ///\r
   UINT16                         DevicePathSize;\r
   ///\r

-  /// Matches the RemainingDevicePath parameter being passed to the Start() function. \r
-  /// Note that this parameter is the variable-length device path and not a pointer \r
+  /// Matches the RemainingDevicePath parameter being passed to the Start() function.\r
+  /// Note that this parameter is the variable-length device path and not a pointer\r

   /// to the device path.\r
   /// to the device path.\r

-  ///  \r
+  ///\r

   //  EFI_DEVICE_PATH_PROTOCOL   RemainingDevicePath;\r
 } EFI_STATUS_CODE_START_EXTENDED_DATA;\r
 \r
   //  EFI_DEVICE_PATH_PROTOCOL   RemainingDevicePath;\r
 } EFI_STATUS_CODE_START_EXTENDED_DATA;\r
 \r


@@ -771,7 +771,7 @@ typedef struct {
   /// The data header identifying the data. DataHeader.HeaderSize should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_LEGACY_OPROM_EXTENDED_DATA) - HeaderSize, and\r
   /// The data header identifying the data. DataHeader.HeaderSize should be\r
   /// sizeof (EFI_STATUS_CODE_DATA), DataHeader.Size should be\r
   /// sizeof (EFI_LEGACY_OPROM_EXTENDED_DATA) - HeaderSize, and\r

-  /// DataHeader.Type should be EFI_STATUS_CODE_SPECIFIC_DATA_GUID.  \r
+  /// DataHeader.Type should be EFI_STATUS_CODE_SPECIFIC_DATA_GUID.\r

   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r
   ///\r
   EFI_STATUS_CODE_DATA  DataHeader;\r
   ///\r


@@ -779,7 +779,7 @@ typedef struct {
   ///\r
   EFI_HANDLE            DeviceHandle;\r
   ///\r
   ///\r
   EFI_HANDLE            DeviceHandle;\r
   ///\r

-  /// The base address of the shadowed legacy ROM image.  May or may not point to the shadow RAM area. \r
+  /// The base address of the shadowed legacy ROM image.  May or may not point to the shadow RAM area.\r

   ///\r
   EFI_PHYSICAL_ADDRESS  RomImageBase;\r
 } EFI_LEGACY_OPROM_EXTENDED_DATA;\r
   ///\r
   EFI_PHYSICAL_ADDRESS  RomImageBase;\r
 } EFI_LEGACY_OPROM_EXTENDED_DATA;\r

diff --git a/MdePkg/Include/Guid/VectorHandoffTable.h b/MdePkg/Include/Guid/VectorHandoffTable.h
index a3b3a95e899dd98c39f6ca5b087117805841a9c5..70d84516174834042c1ffd07570086fff6b664f2 100644 (file)
--- a/MdePkg/Include/Guid/VectorHandoffTable.h
+++ b/MdePkg/Include/Guid/VectorHandoffTable.h
@@ -1,15 +1,15 @@
 /** @file\r
   GUID for system configuration table entry that points to the table\r
 /** @file\r
   GUID for system configuration table entry that points to the table\r

-  in case an entity in DXE wishes to update/change the vector table contents. \r
+  in case an entity in DXE wishes to update/change the vector table contents.\r

 \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
   @par Revision Reference:\r
   GUID defined in PI 1.2.1 spec.\r
 \r
   @par Revision Reference:\r
   GUID defined in PI 1.2.1 spec.\r

diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/ProcessorBind.h
index 1f9b56a8cb30399fcc38eff0379a2bedcc4bff43..8e4de7029cfc4466fad476485950a1beb7e9ed0a 100644 (file)
--- a/MdePkg/Include/Ia32/ProcessorBind.h
+++ b/MdePkg/Include/Ia32/ProcessorBind.h
@@ -1,14 +1,14 @@
 /** @file\r
   Processor or Compiler specific defines and types for IA-32 architecture.\r
 \r
 /** @file\r
   Processor or Compiler specific defines and types for IA-32 architecture.\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
-    \r
-THE PROGRAM 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


@@ -100,17 +100,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 \r
 //\r
 //\r
 \r
 //\r

-// This warning is for potentially uninitialized local variable, and it may cause false \r
+// This warning is for potentially uninitialized local variable, and it may cause false\r

 // positive issues in VS2013 and VS2015 build\r
 //\r
 #pragma warning ( disable : 4701 )\r
 // positive issues in VS2013 and VS2015 build\r
 //\r
 #pragma warning ( disable : 4701 )\r

-  \r
+\r

 //\r
 //\r

-// This warning is for potentially uninitialized local pointer variable, and it may cause \r
+// This warning is for potentially uninitialized local pointer variable, and it may cause\r

 // false positive issues in VS2013 and VS2015 build\r
 //\r
 #pragma warning ( disable : 4703 )\r
 // false positive issues in VS2013 and VS2015 build\r
 //\r
 #pragma warning ( disable : 4703 )\r

-  \r
+\r

 #endif\r
 \r
 #endif\r
 #endif\r
 \r
 #endif\r


@@ -168,7 +168,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   /// 1-byte signed value.\r
   ///\r
   typedef signed char         INT8;\r
   /// 1-byte signed value.\r
   ///\r
   typedef signed char         INT8;\r

-#else  \r
+#else\r

   ///\r
   /// 8-byte unsigned value.\r
   ///\r
   ///\r
   /// 8-byte unsigned value.\r
   ///\r


@@ -280,17 +280,17 @@ typedef INT32   INTN;
 #elif defined(_MSC_EXTENSIONS)\r
   ///\r
   /// Microsoft* compiler specific method for EFIAPI calling convention.\r
 #elif defined(_MSC_EXTENSIONS)\r
   ///\r
   /// Microsoft* compiler specific method for EFIAPI calling convention.\r

-  /// \r
-  #define EFIAPI __cdecl  \r
+  ///\r
+  #define EFIAPI __cdecl\r

 #elif defined(__GNUC__)\r
   ///\r
   /// GCC specific method for EFIAPI calling convention.\r
 #elif defined(__GNUC__)\r
   ///\r
   /// GCC specific method for EFIAPI calling convention.\r

-  /// \r
-  #define EFIAPI __attribute__((cdecl))  \r
+  ///\r
+  #define EFIAPI __attribute__((cdecl))\r

 #else\r
   ///\r
   /// The default for a non Microsoft* or GCC compiler is to assume the EFI ABI\r
 #else\r
   ///\r
   /// The default for a non Microsoft* or GCC compiler is to assume the EFI ABI\r

-  /// is the standard. \r
+  /// is the standard.\r

   ///\r
   #define EFIAPI\r
 #endif\r
   ///\r
   #define EFIAPI\r
 #endif\r


@@ -305,13 +305,13 @@ typedef INT32   INTN;
 \r
 /**\r
   Return the pointer to the first instruction of a function given a function pointer.\r
 \r
 /**\r
   Return the pointer to the first instruction of a function given a function pointer.\r

-  On IA-32 CPU architectures, these two pointer values are the same, \r
+  On IA-32 CPU architectures, these two pointer values are the same,\r

   so the implementation of this macro is very simple.\r
   so the implementation of this macro is very simple.\r

-  \r
+\r

   @param  FunctionPointer   A pointer to a function.\r
 \r
   @return The pointer to the first instruction of a function given a function pointer.\r
   @param  FunctionPointer   A pointer to a function.\r
 \r
   @return The pointer to the first instruction of a function given a function pointer.\r

-  \r
+\r

 **/\r
 #define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)\r
 \r
 **/\r
 #define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)\r
 \r

diff --git a/MdePkg/Include/IndustryStandard/Acpi10.h b/MdePkg/Include/IndustryStandard/Acpi10.h
index 635030ec5a607e1cf5737351a9d95616a1a42f9e..ba84723cb064abb9f0faa76ba2e3d7f446efd5b1 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi10.h
+++ b/MdePkg/Include/IndustryStandard/Acpi10.h
@@ -1,14 +1,14 @@
-/** @file   \r
+/** @file\r

   ACPI 1.0b definitions from the ACPI Specification, revision 1.0b\r
 \r
   ACPI 1.0b definitions from the ACPI Specification, revision 1.0b\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
-    \r
-THE PROGRAM 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
 #ifndef _ACPI_1_0_H_\r
 **/\r
 \r
 #ifndef _ACPI_1_0_H_\r


@@ -357,7 +357,7 @@ typedef struct {
 #define   EFI_ACPI_DMA_SPEED_TYPE_A                     0x20\r
 #define   EFI_ACPI_DMA_SPEED_TYPE_B                     0x40\r
 #define   EFI_ACPI_DMA_SPEED_TYPE_F                     0x60\r
 #define   EFI_ACPI_DMA_SPEED_TYPE_A                     0x20\r
 #define   EFI_ACPI_DMA_SPEED_TYPE_B                     0x40\r
 #define   EFI_ACPI_DMA_SPEED_TYPE_F                     0x60\r

-                                               \r
+\r

 #define EFI_ACPI_DMA_BUS_MASTER_MASK                    0x04\r
 #define   EFI_ACPI_DMA_BUS_MASTER                       0x04\r
 \r
 #define EFI_ACPI_DMA_BUS_MASTER_MASK                    0x04\r
 #define   EFI_ACPI_DMA_BUS_MASTER                       0x04\r
 \r


@@ -403,7 +403,7 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
 \r
 //\r
 // Root System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r

diff --git a/MdePkg/Include/IndustryStandard/Acpi20.h b/MdePkg/Include/IndustryStandard/Acpi20.h
index 4b1abf9e6f16a7cc4b2f4f0d2dedb696ddc461fc..9ca9a9c62b6c6c9a37103cef3f4abdfee799806c 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi20.h
+++ b/MdePkg/Include/IndustryStandard/Acpi20.h
@@ -1,14 +1,14 @@
-/** @file   \r
+/** @file\r

   ACPI 2.0 definitions from the ACPI Specification, revision 2.0\r
 \r
   ACPI 2.0 definitions from the ACPI Specification, revision 2.0\r
 \r

-  Copyright (c) 2006 - 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
+  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
 #ifndef _ACPI_2_0_H_\r
 **/\r
 \r
 #ifndef _ACPI_2_0_H_\r


@@ -103,7 +103,7 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
 \r
 //\r
 // Root System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r


@@ -114,7 +114,7 @@ typedef struct {
 \r
 //\r
 // Extended System Description Table\r
 \r
 //\r
 // Extended System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r

diff --git a/MdePkg/Include/IndustryStandard/Acpi30.h b/MdePkg/Include/IndustryStandard/Acpi30.h
index c47d1a28a03b755c582d9747ba77c8b7f7b9ba2d..9a713037fda4efb4334f10d221f326c17d49c27c 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi30.h
+++ b/MdePkg/Include/IndustryStandard/Acpi30.h
@@ -1,14 +1,14 @@
-/** @file   \r
+/** @file\r

   ACPI 3.0 definitions from the ACPI Specification Revision 3.0b October 10, 2006\r
 \r
   ACPI 3.0 definitions from the ACPI Specification Revision 3.0b October 10, 2006\r
 \r

-  Copyright (c) 2006 - 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
+  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
 #ifndef _ACPI_3_0_H_\r
 **/\r
 \r
 #ifndef _ACPI_3_0_H_\r


@@ -128,7 +128,7 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
 \r
 //\r
 // Root System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r


@@ -139,7 +139,7 @@ typedef struct {
 \r
 //\r
 // Extended System Description Table\r
 \r
 //\r
 // Extended System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r


@@ -597,7 +597,7 @@ typedef struct {
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r

-#define EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') \r
+#define EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ')\r

 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r
 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi40.h b/MdePkg/Include/IndustryStandard/Acpi40.h
index 1f8757fb731a0e22689a78f5543d0eda70b102a5..ecc6048046c3c12d07bff9b288597c5397fa6818 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi40.h
+++ b/MdePkg/Include/IndustryStandard/Acpi40.h
@@ -1,14 +1,14 @@
-/** @file   \r
+/** @file\r

   ACPI 4.0 definitions from the ACPI Specification Revision 4.0a April 5, 2010\r
 \r
   ACPI 4.0 definitions from the ACPI Specification Revision 4.0a April 5, 2010\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
+  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
 #ifndef _ACPI_4_0_H_\r
 **/\r
 \r
 #ifndef _ACPI_4_0_H_\r


@@ -86,7 +86,7 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
 \r
 //\r
 // Root System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r


@@ -97,7 +97,7 @@ typedef struct {
 \r
 //\r
 // Extended System Description Table\r
 \r
 //\r
 // Extended System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r


@@ -1132,7 +1132,7 @@ typedef struct {
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r

-#define EFI_ACPI_4_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') \r
+#define EFI_ACPI_4_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ')\r

 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r
 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi50.h b/MdePkg/Include/IndustryStandard/Acpi50.h
index 8af9963fff3a005b0d190ad9f86fc1b3383e537b..fd0e8d1d00ffb0f20806a13a8c2a69b314cd55e6 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi50.h
+++ b/MdePkg/Include/IndustryStandard/Acpi50.h
@@ -1,15 +1,15 @@
-/** @file   \r
+/** @file\r

   ACPI 5.0 definitions from the ACPI Specification Revision 5.0a November 13, 2013.\r
 \r
   Copyright (c) 2014 Hewlett-Packard Development Company, L.P.<BR>\r
   ACPI 5.0 definitions from the ACPI Specification Revision 5.0a November 13, 2013.\r
 \r
   Copyright (c) 2014 Hewlett-Packard Development Company, L.P.<BR>\r

-  Copyright (c) 2011 - 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) 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
 #ifndef _ACPI_5_0_H_\r
 **/\r
 \r
 #ifndef _ACPI_5_0_H_\r


@@ -208,7 +208,7 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
 \r
 //\r
 // Root System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r


@@ -219,7 +219,7 @@ typedef struct {
 \r
 //\r
 // Extended System Description Table\r
 \r
 //\r
 // Extended System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r


@@ -1876,7 +1876,7 @@ typedef struct {
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r

-#define EFI_ACPI_5_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') \r
+#define EFI_ACPI_5_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ')\r

 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r
 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi51.h b/MdePkg/Include/IndustryStandard/Acpi51.h
index f38aa46a0d785253a176598a1439b054232618ae..4b966ac033f965d6be15a3b5bffcb34e1c4d6ea6 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi51.h
+++ b/MdePkg/Include/IndustryStandard/Acpi51.h
@@ -1,16 +1,16 @@
-/** @file   \r
+/** @file\r

   ACPI 5.1 definitions from the ACPI Specification Revision 5.1 Errata B January, 2016.\r
 \r
   Copyright (c) 2014 Hewlett-Packard Development Company, L.P.<BR>\r
   ACPI 5.1 definitions from the ACPI Specification Revision 5.1 Errata B January, 2016.\r
 \r
   Copyright (c) 2014 Hewlett-Packard Development Company, L.P.<BR>\r

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

   (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
-  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 _ACPI_5_1_H_\r
 **/\r
 \r
 #ifndef _ACPI_5_1_H_\r


@@ -89,7 +89,7 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
 \r
 //\r
 // Root System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r


@@ -100,7 +100,7 @@ typedef struct {
 \r
 //\r
 // Extended System Description Table\r
 \r
 //\r
 // Extended System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r


@@ -1874,7 +1874,7 @@ typedef struct {
   UINT8                                    CommandComplete:1;\r
   UINT8                                    SciDoorbell:1;\r
   UINT8                                    Error:1;\r
   UINT8                                    CommandComplete:1;\r
   UINT8                                    SciDoorbell:1;\r
   UINT8                                    Error:1;\r

-  UINT8                                    PlatformNotification:1;  \r
+  UINT8                                    PlatformNotification:1;\r

   UINT8                                    Reserved:4;\r
   UINT8                                    Reserved1;\r
 } EFI_ACPI_5_1_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;\r
   UINT8                                    Reserved:4;\r
   UINT8                                    Reserved1;\r
 } EFI_ACPI_5_1_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;\r


@@ -1892,7 +1892,7 @@ typedef struct {
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r

-#define EFI_ACPI_5_1_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') \r
+#define EFI_ACPI_5_1_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ')\r

 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r
 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi60.h b/MdePkg/Include/IndustryStandard/Acpi60.h
index 29c16f48405da9ae3af63a257076052cc22b3f11..3570170c6b9717c7efc30cb944afa087c9f55680 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi60.h
+++ b/MdePkg/Include/IndustryStandard/Acpi60.h
@@ -1,15 +1,15 @@
-/** @file   \r
+/** @file\r

   ACPI 6.0 definitions from the ACPI Specification Revision 6.0 Errata A January, 2016.\r
 \r
   ACPI 6.0 definitions from the ACPI Specification Revision 6.0 Errata A January, 2016.\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
   (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
-  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 _ACPI_6_0_H_\r
 **/\r
 \r
 #ifndef _ACPI_6_0_H_\r


@@ -88,7 +88,7 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
 \r
 //\r
 // Root System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r


@@ -99,7 +99,7 @@ typedef struct {
 \r
 //\r
 // Extended System Description Table\r
 \r
 //\r
 // Extended System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r


@@ -2063,7 +2063,7 @@ typedef struct {
   UINT8                                    CommandComplete:1;\r
   UINT8                                    SciDoorbell:1;\r
   UINT8                                    Error:1;\r
   UINT8                                    CommandComplete:1;\r
   UINT8                                    SciDoorbell:1;\r
   UINT8                                    Error:1;\r

-  UINT8                                    PlatformNotification:1;  \r
+  UINT8                                    PlatformNotification:1;\r

   UINT8                                    Reserved:4;\r
   UINT8                                    Reserved1;\r
 } EFI_ACPI_6_0_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;\r
   UINT8                                    Reserved:4;\r
   UINT8                                    Reserved1;\r
 } EFI_ACPI_6_0_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;\r


@@ -2125,7 +2125,7 @@ typedef struct {
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r

-#define EFI_ACPI_6_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') \r
+#define EFI_ACPI_6_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ')\r

 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r
 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi61.h b/MdePkg/Include/IndustryStandard/Acpi61.h
index 4a370c27e01244fbee4b9df70fddb0d0bde1a5f4..b2276b7d64d5ddc8fa617296efe02f6f19686756 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi61.h
+++ b/MdePkg/Include/IndustryStandard/Acpi61.h
@@ -1,15 +1,15 @@
-/** @file   \r
+/** @file\r

   ACPI 6.1 definitions from the ACPI Specification Revision 6.1 January, 2016.\r
 \r
   ACPI 6.1 definitions from the ACPI Specification Revision 6.1 January, 2016.\r
 \r

-  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2016 - 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
 #ifndef _ACPI_6_1_H_\r
 **/\r
 \r
 #ifndef _ACPI_6_1_H_\r


@@ -88,7 +88,7 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
 \r
 //\r
 // Root System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r


@@ -99,7 +99,7 @@ typedef struct {
 \r
 //\r
 // Extended System Description Table\r
 \r
 //\r
 // Extended System Description Table\r

-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r

 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r


@@ -2095,7 +2095,7 @@ typedef struct {
   UINT8                                    CommandComplete:1;\r
   UINT8                                    SciDoorbell:1;\r
   UINT8                                    Error:1;\r
   UINT8                                    CommandComplete:1;\r
   UINT8                                    SciDoorbell:1;\r
   UINT8                                    Error:1;\r

-  UINT8                                    PlatformNotification:1;  \r
+  UINT8                                    PlatformNotification:1;\r

   UINT8                                    Reserved:4;\r
   UINT8                                    Reserved1;\r
 } EFI_ACPI_6_1_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;\r
   UINT8                                    Reserved:4;\r
   UINT8                                    Reserved1;\r
 } EFI_ACPI_6_1_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;\r


@@ -2157,7 +2157,7 @@ typedef struct {
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r

-#define EFI_ACPI_6_1_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') \r
+#define EFI_ACPI_6_1_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ')\r

 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r
 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r

diff --git a/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h b/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
index fac8fc33a3dda041624af7119ac9b0ac0546bab7..dd5566767e8f4b3d90d09ee9ac09227edc7f8805 100644 (file)
--- a/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
+++ b/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
@@ -1,14 +1,14 @@
-/** @file   \r
+/** @file\r

   ACPI Alert Standard Format Description Table ASF! as described in the ASF2.0 Specification\r
 \r
   ACPI Alert Standard Format Description Table ASF! as described in the ASF2.0 Specification\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
+  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
 #ifndef _ALERT_STANDARD_FORMAT_TABLE_H_\r
 **/\r
 \r
 #ifndef _ALERT_STANDARD_FORMAT_TABLE_H_\r


@@ -31,7 +31,7 @@ typedef struct {
 } EFI_ACPI_ASF_RECORD_HEADER;\r
 \r
 ///\r
 } EFI_ACPI_ASF_RECORD_HEADER;\r
 \r
 ///\r

-/// This structure contains information that identifies the system's type \r
+/// This structure contains information that identifies the system's type\r

 /// and configuration\r
 ///\r
 typedef struct {\r
 /// and configuration\r
 ///\r
 typedef struct {\r


@@ -84,7 +84,7 @@ typedef struct {
   UINT8                                DeviceAddress;\r
   UINT8                                Command;\r
   UINT8                                DataValue;\r
   UINT8                                DeviceAddress;\r
   UINT8                                Command;\r
   UINT8                                DataValue;\r

-} EFI_ACPI_ASF_CONTROLDATA;       \r
+} EFI_ACPI_ASF_CONTROLDATA;\r

 \r
 ///\r
 /// Alert Remote Control System Actions\r
 \r
 ///\r
 /// Alert Remote Control System Actions\r

diff --git a/MdePkg/Include/IndustryStandard/Atapi.h b/MdePkg/Include/IndustryStandard/Atapi.h
index 0df802e27bd013e6bdc2de951851301b2e62a509..f1b2d87456d3bb3b8edf047ce54977a8cef2f350 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Atapi.h
+++ b/MdePkg/Include/IndustryStandard/Atapi.h
@@ -2,13 +2,13 @@
   This file contains just some basic definitions that are needed by drivers\r
   that dealing with ATA/ATAPI interface.\r
 \r
   This file contains just some basic definitions that are needed by drivers\r
   that dealing with ATA/ATAPI interface.\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
-    \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


@@ -21,59 +21,59 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///\r
 /// ATA5_IDENTIFY_DATA is defined in ATA-5.\r
 /// (This structure is provided mainly for backward-compatibility support.\r
 ///\r
 /// ATA5_IDENTIFY_DATA is defined in ATA-5.\r
 /// (This structure is provided mainly for backward-compatibility support.\r

-/// Old drivers may reference fields that are marked "obsolete" in \r
-/// ATA_IDENTIFY_DATA, which currently conforms to ATA-8.) \r
+/// Old drivers may reference fields that are marked "obsolete" in\r
+/// ATA_IDENTIFY_DATA, which currently conforms to ATA-8.)\r

 ///\r
 ///\r

-typedef struct {    \r
+typedef struct {\r

   UINT16  config;             ///< General Configuration.\r
   UINT16  cylinders;          ///< Number of Cylinders.\r
   UINT16  config;             ///< General Configuration.\r
   UINT16  cylinders;          ///< Number of Cylinders.\r

-  UINT16  reserved_2; \r
-  UINT16  heads;              ///< Number of logical heads. \r
-  UINT16  vendor_data1; \r
-  UINT16  vendor_data2; \r
-  UINT16  sectors_per_track; \r
-  UINT16  vendor_specific_7_9[3]; \r
-  CHAR8   SerialNo[20];       ///< ASCII  \r
-  UINT16  vendor_specific_20_21[2];  \r
-  UINT16  ecc_bytes_available;    \r
-  CHAR8   FirmwareVer[8];     ///< ASCII  \r
-  CHAR8   ModelName[40];      ///< ASCII    \r
-  UINT16  multi_sector_cmd_max_sct_cnt; \r
-  UINT16  reserved_48; \r
-  UINT16  capabilities; \r
-  UINT16  reserved_50;     \r
-  UINT16  pio_cycle_timing;    \r
-  UINT16  reserved_52;             \r
-  UINT16  field_validity;     \r
-  UINT16  current_cylinders; \r
-  UINT16  current_heads; \r
-  UINT16  current_sectors;    \r
-  UINT16  CurrentCapacityLsb; \r
-  UINT16  CurrentCapacityMsb;     \r
-  UINT16  reserved_59;     \r
-  UINT16  user_addressable_sectors_lo; \r
-  UINT16  user_addressable_sectors_hi; \r
-  UINT16  reserved_62;     \r
-  UINT16  multi_word_dma_mode;    \r
-  UINT16  advanced_pio_modes; \r
-  UINT16  min_multi_word_dma_cycle_time; \r
-  UINT16  rec_multi_word_dma_cycle_time; \r
-  UINT16  min_pio_cycle_time_without_flow_control; \r
-  UINT16  min_pio_cycle_time_with_flow_control; \r
-  UINT16  reserved_69_79[11];     \r
-  UINT16  major_version_no; \r
-  UINT16  minor_version_no; \r
-  UINT16  command_set_supported_82;    ///< word 82 \r
-  UINT16  command_set_supported_83;    ///< word 83 \r
-  UINT16  command_set_feature_extn;    ///< word 84 \r
-  UINT16  command_set_feature_enb_85;  ///< word 85 \r
-  UINT16  command_set_feature_enb_86;  ///< word 86 \r
-  UINT16  command_set_feature_default; ///< word 87 \r
-  UINT16  ultra_dma_mode;              ///< word 88 \r
-  UINT16  reserved_89_127[39]; \r
-  UINT16  security_status; \r
-  UINT16  vendor_data_129_159[31]; \r
-  UINT16  reserved_160_255[96]; \r
+  UINT16  reserved_2;\r
+  UINT16  heads;              ///< Number of logical heads.\r
+  UINT16  vendor_data1;\r
+  UINT16  vendor_data2;\r
+  UINT16  sectors_per_track;\r
+  UINT16  vendor_specific_7_9[3];\r
+  CHAR8   SerialNo[20];       ///< ASCII\r
+  UINT16  vendor_specific_20_21[2];\r
+  UINT16  ecc_bytes_available;\r
+  CHAR8   FirmwareVer[8];     ///< ASCII\r
+  CHAR8   ModelName[40];      ///< ASCII\r
+  UINT16  multi_sector_cmd_max_sct_cnt;\r
+  UINT16  reserved_48;\r
+  UINT16  capabilities;\r
+  UINT16  reserved_50;\r
+  UINT16  pio_cycle_timing;\r
+  UINT16  reserved_52;\r
+  UINT16  field_validity;\r
+  UINT16  current_cylinders;\r
+  UINT16  current_heads;\r
+  UINT16  current_sectors;\r
+  UINT16  CurrentCapacityLsb;\r
+  UINT16  CurrentCapacityMsb;\r
+  UINT16  reserved_59;\r
+  UINT16  user_addressable_sectors_lo;\r
+  UINT16  user_addressable_sectors_hi;\r
+  UINT16  reserved_62;\r
+  UINT16  multi_word_dma_mode;\r
+  UINT16  advanced_pio_modes;\r
+  UINT16  min_multi_word_dma_cycle_time;\r
+  UINT16  rec_multi_word_dma_cycle_time;\r
+  UINT16  min_pio_cycle_time_without_flow_control;\r
+  UINT16  min_pio_cycle_time_with_flow_control;\r
+  UINT16  reserved_69_79[11];\r
+  UINT16  major_version_no;\r
+  UINT16  minor_version_no;\r
+  UINT16  command_set_supported_82;    ///< word 82\r
+  UINT16  command_set_supported_83;    ///< word 83\r
+  UINT16  command_set_feature_extn;    ///< word 84\r
+  UINT16  command_set_feature_enb_85;  ///< word 85\r
+  UINT16  command_set_feature_enb_86;  ///< word 86\r
+  UINT16  command_set_feature_default; ///< word 87\r
+  UINT16  ultra_dma_mode;              ///< word 88\r
+  UINT16  reserved_89_127[39];\r
+  UINT16  security_status;\r
+  UINT16  vendor_data_129_159[31];\r
+  UINT16  reserved_160_255[96];\r

 } ATA5_IDENTIFY_DATA;\r
 \r
 ///\r
 } ATA5_IDENTIFY_DATA;\r
 \r
 ///\r


@@ -86,50 +86,50 @@ typedef struct {
   UINT16  obsolete_1;\r
   UINT16  specific_config;                         ///< Specific Configuration.\r
   UINT16  obsolete_3;\r
   UINT16  obsolete_1;\r
   UINT16  specific_config;                         ///< Specific Configuration.\r
   UINT16  obsolete_3;\r

-  UINT16  retired_4_5[2]; \r
+  UINT16  retired_4_5[2];\r

   UINT16  obsolete_6;\r
   UINT16  cfa_reserved_7_8[2];\r
   UINT16  obsolete_6;\r
   UINT16  cfa_reserved_7_8[2];\r

-  UINT16  retired_9; \r
+  UINT16  retired_9;\r

   CHAR8   SerialNo[20];                            ///< word 10~19\r
   CHAR8   SerialNo[20];                            ///< word 10~19\r

-  UINT16  retired_20_21[2];  \r
-  UINT16  obsolete_22;    \r
+  UINT16  retired_20_21[2];\r
+  UINT16  obsolete_22;\r

   CHAR8   FirmwareVer[8];                          ///< word 23~26\r
   CHAR8   ModelName[40];                           ///< word 27~46\r
   UINT16  multi_sector_cmd_max_sct_cnt;\r
   CHAR8   FirmwareVer[8];                          ///< word 23~26\r
   CHAR8   ModelName[40];                           ///< word 27~46\r
   UINT16  multi_sector_cmd_max_sct_cnt;\r

-  UINT16  trusted_computing_support; \r
+  UINT16  trusted_computing_support;\r

   UINT16  capabilities_49;\r
   UINT16  capabilities_50;\r
   UINT16  capabilities_49;\r
   UINT16  capabilities_50;\r

-  UINT16  obsolete_51_52[2];           \r
-  UINT16  field_validity;     \r
-  UINT16  obsolete_54_58[5];     \r
+  UINT16  obsolete_51_52[2];\r
+  UINT16  field_validity;\r
+  UINT16  obsolete_54_58[5];\r

   UINT16  multi_sector_setting;\r
   UINT16  multi_sector_setting;\r

-  UINT16  user_addressable_sectors_lo; \r
-  UINT16  user_addressable_sectors_hi; \r
-  UINT16  obsolete_62;     \r
-  UINT16  multi_word_dma_mode;    \r
-  UINT16  advanced_pio_modes; \r
-  UINT16  min_multi_word_dma_cycle_time; \r
-  UINT16  rec_multi_word_dma_cycle_time; \r
-  UINT16  min_pio_cycle_time_without_flow_control; \r
-  UINT16  min_pio_cycle_time_with_flow_control; \r
+  UINT16  user_addressable_sectors_lo;\r
+  UINT16  user_addressable_sectors_hi;\r
+  UINT16  obsolete_62;\r
+  UINT16  multi_word_dma_mode;\r
+  UINT16  advanced_pio_modes;\r
+  UINT16  min_multi_word_dma_cycle_time;\r
+  UINT16  rec_multi_word_dma_cycle_time;\r
+  UINT16  min_pio_cycle_time_without_flow_control;\r
+  UINT16  min_pio_cycle_time_with_flow_control;\r

   UINT16  additional_supported;                    ///< word 69\r
   UINT16  reserved_70;\r
   UINT16  reserved_71_74[4];                       ///< Reserved for IDENTIFY PACKET DEVICE cmd.\r
   UINT16  additional_supported;                    ///< word 69\r
   UINT16  reserved_70;\r
   UINT16  reserved_71_74[4];                       ///< Reserved for IDENTIFY PACKET DEVICE cmd.\r

-  UINT16  queue_depth;     \r
+  UINT16  queue_depth;\r

   UINT16  serial_ata_capabilities;\r
   UINT16  reserved_77;                             ///< Reserved for Serial ATA\r
   UINT16  serial_ata_features_supported;\r
   UINT16  serial_ata_features_enabled;\r
   UINT16  serial_ata_capabilities;\r
   UINT16  reserved_77;                             ///< Reserved for Serial ATA\r
   UINT16  serial_ata_features_supported;\r
   UINT16  serial_ata_features_enabled;\r

-  UINT16  major_version_no; \r
-  UINT16  minor_version_no; \r
+  UINT16  major_version_no;\r
+  UINT16  minor_version_no;\r

   UINT16  command_set_supported_82;                ///< word 82\r
   UINT16  command_set_supported_83;                ///< word 83\r
   UINT16  command_set_feature_extn;                ///< word 84\r
   UINT16  command_set_feature_enb_85;              ///< word 85\r
   UINT16  command_set_feature_enb_86;              ///< word 86\r
   UINT16  command_set_feature_default;             ///< word 87\r
   UINT16  command_set_supported_82;                ///< word 82\r
   UINT16  command_set_supported_83;                ///< word 83\r
   UINT16  command_set_feature_extn;                ///< word 84\r
   UINT16  command_set_feature_enb_85;              ///< word 85\r
   UINT16  command_set_feature_enb_86;              ///< word 86\r
   UINT16  command_set_feature_default;             ///< word 87\r

-  UINT16  ultra_dma_mode;                          ///< word 88 \r
-  UINT16  time_for_security_erase_unit; \r
+  UINT16  ultra_dma_mode;                          ///< word 88\r
+  UINT16  time_for_security_erase_unit;\r

   UINT16  time_for_enhanced_security_erase_unit;\r
   UINT16  advanced_power_management_level;\r
   UINT16  master_password_identifier;\r
   UINT16  time_for_enhanced_security_erase_unit;\r
   UINT16  advanced_power_management_level;\r
   UINT16  master_password_identifier;\r


@@ -154,7 +154,7 @@ typedef struct {
   UINT16  reserved_121_126[6];\r
   UINT16  obsolete_127;\r
   UINT16  security_status;                         ///< word 128\r
   UINT16  reserved_121_126[6];\r
   UINT16  obsolete_127;\r
   UINT16  security_status;                         ///< word 128\r

-  UINT16  vendor_specific_129_159[31]; \r
+  UINT16  vendor_specific_129_159[31];\r

   UINT16  cfa_power_mode;                          ///< word 160\r
   UINT16  reserved_for_compactflash_161_167[7];\r
   UINT16  device_nominal_form_factor;\r
   UINT16  cfa_power_mode;                          ///< word 160\r
   UINT16  reserved_for_compactflash_161_167[7];\r
   UINT16  device_nominal_form_factor;\r


@@ -239,7 +239,7 @@ typedef struct {
   UINT16  reserved_95_107[13];\r
   UINT16  world_wide_name[4];                      ///< word 108~111\r
   UINT16  reserved_for_128bit_wwn_112_115[4];\r
   UINT16  reserved_95_107[13];\r
   UINT16  world_wide_name[4];                      ///< word 108~111\r
   UINT16  reserved_for_128bit_wwn_112_115[4];\r

-  UINT16  reserved_116_118[3];  \r
+  UINT16  reserved_116_118[3];\r

   UINT16  command_and_feature_sets_supported;      ///< word 119\r
   UINT16  command_and_feature_sets_supported_enabled;\r
   UINT16  reserved_121_124[4];\r
   UINT16  command_and_feature_sets_supported;      ///< word 119\r
   UINT16  command_and_feature_sets_supported_enabled;\r
   UINT16  reserved_121_124[4];\r


@@ -458,7 +458,7 @@ typedef struct {
 \r
 ///\r
 /// ATAPI_PACKET_COMMAND is not defined in the ATA specification.\r
 \r
 ///\r
 /// ATAPI_PACKET_COMMAND is not defined in the ATA specification.\r

-/// We add it here for the convenience of ATA/ATAPI module writers. \r
+/// We add it here for the convenience of ATA/ATAPI module writers.\r

 ///\r
 typedef union {\r
   UINT16                    Data16[6];\r
 ///\r
 typedef union {\r
   UINT16                    Data16[6];\r


@@ -477,7 +477,7 @@ typedef union {
 #define ATAPI_MAX_DMA_CMD_SECTORS                       0x100\r
 \r
 //  ATA/ATAPI Signature equates\r
 #define ATAPI_MAX_DMA_CMD_SECTORS                       0x100\r
 \r
 //  ATA/ATAPI Signature equates\r

-#define ATA_SIGNATURE                                   0x0101       ///< defined in ACS-3  \r
+#define ATA_SIGNATURE                                   0x0101       ///< defined in ACS-3\r

 #define ATAPI_SIGNATURE                                 0xeb14       ///< defined in ACS-3\r
 #define ATAPI_SIGNATURE_32                              0xeb140101   ///< defined in ACS-3\r
 \r
 #define ATAPI_SIGNATURE                                 0xeb14       ///< defined in ACS-3\r
 #define ATAPI_SIGNATURE_32                              0xeb140101   ///< defined in ACS-3\r
 \r


@@ -521,11 +521,11 @@ typedef union {
 #define ATA_CMD_GET_CONFIGURATION                       0x46   ///< defined in ATAPI Multimedia Devices\r
    #define ATA_GCCD_RT_FIELD_VALUE_ALL                      0x00   ///< defined in ATAPI Multimedia Devices\r
    #define ATA_GCCD_RT_FIELD_VALUE_CURRENT                  0x01   ///< defined in ATAPI Multimedia Devices\r
 #define ATA_CMD_GET_CONFIGURATION                       0x46   ///< defined in ATAPI Multimedia Devices\r
    #define ATA_GCCD_RT_FIELD_VALUE_ALL                      0x00   ///< defined in ATAPI Multimedia Devices\r
    #define ATA_GCCD_RT_FIELD_VALUE_CURRENT                  0x01   ///< defined in ATAPI Multimedia Devices\r

-   #define ATA_GCCD_RT_FIELD_VALUE_SINGLE                   0x02   ///< defined in ATAPI Multimedia Devices \r
-   #define ATA_GCCD_RT_FIELD_VALUE_RESERVED                 0x03   ///< defined in ATAPI Multimedia Devices \r
-   \r
+   #define ATA_GCCD_RT_FIELD_VALUE_SINGLE                   0x02   ///< defined in ATAPI Multimedia Devices\r
+   #define ATA_GCCD_RT_FIELD_VALUE_RESERVED                 0x03   ///< defined in ATAPI Multimedia Devices\r
+\r

    #define ATA_FEATURE_LIST_PROFILE_LIST                    0x0000   ///< defined in ATAPI Multimedia Devices\r
    #define ATA_FEATURE_LIST_PROFILE_LIST                    0x0000   ///< defined in ATAPI Multimedia Devices\r

-   #define ATA_FEATURE_LIST_CORE                            0x0001   ///< defined in ATAPI Multimedia Devices   \r
+   #define ATA_FEATURE_LIST_CORE                            0x0001   ///< defined in ATAPI Multimedia Devices\r

    #define ATA_FEATURE_LIST_MORPHING                        0x0002   ///< defined in ATAPI Multimedia Devices\r
    #define ATA_FEATURE_LIST_REMOVEABLE_MEDIUM               0x0003   ///< defined in ATAPI Multimedia Devices\r
    #define ATA_FEATURE_LIST_WRITE_PROTECT                   0x0004   ///< defined in ATAPI Multimedia Devices\r
    #define ATA_FEATURE_LIST_MORPHING                        0x0002   ///< defined in ATAPI Multimedia Devices\r
    #define ATA_FEATURE_LIST_REMOVEABLE_MEDIUM               0x0003   ///< defined in ATAPI Multimedia Devices\r
    #define ATA_FEATURE_LIST_WRITE_PROTECT                   0x0004   ///< defined in ATAPI Multimedia Devices\r


@@ -549,33 +549,33 @@ typedef union {
 //\r
 #define ATA_CMD_IDENTIFY_DRIVE                          0xec   ///< defined from ATA-3\r
 #define ATA_CMD_READ_BUFFER                             0xe4   ///< defined from ATA-1\r
 //\r
 #define ATA_CMD_IDENTIFY_DRIVE                          0xec   ///< defined from ATA-3\r
 #define ATA_CMD_READ_BUFFER                             0xe4   ///< defined from ATA-1\r

-#define ATA_CMD_READ_SECTORS                            0x20   ///< defined from ATA-1     \r
+#define ATA_CMD_READ_SECTORS                            0x20   ///< defined from ATA-1\r

 #define ATA_CMD_READ_SECTORS_WITH_RETRY                 0x21   ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_READ_LONG                               0x22   ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_READ_LONG_WITH_RETRY                    0x23   ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_READ_SECTORS_EXT                        0x24   ///< defined from ATA-6\r
 #define ATA_CMD_READ_SECTORS_WITH_RETRY                 0x21   ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_READ_LONG                               0x22   ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_READ_LONG_WITH_RETRY                    0x23   ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_READ_SECTORS_EXT                        0x24   ///< defined from ATA-6\r

-#define ATA_CMD_READ_MULTIPLE                           0xc4   ///< defined in ACS-3  \r
-#define ATA_CMD_READ_MULTIPLE_EXT                       0x29   ///< defined in ACS-3  \r
-#define ATA_CMD_READ_LOG_EXT                            0x2f   ///< defined in ACS-3  \r
+#define ATA_CMD_READ_MULTIPLE                           0xc4   ///< defined in ACS-3\r
+#define ATA_CMD_READ_MULTIPLE_EXT                       0x29   ///< defined in ACS-3\r
+#define ATA_CMD_READ_LOG_EXT                            0x2f   ///< defined in ACS-3\r

 \r
 //\r
 // Class 2: PIO Data-Out Commands\r
 //\r
 #define ATA_CMD_FORMAT_TRACK                            0x50  ///< defined from ATA-1, obsoleted from ATA-4\r
 \r
 //\r
 // Class 2: PIO Data-Out Commands\r
 //\r
 #define ATA_CMD_FORMAT_TRACK                            0x50  ///< defined from ATA-1, obsoleted from ATA-4\r

-#define ATA_CMD_WRITE_BUFFER                            0xe8  ///< defined from ATA-1  \r
+#define ATA_CMD_WRITE_BUFFER                            0xe8  ///< defined from ATA-1\r

 #define ATA_CMD_WRITE_SECTORS                           0x30  ///< defined from ATA-1\r
 #define ATA_CMD_WRITE_SECTORS_WITH_RETRY                0x31  ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_WRITE_LONG                              0x32  ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_WRITE_LONG_WITH_RETRY                   0x33  ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_WRITE_VERIFY                            0x3c  ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_WRITE_SECTORS_EXT                       0x34  ///< defined from ATA-6\r
 #define ATA_CMD_WRITE_SECTORS                           0x30  ///< defined from ATA-1\r
 #define ATA_CMD_WRITE_SECTORS_WITH_RETRY                0x31  ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_WRITE_LONG                              0x32  ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_WRITE_LONG_WITH_RETRY                   0x33  ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_WRITE_VERIFY                            0x3c  ///< defined from ATA-1, obsoleted from ATA-5\r
 #define ATA_CMD_WRITE_SECTORS_EXT                       0x34  ///< defined from ATA-6\r

-#define ATA_CMD_WRITE_MULTIPLE                          0xc5  ///< defined in ACS-3  \r
-#define ATA_CMD_WRITE_MULTIPLE_EXT                      0x39  ///< defined in ACS-3  \r
+#define ATA_CMD_WRITE_MULTIPLE                          0xc5  ///< defined in ACS-3\r
+#define ATA_CMD_WRITE_MULTIPLE_EXT                      0x39  ///< defined in ACS-3\r

 \r
 //\r
 // Class 3 No Data Command\r
 //\r
 \r
 //\r
 // Class 3 No Data Command\r
 //\r

-#define ATA_CMD_ACK_MEDIA_CHANGE                        0xdb  ///< defined from ATA-1, obsoleted from ATA-5 \r
+#define ATA_CMD_ACK_MEDIA_CHANGE                        0xdb  ///< defined from ATA-1, obsoleted from ATA-5\r

 #define ATA_CMD_BOOT_POST_BOOT                          0xdc  ///< defined from ATA-1, obsoleted from ATA-3\r
 #define ATA_CMD_BOOT_PRE_BOOT                           0xdd  ///< defined from ATA-1, obsoleted from ATA-3\r
 #define ATA_CMD_CHECK_POWER_MODE                        0x98  ///< defined from ATA-1, obsoleted from ATA-4\r
 #define ATA_CMD_BOOT_POST_BOOT                          0xdc  ///< defined from ATA-1, obsoleted from ATA-3\r
 #define ATA_CMD_BOOT_PRE_BOOT                           0xdd  ///< defined from ATA-1, obsoleted from ATA-3\r
 #define ATA_CMD_CHECK_POWER_MODE                        0x98  ///< defined from ATA-1, obsoleted from ATA-4\r


@@ -599,39 +599,39 @@ typedef union {
 #define ATA_CMD_STANDBY_ALIAS                           0xe2  ///< defined from ATA-1\r
 #define ATA_CMD_STANDBY_IMMEDIATE                       0x94  ///< defined from ATA-1, obsoleted from ATA-4\r
 #define ATA_CMD_STANDBY_IMMEDIATE_ALIAS                 0xe0  ///< defined from ATA-1\r
 #define ATA_CMD_STANDBY_ALIAS                           0xe2  ///< defined from ATA-1\r
 #define ATA_CMD_STANDBY_IMMEDIATE                       0x94  ///< defined from ATA-1, obsoleted from ATA-4\r
 #define ATA_CMD_STANDBY_IMMEDIATE_ALIAS                 0xe0  ///< defined from ATA-1\r

-#define ATA_CMD_SLEEP                                   0xe6  ///< defined in ACS-3  \r
-#define ATA_CMD_READ_NATIVE_MAX_ADDRESS                 0xf8  ///< defined in ATA-6  \r
-#define ATA_CMD_READ_NATIVE_MAX_ADDRESS_EXT             0x27  ///< defined in ATA-6  \r
+#define ATA_CMD_SLEEP                                   0xe6  ///< defined in ACS-3\r
+#define ATA_CMD_READ_NATIVE_MAX_ADDRESS                 0xf8  ///< defined in ATA-6\r
+#define ATA_CMD_READ_NATIVE_MAX_ADDRESS_EXT             0x27  ///< defined in ATA-6\r

 \r
 //\r
 // Set Features Sub Command\r
 //\r
 \r
 //\r
 // Set Features Sub Command\r
 //\r

-#define ATA_SUB_CMD_ENABLE_VOLATILE_WRITE_CACHE             0x02   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_SET_TRANSFER_MODE                       0x03   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_ENABLE_APM                              0x05   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_ENABLE_PUIS                             0x06   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_PUIS_SET_DEVICE_SPINUP                  0x07   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_ENABLE_WRITE_READ_VERIFY                0x0b   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_ENABLE_SATA_FEATURE                     0x10   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_DISABLE_MEDIA_STATUS_NOTIFICATION       0x31   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_ENABLE_FREE_FALL_CONTROL                0x41   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_ACOUSTIC_MANAGEMENT_ENABLE              0x42   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_SET_MAX_HOST_INTERFACE_SECTOR_TIMES     0x43   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_EXTENDED_POWER_CONDITIONS               0x4a   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_DISABLE_READ_LOOK_AHEAD                 0x55   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_EN_DIS_DSN_FEATURE                      0x63   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_DISABLE_REVERT_TO_POWER_ON_DEFAULTS     0x66   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_DISABLE_VOLATILE_WRITE_CACHE            0x82   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_DISABLE_APM                             0x85   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_DISABLE_PUIS                            0x86   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_DISABLE_WRITE_READ_VERIFY               0x8b   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_DISABLE_SATA_FEATURE                    0x90   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_ENABLE_MEDIA_STATUS_NOTIFICATION        0x95   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_ENABLE_READ_LOOK_AHEAD                  0xaa   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_DISABLE_FREE_FALL_CONTROL               0xc1   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_ACOUSTIC_MANAGEMENT_DISABLE             0xc2   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_EN_DIS_SENSE_DATA_REPORTING             0xc3   ///< defined in ACS-3 \r
-#define ATA_SUB_CMD_ENABLE_REVERT_TO_POWER_ON_DEFAULTS      0xcc   ///< defined in ACS-3 \r
+#define ATA_SUB_CMD_ENABLE_VOLATILE_WRITE_CACHE             0x02   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_SET_TRANSFER_MODE                       0x03   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_ENABLE_APM                              0x05   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_ENABLE_PUIS                             0x06   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_PUIS_SET_DEVICE_SPINUP                  0x07   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_ENABLE_WRITE_READ_VERIFY                0x0b   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_ENABLE_SATA_FEATURE                     0x10   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_DISABLE_MEDIA_STATUS_NOTIFICATION       0x31   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_ENABLE_FREE_FALL_CONTROL                0x41   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_ACOUSTIC_MANAGEMENT_ENABLE              0x42   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_SET_MAX_HOST_INTERFACE_SECTOR_TIMES     0x43   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_EXTENDED_POWER_CONDITIONS               0x4a   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_DISABLE_READ_LOOK_AHEAD                 0x55   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_EN_DIS_DSN_FEATURE                      0x63   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_DISABLE_REVERT_TO_POWER_ON_DEFAULTS     0x66   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_DISABLE_VOLATILE_WRITE_CACHE            0x82   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_DISABLE_APM                             0x85   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_DISABLE_PUIS                            0x86   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_DISABLE_WRITE_READ_VERIFY               0x8b   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_DISABLE_SATA_FEATURE                    0x90   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_ENABLE_MEDIA_STATUS_NOTIFICATION        0x95   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_ENABLE_READ_LOOK_AHEAD                  0xaa   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_DISABLE_FREE_FALL_CONTROL               0xc1   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_ACOUSTIC_MANAGEMENT_DISABLE             0xc2   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_EN_DIS_SENSE_DATA_REPORTING             0xc3   ///< defined in ACS-3\r
+#define ATA_SUB_CMD_ENABLE_REVERT_TO_POWER_ON_DEFAULTS      0xcc   ///< defined in ACS-3\r

 \r
 //\r
 // S.M.A.R.T\r
 \r
 //\r
 // S.M.A.R.T\r


@@ -640,13 +640,13 @@ typedef union {
 #define ATA_CONSTANT_C2                                 0xc2  ///< reserved\r
 #define ATA_CONSTANT_4F                                 0x4f  ///< reserved\r
 \r
 #define ATA_CONSTANT_C2                                 0xc2  ///< reserved\r
 #define ATA_CONSTANT_4F                                 0x4f  ///< reserved\r
 \r

-#define ATA_SMART_READ_DATA                             0xd0   ///< defined in ACS-3 \r
+#define ATA_SMART_READ_DATA                             0xd0   ///< defined in ACS-3\r

 \r
 \r

-#define ATA_SMART_AUTOSAVE                              0xd2  ///< defined in ACS-3 \r
+#define ATA_SMART_AUTOSAVE                              0xd2  ///< defined in ACS-3\r

     #define ATA_AUTOSAVE_DISABLE_ATTR                       0x00\r
     #define ATA_AUTOSAVE_ENABLE_ATTR                        0xf1\r
 \r
     #define ATA_AUTOSAVE_DISABLE_ATTR                       0x00\r
     #define ATA_AUTOSAVE_ENABLE_ATTR                        0xf1\r
 \r

-#define ATA_SMART_EXECUTE_OFFLINE_IMMEDIATE             0xd4  ///< defined in ACS-3 \r
+#define ATA_SMART_EXECUTE_OFFLINE_IMMEDIATE             0xd4  ///< defined in ACS-3\r

     #define ATA_EXECUTE_SMART_OFFLINE_ROUTINE               0x00  ///< defined in ACS-3\r
     #define ATA_EXECUTE_SMART_OFFLINE_SHORT_SELFTEST        0x01  ///< defined in ACS-3\r
     #define ATA_EXECUTE_SMART_OFFLINE_EXTENDED_SELFTEST     0x02  ///< defined in ACS-3\r
     #define ATA_EXECUTE_SMART_OFFLINE_ROUTINE               0x00  ///< defined in ACS-3\r
     #define ATA_EXECUTE_SMART_OFFLINE_SHORT_SELFTEST        0x01  ///< defined in ACS-3\r
     #define ATA_EXECUTE_SMART_OFFLINE_EXTENDED_SELFTEST     0x02  ///< defined in ACS-3\r


@@ -658,25 +658,25 @@ typedef union {
     #define ATA_EXECUTE_SMART_CAPTIVE_CONVEYANCE_SELFTEST   0x83  ///< defined in ACS-3\r
     #define ATA_EXECUTE_SMART_CAPTIVE_SELECTIVE_SELFTEST    0x84  ///< defined in ACS-3\r
 \r
     #define ATA_EXECUTE_SMART_CAPTIVE_CONVEYANCE_SELFTEST   0x83  ///< defined in ACS-3\r
     #define ATA_EXECUTE_SMART_CAPTIVE_SELECTIVE_SELFTEST    0x84  ///< defined in ACS-3\r
 \r

-#define ATA_SMART_READLOG                               0xd5  ///< defined in ACS-3 \r
-#define ATA_SMART_WRITELOG                              0xd6  ///< defined in ACS-3 \r
+#define ATA_SMART_READLOG                               0xd5  ///< defined in ACS-3\r
+#define ATA_SMART_WRITELOG                              0xd6  ///< defined in ACS-3\r

 #define ATA_SMART_ENABLE_OPERATION                      0xd8  ///< reserved\r
 #define ATA_SMART_ENABLE_OPERATION                      0xd8  ///< reserved\r

-#define ATA_SMART_DISABLE_OPERATION                     0xd9  ///< defined in ACS-3 \r
+#define ATA_SMART_DISABLE_OPERATION                     0xd9  ///< defined in ACS-3\r

 #define ATA_SMART_RETURN_STATUS                         0xda  ///< defined from ATA-3\r
 \r
 #define ATA_SMART_RETURN_STATUS                         0xda  ///< defined from ATA-3\r
 \r

-#define ATA_SMART_THRESHOLD_NOT_EXCEEDED_VALUE              0xc24f  ///< defined in ACS-3 \r
-#define ATA_SMART_THRESHOLD_EXCEEDED_VALUE                  0x2cf4  ///< defined in ACS-3 \r
+#define ATA_SMART_THRESHOLD_NOT_EXCEEDED_VALUE              0xc24f  ///< defined in ACS-3\r
+#define ATA_SMART_THRESHOLD_EXCEEDED_VALUE                  0x2cf4  ///< defined in ACS-3\r

 \r
 // SMART Log Definitions\r
 \r
 // SMART Log Definitions\r

-#define ATA_SMART_LOG_DIRECTORY                             0x00  ///< defined in ACS-3 \r
-#define ATA_SMART_SUM_SMART_ERROR_LOG                       0x01  ///< defined in ACS-3 \r
-#define ATA_SMART_COMP_SMART_ERROR_LOG                      0x02  ///< defined in ACS-3 \r
-#define ATA_SMART_EXT_COMP_SMART_ERROR_LOG                  0x03  ///< defined in ACS-3 \r
-#define ATA_SMART_SMART_SELFTEST_LOG                        0x06  ///< defined in ACS-3 \r
-#define ATA_SMART_EXT_SMART_SELFTEST_LOG                    0x07  ///< defined in ACS-3 \r
-#define ATA_SMART_SELECTIVE_SELFTEST_LOG                    0x09  ///< defined in ACS-3 \r
-#define ATA_SMART_HOST_VENDOR_SPECIFIC                      0x80  ///< defined in ACS-3 \r
-#define ATA_SMART_DEVICE_VENDOR_SPECIFIC                    0xa0  ///< defined in ACS-3 \r
+#define ATA_SMART_LOG_DIRECTORY                             0x00  ///< defined in ACS-3\r
+#define ATA_SMART_SUM_SMART_ERROR_LOG                       0x01  ///< defined in ACS-3\r
+#define ATA_SMART_COMP_SMART_ERROR_LOG                      0x02  ///< defined in ACS-3\r
+#define ATA_SMART_EXT_COMP_SMART_ERROR_LOG                  0x03  ///< defined in ACS-3\r
+#define ATA_SMART_SMART_SELFTEST_LOG                        0x06  ///< defined in ACS-3\r
+#define ATA_SMART_EXT_SMART_SELFTEST_LOG                    0x07  ///< defined in ACS-3\r
+#define ATA_SMART_SELECTIVE_SELFTEST_LOG                    0x09  ///< defined in ACS-3\r
+#define ATA_SMART_HOST_VENDOR_SPECIFIC                      0x80  ///< defined in ACS-3\r
+#define ATA_SMART_DEVICE_VENDOR_SPECIFIC                    0xa0  ///< defined in ACS-3\r

 \r
 //\r
 // Class 4: DMA Command\r
 \r
 //\r
 // Class 4: DMA Command\r


@@ -687,18 +687,18 @@ typedef union {
 #define ATA_CMD_WRITE_DMA                               0xca   ///< defined from ATA-1\r
 #define ATA_CMD_WRITE_DMA_WITH_RETRY                    0xcb   ///< defined from ATA-1, obsoleted from ATA-\r
 #define ATA_CMD_WRITE_DMA_EXT                           0x35   ///< defined from ATA-6\r
 #define ATA_CMD_WRITE_DMA                               0xca   ///< defined from ATA-1\r
 #define ATA_CMD_WRITE_DMA_WITH_RETRY                    0xcb   ///< defined from ATA-1, obsoleted from ATA-\r
 #define ATA_CMD_WRITE_DMA_EXT                           0x35   ///< defined from ATA-6\r

-  \r
+\r

 //\r
 //  ATA Security commands\r
 //\r
 //\r
 //  ATA Security commands\r
 //\r

-#define ATA_CMD_SECURITY_SET_PASSWORD                   0xf1  ///< defined in ACS-3 \r
-#define ATA_CMD_SECURITY_UNLOCK                         0xf2  ///< defined in ACS-3 \r
-#define ATA_CMD_SECURITY_ERASE_PREPARE                  0xf3  ///< defined in ACS-3 \r
-#define ATA_CMD_SECURITY_ERASE_UNIT                     0xf4  ///< defined in ACS-3 \r
-#define ATA_CMD_SECURITY_FREEZE_LOCK                    0xf5  ///< defined in ACS-3 \r
-#define ATA_CMD_SECURITY_DISABLE_PASSWORD               0xf6  ///< defined in ACS-3 \r
+#define ATA_CMD_SECURITY_SET_PASSWORD                   0xf1  ///< defined in ACS-3\r
+#define ATA_CMD_SECURITY_UNLOCK                         0xf2  ///< defined in ACS-3\r
+#define ATA_CMD_SECURITY_ERASE_PREPARE                  0xf3  ///< defined in ACS-3\r
+#define ATA_CMD_SECURITY_ERASE_UNIT                     0xf4  ///< defined in ACS-3\r
+#define ATA_CMD_SECURITY_FREEZE_LOCK                    0xf5  ///< defined in ACS-3\r
+#define ATA_CMD_SECURITY_DISABLE_PASSWORD               0xf6  ///< defined in ACS-3\r

 \r
 \r

-#define ATA_SECURITY_BUFFER_LENGTH                          512  ///< defined in ACS-3 \r
+#define ATA_SECURITY_BUFFER_LENGTH                          512  ///< defined in ACS-3\r

 \r
 //\r
 //  ATA Device Config Overlay\r
 \r
 //\r
 //  ATA Device Config Overlay\r


@@ -712,19 +712,19 @@ typedef union {
 //\r
 //  ATA Trusted Computing Feature Set Commands\r
 //\r
 //\r
 //  ATA Trusted Computing Feature Set Commands\r
 //\r

-#define ATA_CMD_TRUSTED_NON_DATA                        0x5b  ///< defined in ACS-3 \r
-#define ATA_CMD_TRUSTED_RECEIVE                         0x5c  ///< defined in ACS-3 \r
-#define ATA_CMD_TRUSTED_RECEIVE_DMA                     0x5d  ///< defined in ACS-3 \r
-#define ATA_CMD_TRUSTED_SEND                            0x5e  ///< defined in ACS-3 \r
-#define ATA_CMD_TRUSTED_SEND_DMA                        0x5f  ///< defined in ACS-3 \r
+#define ATA_CMD_TRUSTED_NON_DATA                        0x5b  ///< defined in ACS-3\r
+#define ATA_CMD_TRUSTED_RECEIVE                         0x5c  ///< defined in ACS-3\r
+#define ATA_CMD_TRUSTED_RECEIVE_DMA                     0x5d  ///< defined in ACS-3\r
+#define ATA_CMD_TRUSTED_SEND                            0x5e  ///< defined in ACS-3\r
+#define ATA_CMD_TRUSTED_SEND_DMA                        0x5f  ///< defined in ACS-3\r

 \r
 //\r
 //  ATA Trusted Receive Fields\r
 //\r
 \r
 //\r
 //  ATA Trusted Receive Fields\r
 //\r

-#define ATA_TR_RETURN_SECURITY_PROTOCOL_INFORMATION     0x00  ///< defined in ACS-3 \r
-#define ATA_TR_SECURITY_PROTOCOL_JEDEC_RESERVED         0xec  ///< defined in ACS-3 \r
-#define ATA_TR_SECURITY_PROTOCOL_SDCARD_RESERVED        0xed  ///< defined in ACS-3 \r
-#define ATA_TR_SECURITY_PROTOCOL_IEEE1667_RESERVED      0xee  ///< defined in ACS-3 \r
+#define ATA_TR_RETURN_SECURITY_PROTOCOL_INFORMATION     0x00  ///< defined in ACS-3\r
+#define ATA_TR_SECURITY_PROTOCOL_JEDEC_RESERVED         0xec  ///< defined in ACS-3\r
+#define ATA_TR_SECURITY_PROTOCOL_SDCARD_RESERVED        0xed  ///< defined in ACS-3\r
+#define ATA_TR_SECURITY_PROTOCOL_IEEE1667_RESERVED      0xee  ///< defined in ACS-3\r

 \r
 //\r
 //  Equates used for Acoustic Flags\r
 \r
 //\r
 //  Equates used for Acoustic Flags\r


@@ -732,18 +732,18 @@ typedef union {
 #define ATA_ACOUSTIC_LEVEL_BYPASS                       0xff   ///< defined from ATA-6\r
 #define ATA_ACOUSTIC_LEVEL_MAXIMUM_PERFORMANCE          0xfe   ///< defined from ATA-6\r
 #define ATA_ACOUSTIC_LEVEL_QUIET                        0x80   ///< defined from ATA-6\r
 #define ATA_ACOUSTIC_LEVEL_BYPASS                       0xff   ///< defined from ATA-6\r
 #define ATA_ACOUSTIC_LEVEL_MAXIMUM_PERFORMANCE          0xfe   ///< defined from ATA-6\r
 #define ATA_ACOUSTIC_LEVEL_QUIET                        0x80   ///< defined from ATA-6\r

-       \r
+\r

 //\r
 //  Equates used for DiPM Support\r
 //\r
 //\r
 //  Equates used for DiPM Support\r
 //\r

-#define ATA_CMD_DIPM_SUB                                0x03   // defined in ACS-3 : Count value in SetFeature identification : 03h  Device-initiated interface power state transitions \r
-    #define ATA_DIPM_ENABLE                                 0x10   // defined in ACS-3 \r
-    #define ATA_DIPM_DISABLE                                0x90   // defined in ACS-3 \r
+#define ATA_CMD_DIPM_SUB                                0x03   // defined in ACS-3 : Count value in SetFeature identification : 03h  Device-initiated interface power state transitions\r
+    #define ATA_DIPM_ENABLE                                 0x10   // defined in ACS-3\r
+    #define ATA_DIPM_DISABLE                                0x90   // defined in ACS-3\r

 \r
 //\r
 //  Equates used for DevSleep Support\r
 //\r
 \r
 //\r
 //  Equates used for DevSleep Support\r
 //\r

-#define ATA_CMD_DEVSLEEP_SUB                            0x09   // defined in SATA 3.2 Gold Spec :  Count value in SetFeature identification : 09h  Device Sleep \r
+#define ATA_CMD_DEVSLEEP_SUB                            0x09   // defined in SATA 3.2 Gold Spec :  Count value in SetFeature identification : 09h  Device Sleep\r

     #define ATA_DEVSLEEP_ENABLE                             0x10   // defined in SATA 3.2 Gold Spec\r
     #define ATA_DEVSLEEP_DISABLE                            0x90   // defined in SATA 3.2 Gold Spec\r
 \r
     #define ATA_DEVSLEEP_ENABLE                             0x10   // defined in SATA 3.2 Gold Spec\r
     #define ATA_DEVSLEEP_DISABLE                            0x90   // defined in SATA 3.2 Gold Spec\r
 \r


@@ -765,7 +765,7 @@ typedef union {
 /// Default content of device control register, disable INT,\r
 /// Bit3 is set to 1 according ATA-1\r
 ///\r
 /// Default content of device control register, disable INT,\r
 /// Bit3 is set to 1 according ATA-1\r
 ///\r

-#define ATA_DEFAULT_CTL                                 (0x0a)  \r
+#define ATA_DEFAULT_CTL                                 (0x0a)\r

 ///\r
 /// Default context of Device/Head Register,\r
 /// Bit7 and Bit5 are set to 1 for back-compatibilities.\r
 ///\r
 /// Default context of Device/Head Register,\r
 /// Bit7 and Bit5 are set to 1 for back-compatibilities.\r


@@ -778,9 +778,9 @@ typedef union {
 \r
 //\r
 // Sense Key, Additional Sense Codes and Additional Sense Code Qualifier\r
 \r
 //\r
 // Sense Key, Additional Sense Codes and Additional Sense Code Qualifier\r

-// defined in MultiMedia Commands (MMC, MMC-2) \r
+// defined in MultiMedia Commands (MMC, MMC-2)\r

 //\r
 //\r

-// Sense Key \r
+// Sense Key\r

 //\r
 #define ATA_SK_NO_SENSE                                 (0x0)\r
 #define ATA_SK_RECOVERY_ERROR                           (0x1)\r
 //\r
 #define ATA_SK_NO_SENSE                                 (0x0)\r
 #define ATA_SK_RECOVERY_ERROR                           (0x1)\r


@@ -825,7 +825,7 @@ typedef union {
 \r
 //\r
 // Error Register\r
 \r
 //\r
 // Error Register\r

-//  \r
+//\r

 #define ATA_ERRREG_BBK                                  BIT7  ///< Bad block detected      defined from ATA-1, obsoleted from ATA-2\r
 #define ATA_ERRREG_UNC                                  BIT6  ///< Uncorrectable Data      defined from ATA-1, obsoleted from ATA-4\r
 #define ATA_ERRREG_MC                                   BIT5  ///< Media Change            defined from ATA-1, obsoleted from ATA-4\r
 #define ATA_ERRREG_BBK                                  BIT7  ///< Bad block detected      defined from ATA-1, obsoleted from ATA-2\r
 #define ATA_ERRREG_UNC                                  BIT6  ///< Uncorrectable Data      defined from ATA-1, obsoleted from ATA-4\r
 #define ATA_ERRREG_MC                                   BIT5  ///< Media Change            defined from ATA-1, obsoleted from ATA-4\r

diff --git a/MdePkg/Include/IndustryStandard/DebugPort2Table.h b/MdePkg/Include/IndustryStandard/DebugPort2Table.h
index 08d6fc093d4c87682497237a1aaad5215e77e624..c78b1b6f44703dba34aa3d2bfdefd95932635cc8 100644 (file)
--- a/MdePkg/Include/IndustryStandard/DebugPort2Table.h
+++ b/MdePkg/Include/IndustryStandard/DebugPort2Table.h
@@ -1,8 +1,8 @@
-/** @file   \r
-  ACPI debug port 2 table definition, defined at \r
+/** @file\r
+  ACPI debug port 2 table definition, defined at\r

   Microsoft DebugPort2Specification.\r
 \r
   Microsoft DebugPort2Specification.\r
 \r

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

   Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.<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) 2012 - 2016, ARM Limited. All rights reserved.<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/MdePkg/Include/IndustryStandard/DebugPortTable.h b/MdePkg/Include/IndustryStandard/DebugPortTable.h
index 6c726324a64639a13a4b08e67c16c4c7ed744db1..2f20912d354ee34fab7336753b029b5e687b3216 100644 (file)
--- a/MdePkg/Include/IndustryStandard/DebugPortTable.h
+++ b/MdePkg/Include/IndustryStandard/DebugPortTable.h
@@ -1,8 +1,8 @@
-/** @file   \r
-  ACPI debug port table definition, defined at \r
+/** @file\r
+  ACPI debug port table definition, defined at\r

   Microsoft DebugPortSpecification.\r
 \r
   Microsoft DebugPortSpecification.\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/MdePkg/Include/IndustryStandard/ElTorito.h b/MdePkg/Include/IndustryStandard/ElTorito.h
index 97618b2cc05b79b0af43c84a6f323f79a55fc2c3..6d1ce2aafa23c88054c9a70cc7398443f0803a7a 100644 (file)
--- a/MdePkg/Include/IndustryStandard/ElTorito.h
+++ b/MdePkg/Include/IndustryStandard/ElTorito.h
@@ -1,18 +1,18 @@
 /** @file\r
 /** @file\r

-  ElTorito Partitions Format Definition. \r
-  This file includes some defintions from \r
+  ElTorito Partitions Format Definition.\r
+  This file includes some defintions from\r

   1. "El Torito" Bootable CD-ROM Format Specification, Version 1.0.\r
   1. "El Torito" Bootable CD-ROM Format Specification, Version 1.0.\r

-  2. Volume and File Structure of CDROM for Information Interchange, \r
+  2. Volume and File Structure of CDROM for Information Interchange,\r

      Standard ECMA-119. (IS0 9660)\r
 \r
      Standard ECMA-119. (IS0 9660)\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


@@ -57,13 +57,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #pragma pack(1)\r
 \r
 \r
 #pragma pack(1)\r
 \r

-/// \r
+///\r

 /// CD-ROM Volume Descriptor\r
 /// CD-ROM Volume Descriptor\r

-/// \r
-typedef union { \r
+///\r
+typedef union {\r

   struct {\r
   struct {\r

-    UINT8   Type;     \r
-    CHAR8   Id[5];           ///< "CD001"    \r
+    UINT8   Type;\r
+    CHAR8   Id[5];           ///< "CD001"\r

     CHAR8   Reserved[82];\r
   } Unknown;\r
 \r
     CHAR8   Reserved[82];\r
   } Unknown;\r
 \r


@@ -72,29 +72,29 @@ typedef union {
   ///\r
   struct {\r
     UINT8   Type;            ///< Must be 0\r
   ///\r
   struct {\r
     UINT8   Type;            ///< Must be 0\r

-    CHAR8   Id[5];           ///< "CD001" \r
-    UINT8   Version;         ///< Must be 1 \r
-    CHAR8   SystemId[32];    ///< "EL TORITO SPECIFICATION" \r
-    CHAR8   Unused[32];      ///< Must be 0 \r
+    CHAR8   Id[5];           ///< "CD001"\r
+    UINT8   Version;         ///< Must be 1\r
+    CHAR8   SystemId[32];    ///< "EL TORITO SPECIFICATION"\r
+    CHAR8   Unused[32];      ///< Must be 0\r

     UINT8   EltCatalog[4];   ///< Absolute pointer to first sector of Boot Catalog\r
     CHAR8   Unused2[13];     ///< Must be 0\r
   } BootRecordVolume;\r
     UINT8   EltCatalog[4];   ///< Absolute pointer to first sector of Boot Catalog\r
     CHAR8   Unused2[13];     ///< Must be 0\r
   } BootRecordVolume;\r

- \r
+\r

   ///\r
   /// Primary Volumn Descriptor, defined in ISO 9660.\r
   ///\r
   struct {\r
   ///\r
   /// Primary Volumn Descriptor, defined in ISO 9660.\r
   ///\r
   struct {\r

-    UINT8   Type; \r
+    UINT8   Type;\r

     CHAR8   Id[5];           ///< "CD001"\r
     CHAR8   Id[5];           ///< "CD001"\r

-    UINT8   Version; \r
+    UINT8   Version;\r

     UINT8   Unused;          ///< Must be 0\r
     UINT8   Unused;          ///< Must be 0\r

-    CHAR8   SystemId[32];    \r
-    CHAR8   VolumeId[32];    \r
-    UINT8   Unused2[8];      ///< Must be 0 \r
+    CHAR8   SystemId[32];\r
+    CHAR8   VolumeId[32];\r
+    UINT8   Unused2[8];      ///< Must be 0\r

     UINT32  VolSpaceSize[2]; ///< the number of Logical Blocks\r
   } PrimaryVolume;\r
 \r
     UINT32  VolSpaceSize[2]; ///< the number of Logical Blocks\r
   } PrimaryVolume;\r
 \r

-} CDROM_VOLUME_DESCRIPTOR; \r
+} CDROM_VOLUME_DESCRIPTOR;\r

 \r
 ///\r
 /// Catalog Entry\r
 \r
 ///\r
 /// Catalog Entry\r

diff --git a/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h b/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h
index 6218a77c543c80453f53cbae293bfee80fea9d52..b123f2f7fee70193f9e56bd9ee24c399d38cb6c4 100644 (file)
--- a/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h
+++ b/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h
@@ -1,15 +1,15 @@
 /** @file\r
   ACPI high precision event timer table definition, at www.intel.com\r
   Specification name is IA-PC HPET (High Precision Event Timers) Specification.\r
 /** @file\r
   ACPI high precision event timer table definition, at www.intel.com\r
   Specification name is IA-PC HPET (High Precision Event Timers) Specification.\r

-    \r
-  Copyright (c) 2007 - 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
 \r

-  THE PROGRAM 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
 #ifndef _HIGH_PRECISION_EVENT_TIMER_TABLE_H_\r
 **/\r
 \r
 #ifndef _HIGH_PRECISION_EVENT_TIMER_TABLE_H_\r

diff --git a/MdePkg/Include/IndustryStandard/Hsti.h b/MdePkg/Include/IndustryStandard/Hsti.h
index 036b62cfe0e21a4007854b24a5af340ce1f1149f..d250db72c093fc73ad8b75860f071d0fa20a3f3d 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Hsti.h
+++ b/MdePkg/Include/IndustryStandard/Hsti.h
@@ -2,7 +2,7 @@
   Support for HSTI 1.1a specification, defined at\r
   Microsoft Hardware Security Testability Specification.\r
 \r
   Support for HSTI 1.1a specification, defined at\r
   Microsoft Hardware Security Testability Specification.\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


@@ -25,8 +25,8 @@
 \r
 #define PLATFORM_SECURITY_ROLE_PLATFORM_REFERENCE 0x00000001  // IHV\r
 #define PLATFORM_SECURITY_ROLE_PLATFORM_IBV       0x00000002\r
 \r
 #define PLATFORM_SECURITY_ROLE_PLATFORM_REFERENCE 0x00000001  // IHV\r
 #define PLATFORM_SECURITY_ROLE_PLATFORM_IBV       0x00000002\r

-#define PLATFORM_SECURITY_ROLE_IMPLEMENTOR_OEM    0x00000003 \r
-#define PLATFORM_SECURITY_ROLE_IMPLEMENTOR_ODM    0x00000004  \r
+#define PLATFORM_SECURITY_ROLE_IMPLEMENTOR_OEM    0x00000003\r
+#define PLATFORM_SECURITY_ROLE_IMPLEMENTOR_ODM    0x00000004\r

 \r
 typedef struct {\r
   //\r
 \r
 typedef struct {\r
   //\r

diff --git a/MdePkg/Include/IndustryStandard/Http11.h b/MdePkg/Include/IndustryStandard/Http11.h
index ace335a3764ab1466de4cef7fd110990830991ed..f6388acbb6bf0a2876df6f2072a99d2272b47c85 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Http11.h
+++ b/MdePkg/Include/IndustryStandard/Http11.h
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  Hypertext Transfer Protocol -- HTTP/1.1 Standard definitions, from RFC 2616    \r
+  Hypertext Transfer Protocol -- HTTP/1.1 Standard definitions, from RFC 2616\r
+\r
+  This file contains common HTTP 1.1 definitions from RFC 2616\r

 \r
 \r

-  This file contains common HTTP 1.1 definitions from RFC 2616 \r
-   \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


@@ -20,7 +20,7 @@
 \r
 ///\r
 /// HTTP Version (currently HTTP 1.1)\r
 \r
 ///\r
 /// HTTP Version (currently HTTP 1.1)\r

-/// \r
+///\r

 /// The version of an HTTP message is indicated by an HTTP-Version field\r
 /// in the first line of the message.\r
 ///\r
 /// The version of an HTTP message is indicated by an HTTP-Version field\r
 /// in the first line of the message.\r
 ///\r


@@ -28,7 +28,7 @@
 \r
 ///\r
 /// HTTP Request Method definitions\r
 \r
 ///\r
 /// HTTP Request Method definitions\r

-/// \r
+///\r

 /// The Method  token indicates the method to be performed on the\r
 /// resource identified by the Request-URI. The method is case-sensitive.\r
 ///\r
 /// The Method  token indicates the method to be performed on the\r
 /// resource identified by the Request-URI. The method is case-sensitive.\r
 ///\r


@@ -50,27 +50,27 @@
 \r
 ///\r
 /// Accept Request Header\r
 \r
 ///\r
 /// Accept Request Header\r

-/// The Accept request-header field can be used to specify certain media types which are \r
-/// acceptable for the response. Accept headers can be used to indicate that the request \r
-/// is specifically limited to a small set of desired types, as in the case of a request \r
+/// The Accept request-header field can be used to specify certain media types which are\r
+/// acceptable for the response. Accept headers can be used to indicate that the request\r
+/// is specifically limited to a small set of desired types, as in the case of a request\r

 /// for an in-line image.\r
 ///\r
 #define HTTP_HEADER_ACCEPT             "Accept"\r
 \r
 \r
 /// for an in-line image.\r
 ///\r
 #define HTTP_HEADER_ACCEPT             "Accept"\r
 \r
 \r

-/// \r
+///\r

 /// Accept-Charset Request Header\r
 /// Accept-Charset Request Header\r

-/// The Accept-Charset request-header field can be used to indicate what character sets \r
-/// are acceptable for the response. This field allows clients capable of understanding \r
-/// more comprehensive or special-purpose character sets to signal that capability to a \r
+/// The Accept-Charset request-header field can be used to indicate what character sets\r
+/// are acceptable for the response. This field allows clients capable of understanding\r
+/// more comprehensive or special-purpose character sets to signal that capability to a\r

 /// server which is capable of representing documents in those character sets.\r
 ///\r
 #define HTTP_HEADER_ACCEPT_CHARSET     "Accept-Charset"\r
 \r
 /// server which is capable of representing documents in those character sets.\r
 ///\r
 #define HTTP_HEADER_ACCEPT_CHARSET     "Accept-Charset"\r
 \r

-/// \r
+///\r

 /// Accept-Language Request Header\r
 /// Accept-Language Request Header\r

-/// The Accept-Language request-header field is similar to Accept, \r
-/// but restricts the set of natural languages that are preferred \r
+/// The Accept-Language request-header field is similar to Accept,\r
+/// but restricts the set of natural languages that are preferred\r

 /// as a response to the request.\r
 ///\r
 #define HTTP_HEADER_ACCEPT_LANGUAGE    "Accept-Language"\r
 /// as a response to the request.\r
 ///\r
 #define HTTP_HEADER_ACCEPT_LANGUAGE    "Accept-Language"\r


@@ -83,39 +83,39 @@
 #define HTTP_HEADER_ACCEPT_RANGES      "Accept-Ranges"\r
 \r
 \r
 #define HTTP_HEADER_ACCEPT_RANGES      "Accept-Ranges"\r
 \r
 \r

-/// \r
+///\r

 /// Accept-Encoding Request Header\r
 /// Accept-Encoding Request Header\r

-/// The Accept-Encoding request-header field is similar to Accept, \r
+/// The Accept-Encoding request-header field is similar to Accept,\r

 /// but restricts the content-codings that are acceptable in the response.\r
 ///\r
 #define HTTP_HEADER_ACCEPT_ENCODING    "Accept-Encoding"\r
 \r
 ///\r
 /// Content-Encoding Header\r
 /// but restricts the content-codings that are acceptable in the response.\r
 ///\r
 #define HTTP_HEADER_ACCEPT_ENCODING    "Accept-Encoding"\r
 \r
 ///\r
 /// Content-Encoding Header\r

-/// The Content-Encoding entity-header field is used as a modifier to the media-type. \r
-/// When present, its value indicates what additional content codings have been applied \r
-/// to the entity-body, and thus what decoding mechanisms must be applied in order to \r
-/// obtain the media-type referenced by the Content-Type header field. Content-Encoding \r
-/// is primarily used to allow a document to be compressed without losing the identity \r
+/// The Content-Encoding entity-header field is used as a modifier to the media-type.\r
+/// When present, its value indicates what additional content codings have been applied\r
+/// to the entity-body, and thus what decoding mechanisms must be applied in order to\r
+/// obtain the media-type referenced by the Content-Type header field. Content-Encoding\r
+/// is primarily used to allow a document to be compressed without losing the identity\r

 /// of its underlying media type.\r
 ///\r
 #define HTTP_HEADER_CONTENT_ENCODING   "Content-Encoding"\r
 \r
 /// of its underlying media type.\r
 ///\r
 #define HTTP_HEADER_CONTENT_ENCODING   "Content-Encoding"\r
 \r

-/// \r
+///\r

 /// HTTP Content-Encoding Compression types\r
 ///\r
 \r
 #define HTTP_CONTENT_ENCODING_IDENTITY "identity"  /// No transformation is used. This is the default value for content coding.\r
 #define HTTP_CONTENT_ENCODING_GZIP     "gzip"      /// Content-Encoding: GNU zip format (described in RFC 1952).\r
 /// HTTP Content-Encoding Compression types\r
 ///\r
 \r
 #define HTTP_CONTENT_ENCODING_IDENTITY "identity"  /// No transformation is used. This is the default value for content coding.\r
 #define HTTP_CONTENT_ENCODING_GZIP     "gzip"      /// Content-Encoding: GNU zip format (described in RFC 1952).\r

-#define HTTP_CONTENT_ENCODING_COMPRESS "compress"  /// encoding format produced by the common UNIX file compression program "compress". \r
-#define HTTP_CONTENT_ENCODING_DEFLATE  "deflate"   /// The "zlib" format defined in RFC 1950 in combination with the "deflate" \r
+#define HTTP_CONTENT_ENCODING_COMPRESS "compress"  /// encoding format produced by the common UNIX file compression program "compress".\r
+#define HTTP_CONTENT_ENCODING_DEFLATE  "deflate"   /// The "zlib" format defined in RFC 1950 in combination with the "deflate"\r

                                                    /// compression mechanism described in RFC 1951.\r
 \r
 \r
 ///\r
 /// Content-Type Header\r
                                                    /// compression mechanism described in RFC 1951.\r
 \r
 \r
 ///\r
 /// Content-Type Header\r

-/// The Content-Type entity-header field indicates the media type of the entity-body sent to \r
-/// the recipient or, in the case of the HEAD method, the media type that would have been sent \r
+/// The Content-Type entity-header field indicates the media type of the entity-body sent to\r
+/// the recipient or, in the case of the HEAD method, the media type that would have been sent\r

 /// had the request been a GET.\r
 ///\r
 #define HTTP_HEADER_CONTENT_TYPE       "Content-Type"\r
 /// had the request been a GET.\r
 ///\r
 #define HTTP_HEADER_CONTENT_TYPE       "Content-Type"\r


@@ -124,12 +124,12 @@
 //\r
 #define HTTP_CONTENT_TYPE_APP_JSON          "application/json"\r
 #define HTTP_CONTENT_TYPE_APP_OCTET_STREAM  "application/octet-stream"\r
 //\r
 #define HTTP_CONTENT_TYPE_APP_JSON          "application/json"\r
 #define HTTP_CONTENT_TYPE_APP_OCTET_STREAM  "application/octet-stream"\r

-                                           \r
+\r

 #define HTTP_CONTENT_TYPE_TEXT_HTML         "text/html"\r
 #define HTTP_CONTENT_TYPE_TEXT_PLAIN        "text/plain"\r
 #define HTTP_CONTENT_TYPE_TEXT_CSS          "text/css"\r
 #define HTTP_CONTENT_TYPE_TEXT_XML          "text/xml"\r
 #define HTTP_CONTENT_TYPE_TEXT_HTML         "text/html"\r
 #define HTTP_CONTENT_TYPE_TEXT_PLAIN        "text/plain"\r
 #define HTTP_CONTENT_TYPE_TEXT_CSS          "text/css"\r
 #define HTTP_CONTENT_TYPE_TEXT_XML          "text/xml"\r

-                                           \r
+\r

 #define HTTP_CONTENT_TYPE_IMAGE_GIF         "image/gif"\r
 #define HTTP_CONTENT_TYPE_IMAGE_JPEG        "image/jpeg"\r
 #define HTTP_CONTENT_TYPE_IMAGE_PNG         "image/png"\r
 #define HTTP_CONTENT_TYPE_IMAGE_GIF         "image/gif"\r
 #define HTTP_CONTENT_TYPE_IMAGE_JPEG        "image/jpeg"\r
 #define HTTP_CONTENT_TYPE_IMAGE_PNG         "image/png"\r


@@ -138,17 +138,17 @@
 \r
 ///\r
 /// Content-Length Header\r
 \r
 ///\r
 /// Content-Length Header\r

-/// The Content-Length entity-header field indicates the size of the entity-body, \r
-/// in decimal number of OCTETs, sent to the recipient or, in the case of the HEAD \r
+/// The Content-Length entity-header field indicates the size of the entity-body,\r
+/// in decimal number of OCTETs, sent to the recipient or, in the case of the HEAD\r

 /// method, the size of the entity-body that would have been sent had the request been a GET.\r
 ///\r
 #define HTTP_HEADER_CONTENT_LENGTH     "Content-Length"\r
 /// method, the size of the entity-body that would have been sent had the request been a GET.\r
 ///\r
 #define HTTP_HEADER_CONTENT_LENGTH     "Content-Length"\r

-                                                                                                              \r
+\r

 ///\r
 /// Transfer-Encoding Header\r
 ///\r
 /// Transfer-Encoding Header\r

-/// The Transfer-Encoding general-header field indicates what (if any) type of transformation \r
-/// has been applied to the message body in order to safely transfer it between the sender \r
-/// and the recipient. This differs from the content-coding in that the transfer-coding \r
+/// The Transfer-Encoding general-header field indicates what (if any) type of transformation\r
+/// has been applied to the message body in order to safely transfer it between the sender\r
+/// and the recipient. This differs from the content-coding in that the transfer-coding\r

 /// is a property of the message, not of the entity.\r
 ///\r
 #define HTTP_HEADER_TRANSFER_ENCODING  "Transfer-Encoding"\r
 /// is a property of the message, not of the entity.\r
 ///\r
 #define HTTP_HEADER_TRANSFER_ENCODING  "Transfer-Encoding"\r


@@ -156,14 +156,14 @@
 \r
 ///\r
 /// User Agent Request Header\r
 \r
 ///\r
 /// User Agent Request Header\r

-/// \r
-/// The User-Agent request-header field contains information about the user agent originating \r
-/// the request. This is for statistical purposes, the tracing of protocol violations, and \r
-/// automated recognition of user agents for the sake of tailoring responses to avoid \r
-/// particular user agent limitations. User agents SHOULD include this field with requests. \r
-/// The field can contain multiple product tokens and comments identifying the agent and any \r
-/// subproducts which form a significant part of the user agent. \r
-/// By convention, the product tokens are listed in order of their significance for \r
+///\r
+/// The User-Agent request-header field contains information about the user agent originating\r
+/// the request. This is for statistical purposes, the tracing of protocol violations, and\r
+/// automated recognition of user agents for the sake of tailoring responses to avoid\r
+/// particular user agent limitations. User agents SHOULD include this field with requests.\r
+/// The field can contain multiple product tokens and comments identifying the agent and any\r
+/// subproducts which form a significant part of the user agent.\r
+/// By convention, the product tokens are listed in order of their significance for\r

 /// identifying the application.\r
 ///\r
 #define HTTP_HEADER_USER_AGENT         "User-Agent"\r
 /// identifying the application.\r
 ///\r
 #define HTTP_HEADER_USER_AGENT         "User-Agent"\r


@@ -171,49 +171,49 @@
 ///\r
 /// Host Request Header\r
 ///\r
 ///\r
 /// Host Request Header\r
 ///\r

-/// The Host request-header field specifies the Internet host and port number of the resource \r
-/// being requested, as obtained from the original URI given by the user or referring resource \r
+/// The Host request-header field specifies the Internet host and port number of the resource\r
+/// being requested, as obtained from the original URI given by the user or referring resource\r

 ///\r
 #define HTTP_HEADER_HOST              "Host"\r
 \r
 ///\r
 /// Location Response Header\r
 ///\r
 #define HTTP_HEADER_HOST              "Host"\r
 \r
 ///\r
 /// Location Response Header\r

-/// \r
-/// The Location response-header field is used to redirect the recipient to a location other than \r
-/// the Request-URI for completion of the request or identification of a new resource. \r
-/// For 201 (Created) responses, the Location is that of the new resource which was created by \r
-/// the request. For 3xx responses, the location SHOULD indicate the server's preferred URI for \r
+///\r
+/// The Location response-header field is used to redirect the recipient to a location other than\r
+/// the Request-URI for completion of the request or identification of a new resource.\r
+/// For 201 (Created) responses, the Location is that of the new resource which was created by\r
+/// the request. For 3xx responses, the location SHOULD indicate the server's preferred URI for\r

 /// automatic redirection to the resource. The field value consists of a single absolute URI.\r
 ///\r
 #define HTTP_HEADER_LOCATION           "Location"\r
 \r
 ///\r
 /// The If-Match request-header field is used with a method to make it conditional.\r
 /// automatic redirection to the resource. The field value consists of a single absolute URI.\r
 ///\r
 #define HTTP_HEADER_LOCATION           "Location"\r
 \r
 ///\r
 /// The If-Match request-header field is used with a method to make it conditional.\r

-/// A client that has one or more entities previously obtained from the resource \r
-/// can verify that one of those entities is current by including a list of their \r
-/// associated entity tags in the If-Match header field. \r
-/// The purpose of this feature is to allow efficient updates of cached information \r
-/// with a minimum amount of transaction overhead. It is also used, on updating requests, \r
-/// to prevent inadvertent modification of the wrong version of a resource. \r
+/// A client that has one or more entities previously obtained from the resource\r
+/// can verify that one of those entities is current by including a list of their\r
+/// associated entity tags in the If-Match header field.\r
+/// The purpose of this feature is to allow efficient updates of cached information\r
+/// with a minimum amount of transaction overhead. It is also used, on updating requests,\r
+/// to prevent inadvertent modification of the wrong version of a resource.\r

 /// As a special case, the value "*" matches any current entity of the resource.\r
 ///\r
 #define HTTP_HEADER_IF_MATCH          "If-Match"\r
 \r
 \r
 ///\r
 /// As a special case, the value "*" matches any current entity of the resource.\r
 ///\r
 #define HTTP_HEADER_IF_MATCH          "If-Match"\r
 \r
 \r
 ///\r

-/// The If-None-Match request-header field is used with a method to make it conditional. \r
-/// A client that has one or more entities previously obtained from the resource can verify \r
-/// that none of those entities is current by including a list of their associated entity \r
-/// tags in the If-None-Match header field. The purpose of this feature is to allow efficient \r
-/// updates of cached information with a minimum amount of transaction overhead. It is also used \r
-/// to prevent a method (e.g. PUT) from inadvertently modifying an existing resource when the \r
+/// The If-None-Match request-header field is used with a method to make it conditional.\r
+/// A client that has one or more entities previously obtained from the resource can verify\r
+/// that none of those entities is current by including a list of their associated entity\r
+/// tags in the If-None-Match header field. The purpose of this feature is to allow efficient\r
+/// updates of cached information with a minimum amount of transaction overhead. It is also used\r
+/// to prevent a method (e.g. PUT) from inadvertently modifying an existing resource when the\r

 /// client believes that the resource does not exist.\r
 ///\r
 #define HTTP_HEADER_IF_NONE_MATCH     "If-None-Match"\r
 \r
 \r
 \r
 /// client believes that the resource does not exist.\r
 ///\r
 #define HTTP_HEADER_IF_NONE_MATCH     "If-None-Match"\r
 \r
 \r
 \r

-/// \r
+///\r

 /// Authorization Request Header\r
 /// The Authorization field value consists of credentials\r
 /// containing the authentication information of the user agent for\r
 /// Authorization Request Header\r
 /// The Authorization field value consists of credentials\r
 /// containing the authentication information of the user agent for\r


@@ -223,8 +223,8 @@
 \r
 ///\r
 /// ETAG Response Header\r
 \r
 ///\r
 /// ETAG Response Header\r

-/// The ETag response-header field provides the current value of the entity tag \r
-/// for the requested variant. \r
+/// The ETag response-header field provides the current value of the entity tag\r
+/// for the requested variant.\r

 ///\r
 #define HTTP_HEADER_ETAG              "ETag"\r
 \r
 ///\r
 #define HTTP_HEADER_ETAG              "ETag"\r
 \r

diff --git a/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h b/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
index 1e1a5ac97e7ee863eac0f79cbdd7ec5e1a4ebd25..2509dc46e966b5c64b1d7cc42a13a8c4de2d037b 100644 (file)
--- a/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
+++ b/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
@@ -1,15 +1,15 @@
 /** @file\r
   The definition for iSCSI Boot Firmware Table, it's defined in Microsoft's\r
 /** @file\r
   The definition for iSCSI Boot Firmware Table, it's defined in Microsoft's\r

-  iSCSI Boot Firmware Table(iBFT) as Defined in ACPI 3.0b Specification. \r
-  \r
-  Copyright (c) 2006 - 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
+  iSCSI Boot Firmware Table(iBFT) as Defined in ACPI 3.0b Specification.\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


@@ -58,7 +58,7 @@ typedef struct {
 } EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER;\r
 \r
 ///\r
 } EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER;\r
 \r
 ///\r

-/// Common Header of Boot Firmware Table Structure \r
+/// Common Header of Boot Firmware Table Structure\r

 ///\r
 typedef struct {\r
   UINT8   StructureId;\r
 ///\r
 typedef struct {\r
   UINT8   StructureId;\r


@@ -78,7 +78,7 @@ typedef struct {
   UINT16                                               NIC0Offset;\r
   UINT16                                               Target0Offset;\r
   UINT16                                               NIC1Offset;\r
   UINT16                                               NIC0Offset;\r
   UINT16                                               Target0Offset;\r
   UINT16                                               NIC1Offset;\r

-  UINT16                                               Target1Offset;  \r
+  UINT16                                               Target1Offset;\r

 } EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE;\r
 \r
 #define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_VERSION              0x1\r
 } EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE;\r
 \r
 #define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_VERSION              0x1\r


@@ -100,8 +100,8 @@ typedef struct {
 \r
 #define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_VERSION             0x1\r
 \r
 \r
 #define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_VERSION             0x1\r
 \r

-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BLOCK_VALID    BIT0 \r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BOOT_SELECTED  BIT1 \r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BLOCK_VALID    BIT0\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BOOT_SELECTED  BIT1\r

 \r
 ///\r
 /// NIC Structure\r
 \r
 ///\r
 /// NIC Structure\r

diff --git a/MdePkg/Include/IndustryStandard/LegacyBiosMpTable.h b/MdePkg/Include/IndustryStandard/LegacyBiosMpTable.h
index 287de2a7b0fd14eda10b8ba1188073c2b83fce44..daefdb41a07e367091cdd466843601470a399486 100644 (file)
--- a/MdePkg/Include/IndustryStandard/LegacyBiosMpTable.h
+++ b/MdePkg/Include/IndustryStandard/LegacyBiosMpTable.h
@@ -1,17 +1,17 @@
 /** @file\r
   Defives data structures per MultiProcessor Specification Ver 1.4.\r
 /** @file\r
   Defives data structures per MultiProcessor Specification Ver 1.4.\r

-  \r
-  The MultiProcessor Specification defines an enhancement to the standard \r
+\r
+  The MultiProcessor Specification defines an enhancement to the standard\r

   to which PC manufacturers design DOS-compatible systems.\r
 \r
   to which PC manufacturers design DOS-compatible systems.\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

diff --git a/MdePkg/Include/IndustryStandard/Mbr.h b/MdePkg/Include/IndustryStandard/Mbr.h
index f72b4afbb7106968f8278d7c6bfbfb7148cc596a..3937499d9baf2d3f645866bd6ba10e63fe174043 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Mbr.h
+++ b/MdePkg/Include/IndustryStandard/Mbr.h
@@ -1,14 +1,14 @@
 /** @file\r
   Legacy Master Boot Record Format Definition.\r
 \r
 /** @file\r
   Legacy Master Boot Record Format Definition.\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
+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
 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

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

diff --git a/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h b/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
index e32ba660b613c369acb724770b2f48156c01c13a..7e4089886ff01493f9bde538ab5b6105d024a6e5 100644 (file)
--- a/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
+++ b/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
@@ -1,16 +1,16 @@
 /** @file\r
 /** @file\r

-  ACPI memory mapped configuration space access table definition, defined at \r
+  ACPI memory mapped configuration space access table definition, defined at\r

   in the PCI Firmware Specification, version 3.0.\r
   Specification is available at http://www.pcisig.com.\r
   in the PCI Firmware Specification, version 3.0.\r
   Specification is available at http://www.pcisig.com.\r

-    \r
-  Copyright (c) 2007 - 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) 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
 #ifndef _MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_H_\r
 **/\r
 \r
 #ifndef _MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_H_\r


@@ -35,7 +35,7 @@ typedef struct {
 } EFI_ACPI_MEMORY_MAPPED_ENHANCED_CONFIGURATION_SPACE_BASE_ADDRESS_ALLOCATION_STRUCTURE;\r
 \r
 ///\r
 } EFI_ACPI_MEMORY_MAPPED_ENHANCED_CONFIGURATION_SPACE_BASE_ADDRESS_ALLOCATION_STRUCTURE;\r
 \r
 ///\r

-/// MCFG Table header definition.  The rest of the table \r
+/// MCFG Table header definition.  The rest of the table\r

 /// must be defined in a platform specific manner.\r
 ///\r
 typedef struct {\r
 /// must be defined in a platform specific manner.\r
 ///\r
 typedef struct {\r

diff --git a/MdePkg/Include/IndustryStandard/MemoryOverwriteRequestControlLock.h b/MdePkg/Include/IndustryStandard/MemoryOverwriteRequestControlLock.h
index 8a34731396731c29a38976c3c2b1e8b5621a8914..08b22f0070fdbcb8562a290a067ca5157d19fd6f 100644 (file)
--- a/MdePkg/Include/IndustryStandard/MemoryOverwriteRequestControlLock.h
+++ b/MdePkg/Include/IndustryStandard/MemoryOverwriteRequestControlLock.h
@@ -1,9 +1,9 @@
 /** @file\r
 /** @file\r

-  Support for Microsoft Secure MOR implementation, defined at \r
+  Support for Microsoft Secure MOR implementation, defined at\r

   Microsoft Secure MOR implementation.\r
   https://msdn.microsoft.com/en-us/library/windows/hardware/mt270973(v=vs.85).aspx\r
 \r
   Microsoft Secure MOR implementation.\r
   https://msdn.microsoft.com/en-us/library/windows/hardware/mt270973(v=vs.85).aspx\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

diff --git a/MdePkg/Include/IndustryStandard/Pal.h b/MdePkg/Include/IndustryStandard/Pal.h
index aceeaae0a9cd938d7ffdde1737b86481ad3bf011..239406e6b6f8ab5d4cb1ac200ae8a77e8dfa34b4 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Pal.h
+++ b/MdePkg/Include/IndustryStandard/Pal.h
@@ -1,14 +1,14 @@
 /** @file\r
   Main PAL API's defined in Intel Itanium Architecture Software Developer's Manual.\r
 \r
 /** @file\r
   Main PAL API's defined in Intel Itanium Architecture Software Developer's Manual.\r
 \r

-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \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


@@ -1152,7 +1152,7 @@ typedef struct {
                                                 ///< be enabled or disabled by\r
                                                 ///< PAL_PROC_SET_FEATURES. The\r
                                                 ///< corresponding argument is ignored.\r
                                                 ///< be enabled or disabled by\r
                                                 ///< PAL_PROC_SET_FEATURES. The\r
                                                 ///< corresponding argument is ignored.\r

-                                                \r
+\r

   UINT64  NoPresentPmi:1;                       ///< Bit37, No INIT, PMI, and LINT pins\r
                                                 ///< present. Denotes the absence of INIT,\r
                                                 ///< PMI, LINT0 and LINT1 pins on the\r
   UINT64  NoPresentPmi:1;                       ///< Bit37, No INIT, PMI, and LINT pins\r
                                                 ///< present. Denotes the absence of INIT,\r
                                                 ///< PMI, LINT0 and LINT1 pins on the\r


@@ -1163,7 +1163,7 @@ typedef struct {
                                                 ///< enabled or disabled by\r
                                                 ///< PAL_PROC_SET_FEATURES. The corresponding\r
                                                 ///< argument is ignored.\r
                                                 ///< enabled or disabled by\r
                                                 ///< PAL_PROC_SET_FEATURES. The corresponding\r
                                                 ///< argument is ignored.\r

-                                                \r
+\r

   UINT64  NoSimpleImpInUndefinedIns:1;          ///< Bit38, No Simple\r
                                                 ///< implementation of\r
                                                 ///< unimplemented instruction\r
   UINT64  NoSimpleImpInUndefinedIns:1;          ///< Bit38, No Simple\r
                                                 ///< implementation of\r
                                                 ///< unimplemented instruction\r


@@ -1432,7 +1432,7 @@ typedef struct {
                                                 ///<   bit has no effect if BERR\r
                                                 ///<   signalling is disabled. (See\r
                                                 ///<   PAL_BUS_GET/SET_FEATURES)\r
                                                 ///<   bit has no effect if BERR\r
                                                 ///<   signalling is disabled. (See\r
                                                 ///<   PAL_BUS_GET/SET_FEATURES)\r

-                                                \r
+\r

   UINT64  EnableBerrPromotion:1;                ///< Bit63. Enable BERR promotion. When\r
                                                 ///<   1, the Bus Error (BERR) signal is\r
                                                 ///<   promoted to the Bus Initialization\r
   UINT64  EnableBerrPromotion:1;                ///< Bit63. Enable BERR promotion. When\r
                                                 ///<   1, the Bus Error (BERR) signal is\r
                                                 ///<   promoted to the Bus Initialization\r


@@ -1757,15 +1757,15 @@ typedef struct {
 \r
   UINT64  FailedInInsCache:1;           ///< Bit11, Failure located in the\r
                                         ///< instruction cache.\r
 \r
   UINT64  FailedInInsCache:1;           ///< Bit11, Failure located in the\r
                                         ///< instruction cache.\r

-                                        \r
+\r

   UINT64  Mesi:3;                       ///< Bit14:12,  0 - cache line is invalid. 1 - cache\r
                                         ///< line is held shared. 2 - cache line is held\r
                                         ///< exclusive. 3 - cache line is modified. All other\r
                                         ///< values are reserved.\r
   UINT64  Mesi:3;                       ///< Bit14:12,  0 - cache line is invalid. 1 - cache\r
                                         ///< line is held shared. 2 - cache line is held\r
                                         ///< exclusive. 3 - cache line is modified. All other\r
                                         ///< values are reserved.\r

-                                        \r
+\r

   UINT64  MesiIsValid:1;                ///< Bit15, The mesi field in the cache_check\r
                                         ///< parameter is valid.\r
   UINT64  MesiIsValid:1;                ///< Bit15, The mesi field in the cache_check\r
                                         ///< parameter is valid.\r

-                                        \r
+\r

   UINT64  FailedWay:5;                  ///< Bit20:16, Failure located in the way of\r
                                         ///< the cache indicated by this value.\r
 \r
   UINT64  FailedWay:5;                  ///< Bit20:16, Failure located in the way of\r
                                         ///< the cache indicated by this value.\r
 \r


@@ -2288,7 +2288,7 @@ typedef struct {
                                 ///<   ignored or generate an illegal argument in\r
                                 ///<   procedure calls if the caller sets these\r
                                 ///<   bits.\r
                                 ///<   ignored or generate an illegal argument in\r
                                 ///<   procedure calls if the caller sets these\r
                                 ///<   bits.\r

-                                \r
+\r

   UINT64  ControlSupport:1;     ///< This bit defines if an implementation\r
                                 ///<  supports control of the PAL self-tests\r
                                 ///<  via the self-test control word. If\r
   UINT64  ControlSupport:1;     ///< This bit defines if an implementation\r
                                 ///<  supports control of the PAL self-tests\r
                                 ///<  via the self-test control word. If\r

diff --git a/MdePkg/Include/IndustryStandard/Pci.h b/MdePkg/Include/IndustryStandard/Pci.h
index a808494a785d8b63a00b46ffff6699e00c1054b4..bf19738e5aab85ac9fa95ac9522a3f41c01420ec 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Pci.h
+++ b/MdePkg/Include/IndustryStandard/Pci.h
@@ -1,14 +1,14 @@
 /** @file\r
   Support for the latest PCI standard.\r
 \r
 /** @file\r
   Support for the latest PCI standard.\r
 \r

-Copyright (c) 2006 - 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) 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
-    \r
-THE PROGRAM 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

diff --git a/MdePkg/Include/IndustryStandard/Pci22.h b/MdePkg/Include/IndustryStandard/Pci22.h
index 96a76801d3e95166abfe6142aecef4ba938e6fe5..9b27355bcaa7243a9cb97459f8f07ad26e1b4aaa 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Pci22.h
+++ b/MdePkg/Include/IndustryStandard/Pci22.h
@@ -7,15 +7,15 @@
     PC Card Standard, 8.0\r
     PCI Power Management Interface Specifiction, Revision 1.2\r
 \r
     PC Card Standard, 8.0\r
     PCI Power Management Interface Specifiction, Revision 1.2\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) 2014 - 2015, Hewlett-Packard Development Company, L.P.<BR>\r
   Copyright (c) 2014 - 2015, 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
-  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


@@ -116,8 +116,8 @@ typedef union {
   PCI_TYPE01  Bridge;\r
 } PCI_TYPE_GENERIC;\r
 \r
   PCI_TYPE01  Bridge;\r
 } PCI_TYPE_GENERIC;\r
 \r

-/// \r
-/// CardBus Conroller Configuration Space, \r
+///\r
+/// CardBus Conroller Configuration Space,\r

 /// Section 4.5.1, PC Card Standard. 8.0\r
 ///\r
 typedef struct {\r
 /// Section 4.5.1, PC Card Standard. 8.0\r
 ///\r
 typedef struct {\r


@@ -158,7 +158,7 @@ typedef struct {
 #define   PCI_CLASS_MASS_STORAGE_OTHER  0x80\r
 \r
 #define PCI_CLASS_NETWORK             0x02\r
 #define   PCI_CLASS_MASS_STORAGE_OTHER  0x80\r
 \r
 #define PCI_CLASS_NETWORK             0x02\r

-#define   PCI_CLASS_NETWORK_ETHERNET    0x00  \r
+#define   PCI_CLASS_NETWORK_ETHERNET    0x00\r

 #define   PCI_CLASS_NETWORK_TOKENRING   0x01\r
 #define   PCI_CLASS_NETWORK_FDDI        0x02\r
 #define   PCI_CLASS_NETWORK_ATM         0x03\r
 #define   PCI_CLASS_NETWORK_TOKENRING   0x01\r
 #define   PCI_CLASS_NETWORK_FDDI        0x02\r
 #define   PCI_CLASS_NETWORK_ATM         0x03\r


@@ -171,7 +171,7 @@ typedef struct {
 #define     PCI_IF_VGA_8514               0x01\r
 #define   PCI_CLASS_DISPLAY_XGA         0x01\r
 #define   PCI_CLASS_DISPLAY_3D          0x02\r
 #define     PCI_IF_VGA_8514               0x01\r
 #define   PCI_CLASS_DISPLAY_XGA         0x01\r
 #define   PCI_CLASS_DISPLAY_3D          0x02\r

-#define   PCI_CLASS_DISPLAY_OTHER       0x80  \r
+#define   PCI_CLASS_DISPLAY_OTHER       0x80\r

 \r
 #define PCI_CLASS_MEDIA               0x04\r
 #define   PCI_CLASS_MEDIA_VIDEO         0x00\r
 \r
 #define PCI_CLASS_MEDIA               0x04\r
 #define   PCI_CLASS_MEDIA_VIDEO         0x00\r


@@ -199,7 +199,7 @@ typedef struct {
 #define   PCI_CLASS_BRIDGE_OTHER        0x80\r
 #define   PCI_CLASS_BRIDGE_ISA_PDECODE  0x80\r
 \r
 #define   PCI_CLASS_BRIDGE_OTHER        0x80\r
 #define   PCI_CLASS_BRIDGE_ISA_PDECODE  0x80\r
 \r

-#define PCI_CLASS_SCC                 0x07  ///< Simple communications controllers \r
+#define PCI_CLASS_SCC                 0x07  ///< Simple communications controllers\r

 #define   PCI_SUBCLASS_SERIAL           0x00\r
 #define     PCI_IF_GENERIC_XT             0x00\r
 #define     PCI_IF_16450                  0x01\r
 #define   PCI_SUBCLASS_SERIAL           0x00\r
 #define     PCI_IF_GENERIC_XT             0x00\r
 #define     PCI_IF_16450                  0x01\r


@@ -228,8 +228,8 @@ typedef struct {
 #define     PCI_IF_8259_PIC               0x00\r
 #define     PCI_IF_ISA_PIC                0x01\r
 #define     PCI_IF_EISA_PIC               0x02\r
 #define     PCI_IF_8259_PIC               0x00\r
 #define     PCI_IF_ISA_PIC                0x01\r
 #define     PCI_IF_EISA_PIC               0x02\r

-#define     PCI_IF_APIC_CONTROLLER        0x10  ///< I/O APIC interrupt controller , 32 bye none-prefectable memory.  \r
-#define     PCI_IF_APIC_CONTROLLER2       0x20 \r
+#define     PCI_IF_APIC_CONTROLLER        0x10  ///< I/O APIC interrupt controller , 32 bye none-prefectable memory.\r
+#define     PCI_IF_APIC_CONTROLLER2       0x20\r

 #define   PCI_SUBCLASS_DMA              0x01\r
 #define     PCI_IF_8237_DMA               0x00\r
 #define     PCI_IF_ISA_DMA                0x01\r
 #define   PCI_SUBCLASS_DMA              0x01\r
 #define     PCI_IF_8237_DMA               0x00\r
 #define     PCI_IF_ISA_DMA                0x01\r


@@ -297,25 +297,25 @@ typedef struct {
 \r
 #define PCI_SECURITY_CONTROLLER       0x10   ///< Encryption and decryption controller\r
 #define   PCI_SUBCLASS_NET_COMPUT       0x00\r
 \r
 #define PCI_SECURITY_CONTROLLER       0x10   ///< Encryption and decryption controller\r
 #define   PCI_SUBCLASS_NET_COMPUT       0x00\r

-#define   PCI_SUBCLASS_ENTERTAINMENT    0x10 \r
+#define   PCI_SUBCLASS_ENTERTAINMENT    0x10\r

 #define   PCI_SUBCLASS_SECURITY_OTHER   0x80\r
 \r
 #define PCI_CLASS_DPIO                0x11\r
 #define   PCI_SUBCLASS_DPIO             0x00\r
 #define   PCI_SUBCLASS_DPIO_OTHER       0x80\r
 \r
 #define   PCI_SUBCLASS_SECURITY_OTHER   0x80\r
 \r
 #define PCI_CLASS_DPIO                0x11\r
 #define   PCI_SUBCLASS_DPIO             0x00\r
 #define   PCI_SUBCLASS_DPIO_OTHER       0x80\r
 \r

-/**  \r
+/**\r

   Macro that checks whether the Base Class code of device matched.\r
 \r
   @param  _p      Specified device.\r
   @param  c       Base Class code needs matching.\r
 \r
   @retval TRUE    Base Class code matches the specified device.\r
   Macro that checks whether the Base Class code of device matched.\r
 \r
   @param  _p      Specified device.\r
   @param  c       Base Class code needs matching.\r
 \r
   @retval TRUE    Base Class code matches the specified device.\r

-  @retval FALSE   Base Class code doesn't match the specified device.         \r
+  @retval FALSE   Base Class code doesn't match the specified device.\r

 \r
 **/\r
 #define IS_CLASS1(_p, c)              ((_p)->Hdr.ClassCode[2] == (c))\r
 \r
 **/\r
 #define IS_CLASS1(_p, c)              ((_p)->Hdr.ClassCode[2] == (c))\r

-/**  \r
+/**\r

   Macro that checks whether the Base Class code and Sub-Class code of device matched.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether the Base Class code and Sub-Class code of device matched.\r
 \r
   @param  _p      Specified device.\r


@@ -323,11 +323,11 @@ typedef struct {
   @param  s       Sub-Class code needs matching.\r
 \r
   @retval TRUE    Base Class code and Sub-Class code match the specified device.\r
   @param  s       Sub-Class code needs matching.\r
 \r
   @retval TRUE    Base Class code and Sub-Class code match the specified device.\r

-  @retval FALSE   Base Class code and Sub-Class code don't match the specified device.         \r
+  @retval FALSE   Base Class code and Sub-Class code don't match the specified device.\r

 \r
 **/\r
 #define IS_CLASS2(_p, c, s)           (IS_CLASS1 (_p, c) && ((_p)->Hdr.ClassCode[1] == (s)))\r
 \r
 **/\r
 #define IS_CLASS2(_p, c, s)           (IS_CLASS1 (_p, c) && ((_p)->Hdr.ClassCode[1] == (s)))\r

-/**  \r
+/**\r

   Macro that checks whether the Base Class code, Sub-Class code and Interface code of device matched.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether the Base Class code, Sub-Class code and Interface code of device matched.\r
 \r
   @param  _p      Specified device.\r


@@ -336,12 +336,12 @@ typedef struct {
   @param  p       Interface code needs matching.\r
 \r
   @retval TRUE    Base Class code, Sub-Class code and Interface code match the specified device.\r
   @param  p       Interface code needs matching.\r
 \r
   @retval TRUE    Base Class code, Sub-Class code and Interface code match the specified device.\r

-  @retval FALSE   Base Class code, Sub-Class code and Interface code don't match the specified device.         \r
+  @retval FALSE   Base Class code, Sub-Class code and Interface code don't match the specified device.\r

 \r
 **/\r
 #define IS_CLASS3(_p, c, s, p)        (IS_CLASS2 (_p, c, s) && ((_p)->Hdr.ClassCode[0] == (p)))\r
 \r
 \r
 **/\r
 #define IS_CLASS3(_p, c, s, p)        (IS_CLASS2 (_p, c, s) && ((_p)->Hdr.ClassCode[0] == (p)))\r
 \r

-/**  \r
+/**\r

   Macro that checks whether device is a display controller.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a display controller.\r
 \r
   @param  _p      Specified device.\r


@@ -351,7 +351,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_DISPLAY(_p)            IS_CLASS1 (_p, PCI_CLASS_DISPLAY)\r
 \r
 **/\r
 #define IS_PCI_DISPLAY(_p)            IS_CLASS1 (_p, PCI_CLASS_DISPLAY)\r

-/**  \r
+/**\r

   Macro that checks whether device is a VGA-compatible controller.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a VGA-compatible controller.\r
 \r
   @param  _p      Specified device.\r


@@ -361,7 +361,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_VGA(_p)                IS_CLASS3 (_p, PCI_CLASS_DISPLAY, PCI_CLASS_DISPLAY_VGA, PCI_IF_VGA_VGA)\r
 \r
 **/\r
 #define IS_PCI_VGA(_p)                IS_CLASS3 (_p, PCI_CLASS_DISPLAY, PCI_CLASS_DISPLAY_VGA, PCI_IF_VGA_VGA)\r

-/**  \r
+/**\r

   Macro that checks whether device is an 8514-compatible controller.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is an 8514-compatible controller.\r
 \r
   @param  _p      Specified device.\r


@@ -371,7 +371,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_8514(_p)               IS_CLASS3 (_p, PCI_CLASS_DISPLAY, PCI_CLASS_DISPLAY_VGA, PCI_IF_VGA_8514)\r
 \r
 **/\r
 #define IS_PCI_8514(_p)               IS_CLASS3 (_p, PCI_CLASS_DISPLAY, PCI_CLASS_DISPLAY_VGA, PCI_IF_VGA_8514)\r

-/**  \r
+/**\r

   Macro that checks whether device is built before the Class Code field was defined.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is built before the Class Code field was defined.\r
 \r
   @param  _p      Specified device.\r


@@ -381,7 +381,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_OLD(_p)                IS_CLASS1 (_p, PCI_CLASS_OLD)\r
 \r
 **/\r
 #define IS_PCI_OLD(_p)                IS_CLASS1 (_p, PCI_CLASS_OLD)\r

-/**  \r
+/**\r

   Macro that checks whether device is a VGA-compatible device built before the Class Code field was defined.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a VGA-compatible device built before the Class Code field was defined.\r
 \r
   @param  _p      Specified device.\r


@@ -391,7 +391,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_OLD_VGA(_p)            IS_CLASS2 (_p, PCI_CLASS_OLD, PCI_CLASS_OLD_VGA)\r
 \r
 **/\r
 #define IS_PCI_OLD_VGA(_p)            IS_CLASS2 (_p, PCI_CLASS_OLD, PCI_CLASS_OLD_VGA)\r

-/**  \r
+/**\r

   Macro that checks whether device is an IDE controller.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is an IDE controller.\r
 \r
   @param  _p      Specified device.\r


@@ -401,7 +401,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_IDE(_p)                IS_CLASS2 (_p, PCI_CLASS_MASS_STORAGE, PCI_CLASS_MASS_STORAGE_IDE)\r
 \r
 **/\r
 #define IS_PCI_IDE(_p)                IS_CLASS2 (_p, PCI_CLASS_MASS_STORAGE, PCI_CLASS_MASS_STORAGE_IDE)\r

-/**  \r
+/**\r

   Macro that checks whether device is a SCSI bus controller.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a SCSI bus controller.\r
 \r
   @param  _p      Specified device.\r


@@ -411,7 +411,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_SCSI(_p)               IS_CLASS2 (_p, PCI_CLASS_MASS_STORAGE, PCI_CLASS_MASS_STORAGE_SCSI)\r
 \r
 **/\r
 #define IS_PCI_SCSI(_p)               IS_CLASS2 (_p, PCI_CLASS_MASS_STORAGE, PCI_CLASS_MASS_STORAGE_SCSI)\r

-/**  \r
+/**\r

   Macro that checks whether device is a RAID controller.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a RAID controller.\r
 \r
   @param  _p      Specified device.\r


@@ -421,7 +421,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_RAID(_p)               IS_CLASS2 (_p, PCI_CLASS_MASS_STORAGE, PCI_CLASS_MASS_STORAGE_RAID)\r
 \r
 **/\r
 #define IS_PCI_RAID(_p)               IS_CLASS2 (_p, PCI_CLASS_MASS_STORAGE, PCI_CLASS_MASS_STORAGE_RAID)\r

-/**  \r
+/**\r

   Macro that checks whether device is an ISA bridge.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is an ISA bridge.\r
 \r
   @param  _p      Specified device.\r


@@ -431,7 +431,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_LPC(_p)                IS_CLASS2 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA)\r
 \r
 **/\r
 #define IS_PCI_LPC(_p)                IS_CLASS2 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA)\r

-/**  \r
+/**\r

   Macro that checks whether device is a PCI-to-PCI bridge.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a PCI-to-PCI bridge.\r
 \r
   @param  _p      Specified device.\r


@@ -441,7 +441,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_P2P(_p)                IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_P2P, PCI_IF_BRIDGE_P2P)\r
 \r
 **/\r
 #define IS_PCI_P2P(_p)                IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_P2P, PCI_IF_BRIDGE_P2P)\r

-/**  \r
+/**\r

   Macro that checks whether device is a Subtractive Decode PCI-to-PCI bridge.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a Subtractive Decode PCI-to-PCI bridge.\r
 \r
   @param  _p      Specified device.\r


@@ -451,7 +451,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_P2P_SUB(_p)            IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_P2P, PCI_IF_BRIDGE_P2P_SUBTRACTIVE)\r
 \r
 **/\r
 #define IS_PCI_P2P_SUB(_p)            IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_P2P, PCI_IF_BRIDGE_P2P_SUBTRACTIVE)\r

-/**  \r
+/**\r

   Macro that checks whether device is a 16550-compatible serial controller.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a 16550-compatible serial controller.\r
 \r
   @param  _p      Specified device.\r


@@ -461,7 +461,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_16550_SERIAL(_p)       IS_CLASS3 (_p, PCI_CLASS_SCC, PCI_SUBCLASS_SERIAL, PCI_IF_16550)\r
 \r
 **/\r
 #define IS_PCI_16550_SERIAL(_p)       IS_CLASS3 (_p, PCI_CLASS_SCC, PCI_SUBCLASS_SERIAL, PCI_IF_16550)\r

-/**  \r
+/**\r

   Macro that checks whether device is a Universal Serial Bus controller.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a Universal Serial Bus controller.\r
 \r
   @param  _p      Specified device.\r


@@ -473,7 +473,7 @@ typedef struct {
 #define IS_PCI_USB(_p)                IS_CLASS2 (_p, PCI_CLASS_SERIAL, PCI_CLASS_SERIAL_USB)\r
 \r
 //\r
 #define IS_PCI_USB(_p)                IS_CLASS2 (_p, PCI_CLASS_SERIAL, PCI_CLASS_SERIAL_USB)\r
 \r
 //\r

-// the definition of Header Type \r
+// the definition of Header Type\r

 //\r
 #define HEADER_TYPE_DEVICE            0x00\r
 #define HEADER_TYPE_PCI_TO_PCI_BRIDGE 0x01\r
 //\r
 #define HEADER_TYPE_DEVICE            0x00\r
 #define HEADER_TYPE_PCI_TO_PCI_BRIDGE 0x01\r


@@ -483,7 +483,7 @@ typedef struct {
 // Mask of Header type\r
 //\r
 #define HEADER_LAYOUT_CODE            0x7f\r
 // Mask of Header type\r
 //\r
 #define HEADER_LAYOUT_CODE            0x7f\r

-/**  \r
+/**\r

   Macro that checks whether device is a PCI-PCI bridge.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a PCI-PCI bridge.\r
 \r
   @param  _p      Specified device.\r


@@ -493,7 +493,7 @@ typedef struct {
 \r
 **/\r
 #define IS_PCI_BRIDGE(_p)             (((_p)->Hdr.HeaderType & HEADER_LAYOUT_CODE) == (HEADER_TYPE_PCI_TO_PCI_BRIDGE))\r
 \r
 **/\r
 #define IS_PCI_BRIDGE(_p)             (((_p)->Hdr.HeaderType & HEADER_LAYOUT_CODE) == (HEADER_TYPE_PCI_TO_PCI_BRIDGE))\r

-/**  \r
+/**\r

   Macro that checks whether device is a CardBus bridge.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a CardBus bridge.\r
 \r
   @param  _p      Specified device.\r


@@ -503,7 +503,7 @@ typedef struct {
 \r
 **/\r
 #define IS_CARDBUS_BRIDGE(_p)         (((_p)->Hdr.HeaderType & HEADER_LAYOUT_CODE) == (HEADER_TYPE_CARDBUS_BRIDGE))\r
 \r
 **/\r
 #define IS_CARDBUS_BRIDGE(_p)         (((_p)->Hdr.HeaderType & HEADER_LAYOUT_CODE) == (HEADER_TYPE_CARDBUS_BRIDGE))\r

-/**  \r
+/**\r

   Macro that checks whether device is a multiple functions device.\r
 \r
   @param  _p      Specified device.\r
   Macro that checks whether device is a multiple functions device.\r
 \r
   @param  _p      Specified device.\r


@@ -548,17 +548,17 @@ typedef struct {
 //\r
 // defined in PCI-to-PCI Bridge Architecture Specification\r
 //\r
 //\r
 // defined in PCI-to-PCI Bridge Architecture Specification\r
 //\r

-#define PCI_BRIDGE_PRIMARY_BUS_REGISTER_OFFSET      0x18   \r
-#define PCI_BRIDGE_SECONDARY_BUS_REGISTER_OFFSET    0x19   \r
-#define PCI_BRIDGE_SUBORDINATE_BUS_REGISTER_OFFSET  0x1a   \r
+#define PCI_BRIDGE_PRIMARY_BUS_REGISTER_OFFSET      0x18\r
+#define PCI_BRIDGE_SECONDARY_BUS_REGISTER_OFFSET    0x19\r
+#define PCI_BRIDGE_SUBORDINATE_BUS_REGISTER_OFFSET  0x1a\r

 #define PCI_BRIDGE_SECONDARY_LATENCY_TIMER_OFFSET   0x1b\r
 #define PCI_BRIDGE_SECONDARY_LATENCY_TIMER_OFFSET   0x1b\r

-#define PCI_BRIDGE_STATUS_REGISTER_OFFSET           0x1E   \r
-#define PCI_BRIDGE_CONTROL_REGISTER_OFFSET          0x3E   \r
+#define PCI_BRIDGE_STATUS_REGISTER_OFFSET           0x1E\r
+#define PCI_BRIDGE_CONTROL_REGISTER_OFFSET          0x3E\r

 \r
 ///\r
 /// Interrupt Line "Unknown" or "No connection" value defined for x86 based system\r
 ///\r
 \r
 ///\r
 /// Interrupt Line "Unknown" or "No connection" value defined for x86 based system\r
 ///\r

-#define PCI_INT_LINE_UNKNOWN                        0xFF               \r
+#define PCI_INT_LINE_UNKNOWN                        0xFF\r

 \r
 ///\r
 /// PCI Access Data Format\r
 \r
 ///\r
 /// PCI Access Data Format\r


@@ -770,7 +770,7 @@ typedef struct {
 } EFI_PCI_CAPABILITY_MSI64;\r
 \r
 ///\r
 } EFI_PCI_CAPABILITY_MSI64;\r
 \r
 ///\r

-/// Capability EFI_PCI_CAPABILITY_ID_HOTPLUG, \r
+/// Capability EFI_PCI_CAPABILITY_ID_HOTPLUG,\r

 /// CompactPCI Hot Swap Specification PICMG 2.1, R1.0\r
 ///\r
 typedef struct {\r
 /// CompactPCI Hot Swap Specification PICMG 2.1, R1.0\r
 ///\r
 typedef struct {\r


@@ -789,8 +789,8 @@ typedef struct {
 \r
 ///\r
 /// EFI PCI Option ROM definitions\r
 \r
 ///\r
 /// EFI PCI Option ROM definitions\r

-/// \r
-#define EFI_ROOT_BRIDGE_LIST                            'eprb'  \r
+///\r
+#define EFI_ROOT_BRIDGE_LIST                            'eprb'\r

 #define EFI_PCI_EXPANSION_ROM_HEADER_EFISIGNATURE       0x0EF1  ///< defined in UEFI Spec.\r
 \r
 #define PCI_EXPANSION_ROM_HEADER_SIGNATURE              0xaa55\r
 #define EFI_PCI_EXPANSION_ROM_HEADER_EFISIGNATURE       0x0EF1  ///< defined in UEFI Spec.\r
 \r
 #define PCI_EXPANSION_ROM_HEADER_SIGNATURE              0xaa55\r

diff --git a/MdePkg/Include/IndustryStandard/Pci23.h b/MdePkg/Include/IndustryStandard/Pci23.h
index 87bd16375c0235d9be13a85ea390f84d8ef2130b..bf65d42ec5b6469e2c9b40209908a671b60a664d 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Pci23.h
+++ b/MdePkg/Include/IndustryStandard/Pci23.h
@@ -1,14 +1,14 @@
 /** @file\r
   Support for PCI 2.3 standard.\r
 \r
 /** @file\r
   Support for PCI 2.3 standard.\r
 \r

-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \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


@@ -96,7 +96,7 @@
 \r
 #pragma pack(1)\r
 ///\r
 \r
 #pragma pack(1)\r
 ///\r

-/// PCI-X Capabilities List, \r
+/// PCI-X Capabilities List,\r

 /// Section 7.2, PCI-X Addendum to the PCI Local Bus Specification, Revision 1.0b.\r
 ///\r
 typedef struct {\r
 /// Section 7.2, PCI-X Addendum to the PCI Local Bus Specification, Revision 1.0b.\r
 ///\r
 typedef struct {\r


@@ -106,7 +106,7 @@ typedef struct {
 } EFI_PCI_CAPABILITY_PCIX;\r
 \r
 ///\r
 } EFI_PCI_CAPABILITY_PCIX;\r
 \r
 ///\r

-/// PCI-X Bridge Capabilities List, \r
+/// PCI-X Bridge Capabilities List,\r

 /// Section 8.6.2, PCI-X Addendum to the PCI Local Bus Specification, Revision 1.0b.\r
 ///\r
 typedef struct {\r
 /// Section 8.6.2, PCI-X Addendum to the PCI Local Bus Specification, Revision 1.0b.\r
 ///\r
 typedef struct {\r

diff --git a/MdePkg/Include/IndustryStandard/Pci30.h b/MdePkg/Include/IndustryStandard/Pci30.h
index a4ab909eb53434c5e196916d0430840be1d0db6c..6280f5991bb53e9b02a92cfd1d632618e3d7e02f 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Pci30.h
+++ b/MdePkg/Include/IndustryStandard/Pci30.h
@@ -1,14 +1,14 @@
 /** @file\r
   Support for PCI 3.0 standard.\r
 \r
 /** @file\r
   Support for PCI 3.0 standard.\r
 \r

-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  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/MdePkg/Include/IndustryStandard/PciCodeId.h b/MdePkg/Include/IndustryStandard/PciCodeId.h
index dba98565baab324a8054c548e7dad7aba3b7f5f4..4a51005fc29b3992ab1706a3f9d64026102400c3 100644 (file)
--- a/MdePkg/Include/IndustryStandard/PciCodeId.h
+++ b/MdePkg/Include/IndustryStandard/PciCodeId.h
@@ -2,14 +2,14 @@
   The file lists the PCI class codes only defined in PCI code and ID assignment specification\r
   revision 1.3.\r
 \r
   The file lists the PCI class codes only defined in PCI code and ID assignment specification\r
   revision 1.3.\r
 \r

-  Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \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) 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
+  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/MdePkg/Include/IndustryStandard/PciExpress21.h b/MdePkg/Include/IndustryStandard/PciExpress21.h
index d90b5975ba922a47550121a978075b90625ee7e3..2bf26d86997b41659aabf1da4fc1765a1a0ed4b3 100644 (file)
--- a/MdePkg/Include/IndustryStandard/PciExpress21.h
+++ b/MdePkg/Include/IndustryStandard/PciExpress21.h
@@ -1,15 +1,15 @@
 /** @file\r
   Support for the latest PCI standard.\r
 \r
 /** @file\r
   Support for the latest PCI standard.\r
 \r

-  Copyright (c) 2006 - 2017, 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
-  THE PROGRAM 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
+  (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
+  THE PROGRAM IS 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/MdePkg/Include/IndustryStandard/PciExpress30.h b/MdePkg/Include/IndustryStandard/PciExpress30.h
index db6a427bc8749e65d55ab4e9dc7cafafcb3e298f..4a30077a038226964818e71c7f5ca73ab6ceb289 100644 (file)
--- a/MdePkg/Include/IndustryStandard/PciExpress30.h
+++ b/MdePkg/Include/IndustryStandard/PciExpress30.h
@@ -3,14 +3,14 @@
 \r
   This header file may not define all structures.  Please extend as required.\r
 \r
 \r
   This header file may not define all structures.  Please extend as required.\r
 \r

-  Copyright (c) 2014 - 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) 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
+  THE PROGRAM IS 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/MdePkg/Include/IndustryStandard/PeImage.h b/MdePkg/Include/IndustryStandard/PeImage.h
index 1abe72971ecbfb9e8faf8098ce88f2c9d8441de9..c09bdc7eec2ce60462855e8c48d7571349cbee08 100644 (file)
--- a/MdePkg/Include/IndustryStandard/PeImage.h
+++ b/MdePkg/Include/IndustryStandard/PeImage.h
@@ -1,21 +1,21 @@
 /** @file\r
 /** @file\r

-  EFI image format for PE32, PE32+ and TE. Please note some data structures are \r
-  different for PE32 and PE32+. EFI_IMAGE_NT_HEADERS32 is for PE32 and \r
-  EFI_IMAGE_NT_HEADERS64 is for PE32+. \r
+  EFI image format for PE32, PE32+ and TE. Please note some data structures are\r
+  different for PE32 and PE32+. EFI_IMAGE_NT_HEADERS32 is for PE32 and\r
+  EFI_IMAGE_NT_HEADERS64 is for PE32+.\r

 \r
 \r

-  This file is coded to the Visual Studio, Microsoft Portable Executable and \r
+  This file is coded to the Visual Studio, Microsoft Portable Executable and\r

   Common Object File Format Specification, Revision 8.3 - February 6, 2013.\r
   This file also includes some definitions in PI Specification, Revision 1.0.\r
 \r
   Common Object File Format Specification, Revision 8.3 - February 6, 2013.\r
   This file also includes some definitions in PI Specification, Revision 1.0.\r
 \r

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

 Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 Portions copyright (c) 2008 - 2009, Apple 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
-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


@@ -134,12 +134,12 @@ typedef struct {
 \r
 ///\r
 /// @attention\r
 \r
 ///\r
 /// @attention\r

-/// EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC means PE32 and \r
+/// EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC means PE32 and\r

 /// EFI_IMAGE_OPTIONAL_HEADER32 must be used. The data structures only vary\r
 /// after NT additional fields.\r
 ///\r
 #define EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x10b\r
 /// EFI_IMAGE_OPTIONAL_HEADER32 must be used. The data structures only vary\r
 /// after NT additional fields.\r
 ///\r
 #define EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x10b\r

-          \r
+\r

 ///\r
 /// Optional Header Standard Fields for PE32.\r
 ///\r
 ///\r
 /// Optional Header Standard Fields for PE32.\r
 ///\r


@@ -185,7 +185,7 @@ typedef struct {
 \r
 ///\r
 /// @attention\r
 \r
 ///\r
 /// @attention\r

-/// EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC means PE32+ and \r
+/// EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC means PE32+ and\r

 /// EFI_IMAGE_OPTIONAL_HEADER64 must be used. The data structures only vary\r
 /// after NT additional fields.\r
 ///\r
 /// EFI_IMAGE_OPTIONAL_HEADER64 must be used. The data structures only vary\r
 /// after NT additional fields.\r
 ///\r


@@ -296,7 +296,7 @@ typedef struct {
 /// Size of EFI_IMAGE_SECTION_HEADER.\r
 ///\r
 #define EFI_IMAGE_SIZEOF_SECTION_HEADER       40\r
 /// Size of EFI_IMAGE_SECTION_HEADER.\r
 ///\r
 #define EFI_IMAGE_SIZEOF_SECTION_HEADER       40\r

-         \r
+\r

 //\r
 // Section Flags Values\r
 //\r
 //\r
 // Section Flags Values\r
 //\r


@@ -304,12 +304,12 @@ typedef struct {
 #define EFI_IMAGE_SCN_CNT_CODE                     BIT5   ///< 0x00000020\r
 #define EFI_IMAGE_SCN_CNT_INITIALIZED_DATA         BIT6   ///< 0x00000040\r
 #define EFI_IMAGE_SCN_CNT_UNINITIALIZED_DATA       BIT7   ///< 0x00000080\r
 #define EFI_IMAGE_SCN_CNT_CODE                     BIT5   ///< 0x00000020\r
 #define EFI_IMAGE_SCN_CNT_INITIALIZED_DATA         BIT6   ///< 0x00000040\r
 #define EFI_IMAGE_SCN_CNT_UNINITIALIZED_DATA       BIT7   ///< 0x00000080\r

-                                                   \r
+\r

 #define EFI_IMAGE_SCN_LNK_OTHER                    BIT8   ///< 0x00000100  ///< Reserved.\r
 #define EFI_IMAGE_SCN_LNK_INFO                     BIT9   ///< 0x00000200  ///< Section contains comments or some other type of information.\r
 #define EFI_IMAGE_SCN_LNK_REMOVE                   BIT11  ///< 0x00000800  ///< Section contents will not become part of image.\r
 #define EFI_IMAGE_SCN_LNK_COMDAT                   BIT12  ///< 0x00001000\r
 #define EFI_IMAGE_SCN_LNK_OTHER                    BIT8   ///< 0x00000100  ///< Reserved.\r
 #define EFI_IMAGE_SCN_LNK_INFO                     BIT9   ///< 0x00000200  ///< Section contains comments or some other type of information.\r
 #define EFI_IMAGE_SCN_LNK_REMOVE                   BIT11  ///< 0x00000800  ///< Section contents will not become part of image.\r
 #define EFI_IMAGE_SCN_LNK_COMDAT                   BIT12  ///< 0x00001000\r

-                                                   \r
+\r

 #define EFI_IMAGE_SCN_ALIGN_1BYTES                 BIT20  ///< 0x00100000\r
 #define EFI_IMAGE_SCN_ALIGN_2BYTES                 BIT21  ///< 0x00200000\r
 #define EFI_IMAGE_SCN_ALIGN_4BYTES          (BIT20|BIT21) ///< 0x00300000\r
 #define EFI_IMAGE_SCN_ALIGN_1BYTES                 BIT20  ///< 0x00100000\r
 #define EFI_IMAGE_SCN_ALIGN_2BYTES                 BIT21  ///< 0x00200000\r
 #define EFI_IMAGE_SCN_ALIGN_4BYTES          (BIT20|BIT21) ///< 0x00300000\r


@@ -317,7 +317,7 @@ typedef struct {
 #define EFI_IMAGE_SCN_ALIGN_16BYTES         (BIT20|BIT22) ///< 0x00500000\r
 #define EFI_IMAGE_SCN_ALIGN_32BYTES         (BIT21|BIT22) ///< 0x00600000\r
 #define EFI_IMAGE_SCN_ALIGN_64BYTES   (BIT20|BIT21|BIT22) ///< 0x00700000\r
 #define EFI_IMAGE_SCN_ALIGN_16BYTES         (BIT20|BIT22) ///< 0x00500000\r
 #define EFI_IMAGE_SCN_ALIGN_32BYTES         (BIT21|BIT22) ///< 0x00600000\r
 #define EFI_IMAGE_SCN_ALIGN_64BYTES   (BIT20|BIT21|BIT22) ///< 0x00700000\r

-                                              \r
+\r

 #define EFI_IMAGE_SCN_MEM_DISCARDABLE              BIT25  ///< 0x02000000\r
 #define EFI_IMAGE_SCN_MEM_NOT_CACHED               BIT26  ///< 0x04000000\r
 #define EFI_IMAGE_SCN_MEM_NOT_PAGED                BIT27  ///< 0x08000000\r
 #define EFI_IMAGE_SCN_MEM_DISCARDABLE              BIT25  ///< 0x02000000\r
 #define EFI_IMAGE_SCN_MEM_NOT_CACHED               BIT26  ///< 0x04000000\r
 #define EFI_IMAGE_SCN_MEM_NOT_PAGED                BIT27  ///< 0x08000000\r


@@ -415,7 +415,7 @@ typedef struct {
 #define EFI_IMAGE_COMDAT_SELECT_SAME_SIZE       3\r
 #define EFI_IMAGE_COMDAT_SELECT_EXACT_MATCH     4\r
 #define EFI_IMAGE_COMDAT_SELECT_ASSOCIATIVE     5\r
 #define EFI_IMAGE_COMDAT_SELECT_SAME_SIZE       3\r
 #define EFI_IMAGE_COMDAT_SELECT_EXACT_MATCH     4\r
 #define EFI_IMAGE_COMDAT_SELECT_ASSOCIATIVE     5\r

-                                       \r
+\r

 //\r
 // the following values only be referred in PeCoff, not defined in PECOFF.\r
 //\r
 //\r
 // the following values only be referred in PeCoff, not defined in PECOFF.\r
 //\r


@@ -450,9 +450,9 @@ typedef struct {
 #define EFI_IMAGE_REL_I386_SECREL   0x000B\r
 #define EFI_IMAGE_REL_I386_REL32    0x0014  ///< PC-relative 32-bit reference to the symbols virtual address.\r
 \r
 #define EFI_IMAGE_REL_I386_SECREL   0x000B\r
 #define EFI_IMAGE_REL_I386_REL32    0x0014  ///< PC-relative 32-bit reference to the symbols virtual address.\r
 \r

-// \r
+//\r

 // x64 processor relocation types.\r
 // x64 processor relocation types.\r

-// \r
+//\r

 #define IMAGE_REL_AMD64_ABSOLUTE  0x0000\r
 #define IMAGE_REL_AMD64_ADDR64    0x0001\r
 #define IMAGE_REL_AMD64_ADDR32    0x0002\r
 #define IMAGE_REL_AMD64_ABSOLUTE  0x0000\r
 #define IMAGE_REL_AMD64_ADDR64    0x0001\r
 #define IMAGE_REL_AMD64_ADDR32    0x0002\r

diff --git a/MdePkg/Include/IndustryStandard/Sal.h b/MdePkg/Include/IndustryStandard/Sal.h
index a229251049c0e66e2e67f1a43eed51e553efd139..8856b4f84537b8b43c68922e4988cdee26edf4a9 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Sal.h
+++ b/MdePkg/Include/IndustryStandard/Sal.h
@@ -2,14 +2,14 @@
   Main SAL API's defined in Intel Itanium Processor Family System Abstraction\r
   Layer Specification Revision 3.2 (December 2003)\r
 \r
   Main SAL API's defined in Intel Itanium Processor Family System Abstraction\r
   Layer Specification Revision 3.2 (December 2003)\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
-    \r
-THE PROGRAM 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


@@ -17,16 +17,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __SAL_API_H__\r
 \r
 ///\r
 #define __SAL_API_H__\r
 \r
 ///\r

-/// SAL return status type \r
+/// SAL return status type\r

 ///\r
 typedef INTN EFI_SAL_STATUS;\r
 \r
 ///\r
 ///\r
 typedef INTN EFI_SAL_STATUS;\r
 \r
 ///\r

-/// Call completed without error. \r
+/// Call completed without error.\r

 ///\r
 #define EFI_SAL_SUCCESS               ((EFI_SAL_STATUS) 0)\r
 ///\r
 ///\r
 #define EFI_SAL_SUCCESS               ((EFI_SAL_STATUS) 0)\r
 ///\r

-/// Call completed without error, but some information was lost due to overflow. \r
+/// Call completed without error, but some information was lost due to overflow.\r

 ///\r
 #define EFI_SAL_OVERFLOW              ((EFI_SAL_STATUS) 1)\r
 ///\r
 ///\r
 #define EFI_SAL_OVERFLOW              ((EFI_SAL_STATUS) 1)\r
 ///\r


@@ -34,7 +34,7 @@ typedef INTN EFI_SAL_STATUS;
 ///\r
 #define EFI_SAL_WARM_BOOT_NEEDED      ((EFI_SAL_STATUS) 2)\r
 ///\r
 ///\r
 #define EFI_SAL_WARM_BOOT_NEEDED      ((EFI_SAL_STATUS) 2)\r
 ///\r

-/// More information is available for retrieval. \r
+/// More information is available for retrieval.\r

 ///\r
 #define EFI_SAL_MORE_RECORDS          ((EFI_SAL_STATUS) 3)\r
 ///\r
 ///\r
 #define EFI_SAL_MORE_RECORDS          ((EFI_SAL_STATUS) 3)\r
 ///\r


@@ -46,15 +46,15 @@ typedef INTN EFI_SAL_STATUS;
 ///\r
 #define EFI_SAL_INVALID_ARGUMENT      ((EFI_SAL_STATUS) - 2)\r
 ///\r
 ///\r
 #define EFI_SAL_INVALID_ARGUMENT      ((EFI_SAL_STATUS) - 2)\r
 ///\r

-/// Call completed without error. \r
+/// Call completed without error.\r

 ///\r
 #define EFI_SAL_ERROR                 ((EFI_SAL_STATUS) - 3)\r
 ///\r
 ///\r
 #define EFI_SAL_ERROR                 ((EFI_SAL_STATUS) - 3)\r
 ///\r

-/// Virtual address not registered. \r
+/// Virtual address not registered.\r

 ///\r
 #define EFI_SAL_VIRTUAL_ADDRESS_ERROR ((EFI_SAL_STATUS) - 4)\r
 ///\r
 ///\r
 #define EFI_SAL_VIRTUAL_ADDRESS_ERROR ((EFI_SAL_STATUS) - 4)\r
 ///\r

-/// No information available. \r
+/// No information available.\r

 ///\r
 #define EFI_SAL_NO_INFORMATION        ((EFI_SAL_STATUS) - 5)\r
 ///\r
 ///\r
 #define EFI_SAL_NO_INFORMATION        ((EFI_SAL_STATUS) - 5)\r
 ///\r


@@ -213,7 +213,7 @@ typedef struct {
 \r
 //\r
 // Parameter of EFI_SAL_GET_STATE_INFO, EFI_SAL_GET_STATE_INFO_SIZE, and EFI_SAL_CLEAR_STATE_INFO\r
 \r
 //\r
 // Parameter of EFI_SAL_GET_STATE_INFO, EFI_SAL_GET_STATE_INFO_SIZE, and EFI_SAL_CLEAR_STATE_INFO\r

-// \r
+//\r

 // Type of information\r
 //\r
 #define EFI_SAL_MCA_STATE_INFO  0x0\r
 // Type of information\r
 //\r
 #define EFI_SAL_MCA_STATE_INFO  0x0\r


@@ -345,8 +345,8 @@ typedef struct _SAL_UPDATE_PAL_INFO_BLOCK {
 #pragma pack(1)\r
 typedef struct {\r
   ///\r
 #pragma pack(1)\r
 typedef struct {\r
   ///\r

-  /// The ASCII string representation of "SST_" that confirms the presence of the table. \r
-  /// \r
+  /// The ASCII string representation of "SST_" that confirms the presence of the table.\r
+  ///\r

   UINT32  Signature;\r
   ///\r
   /// The length of the entire table in bytes, starting from offset zero and including the\r
   UINT32  Signature;\r
   ///\r
   /// The length of the entire table in bytes, starting from offset zero and including the\r


@@ -470,7 +470,7 @@ typedef struct {
   UINT64  NumberOfProcessors;\r
   UINT64  LocalIDRegister;\r
 } SAL_COHERENCE_DOMAIN_INFO;\r
   UINT64  NumberOfProcessors;\r
   UINT64  LocalIDRegister;\r
 } SAL_COHERENCE_DOMAIN_INFO;\r

-           \r
+\r

 ///\r
 /// Format of Purge Translation Cache Coherence Domain Entry.\r
 ///\r
 ///\r
 /// Format of Purge Translation Cache Coherence Domain Entry.\r
 ///\r


@@ -504,7 +504,7 @@ typedef struct {
   UINT8   CheckSum;\r
 } EFI_SAL_FIT_ENTRY;\r
 //\r
   UINT8   CheckSum;\r
 } EFI_SAL_FIT_ENTRY;\r
 //\r

-// FIT Types \r
+// FIT Types\r

 //\r
 #define EFI_SAL_FIT_FIT_HEADER_TYPE                0x00\r
 #define EFI_SAL_FIT_PAL_B_TYPE                     0x01\r
 //\r
 #define EFI_SAL_FIT_FIT_HEADER_TYPE                0x00\r
 #define EFI_SAL_FIT_PAL_B_TYPE                     0x01\r

diff --git a/MdePkg/Include/IndustryStandard/Scsi.h b/MdePkg/Include/IndustryStandard/Scsi.h
index 0d813147c17cb33944a51df7b3db5adc15424638..213d8acc2d77d68bd8f72e0cc58d5697f1550b6f 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Scsi.h
+++ b/MdePkg/Include/IndustryStandard/Scsi.h
@@ -1,14 +1,14 @@
 /** @file\r
   Support for SCSI-2 standard\r
 \r
 /** @file\r
   Support for SCSI-2 standard\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


@@ -346,9 +346,9 @@ typedef struct {
   UINT8 BlockSize0;\r
   UINT8 Protection;\r
   UINT8 LogicPerPhysical;\r
   UINT8 BlockSize0;\r
   UINT8 Protection;\r
   UINT8 LogicPerPhysical;\r

-  UINT8 LowestAlignLogic2;  \r
-  UINT8 LowestAlignLogic1;    \r
-  UINT8 Reserved[16];  \r
+  UINT8 LowestAlignLogic2;\r
+  UINT8 LowestAlignLogic1;\r
+  UINT8 Reserved[16];\r

 } EFI_SCSI_DISK_CAPACITY_DATA16;\r
 \r
 typedef struct {\r
 } EFI_SCSI_DISK_CAPACITY_DATA16;\r
 \r
 typedef struct {\r

diff --git a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
index 47030a442836fc16d64223242d372d7539dedae1..59536917aee8bd3ec56aa9d39122fb865468a819 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
+++ b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
@@ -1,17 +1,17 @@
 /** @file\r
   ACPI Serial Port Console Redirection Table as defined by Microsoft in\r
   http://www.microsoft.com/whdc/system/platform/server/spcr.mspx\r
 /** @file\r
   ACPI Serial Port Console Redirection Table as defined by Microsoft in\r
   http://www.microsoft.com/whdc/system/platform/server/spcr.mspx\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

   (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
   Copyright (c) 2014 - 2016, ARM Limited. All rights reserved.<BR>\r
   (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
   Copyright (c) 2014 - 2016, ARM Limited. All rights reserved.<BR>\r

-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \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 _SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_H_\r
 **/\r
 \r
 #ifndef _SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_H_\r

diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index e8a7511c9c7ba8596c82dbdc44b49beda3b1a104..5d0442873dfcd54ca717456857ef87f2967bf718 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -3,13 +3,13 @@
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP<BR>\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2015-2017 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
+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


@@ -101,10 +101,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 ///\r
 /// Inactive type is added from SMBIOS 2.2. Reference SMBIOS 2.6, chapter 3.3.43.\r
 \r
 ///\r
 /// Inactive type is added from SMBIOS 2.2. Reference SMBIOS 2.6, chapter 3.3.43.\r

-/// Upper-level software that interprets the SMBIOS structure-table should bypass an \r
+/// Upper-level software that interprets the SMBIOS structure-table should bypass an\r

 /// Inactive structure just like a structure type that the software does not recognize.\r
 ///\r
 /// Inactive structure just like a structure type that the software does not recognize.\r
 ///\r

-#define SMBIOS_TYPE_INACTIVE         0x007E    \r
+#define SMBIOS_TYPE_INACTIVE         0x007E\r

 \r
 ///\r
 /// End-of-table type is added from SMBIOS 2.2. Reference SMBIOS 2.6, chapter 3.3.44.\r
 \r
 ///\r
 /// End-of-table type is added from SMBIOS 2.2. Reference SMBIOS 2.6, chapter 3.3.44.\r


@@ -117,7 +117,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 ///\r
 /// Types 0 through 127 (7Fh) are reserved for and defined by this\r
 \r
 ///\r
 /// Types 0 through 127 (7Fh) are reserved for and defined by this\r

-/// specification. Types 128 through 256 (80h to FFh) are available for system- and OEM-specific information.  \r
+/// specification. Types 128 through 256 (80h to FFh) are available for system- and OEM-specific information.\r

 ///\r
 typedef UINT8  SMBIOS_TYPE;\r
 \r
 ///\r
 typedef UINT8  SMBIOS_TYPE;\r
 \r


@@ -225,8 +225,8 @@ typedef struct {
   UINT32  PrinterIsSupported                :1;\r
   UINT32  CgaMonoIsSupported                :1;\r
   UINT32  NecPc98                           :1;\r
   UINT32  PrinterIsSupported                :1;\r
   UINT32  CgaMonoIsSupported                :1;\r
   UINT32  NecPc98                           :1;\r

-  UINT32  ReservedForVendor                 :32; ///< Bits 32-63. Bits 32-47 reserved for BIOS vendor \r
-                                                 ///< and bits 48-63 reserved for System Vendor. \r
+  UINT32  ReservedForVendor                 :32; ///< Bits 32-63. Bits 32-47 reserved for BIOS vendor\r
+                                                 ///< and bits 48-63 reserved for System Vendor.\r

 } MISC_BIOS_CHARACTERISTICS;\r
 \r
 ///\r
 } MISC_BIOS_CHARACTERISTICS;\r
 \r
 ///\r


@@ -300,7 +300,7 @@ typedef struct {
 ///\r
 ///  System Wake-up Type.\r
 ///\r
 ///\r
 ///  System Wake-up Type.\r
 ///\r

-typedef enum {  \r
+typedef enum {\r

   SystemWakeupTypeReserved         = 0x00,\r
   SystemWakeupTypeOther            = 0x01,\r
   SystemWakeupTypeUnknown          = 0x02,\r
   SystemWakeupTypeReserved         = 0x00,\r
   SystemWakeupTypeOther            = 0x01,\r
   SystemWakeupTypeUnknown          = 0x02,\r


@@ -314,10 +314,10 @@ typedef enum {
 \r
 ///\r
 /// System Information (Type 1).\r
 \r
 ///\r
 /// System Information (Type 1).\r

-/// \r
-/// The information in this structure defines attributes of the overall system and is \r
+///\r
+/// The information in this structure defines attributes of the overall system and is\r

 /// intended to be associated with the Component ID group of the system's MIF.\r
 /// intended to be associated with the Component ID group of the system's MIF.\r

-/// An SMBIOS implementation is associated with a single system instance and contains \r
+/// An SMBIOS implementation is associated with a single system instance and contains\r

 /// one and only one System Information (Type 1) structure.\r
 ///\r
 typedef struct {\r
 /// one and only one System Information (Type 1) structure.\r
 ///\r
 typedef struct {\r


@@ -333,7 +333,7 @@ typedef struct {
 } SMBIOS_TABLE_TYPE1;\r
 \r
 ///\r
 } SMBIOS_TABLE_TYPE1;\r
 \r
 ///\r

-///  Base Board - Feature Flags. \r
+///  Base Board - Feature Flags.\r

 ///\r
 typedef struct {\r
   UINT8  Motherboard           :1;\r
 ///\r
 typedef struct {\r
   UINT8  Motherboard           :1;\r


@@ -347,7 +347,7 @@ typedef struct {
 ///\r
 ///  Base Board - Board Type.\r
 ///\r
 ///\r
 ///  Base Board - Board Type.\r
 ///\r

-typedef enum {  \r
+typedef enum {\r

   BaseBoardTypeUnknown                  = 0x1,\r
   BaseBoardTypeOther                    = 0x2,\r
   BaseBoardTypeServerBlade              = 0x3,\r
   BaseBoardTypeUnknown                  = 0x1,\r
   BaseBoardTypeOther                    = 0x2,\r
   BaseBoardTypeServerBlade              = 0x3,\r


@@ -366,7 +366,7 @@ typedef enum {
 ///\r
 /// Base Board (or Module) Information (Type 2).\r
 ///\r
 ///\r
 /// Base Board (or Module) Information (Type 2).\r
 ///\r

-/// The information in this structure defines attributes of a system baseboard - \r
+/// The information in this structure defines attributes of a system baseboard -\r

 /// for example a motherboard, planar, or server blade or other standard system module.\r
 ///\r
 typedef struct {\r
 /// for example a motherboard, planar, or server blade or other standard system module.\r
 ///\r
 typedef struct {\r


@@ -387,7 +387,7 @@ typedef struct {
 ///\r
 /// System Enclosure or Chassis Types\r
 ///\r
 ///\r
 /// System Enclosure or Chassis Types\r
 ///\r

-typedef enum {  \r
+typedef enum {\r

   MiscChassisTypeOther                = 0x01,\r
   MiscChassisTypeUnknown              = 0x02,\r
   MiscChassisTypeDeskTop              = 0x03,\r
   MiscChassisTypeOther                = 0x01,\r
   MiscChassisTypeUnknown              = 0x02,\r
   MiscChassisTypeDeskTop              = 0x03,\r


@@ -429,7 +429,7 @@ typedef enum {
 ///\r
 /// System Enclosure or Chassis States .\r
 ///\r
 ///\r
 /// System Enclosure or Chassis States .\r
 ///\r

-typedef enum {  \r
+typedef enum {\r

   ChassisStateOther           = 0x01,\r
   ChassisStateUnknown         = 0x02,\r
   ChassisStateSafe            = 0x03,\r
   ChassisStateOther           = 0x01,\r
   ChassisStateUnknown         = 0x02,\r
   ChassisStateSafe            = 0x03,\r


@@ -441,7 +441,7 @@ typedef enum {
 ///\r
 /// System Enclosure or Chassis Security Status.\r
 ///\r
 ///\r
 /// System Enclosure or Chassis Security Status.\r
 ///\r

-typedef enum {  \r
+typedef enum {\r

   ChassisSecurityStatusOther                          = 0x01,\r
   ChassisSecurityStatusUnknown                        = 0x02,\r
   ChassisSecurityStatusNone                           = 0x03,\r
   ChassisSecurityStatusOther                          = 0x01,\r
   ChassisSecurityStatusUnknown                        = 0x02,\r
   ChassisSecurityStatusNone                           = 0x03,\r


@@ -462,11 +462,11 @@ typedef struct {
 ///\r
 /// System Enclosure or Chassis (Type 3).\r
 ///\r
 ///\r
 /// System Enclosure or Chassis (Type 3).\r
 ///\r

-/// The information in this structure defines attributes of the system's mechanical enclosure(s).  \r
-/// For example, if a system included a separate enclosure for its peripheral devices, \r
+/// The information in this structure defines attributes of the system's mechanical enclosure(s).\r
+/// For example, if a system included a separate enclosure for its peripheral devices,\r

 /// two structures would be returned: one for the main, system enclosure and the second for\r
 /// the peripheral device enclosure.  The additions to this structure in v2.1 of this specification\r
 /// two structures would be returned: one for the main, system enclosure and the second for\r
 /// the peripheral device enclosure.  The additions to this structure in v2.1 of this specification\r

-/// support the population of the CIM_Chassis class. \r
+/// support the population of the CIM_Chassis class.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE            Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE            Hdr;\r


@@ -514,29 +514,29 @@ typedef enum {
 /// Processor Information - Processor Family.\r
 ///\r
 typedef enum {\r
 /// Processor Information - Processor Family.\r
 ///\r
 typedef enum {\r

-  ProcessorFamilyOther                  = 0x01, \r
+  ProcessorFamilyOther                  = 0x01,\r

   ProcessorFamilyUnknown                = 0x02,\r
   ProcessorFamilyUnknown                = 0x02,\r

-  ProcessorFamily8086                   = 0x03, \r
+  ProcessorFamily8086                   = 0x03,\r

   ProcessorFamily80286                  = 0x04,\r
   ProcessorFamily80286                  = 0x04,\r

-  ProcessorFamilyIntel386               = 0x05, \r
+  ProcessorFamilyIntel386               = 0x05,\r

   ProcessorFamilyIntel486               = 0x06,\r
   ProcessorFamily8087                   = 0x07,\r
   ProcessorFamily80287                  = 0x08,\r
   ProcessorFamilyIntel486               = 0x06,\r
   ProcessorFamily8087                   = 0x07,\r
   ProcessorFamily80287                  = 0x08,\r

-  ProcessorFamily80387                  = 0x09, \r
+  ProcessorFamily80387                  = 0x09,\r

   ProcessorFamily80487                  = 0x0A,\r
   ProcessorFamily80487                  = 0x0A,\r

-  ProcessorFamilyPentium                = 0x0B, \r
+  ProcessorFamilyPentium                = 0x0B,\r

   ProcessorFamilyPentiumPro             = 0x0C,\r
   ProcessorFamilyPentiumII              = 0x0D,\r
   ProcessorFamilyPentiumMMX             = 0x0E,\r
   ProcessorFamilyCeleron                = 0x0F,\r
   ProcessorFamilyPentiumIIXeon          = 0x10,\r
   ProcessorFamilyPentiumPro             = 0x0C,\r
   ProcessorFamilyPentiumII              = 0x0D,\r
   ProcessorFamilyPentiumMMX             = 0x0E,\r
   ProcessorFamilyCeleron                = 0x0F,\r
   ProcessorFamilyPentiumIIXeon          = 0x10,\r

-  ProcessorFamilyPentiumIII             = 0x11, \r
+  ProcessorFamilyPentiumIII             = 0x11,\r

   ProcessorFamilyM1                     = 0x12,\r
   ProcessorFamilyM2                     = 0x13,\r
   ProcessorFamilyIntelCeleronM          = 0x14,\r
   ProcessorFamilyIntelPentium4Ht        = 0x15,\r
   ProcessorFamilyAmdDuron               = 0x18,\r
   ProcessorFamilyM1                     = 0x12,\r
   ProcessorFamilyM2                     = 0x13,\r
   ProcessorFamilyIntelCeleronM          = 0x14,\r
   ProcessorFamilyIntelPentium4Ht        = 0x15,\r
   ProcessorFamilyAmdDuron               = 0x18,\r

-  ProcessorFamilyK5                     = 0x19, \r
+  ProcessorFamilyK5                     = 0x19,\r

   ProcessorFamilyK6                     = 0x1A,\r
   ProcessorFamilyK6_2                   = 0x1B,\r
   ProcessorFamilyK6_3                   = 0x1C,\r
   ProcessorFamilyK6                     = 0x1A,\r
   ProcessorFamilyK6_2                   = 0x1B,\r
   ProcessorFamilyK6_3                   = 0x1C,\r


@@ -630,7 +630,7 @@ typedef enum {
   ProcessorFamilyAmdPhenomFxQuadCore    = 0x8C,\r
   ProcessorFamilyAmdPhenomX4QuadCore    = 0x8D,\r
   ProcessorFamilyAmdPhenomX2DualCore    = 0x8E,\r
   ProcessorFamilyAmdPhenomFxQuadCore    = 0x8C,\r
   ProcessorFamilyAmdPhenomX4QuadCore    = 0x8D,\r
   ProcessorFamilyAmdPhenomX2DualCore    = 0x8E,\r

-  ProcessorFamilyAmdAthlonX2DualCore    = 0x8F,  \r
+  ProcessorFamilyAmdAthlonX2DualCore    = 0x8F,\r

   ProcessorFamilyPARISC                 = 0x90,\r
   ProcessorFamilyPaRisc8500             = 0x91,\r
   ProcessorFamilyPaRisc8000             = 0x92,\r
   ProcessorFamilyPARISC                 = 0x90,\r
   ProcessorFamilyPaRisc8500             = 0x91,\r
   ProcessorFamilyPaRisc8000             = 0x92,\r


@@ -677,7 +677,7 @@ typedef enum {
   ProcessorFamilyIntelCore2DuoMobile    = 0xC4,\r
   ProcessorFamilyIntelCore2SoloMobile   = 0xC5,\r
   ProcessorFamilyIntelCoreI7            = 0xC6,\r
   ProcessorFamilyIntelCore2DuoMobile    = 0xC4,\r
   ProcessorFamilyIntelCore2SoloMobile   = 0xC5,\r
   ProcessorFamilyIntelCoreI7            = 0xC6,\r

-  ProcessorFamilyDualCoreIntelCeleron   = 0xC7,  \r
+  ProcessorFamilyDualCoreIntelCeleron   = 0xC7,\r

   ProcessorFamilyIBM390                 = 0xC8,\r
   ProcessorFamilyG4                     = 0xC9,\r
   ProcessorFamilyG5                     = 0xCA,\r
   ProcessorFamilyIBM390                 = 0xC8,\r
   ProcessorFamilyG4                     = 0xC9,\r
   ProcessorFamilyG5                     = 0xCA,\r


@@ -736,12 +736,12 @@ typedef enum {
 } PROCESSOR_FAMILY2_DATA;\r
 \r
 ///\r
 } PROCESSOR_FAMILY2_DATA;\r
 \r
 ///\r

-/// Processor Information - Voltage. \r
+/// Processor Information - Voltage.\r

 ///\r
 typedef struct {\r
 ///\r
 typedef struct {\r

-  UINT8  ProcessorVoltageCapability5V        :1; \r
-  UINT8  ProcessorVoltageCapability3_3V      :1;  \r
-  UINT8  ProcessorVoltageCapability2_9V      :1;  \r
+  UINT8  ProcessorVoltageCapability5V        :1;\r
+  UINT8  ProcessorVoltageCapability3_3V      :1;\r
+  UINT8  ProcessorVoltageCapability2_9V      :1;\r

   UINT8  ProcessorVoltageCapabilityReserved  :1; ///< Bit 3, must be zero.\r
   UINT8  ProcessorVoltageReserved            :3; ///< Bits 4-6, must be zero.\r
   UINT8  ProcessorVoltageIndicateLegacy      :1;\r
   UINT8  ProcessorVoltageCapabilityReserved  :1; ///< Bit 3, must be zero.\r
   UINT8  ProcessorVoltageReserved            :3; ///< Bits 4-6, must be zero.\r
   UINT8  ProcessorVoltageIndicateLegacy      :1;\r


@@ -865,13 +865,13 @@ typedef struct {
 ///\r
 /// Processor Information (Type 4).\r
 ///\r
 ///\r
 /// Processor Information (Type 4).\r
 ///\r

-/// The information in this structure defines the attributes of a single processor; \r
-/// a separate structure instance is provided for each system processor socket/slot. \r
-/// For example, a system with an IntelDX2 processor would have a single \r
+/// The information in this structure defines the attributes of a single processor;\r
+/// a separate structure instance is provided for each system processor socket/slot.\r
+/// For example, a system with an IntelDX2 processor would have a single\r

 /// structure instance, while a system with an IntelSX2 processor would have a structure\r
 /// structure instance, while a system with an IntelSX2 processor would have a structure\r

-/// to describe the main CPU, and a second structure to describe the 80487 co-processor. \r
+/// to describe the main CPU, and a second structure to describe the 80487 co-processor.\r

 ///\r
 ///\r

-typedef struct { \r
+typedef struct {\r

   SMBIOS_STRUCTURE      Hdr;\r
   SMBIOS_TABLE_STRING   Socket;\r
   UINT8                 ProcessorType;          ///< The enumeration value from PROCESSOR_TYPE_DATA.\r
   SMBIOS_STRUCTURE      Hdr;\r
   SMBIOS_TABLE_STRING   Socket;\r
   UINT8                 ProcessorType;          ///< The enumeration value from PROCESSOR_TYPE_DATA.\r


@@ -913,7 +913,7 @@ typedef struct {
 ///\r
 /// Memory Controller Error Detecting Method.\r
 ///\r
 ///\r
 /// Memory Controller Error Detecting Method.\r
 ///\r

-typedef enum {  \r
+typedef enum {\r

   ErrorDetectingMethodOther   = 0x01,\r
   ErrorDetectingMethodUnknown = 0x02,\r
   ErrorDetectingMethodNone    = 0x03,\r
   ErrorDetectingMethodOther   = 0x01,\r
   ErrorDetectingMethodUnknown = 0x02,\r
   ErrorDetectingMethodNone    = 0x03,\r


@@ -940,7 +940,7 @@ typedef struct {
 ///\r
 /// Memory Controller Information - Interleave Support.\r
 ///\r
 ///\r
 /// Memory Controller Information - Interleave Support.\r
 ///\r

-typedef enum {  \r
+typedef enum {\r

   MemoryInterleaveOther      = 0x01,\r
   MemoryInterleaveUnknown    = 0x02,\r
   MemoryInterleaveOneWay     = 0x03,\r
   MemoryInterleaveOther      = 0x01,\r
   MemoryInterleaveUnknown    = 0x02,\r
   MemoryInterleaveOneWay     = 0x03,\r


@@ -965,10 +965,10 @@ typedef struct {
 ///\r
 /// Memory Controller Information (Type 5, Obsolete).\r
 ///\r
 ///\r
 /// Memory Controller Information (Type 5, Obsolete).\r
 ///\r

-/// The information in this structure defines the attributes of the system's memory controller(s) \r
-/// and the supported attributes of any memory-modules present in the sockets controlled by \r
-/// this controller. \r
-/// Note: This structure, and its companion Memory Module Information (Type 6, Obsolete), \r
+/// The information in this structure defines the attributes of the system's memory controller(s)\r
+/// and the supported attributes of any memory-modules present in the sockets controlled by\r
+/// this controller.\r
+/// Note: This structure, and its companion Memory Module Information (Type 6, Obsolete),\r

 /// are obsolete starting with version 2.1 of this specification. The Physical Memory Array (Type 16)\r
 /// and Memory Device (Type 17) structures should be used instead.  BIOS providers might\r
 /// choose to implement both memory description types to allow existing DMI browsers\r
 /// are obsolete starting with version 2.1 of this specification. The Physical Memory Array (Type 16)\r
 /// and Memory Device (Type 17) structures should be used instead.  BIOS providers might\r
 /// choose to implement both memory description types to allow existing DMI browsers\r


@@ -979,7 +979,7 @@ typedef struct {
   UINT8                           ErrDetectMethod;            ///< The enumeration value from MEMORY_ERROR_DETECT_METHOD.\r
   MEMORY_ERROR_CORRECT_CAPABILITY ErrCorrectCapability;\r
   UINT8                           SupportInterleave;          ///< The enumeration value from MEMORY_SUPPORT_INTERLEAVE_TYPE.\r
   UINT8                           ErrDetectMethod;            ///< The enumeration value from MEMORY_ERROR_DETECT_METHOD.\r
   MEMORY_ERROR_CORRECT_CAPABILITY ErrCorrectCapability;\r
   UINT8                           SupportInterleave;          ///< The enumeration value from MEMORY_SUPPORT_INTERLEAVE_TYPE.\r

-  UINT8                           CurrentInterleave;          ///< The enumeration value from MEMORY_SUPPORT_INTERLEAVE_TYPE .     \r
+  UINT8                           CurrentInterleave;          ///< The enumeration value from MEMORY_SUPPORT_INTERLEAVE_TYPE .\r

   UINT8                           MaxMemoryModuleSize;\r
   MEMORY_SPEED_TYPE               SupportSpeed;\r
   UINT16                          SupportMemoryType;\r
   UINT8                           MaxMemoryModuleSize;\r
   MEMORY_SPEED_TYPE               SupportSpeed;\r
   UINT16                          SupportMemoryType;\r


@@ -1017,11 +1017,11 @@ typedef struct {
 ///\r
 /// Memory Module Information (Type 6, Obsolete)\r
 ///\r
 ///\r
 /// Memory Module Information (Type 6, Obsolete)\r
 ///\r

-/// One Memory Module Information structure is included for each memory-module socket \r
+/// One Memory Module Information structure is included for each memory-module socket\r

 /// in the system.  The structure describes the speed, type, size, and error status\r
 /// in the system.  The structure describes the speed, type, size, and error status\r

-/// of each system memory module.  The supported attributes of each module are described \r
-/// by the "owning" Memory Controller Information structure.  \r
-/// Note:  This structure, and its companion Memory Controller Information (Type 5, Obsolete), \r
+/// of each system memory module.  The supported attributes of each module are described\r
+/// by the "owning" Memory Controller Information structure.\r
+/// Note:  This structure, and its companion Memory Controller Information (Type 5, Obsolete),\r

 /// are obsolete starting with version 2.1 of this specification. The Physical Memory Array (Type 16)\r
 /// and Memory Device (Type 17) structures should be used instead.\r
 ///\r
 /// are obsolete starting with version 2.1 of this specification. The Physical Memory Array (Type 16)\r
 /// and Memory Device (Type 17) structures should be used instead.\r
 ///\r


@@ -1063,7 +1063,7 @@ typedef enum {
 } CACHE_ERROR_TYPE_DATA;\r
 \r
 ///\r
 } CACHE_ERROR_TYPE_DATA;\r
 \r
 ///\r

-/// Cache Information - System Cache Type. \r
+/// Cache Information - System Cache Type.\r

 ///\r
 typedef enum {\r
   CacheTypeOther       = 0x01,\r
 ///\r
 typedef enum {\r
   CacheTypeOther       = 0x01,\r


@@ -1074,7 +1074,7 @@ typedef enum {
 } CACHE_TYPE_DATA;\r
 \r
 ///\r
 } CACHE_TYPE_DATA;\r
 \r
 ///\r

-/// Cache Information - Associativity. \r
+/// Cache Information - Associativity.\r

 ///\r
 typedef enum {\r
   CacheAssociativityOther        = 0x01,\r
 ///\r
 typedef enum {\r
   CacheAssociativityOther        = 0x01,\r


@@ -1096,7 +1096,7 @@ typedef enum {
 ///\r
 /// Cache Information (Type 7).\r
 ///\r
 ///\r
 /// Cache Information (Type 7).\r
 ///\r

-/// The information in this structure defines the attributes of CPU cache device in the system. \r
+/// The information in this structure defines the attributes of CPU cache device in the system.\r

 /// One structure is specified for each such device, whether the device is internal to\r
 /// or external to the CPU module.  Cache modules can be associated with a processor structure\r
 /// in one or two ways, depending on the SMBIOS version.\r
 /// One structure is specified for each such device, whether the device is internal to\r
 /// or external to the CPU module.  Cache modules can be associated with a processor structure\r
 /// in one or two ways, depending on the SMBIOS version.\r


@@ -1121,7 +1121,7 @@ typedef struct {
 } SMBIOS_TABLE_TYPE7;\r
 \r
 ///\r
 } SMBIOS_TABLE_TYPE7;\r
 \r
 ///\r

-/// Port Connector Information - Connector Types. \r
+/// Port Connector Information - Connector Types.\r

 ///\r
 typedef enum {\r
   PortConnectorTypeNone                   = 0x00,\r
 ///\r
 typedef enum {\r
   PortConnectorTypeNone                   = 0x00,\r


@@ -1168,7 +1168,7 @@ typedef enum {
 } MISC_PORT_CONNECTOR_TYPE;\r
 \r
 ///\r
 } MISC_PORT_CONNECTOR_TYPE;\r
 \r
 ///\r

-/// Port Connector Information - Port Types \r
+/// Port Connector Information - Port Types\r

 ///\r
 typedef enum {\r
   PortTypeNone                      = 0x00,\r
 ///\r
 typedef enum {\r
   PortTypeNone                      = 0x00,\r


@@ -1213,8 +1213,8 @@ typedef enum {
 ///\r
 /// Port Connector Information (Type 8).\r
 ///\r
 ///\r
 /// Port Connector Information (Type 8).\r
 ///\r

-/// The information in this structure defines the attributes of a system port connector, \r
-/// e.g. parallel, serial, keyboard, or mouse ports.  The port's type and connector information \r
+/// The information in this structure defines the attributes of a system port connector,\r
+/// e.g. parallel, serial, keyboard, or mouse ports.  The port's type and connector information\r

 /// are provided. One structure is present for each port provided by the system.\r
 ///\r
 typedef struct {\r
 /// are provided. One structure is present for each port provided by the system.\r
 ///\r
 typedef struct {\r


@@ -1321,7 +1321,7 @@ typedef enum {
 } MISC_SLOT_USAGE;\r
 \r
 ///\r
 } MISC_SLOT_USAGE;\r
 \r
 ///\r

-/// System Slots - Slot Length. \r
+/// System Slots - Slot Length.\r

 ///\r
 typedef enum {\r
   SlotLengthOther   = 0x01,\r
 ///\r
 typedef enum {\r
   SlotLengthOther   = 0x01,\r


@@ -1331,7 +1331,7 @@ typedef enum {
 } MISC_SLOT_LENGTH;\r
 \r
 ///\r
 } MISC_SLOT_LENGTH;\r
 \r
 ///\r

-/// System Slots - Slot Characteristics 1. \r
+/// System Slots - Slot Characteristics 1.\r

 ///\r
 typedef struct {\r
   UINT8  CharacteristicsUnknown  :1;\r
 ///\r
 typedef struct {\r
   UINT8  CharacteristicsUnknown  :1;\r


@@ -1344,7 +1344,7 @@ typedef struct {
   UINT8  ModemRingResumeSupported:1;\r
 } MISC_SLOT_CHARACTERISTICS1;\r
 ///\r
   UINT8  ModemRingResumeSupported:1;\r
 } MISC_SLOT_CHARACTERISTICS1;\r
 ///\r

-/// System Slots - Slot Characteristics 2.  \r
+/// System Slots - Slot Characteristics 2.\r

 ///\r
 typedef struct {\r
   UINT8  PmeSignalSupported      :1;\r
 ///\r
 typedef struct {\r
   UINT8  PmeSignalSupported      :1;\r


@@ -1356,7 +1356,7 @@ typedef struct {
 ///\r
 /// System Slots (Type 9)\r
 ///\r
 ///\r
 /// System Slots (Type 9)\r
 ///\r

-/// The information in this structure defines the attributes of a system slot. \r
+/// The information in this structure defines the attributes of a system slot.\r

 /// One structure is provided for each slot in the system.\r
 ///\r
 ///\r
 /// One structure is provided for each slot in the system.\r
 ///\r
 ///\r


@@ -1379,7 +1379,7 @@ typedef struct {
 } SMBIOS_TABLE_TYPE9;\r
 \r
 ///\r
 } SMBIOS_TABLE_TYPE9;\r
 \r
 ///\r

-/// On Board Devices Information - Device Types. \r
+/// On Board Devices Information - Device Types.\r

 ///\r
 typedef enum {\r
   OnBoardDeviceTypeOther          = 0x01,\r
 ///\r
 typedef enum {\r
   OnBoardDeviceTypeOther          = 0x01,\r


@@ -1406,10 +1406,10 @@ typedef struct {
 ///\r
 /// On Board Devices Information (Type 10, obsolete).\r
 ///\r
 ///\r
 /// On Board Devices Information (Type 10, obsolete).\r
 ///\r

-/// Note: This structure is obsolete starting with version 2.6 specification; the Onboard Devices Extended \r
-/// Information (Type 41) structure should be used instead . BIOS providers can choose to implement both \r
-/// types to allow existing SMBIOS browsers to properly display the system's onboard devices information.  \r
-/// The information in this structure defines the attributes of devices that are onboard (soldered onto) \r
+/// Note: This structure is obsolete starting with version 2.6 specification; the Onboard Devices Extended\r
+/// Information (Type 41) structure should be used instead . BIOS providers can choose to implement both\r
+/// types to allow existing SMBIOS browsers to properly display the system's onboard devices information.\r
+/// The information in this structure defines the attributes of devices that are onboard (soldered onto)\r

 /// a system element, usually the baseboard.  In general, an entry in this table implies that the BIOS\r
 /// has some level of control over the enabling of the associated device for use by the system.\r
 ///\r
 /// a system element, usually the baseboard.  In general, an entry in this table implies that the BIOS\r
 /// has some level of control over the enabling of the associated device for use by the system.\r
 ///\r


@@ -1420,8 +1420,8 @@ typedef struct {
 \r
 ///\r
 /// OEM Strings (Type 11).\r
 \r
 ///\r
 /// OEM Strings (Type 11).\r

-/// This structure contains free form strings defined by the OEM. Examples of this are: \r
-/// Part Numbers for Reference Documents for the system, contact information for the manufacturer, etc. \r
+/// This structure contains free form strings defined by the OEM. Examples of this are:\r
+/// Part Numbers for Reference Documents for the system, contact information for the manufacturer, etc.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r


@@ -1431,7 +1431,7 @@ typedef struct {
 ///\r
 /// System Configuration Options (Type 12).\r
 ///\r
 ///\r
 /// System Configuration Options (Type 12).\r
 ///\r

-/// This structure contains information required to configure the base board's Jumpers and Switches. \r
+/// This structure contains information required to configure the base board's Jumpers and Switches.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r


@@ -1442,8 +1442,8 @@ typedef struct {
 ///\r
 /// BIOS Language Information (Type 13).\r
 ///\r
 ///\r
 /// BIOS Language Information (Type 13).\r
 ///\r

-/// The information in this structure defines the installable language attributes of the BIOS.  \r
-/// \r
+/// The information in this structure defines the installable language attributes of the BIOS.\r
+///\r

 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
   UINT8                 InstallableLanguages;\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
   UINT8                 InstallableLanguages;\r


@@ -1463,9 +1463,9 @@ typedef struct {
 ///\r
 /// Group Associations (Type 14).\r
 ///\r
 ///\r
 /// Group Associations (Type 14).\r
 ///\r

-/// The Group Associations structure is provided for OEMs who want to specify \r
-/// the arrangement or hierarchy of certain components (including other Group Associations) \r
-/// within the system. \r
+/// The Group Associations structure is provided for OEMs who want to specify\r
+/// the arrangement or hierarchy of certain components (including other Group Associations)\r
+/// within the system.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r


@@ -1475,7 +1475,7 @@ typedef struct {
 \r
 ///\r
 /// System Event Log - Event Log Types.\r
 \r
 ///\r
 /// System Event Log - Event Log Types.\r

-/// \r
+///\r

 typedef enum {\r
   EventLogTypeReserved         = 0x00,\r
   EventLogTypeSingleBitECC     = 0x01,\r
 typedef enum {\r
   EventLogTypeReserved         = 0x00,\r
   EventLogTypeSingleBitECC     = 0x01,\r


@@ -1506,8 +1506,8 @@ typedef enum {
 } EVENT_LOG_TYPE_DATA;\r
 \r
 ///\r
 } EVENT_LOG_TYPE_DATA;\r
 \r
 ///\r

-/// System Event Log - Variable Data Format Types. \r
-/// \r
+/// System Event Log - Variable Data Format Types.\r
+///\r

 typedef enum {\r
   EventLogVariableNone                        = 0x00,\r
   EventLogVariableHandle                      = 0x01,\r
 typedef enum {\r
   EventLogVariableNone                        = 0x00,\r
   EventLogVariableHandle                      = 0x01,\r


@@ -1515,7 +1515,7 @@ typedef enum {
   EventLogVariableMutilEventHandle            = 0x03,\r
   EventLogVariablePOSTResultBitmap            = 0x04,\r
   EventLogVariableSysManagementType           = 0x05,\r
   EventLogVariableMutilEventHandle            = 0x03,\r
   EventLogVariablePOSTResultBitmap            = 0x04,\r
   EventLogVariableSysManagementType           = 0x05,\r

-  EventLogVariableMutliEventSysManagmentType  = 0x06,                               \r
+  EventLogVariableMutliEventSysManagmentType  = 0x06,\r

   EventLogVariableUnused                      = 0x07,\r
   EventLogVariableOEMAssigned                 = 0x80\r
 } EVENT_LOG_VARIABLE_DATA;\r
   EventLogVariableUnused                      = 0x07,\r
   EventLogVariableOEMAssigned                 = 0x80\r
 } EVENT_LOG_VARIABLE_DATA;\r


@@ -1531,10 +1531,10 @@ typedef struct {
 ///\r
 /// System Event Log (Type 15).\r
 ///\r
 ///\r
 /// System Event Log (Type 15).\r
 ///\r

-/// The presence of this structure within the SMBIOS data returned for a system indicates \r
-/// that the system supports an event log.  An event log is a fixed-length area within a \r
-/// non-volatile storage element, starting with a fixed-length (and vendor-specific) header \r
-/// record, followed by one or more variable-length log records. \r
+/// The presence of this structure within the SMBIOS data returned for a system indicates\r
+/// that the system supports an event log.  An event log is a fixed-length area within a\r
+/// non-volatile storage element, starting with a fixed-length (and vendor-specific) header\r
+/// record, followed by one or more variable-length log records.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r


@@ -1585,7 +1585,7 @@ typedef enum {
 } MEMORY_ARRAY_USE;\r
 \r
 ///\r
 } MEMORY_ARRAY_USE;\r
 \r
 ///\r

-/// Physical Memory Array - Error Correction Types. \r
+/// Physical Memory Array - Error Correction Types.\r

 ///\r
 typedef enum {\r
   MemoryErrorCorrectionOther               = 0x01,\r
 ///\r
 typedef enum {\r
   MemoryErrorCorrectionOther               = 0x01,\r


@@ -1600,8 +1600,8 @@ typedef enum {
 ///\r
 /// Physical Memory Array (Type 16).\r
 ///\r
 ///\r
 /// Physical Memory Array (Type 16).\r
 ///\r

-/// This structure describes a collection of memory devices that operate \r
-/// together to form a memory address space. \r
+/// This structure describes a collection of memory devices that operate\r
+/// together to form a memory address space.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE          Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE          Hdr;\r


@@ -1693,10 +1693,10 @@ typedef struct {
 ///\r
 /// Memory Device (Type 17).\r
 ///\r
 ///\r
 /// Memory Device (Type 17).\r
 ///\r

-/// This structure describes a single memory device that is part of \r
+/// This structure describes a single memory device that is part of\r

 /// a larger Physical Memory Array (Type 16).\r
 /// a larger Physical Memory Array (Type 16).\r

-/// Note:  If a system includes memory-device sockets, the SMBIOS implementation \r
-/// includes a Memory Device structure instance for each slot, whether or not the \r
+/// Note:  If a system includes memory-device sockets, the SMBIOS implementation\r
+/// includes a Memory Device structure instance for each slot, whether or not the\r

 /// socket is currently populated.\r
 ///\r
 typedef struct {\r
 /// socket is currently populated.\r
 ///\r
 typedef struct {\r


@@ -1719,7 +1719,7 @@ typedef struct {
   SMBIOS_TABLE_STRING       PartNumber;\r
   //\r
   // Add for smbios 2.6\r
   SMBIOS_TABLE_STRING       PartNumber;\r
   //\r
   // Add for smbios 2.6\r

-  //  \r
+  //\r

   UINT8                     Attributes;\r
   //\r
   // Add for smbios 2.7\r
   UINT8                     Attributes;\r
   //\r
   // Add for smbios 2.7\r


@@ -1735,9 +1735,9 @@ typedef struct {
 } SMBIOS_TABLE_TYPE17;\r
 \r
 ///\r
 } SMBIOS_TABLE_TYPE17;\r
 \r
 ///\r

-/// 32-bit Memory Error Information - Error Type. \r
+/// 32-bit Memory Error Information - Error Type.\r

 ///\r
 ///\r

-typedef enum {  \r
+typedef enum {\r

   MemoryErrorOther             = 0x01,\r
   MemoryErrorUnknown           = 0x02,\r
   MemoryErrorOk                = 0x03,\r
   MemoryErrorOther             = 0x01,\r
   MemoryErrorUnknown           = 0x02,\r
   MemoryErrorOk                = 0x03,\r


@@ -1755,9 +1755,9 @@ typedef enum {
 } MEMORY_ERROR_TYPE;\r
 \r
 ///\r
 } MEMORY_ERROR_TYPE;\r
 \r
 ///\r

-/// 32-bit Memory Error Information - Error Granularity. \r
+/// 32-bit Memory Error Information - Error Granularity.\r

 ///\r
 ///\r

-typedef enum {  \r
+typedef enum {\r

   MemoryGranularityOther               = 0x01,\r
   MemoryGranularityOtherUnknown        = 0x02,\r
   MemoryGranularityDeviceLevel         = 0x03,\r
   MemoryGranularityOther               = 0x01,\r
   MemoryGranularityOtherUnknown        = 0x02,\r
   MemoryGranularityDeviceLevel         = 0x03,\r


@@ -1765,9 +1765,9 @@ typedef enum {
 } MEMORY_ERROR_GRANULARITY;\r
 \r
 ///\r
 } MEMORY_ERROR_GRANULARITY;\r
 \r
 ///\r

-/// 32-bit Memory Error Information - Error Operation. \r
+/// 32-bit Memory Error Information - Error Operation.\r

 ///\r
 ///\r

-typedef enum {  \r
+typedef enum {\r

   MemoryErrorOperationOther            = 0x01,\r
   MemoryErrorOperationUnknown          = 0x02,\r
   MemoryErrorOperationRead             = 0x03,\r
   MemoryErrorOperationOther            = 0x01,\r
   MemoryErrorOperationUnknown          = 0x02,\r
   MemoryErrorOperationRead             = 0x03,\r


@@ -1777,8 +1777,8 @@ typedef enum {
 \r
 ///\r
 /// 32-bit Memory Error Information (Type 18).\r
 \r
 ///\r
 /// 32-bit Memory Error Information (Type 18).\r

-/// \r
-/// This structure identifies the specifics of an error that might be detected \r
+///\r
+/// This structure identifies the specifics of an error that might be detected\r

 /// within a Physical Memory Array.\r
 ///\r
 typedef struct {\r
 /// within a Physical Memory Array.\r
 ///\r
 typedef struct {\r


@@ -1795,7 +1795,7 @@ typedef struct {
 ///\r
 /// Memory Array Mapped Address (Type 19).\r
 ///\r
 ///\r
 /// Memory Array Mapped Address (Type 19).\r
 ///\r

-/// This structure provides the address mapping for a Physical Memory Array.  \r
+/// This structure provides the address mapping for a Physical Memory Array.\r

 /// One structure is present for each contiguous address range described.\r
 ///\r
 typedef struct {\r
 /// One structure is present for each contiguous address range described.\r
 ///\r
 typedef struct {\r


@@ -1814,8 +1814,8 @@ typedef struct {
 ///\r
 /// Memory Device Mapped Address (Type 20).\r
 ///\r
 ///\r
 /// Memory Device Mapped Address (Type 20).\r
 ///\r

-/// This structure maps memory address space usually to a device-level granularity.  \r
-/// One structure is present for each contiguous address range described. \r
+/// This structure maps memory address space usually to a device-level granularity.\r
+/// One structure is present for each contiguous address range described.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r


@@ -1868,9 +1868,9 @@ typedef enum {
 ///\r
 /// Built-in Pointing Device (Type 21).\r
 ///\r
 ///\r
 /// Built-in Pointing Device (Type 21).\r
 ///\r

-/// This structure describes the attributes of the built-in pointing device for the \r
+/// This structure describes the attributes of the built-in pointing device for the\r

 /// system. The presence of this structure does not imply that the built-in\r
 /// system. The presence of this structure does not imply that the built-in\r

-/// pointing device is active for the system's use! \r
+/// pointing device is active for the system's use!\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                  Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                  Hdr;\r


@@ -1882,7 +1882,7 @@ typedef struct {
 ///\r
 /// Portable Battery - Device Chemistry\r
 ///\r
 ///\r
 /// Portable Battery - Device Chemistry\r
 ///\r

-typedef enum {  \r
+typedef enum {\r

   PortableBatteryDeviceChemistryOther               = 0x01,\r
   PortableBatteryDeviceChemistryUnknown             = 0x02,\r
   PortableBatteryDeviceChemistryLeadAcid            = 0x03,\r
   PortableBatteryDeviceChemistryOther               = 0x01,\r
   PortableBatteryDeviceChemistryUnknown             = 0x02,\r
   PortableBatteryDeviceChemistryLeadAcid            = 0x03,\r


@@ -1896,8 +1896,8 @@ typedef enum {
 ///\r
 /// Portable Battery (Type 22).\r
 ///\r
 ///\r
 /// Portable Battery (Type 22).\r
 ///\r

-/// This structure describes the attributes of the portable battery(s) for the system.  \r
-/// The structure contains the static attributes for the group.  Each structure describes \r
+/// This structure describes the attributes of the portable battery(s) for the system.\r
+/// The structure contains the static attributes for the group.  Each structure describes\r

 /// a single battery pack's attributes.\r
 ///\r
 typedef struct {\r
 /// a single battery pack's attributes.\r
 ///\r
 typedef struct {\r


@@ -1922,11 +1922,11 @@ typedef struct {
 ///\r
 /// System Reset (Type 23)\r
 ///\r
 ///\r
 /// System Reset (Type 23)\r
 ///\r

-/// This structure describes whether Automatic System Reset functions enabled (Status).  \r
+/// This structure describes whether Automatic System Reset functions enabled (Status).\r

 /// If the system has a watchdog Timer and the timer is not reset (Timer Reset)\r
 /// If the system has a watchdog Timer and the timer is not reset (Timer Reset)\r

-/// before the Interval elapses, an automatic system reset will occur. The system will re-boot \r
-/// according to the Boot Option. This function may repeat until the Limit is reached, at which time \r
-/// the system will re-boot according to the Boot Option at Limit.  \r
+/// before the Interval elapses, an automatic system reset will occur. The system will re-boot\r
+/// according to the Boot Option. This function may repeat until the Limit is reached, at which time\r
+/// the system will re-boot according to the Boot Option at Limit.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r


@@ -1940,7 +1940,7 @@ typedef struct {
 ///\r
 /// Hardware Security (Type 24).\r
 ///\r
 ///\r
 /// Hardware Security (Type 24).\r
 ///\r

-/// This structure describes the system-wide hardware security settings. \r
+/// This structure describes the system-wide hardware security settings.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r


@@ -1950,10 +1950,10 @@ typedef struct {
 ///\r
 /// System Power Controls (Type 25).\r
 ///\r
 ///\r
 /// System Power Controls (Type 25).\r
 ///\r

-/// This structure describes the attributes for controlling the main power supply to the system. \r
-/// Software that interprets this structure uses the month, day, hour, minute, and second values \r
-/// to determine the number of seconds until the next power-on of the system.  The presence of  \r
-/// this structure implies that a timed power-on facility is available for the system. \r
+/// This structure describes the attributes for controlling the main power supply to the system.\r
+/// Software that interprets this structure uses the month, day, hour, minute, and second values\r
+/// to determine the number of seconds until the next power-on of the system.  The presence of\r
+/// this structure implies that a timed power-on facility is available for the system.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r


@@ -1975,7 +1975,7 @@ typedef struct {
 ///\r
 /// Voltage Probe (Type 26)\r
 ///\r
 ///\r
 /// Voltage Probe (Type 26)\r
 ///\r

-/// This describes the attributes for a voltage probe in the system.   \r
+/// This describes the attributes for a voltage probe in the system.\r

 /// Each structure describes a single voltage probe.\r
 ///\r
 typedef struct {\r
 /// Each structure describes a single voltage probe.\r
 ///\r
 typedef struct {\r


@@ -2002,9 +2002,9 @@ typedef struct {
 ///\r
 /// Cooling Device (Type 27)\r
 ///\r
 ///\r
 /// Cooling Device (Type 27)\r
 ///\r

-/// This structure describes the attributes for a cooling device in the system.  \r
-/// Each structure describes a single cooling device. \r
-/// \r
+/// This structure describes the attributes for a cooling device in the system.\r
+/// Each structure describes a single cooling device.\r
+///\r

 typedef struct {\r
   SMBIOS_STRUCTURE                  Hdr;\r
   UINT16                            TemperatureProbeHandle;\r
 typedef struct {\r
   SMBIOS_STRUCTURE                  Hdr;\r
   UINT16                            TemperatureProbeHandle;\r


@@ -2029,8 +2029,8 @@ typedef struct {
 ///\r
 /// Temperature Probe (Type 28).\r
 ///\r
 ///\r
 /// Temperature Probe (Type 28).\r
 ///\r

-/// This structure describes the attributes for a temperature probe in the system.  \r
-/// Each structure describes a single temperature probe. \r
+/// This structure describes the attributes for a temperature probe in the system.\r
+/// Each structure describes a single temperature probe.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                  Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                  Hdr;\r


@@ -2057,7 +2057,7 @@ typedef struct {
 /// Electrical Current Probe (Type 29).\r
 ///\r
 /// This structure describes the attributes for an electrical current probe in the system.\r
 /// Electrical Current Probe (Type 29).\r
 ///\r
 /// This structure describes the attributes for an electrical current probe in the system.\r

-/// Each structure describes a single electrical current probe. \r
+/// Each structure describes a single electrical current probe.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                        Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                        Hdr;\r


@@ -2075,9 +2075,9 @@ typedef struct {
 ///\r
 /// Out-of-Band Remote Access (Type 30).\r
 ///\r
 ///\r
 /// Out-of-Band Remote Access (Type 30).\r
 ///\r

-/// This structure describes the attributes and policy settings of a hardware facility \r
-/// that may be used to gain remote access to a hardware system when the operating system \r
-/// is not available due to power-down status, hardware failures, or boot failures. \r
+/// This structure describes the attributes and policy settings of a hardware facility\r
+/// that may be used to gain remote access to a hardware system when the operating system\r
+/// is not available due to power-down status, hardware failures, or boot failures.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r


@@ -2088,8 +2088,8 @@ typedef struct {
 ///\r
 /// Boot Integrity Services (BIS) Entry Point (Type 31).\r
 ///\r
 ///\r
 /// Boot Integrity Services (BIS) Entry Point (Type 31).\r
 ///\r

-/// Structure type 31 (decimal) is reserved for use by the Boot Integrity Services (BIS). \r
-/// \r
+/// Structure type 31 (decimal) is reserved for use by the Boot Integrity Services (BIS).\r
+///\r

 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
   UINT8                 Checksum;\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
   UINT8                 Checksum;\r


@@ -2122,12 +2122,12 @@ typedef enum {
 ///\r
 /// System Boot Information (Type 32).\r
 ///\r
 ///\r
 /// System Boot Information (Type 32).\r
 ///\r

-/// The client system firmware, e.g. BIOS, communicates the System Boot Status to the \r
-/// client's Pre-boot Execution Environment (PXE) boot image or OS-present management \r
-/// application via this structure. When used in the PXE environment, for example, \r
-/// this code identifies the reason the PXE was initiated and can be used by boot-image \r
-/// software to further automate an enterprise's PXE sessions.  For example, an enterprise  \r
-/// could choose to automatically download a hardware-diagnostic image to a client whose \r
+/// The client system firmware, e.g. BIOS, communicates the System Boot Status to the\r
+/// client's Pre-boot Execution Environment (PXE) boot image or OS-present management\r
+/// application via this structure. When used in the PXE environment, for example,\r
+/// this code identifies the reason the PXE was initiated and can be used by boot-image\r
+/// software to further automate an enterprise's PXE sessions.  For example, an enterprise\r
+/// could choose to automatically download a hardware-diagnostic image to a client whose\r

 /// reason code indicated either a firmware- or operating system-detected hardware failure.\r
 ///\r
 typedef struct {\r
 /// reason code indicated either a firmware- or operating system-detected hardware failure.\r
 ///\r
 typedef struct {\r


@@ -2139,9 +2139,9 @@ typedef struct {
 ///\r
 /// 64-bit Memory Error Information (Type 33).\r
 ///\r
 ///\r
 /// 64-bit Memory Error Information (Type 33).\r
 ///\r

-/// This structure describes an error within a Physical Memory Array, \r
+/// This structure describes an error within a Physical Memory Array,\r

 /// when the error address is above 4G (0xFFFFFFFF).\r
 /// when the error address is above 4G (0xFFFFFFFF).\r

-///    \r
+///\r

 typedef struct {\r
   SMBIOS_STRUCTURE          Hdr;\r
   UINT8                     ErrorType;                    ///< The enumeration value from MEMORY_ERROR_TYPE.\r
 typedef struct {\r
   SMBIOS_STRUCTURE          Hdr;\r
   UINT8                     ErrorType;                    ///< The enumeration value from MEMORY_ERROR_TYPE.\r


@@ -2154,7 +2154,7 @@ typedef struct {
 } SMBIOS_TABLE_TYPE33;\r
 \r
 ///\r
 } SMBIOS_TABLE_TYPE33;\r
 \r
 ///\r

-/// Management Device -  Type. \r
+/// Management Device -  Type.\r

 ///\r
 typedef enum {\r
   ManagementDeviceTypeOther      = 0x01,\r
 ///\r
 typedef enum {\r
   ManagementDeviceTypeOther      = 0x01,\r


@@ -2173,7 +2173,7 @@ typedef enum {
 } MISC_MANAGEMENT_DEVICE_TYPE;\r
 \r
 ///\r
 } MISC_MANAGEMENT_DEVICE_TYPE;\r
 \r
 ///\r

-/// Management Device -  Address Type. \r
+/// Management Device -  Address Type.\r

 ///\r
 typedef enum {\r
   ManagementDeviceAddressTypeOther   = 0x01,\r
 ///\r
 typedef enum {\r
   ManagementDeviceAddressTypeOther   = 0x01,\r


@@ -2186,7 +2186,7 @@ typedef enum {
 ///\r
 /// Management Device (Type 34).\r
 ///\r
 ///\r
 /// Management Device (Type 34).\r
 ///\r

-/// The information in this structure defines the attributes of a Management Device.  \r
+/// The information in this structure defines the attributes of a Management Device.\r

 /// A Management Device might control one or more fans or voltage, current, or temperature\r
 /// probes as defined by one or more Management Device Component structures.\r
 ///\r
 /// A Management Device might control one or more fans or voltage, current, or temperature\r
 /// probes as defined by one or more Management Device Component structures.\r
 ///\r


@@ -2201,8 +2201,8 @@ typedef struct {
 ///\r
 /// Management Device Component (Type 35)\r
 ///\r
 ///\r
 /// Management Device Component (Type 35)\r
 ///\r

-/// This structure associates a cooling device or environmental probe with structures \r
-/// that define the controlling hardware device and (optionally) the component's thresholds. \r
+/// This structure associates a cooling device or environmental probe with structures\r
+/// that define the controlling hardware device and (optionally) the component's thresholds.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r


@@ -2215,8 +2215,8 @@ typedef struct {
 ///\r
 /// Management Device Threshold Data (Type 36).\r
 ///\r
 ///\r
 /// Management Device Threshold Data (Type 36).\r
 ///\r

-/// The information in this structure defines threshold information for \r
-/// a component (probe or cooling-unit) contained within a Management Device.  \r
+/// The information in this structure defines threshold information for\r
+/// a component (probe or cooling-unit) contained within a Management Device.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r


@@ -2250,7 +2250,7 @@ typedef enum {
 /// Memory Channel (Type 37)\r
 ///\r
 /// The information in this structure provides the correlation between a Memory Channel\r
 /// Memory Channel (Type 37)\r
 ///\r
 /// The information in this structure provides the correlation between a Memory Channel\r

-/// and its associated Memory Devices.  Each device presents one or more loads to the channel. \r
+/// and its associated Memory Devices.  Each device presents one or more loads to the channel.\r

 /// The sum of all device loads cannot exceed the channel's defined maximum.\r
 ///\r
 typedef struct {\r
 /// The sum of all device loads cannot exceed the channel's defined maximum.\r
 ///\r
 typedef struct {\r


@@ -2331,10 +2331,10 @@ typedef struct {
 } SMBIOS_TABLE_TYPE39;\r
 \r
 ///\r
 } SMBIOS_TABLE_TYPE39;\r
 \r
 ///\r

-/// Additional Information Entry Format. \r
+/// Additional Information Entry Format.\r

 ///\r
 ///\r

-typedef struct {                       \r
-  UINT8                   EntryLength; \r
+typedef struct {\r
+  UINT8                   EntryLength;\r

   UINT16                  ReferencedHandle;\r
   UINT8                   ReferencedOffset;\r
   SMBIOS_TABLE_STRING     EntryString;\r
   UINT16                  ReferencedHandle;\r
   UINT8                   ReferencedOffset;\r
   SMBIOS_TABLE_STRING     EntryString;\r


@@ -2344,13 +2344,13 @@ typedef struct {
 ///\r
 /// Additional Information (Type 40).\r
 ///\r
 ///\r
 /// Additional Information (Type 40).\r
 ///\r

-/// This structure is intended to provide additional information for handling unspecified \r
-/// enumerated values and interim field updates in another structure. \r
+/// This structure is intended to provide additional information for handling unspecified\r
+/// enumerated values and interim field updates in another structure.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                      Hdr;\r
   UINT8                                 NumberOfAdditionalInformationEntries;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                      Hdr;\r
   UINT8                                 NumberOfAdditionalInformationEntries;\r

-  ADDITIONAL_INFORMATION_ENTRY          AdditionalInfoEntries[1];  \r
+  ADDITIONAL_INFORMATION_ENTRY          AdditionalInfoEntries[1];\r

 } SMBIOS_TABLE_TYPE40;\r
 \r
 ///\r
 } SMBIOS_TABLE_TYPE40;\r
 \r
 ///\r


@@ -2372,10 +2372,10 @@ typedef enum{
 ///\r
 /// Onboard Devices Extended Information (Type 41).\r
 ///\r
 ///\r
 /// Onboard Devices Extended Information (Type 41).\r
 ///\r

-/// The information in this structure defines the attributes of devices that \r
-/// are onboard (soldered onto) a system element, usually the baseboard.  \r
-/// In general, an entry in this table implies that the BIOS has some level of \r
-/// control over the enabling of the associated device for use by the system. \r
+/// The information in this structure defines the attributes of devices that\r
+/// are onboard (soldered onto) a system element, usually the baseboard.\r
+/// In general, an entry in this table implies that the BIOS has some level of\r
+/// control over the enabling of the associated device for use by the system.\r

 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                  Hdr;\r
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                  Hdr;\r

diff --git a/MdePkg/Include/IndustryStandard/SmBus.h b/MdePkg/Include/IndustryStandard/SmBus.h
index 197209cf9fa26685e1bafe66bedc0affc1b58c90..6eebd14e5a37bcf8ee040532f9de3df14d03f89e 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SmBus.h
+++ b/MdePkg/Include/IndustryStandard/SmBus.h
@@ -2,14 +2,14 @@
   This file declares the SMBus definitions defined in SmBus Specifciation V2.0\r
   and defined in PI1.0 specification volume 5.\r
 \r
   This file declares the SMBus definitions defined in SmBus Specifciation V2.0\r
   and defined in PI1.0 specification volume 5.\r
 \r

-  Copyright (c) 2007 - 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) 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
 \r

-  THE PROGRAM 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/MdePkg/Include/IndustryStandard/TcgPhysicalPresence.h b/MdePkg/Include/IndustryStandard/TcgPhysicalPresence.h
index 15628a2e0ec0b0d1372fdab551fd875744f9e06b..1f45553952fb32de925b1012296ae2129ecc7deb 100644 (file)
--- a/MdePkg/Include/IndustryStandard/TcgPhysicalPresence.h
+++ b/MdePkg/Include/IndustryStandard/TcgPhysicalPresence.h
@@ -1,13 +1,13 @@
 /** @file\r
   TCG Physical Presence definition.\r
 \r
 /** @file\r
   TCG Physical Presence definition.\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
+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
 http://opensource.org/licenses/bsd-license.php\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


@@ -65,7 +65,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define TCG_PHYSICAL_PRESENCE_ENABLE                                  1\r
 #define TCG_PHYSICAL_PRESENCE_DISABLE                                 2\r
 #define TCG_PHYSICAL_PRESENCE_ACTIVATE                                3\r
 #define TCG_PHYSICAL_PRESENCE_ENABLE                                  1\r
 #define TCG_PHYSICAL_PRESENCE_DISABLE                                 2\r
 #define TCG_PHYSICAL_PRESENCE_ACTIVATE                                3\r

-#define TCG_PHYSICAL_PRESENCE_DEACTIVATE                              4 \r
+#define TCG_PHYSICAL_PRESENCE_DEACTIVATE                              4\r

 #define TCG_PHYSICAL_PRESENCE_CLEAR                                   5\r
 #define TCG_PHYSICAL_PRESENCE_ENABLE_ACTIVATE                         6\r
 #define TCG_PHYSICAL_PRESENCE_DEACTIVATE_DISABLE                      7\r
 #define TCG_PHYSICAL_PRESENCE_CLEAR                                   5\r
 #define TCG_PHYSICAL_PRESENCE_ENABLE_ACTIVATE                         6\r
 #define TCG_PHYSICAL_PRESENCE_DEACTIVATE_DISABLE                      7\r

diff --git a/MdePkg/Include/IndustryStandard/Tls1.h b/MdePkg/Include/IndustryStandard/Tls1.h
index cccb6db7fb89993de35243bdb3ebfb4727c2d31c..c6933cd1eeb92b1949cd96717f10534ce410a9b6 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Tls1.h
+++ b/MdePkg/Include/IndustryStandard/Tls1.h
@@ -91,13 +91,13 @@ typedef struct {
 \r
 //\r
 // The length (in bytes) of the TLSPlaintext records payload MUST NOT exceed 2^14.\r
 \r
 //\r
 // The length (in bytes) of the TLSPlaintext records payload MUST NOT exceed 2^14.\r

-// Refers to section 6.2 of RFC5246. \r
+// Refers to section 6.2 of RFC5246.\r

 //\r
 #define TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH   16384\r
 \r
 //\r
 // The length (in bytes) of the TLSCiphertext records payload MUST NOT exceed 2^14 + 2048.\r
 //\r
 #define TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH   16384\r
 \r
 //\r
 // The length (in bytes) of the TLSCiphertext records payload MUST NOT exceed 2^14 + 2048.\r

-// Refers to section 6.2 of RFC5246. \r
+// Refers to section 6.2 of RFC5246.\r

 //\r
 #define TLS_CIPHERTEXT_RECORD_MAX_PAYLOAD_LENGTH   18432\r
 \r
 //\r
 #define TLS_CIPHERTEXT_RECORD_MAX_PAYLOAD_LENGTH   18432\r
 \r

diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h
index 5bcc16ca7e3cef3b28d008860104a17346ceb8af..bc840fa67217187e54f82351fb803d22c85c3183 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Tpm12.h
+++ b/MdePkg/Include/IndustryStandard/Tpm12.h
@@ -1,15 +1,15 @@
-/** @file   \r
+/** @file\r

   TPM Specification data structures (TCG TPM Specification Version 1.2 Revision 103)\r
   See http://trustedcomputinggroup.org for latest specification updates\r
 \r
   TPM Specification data structures (TCG TPM Specification Version 1.2 Revision 103)\r
   See http://trustedcomputinggroup.org for latest specification updates\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
+  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


@@ -155,8 +155,8 @@ typedef UINT32                      TPM_KEY_CONTROL;
 ///\r
 typedef UINT32                      TPM_NV_INDEX;\r
 ///\r
 ///\r
 typedef UINT32                      TPM_NV_INDEX;\r
 ///\r

-/// The family ID. Family IDs are automatically assigned a sequence number by the TPM. \r
-/// A trusted process can set the FamilyID value in an individual row to NULL, which \r
+/// The family ID. Family IDs are automatically assigned a sequence number by the TPM.\r
+/// A trusted process can set the FamilyID value in an individual row to NULL, which\r

 /// invalidates that row. The family ID resets to NULL on each change of TPM Owner.\r
 ///\r
 typedef UINT32                      TPM_FAMILY_ID;\r
 /// invalidates that row. The family ID resets to NULL on each change of TPM Owner.\r
 ///\r
 typedef UINT32                      TPM_FAMILY_ID;\r


@@ -826,7 +826,7 @@ typedef struct tdTPM_STANY_FLAGS{
 #define TPM_AF_TOSPRESENT           ((TPM_CAPABILITY_AREA) 4)\r
 \r
 //\r
 #define TPM_AF_TOSPRESENT           ((TPM_CAPABILITY_AREA) 4)\r
 \r
 //\r

-// All those structures defined in section 7.4, 7.5, 7.6 are not normative and \r
+// All those structures defined in section 7.4, 7.5, 7.6 are not normative and\r

 // thus no definitions here\r
 //\r
 // Part 2, section 7.4: TPM_PERMANENT_DATA\r
 // thus no definitions here\r
 //\r
 // Part 2, section 7.4: TPM_PERMANENT_DATA\r


@@ -901,7 +901,7 @@ typedef struct tdTPM_STANY_FLAGS{
 \r
 //\r
 // Part 2, section 8: PCR Structures\r
 \r
 //\r
 // Part 2, section 8: PCR Structures\r

-// \r
+//\r

 \r
 ///\r
 /// Part 2, section 8.1: TPM_PCR_SELECTION\r
 \r
 ///\r
 /// Part 2, section 8.1: TPM_PCR_SELECTION\r


@@ -1039,7 +1039,7 @@ typedef struct tdTPM_BOUND_DATA {
 \r
 //\r
 // Part 2 section 10: TPM_KEY complex\r
 \r
 //\r
 // Part 2 section 10: TPM_KEY complex\r

-// \r
+//\r

 \r
 //\r
 // Section 10.1, 10.4, and 10.5 have been defined previously\r
 \r
 //\r
 // Section 10.1, 10.4, and 10.5 have been defined previously\r

diff --git a/MdePkg/Include/IndustryStandard/TpmPtp.h b/MdePkg/Include/IndustryStandard/TpmPtp.h
index c7ff8fdc582bb679ab167da8a6b0f031ed200a6b..7493850bf1cc69f91ace9ef518532b91bdfac0b4 100644 (file)
--- a/MdePkg/Include/IndustryStandard/TpmPtp.h
+++ b/MdePkg/Include/IndustryStandard/TpmPtp.h
@@ -520,4 +520,4 @@ typedef union {
 #define PTP_TIMEOUT_C               (200 * 1000)   // 200ms\r
 #define PTP_TIMEOUT_D               (30 * 1000)    // 30ms\r
 \r
 #define PTP_TIMEOUT_C               (200 * 1000)   // 200ms\r
 #define PTP_TIMEOUT_D               (30 * 1000)    // 30ms\r
 \r

-#endif
\ No newline at end of file
+#endif\r

diff --git a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
index adbc956f635c91bd90ad01966dd10143996626f3..5ecb4ac86e7ba687f7ea6d02f5f410f23ec88753 100644 (file)
--- a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
+++ b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
@@ -1,7 +1,7 @@
 /** @file\r
   TCG EFI Platform Definition in TCG_EFI_Platform_1_20_Final\r
 \r
 /** @file\r
   TCG EFI Platform Definition in TCG_EFI_Platform_1_20_Final\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


@@ -190,7 +190,7 @@ typedef struct {
 \r
 typedef struct tdEFI_GPT_DATA {\r
   EFI_PARTITION_TABLE_HEADER  EfiPartitionHeader;\r
 \r
 typedef struct tdEFI_GPT_DATA {\r
   EFI_PARTITION_TABLE_HEADER  EfiPartitionHeader;\r

-  UINTN                       NumberOfPartitions; \r
+  UINTN                       NumberOfPartitions;\r

   EFI_PARTITION_ENTRY         Partitions[1];\r
 } EFI_GPT_DATA;\r
 \r
   EFI_PARTITION_ENTRY         Partitions[1];\r
 } EFI_GPT_DATA;\r
 \r

diff --git a/MdePkg/Include/IndustryStandard/WatchdogActionTable.h b/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
index 759f498546e3543233377be36c16a7cf4be1d74a..8600db32794d7c3594ff178b5a5f94deb3530135 100644 (file)
--- a/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
+++ b/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
@@ -1,15 +1,15 @@
-/** @file   \r
+/** @file\r

   ACPI Watchdog Action Table (WADT) as defined at\r
   Microsoft Hardware Watchdog Timers Design Specification.\r
 \r
   ACPI Watchdog Action Table (WADT) as defined at\r
   Microsoft Hardware Watchdog Timers Design Specification.\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


@@ -36,8 +36,8 @@ typedef struct {
   UINT32                                  TimerPeriod;\r
   UINT32                                  MaxCount;\r
   UINT32                                  MinCount;\r
   UINT32                                  TimerPeriod;\r
   UINT32                                  MaxCount;\r
   UINT32                                  MinCount;\r

-  UINT8                                   WatchdogFlags;  \r
-  UINT8                                   Reserved_61[3];  \r
+  UINT8                                   WatchdogFlags;\r
+  UINT8                                   Reserved_61[3];\r

   UINT32                                  NumberWatchdogInstructionEntries;\r
 } EFI_ACPI_WATCHDOG_ACTION_1_0_TABLE;\r
 \r
   UINT32                                  NumberWatchdogInstructionEntries;\r
 } EFI_ACPI_WATCHDOG_ACTION_1_0_TABLE;\r
 \r

diff --git a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
index b9b33ce47e6187392a8d992e8c54525851384b97..6088aa8def9fa2edaa62e9d748ec8e25aaa0fd86 100644 (file)
--- a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
+++ b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
@@ -1,15 +1,15 @@
-/** @file   \r
+/** @file\r

   ACPI Watchdog Resource Table (WDRT) as defined at\r
   Microsoft Windows Hardware Developer Central.\r
 \r
   ACPI Watchdog Resource Table (WDRT) as defined at\r
   Microsoft Windows Hardware Developer Central.\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
+  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
 #ifndef _WATCHDOG_RESOURCE_TABLE_H_\r
 **/\r
 \r
 #ifndef _WATCHDOG_RESOURCE_TABLE_H_\r

diff --git a/MdePkg/Include/IndustryStandard/WindowsSmmSecurityMitigationTable.h b/MdePkg/Include/IndustryStandard/WindowsSmmSecurityMitigationTable.h
index 2b0a6446fa57060bb629127f06712d5600d58e44..7341675a2019f4a388fb30a867dd39e117a72f61 100644 (file)
--- a/MdePkg/Include/IndustryStandard/WindowsSmmSecurityMitigationTable.h
+++ b/MdePkg/Include/IndustryStandard/WindowsSmmSecurityMitigationTable.h
@@ -2,8 +2,8 @@
   Defines Windows SMM Security Mitigation Table\r
   @ https://msdn.microsoft.com/windows/hardware/drivers/bringup/acpi-system-description-tables#wsmt\r
 \r
   Defines Windows SMM Security Mitigation Table\r
   @ https://msdn.microsoft.com/windows/hardware/drivers/bringup/acpi-system-description-tables#wsmt\r
 \r

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

diff --git a/MdePkg/Include/IndustryStandard/WindowsUxCapsule.h b/MdePkg/Include/IndustryStandard/WindowsUxCapsule.h
index f7c67205be3f010f05d7a41060f9f7e5aab2caa7..804ac4d4cbbf3e8bf28f483420dfc6dddaaccfc7 100644 (file)
--- a/MdePkg/Include/IndustryStandard/WindowsUxCapsule.h
+++ b/MdePkg/Include/IndustryStandard/WindowsUxCapsule.h
@@ -2,8 +2,8 @@
   Defines Windows UX Capsule GUID and layout defined at Microsoft\r
   Windows UEFI Firmware Update Platform specification\r
 \r
   Defines Windows UX Capsule GUID and layout defined at Microsoft\r
   Windows UEFI Firmware Update Platform specification\r
 \r

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

diff --git a/MdePkg/Include/Ipf/ProcessorBind.h b/MdePkg/Include/Ipf/ProcessorBind.h
index bfbae01abb8479704f7e2135d0c2b93fbb7f1a81..30bb4a740d00e524e2ddd3b914d3f6ee3fb70218 100644 (file)
--- a/MdePkg/Include/Ipf/ProcessorBind.h
+++ b/MdePkg/Include/Ipf/ProcessorBind.h
@@ -1,8 +1,8 @@
 /** @file\r
   Processor or Compiler specific defines and types for Intel Itanium(TM) processors.\r
 \r
 /** @file\r
   Processor or Compiler specific defines and types for Intel Itanium(TM) processors.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available \r
+Copyright (c) 2006 - 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
 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


@@ -271,7 +271,7 @@ typedef INT64   INTN;
 #elif defined(_MSC_EXTENSIONS)\r
   ///\r
   /// Microsoft* compiler-specific method for EFIAPI calling convention.\r
 #elif defined(_MSC_EXTENSIONS)\r
   ///\r
   /// Microsoft* compiler-specific method for EFIAPI calling convention.\r

-  /// \r
+  ///\r

   #define EFIAPI __cdecl\r
 #else\r
   #define EFIAPI\r
   #define EFIAPI __cdecl\r
 #else\r
   #define EFIAPI\r


@@ -303,16 +303,16 @@ typedef struct {
 \r
 /**\r
   Return the pointer to the first instruction of a function given a function pointer.\r
 \r
 /**\r
   Return the pointer to the first instruction of a function given a function pointer.\r

-  For Itanium processors, all function calls are made through a PLABEL, so a pointer to a function \r
-  is actually a pointer to a PLABEL.  The pointer to the first instruction of the function \r
-  is contained within the PLABEL.  This macro may be used to retrieve a pointer to the first \r
-  instruction of a function independent of the CPU architecture being used.  This is very \r
+  For Itanium processors, all function calls are made through a PLABEL, so a pointer to a function\r
+  is actually a pointer to a PLABEL.  The pointer to the first instruction of the function\r
+  is contained within the PLABEL.  This macro may be used to retrieve a pointer to the first\r
+  instruction of a function independent of the CPU architecture being used.  This is very\r

   useful when printing function addresses through DEBUG() macros.\r
   useful when printing function addresses through DEBUG() macros.\r

-  \r
+\r

   @param  FunctionPointer   A pointer to a function.\r
 \r
   @return The pointer to the first instruction of a function given a function pointer.\r
   @param  FunctionPointer   A pointer to a function.\r
 \r
   @return The pointer to the first instruction of a function given a function pointer.\r

-  \r
+\r

 **/\r
 #define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(((EFI_PLABEL *)(FunctionPointer))->EntryPoint)\r
 \r
 **/\r
 #define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(((EFI_PLABEL *)(FunctionPointer))->EntryPoint)\r
 \r

diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/BaseLib.h
index eb2899f8524e7a8e1856d68f0c25ced58c4253fb..1db3a0475d9366f63f749b65f88913857a73297b 100644 (file)
--- a/MdePkg/Include/Library/BaseLib.h
+++ b/MdePkg/Include/Library/BaseLib.h
@@ -2,7 +2,7 @@
   Provides string functions, linked list functions, math functions, synchronization\r
   functions, file path functions, and CPU architecture-specific functions.\r
 \r
   Provides string functions, linked list functions, math functions, synchronization\r
   functions, file path functions, and CPU architecture-specific 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

 Portions copyright (c) 2008 - 2009, Apple 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
 Portions copyright (c) 2008 - 2009, Apple 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


@@ -257,7 +257,7 @@ StrnSizeS (
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumUnicodeStringLength is not zero,\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumUnicodeStringLength is not zero,\r

-                                    and DestMax is greater than \r
+                                    and DestMax is greater than\r

                                     PcdMaximumUnicodeStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r
                                     PcdMaximumUnicodeStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r


@@ -290,12 +290,12 @@ StrCpyS (
   @param  Length                   The maximum number of Unicode characters to copy.\r
 \r
   @retval RETURN_SUCCESS           String is copied.\r
   @param  Length                   The maximum number of Unicode characters to copy.\r
 \r
   @retval RETURN_SUCCESS           String is copied.\r

-  @retval RETURN_BUFFER_TOO_SMALL  If DestMax is NOT greater than \r
+  @retval RETURN_BUFFER_TOO_SMALL  If DestMax is NOT greater than\r

                                    MIN(StrLen(Source), Length).\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumUnicodeStringLength is not zero,\r
                                    MIN(StrLen(Source), Length).\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumUnicodeStringLength is not zero,\r

-                                    and DestMax is greater than \r
+                                    and DestMax is greater than\r

                                     PcdMaximumUnicodeStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r
                                     PcdMaximumUnicodeStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r


@@ -327,14 +327,14 @@ StrnCpyS (
   @param  Source                   A pointer to a Null-terminated Unicode string.\r
 \r
   @retval RETURN_SUCCESS           String is appended.\r
   @param  Source                   A pointer to a Null-terminated Unicode string.\r
 \r
   @retval RETURN_SUCCESS           String is appended.\r

-  @retval RETURN_BAD_BUFFER_SIZE   If DestMax is NOT greater than \r
+  @retval RETURN_BAD_BUFFER_SIZE   If DestMax is NOT greater than\r

                                    StrLen(Destination).\r
   @retval RETURN_BUFFER_TOO_SMALL  If (DestMax - StrLen(Destination)) is NOT\r
                                    greater than StrLen(Source).\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumUnicodeStringLength is not zero,\r
                                    StrLen(Destination).\r
   @retval RETURN_BUFFER_TOO_SMALL  If (DestMax - StrLen(Destination)) is NOT\r
                                    greater than StrLen(Source).\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumUnicodeStringLength is not zero,\r

-                                    and DestMax is greater than \r
+                                    and DestMax is greater than\r

                                     PcdMaximumUnicodeStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r
                                     PcdMaximumUnicodeStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r


@@ -375,7 +375,7 @@ StrCatS (
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumUnicodeStringLength is not zero,\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumUnicodeStringLength is not zero,\r

-                                    and DestMax is greater than \r
+                                    and DestMax is greater than\r

                                     PcdMaximumUnicodeStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r
                                     PcdMaximumUnicodeStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r


@@ -690,7 +690,7 @@ AsciiStrnSizeS (
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumAsciiStringLength is not zero,\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumAsciiStringLength is not zero,\r

-                                    and DestMax is greater than \r
+                                    and DestMax is greater than\r

                                     PcdMaximumAsciiStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r
                                     PcdMaximumAsciiStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r


@@ -721,12 +721,12 @@ AsciiStrCpyS (
   @param  Length                   The maximum number of Ascii characters to copy.\r
 \r
   @retval RETURN_SUCCESS           String is copied.\r
   @param  Length                   The maximum number of Ascii characters to copy.\r
 \r
   @retval RETURN_SUCCESS           String is copied.\r

-  @retval RETURN_BUFFER_TOO_SMALL  If DestMax is NOT greater than \r
+  @retval RETURN_BUFFER_TOO_SMALL  If DestMax is NOT greater than\r

                                    MIN(StrLen(Source), Length).\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumAsciiStringLength is not zero,\r
                                    MIN(StrLen(Source), Length).\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumAsciiStringLength is not zero,\r

-                                    and DestMax is greater than \r
+                                    and DestMax is greater than\r

                                     PcdMaximumAsciiStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r
                                     PcdMaximumAsciiStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r


@@ -756,14 +756,14 @@ AsciiStrnCpyS (
   @param  Source                   A pointer to a Null-terminated Ascii string.\r
 \r
   @retval RETURN_SUCCESS           String is appended.\r
   @param  Source                   A pointer to a Null-terminated Ascii string.\r
 \r
   @retval RETURN_SUCCESS           String is appended.\r

-  @retval RETURN_BAD_BUFFER_SIZE   If DestMax is NOT greater than \r
+  @retval RETURN_BAD_BUFFER_SIZE   If DestMax is NOT greater than\r

                                    StrLen(Destination).\r
   @retval RETURN_BUFFER_TOO_SMALL  If (DestMax - StrLen(Destination)) is NOT\r
                                    greater than StrLen(Source).\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumAsciiStringLength is not zero,\r
                                    StrLen(Destination).\r
   @retval RETURN_BUFFER_TOO_SMALL  If (DestMax - StrLen(Destination)) is NOT\r
                                    greater than StrLen(Source).\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumAsciiStringLength is not zero,\r

-                                    and DestMax is greater than \r
+                                    and DestMax is greater than\r

                                     PcdMaximumAsciiStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r
                                     PcdMaximumAsciiStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r


@@ -802,7 +802,7 @@ AsciiStrCatS (
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumAsciiStringLength is not zero,\r
   @retval RETURN_INVALID_PARAMETER If Destination is NULL.\r
                                    If Source is NULL.\r
                                    If PcdMaximumAsciiStringLength is not zero,\r

-                                    and DestMax is greater than \r
+                                    and DestMax is greater than\r

                                     PcdMaximumAsciiStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r
                                     PcdMaximumAsciiStringLength.\r
                                    If DestMax is 0.\r
   @retval RETURN_ACCESS_DENIED     If Source and Destination overlap.\r


@@ -1083,7 +1083,7 @@ StrCpy (
 /**\r
   [ATTENTION] This function is deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function is deprecated for security reason.\r
 \r

-  Copies up to a specified length from one Null-terminated Unicode string to \r
+  Copies up to a specified length from one Null-terminated Unicode string to\r

   another Null-terminated Unicode string and returns the new Unicode string.\r
 \r
   This function copies the contents of the Unicode string Source to the Unicode\r
   another Null-terminated Unicode string and returns the new Unicode string.\r
 \r
   This function copies the contents of the Unicode string Source to the Unicode\r


@@ -1099,7 +1099,7 @@ StrCpy (
   If Length > 0 and Source is NULL, then ASSERT().\r
   If Length > 0 and Source is not aligned on a 16-bit boundary, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Length > 0 and Source is NULL, then ASSERT().\r
   If Length > 0 and Source is not aligned on a 16-bit boundary, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and Length is greater than \r
+  If PcdMaximumUnicodeStringLength is not zero, and Length is greater than\r

   PcdMaximumUnicodeStringLength, then ASSERT().\r
   If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
   PcdMaximumUnicodeStringLength Unicode characters, not including the Null-terminator,\r
   PcdMaximumUnicodeStringLength, then ASSERT().\r
   If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
   PcdMaximumUnicodeStringLength Unicode characters, not including the Null-terminator,\r


@@ -1149,7 +1149,7 @@ StrLen (
   Returns the size of a Null-terminated Unicode string in bytes, including the\r
   Null terminator.\r
 \r
   Returns the size of a Null-terminated Unicode string in bytes, including the\r
   Null terminator.\r
 \r

-  This function returns the size, in bytes, of the Null-terminated Unicode string \r
+  This function returns the size, in bytes, of the Null-terminated Unicode string\r

   specified by String.\r
 \r
   If String is NULL, then ASSERT().\r
   specified by String.\r
 \r
   If String is NULL, then ASSERT().\r


@@ -1209,7 +1209,7 @@ StrCmp (
 /**\r
   Compares up to a specified length the contents of two Null-terminated Unicode strings,\r
   and returns the difference between the first mismatched Unicode characters.\r
 /**\r
   Compares up to a specified length the contents of two Null-terminated Unicode strings,\r
   and returns the difference between the first mismatched Unicode characters.\r

-  \r
+\r

   This function compares the Null-terminated Unicode string FirstString to the\r
   Null-terminated Unicode string SecondString. At most, Length Unicode\r
   characters will be compared. If Length is 0, then 0 is returned. If\r
   This function compares the Null-terminated Unicode string FirstString to the\r
   Null-terminated Unicode string SecondString. At most, Length Unicode\r
   characters will be compared. If Length is 0, then 0 is returned. If\r


@@ -1294,8 +1294,8 @@ StrCat (
 /**\r
   [ATTENTION] This function is deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function is deprecated for security reason.\r
 \r

-  Concatenates up to a specified length one Null-terminated Unicode to the end \r
-  of another Null-terminated Unicode string, and returns the concatenated \r
+  Concatenates up to a specified length one Null-terminated Unicode to the end\r
+  of another Null-terminated Unicode string, and returns the concatenated\r

   Unicode string.\r
 \r
   This function concatenates two Null-terminated Unicode strings. The contents\r
   Unicode string.\r
 \r
   This function concatenates two Null-terminated Unicode strings. The contents\r


@@ -1311,7 +1311,7 @@ StrCat (
   If Length > 0 and Source is NULL, then ASSERT().\r
   If Length > 0 and Source is not aligned on a 16-bit boundary, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Length > 0 and Source is NULL, then ASSERT().\r
   If Length > 0 and Source is not aligned on a 16-bit boundary, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and Length is greater than \r
+  If PcdMaximumUnicodeStringLength is not zero, and Length is greater than\r

   PcdMaximumUnicodeStringLength, then ASSERT().\r
   If PcdMaximumUnicodeStringLength is not zero, and Destination contains more\r
   than PcdMaximumUnicodeStringLength Unicode characters, not including the\r
   PcdMaximumUnicodeStringLength, then ASSERT().\r
   If PcdMaximumUnicodeStringLength is not zero, and Destination contains more\r
   than PcdMaximumUnicodeStringLength Unicode characters, not including the\r


@@ -1451,7 +1451,7 @@ EFIAPI
 StrDecimalToUint64 (\r
   IN      CONST CHAR16              *String\r
   );\r
 StrDecimalToUint64 (\r
   IN      CONST CHAR16              *String\r
   );\r

- \r
+\r

 \r
 /**\r
   Convert a Null-terminated Unicode hexadecimal string to a value of type UINTN.\r
 \r
 /**\r
   Convert a Null-terminated Unicode hexadecimal string to a value of type UINTN.\r


@@ -1468,7 +1468,7 @@ StrDecimalToUint64 (
   The function will ignore the pad space, which includes spaces or tab characters,\r
   before [zeros], [x] or [hexadecimal digit]. The running zero before [x] or\r
   [hexadecimal digit] will be ignored. Then, the decoding starts after [x] or the\r
   The function will ignore the pad space, which includes spaces or tab characters,\r
   before [zeros], [x] or [hexadecimal digit]. The running zero before [x] or\r
   [hexadecimal digit] will be ignored. Then, the decoding starts after [x] or the\r

-  first valid hexadecimal digit. Then, the function stops at the first character \r
+  first valid hexadecimal digit. Then, the function stops at the first character\r

   that is a not a valid hexadecimal character or NULL, whichever one comes first.\r
 \r
   If String is NULL, then ASSERT().\r
   that is a not a valid hexadecimal character or NULL, whichever one comes first.\r
 \r
   If String is NULL, then ASSERT().\r


@@ -1952,7 +1952,7 @@ AsciiStrCpy (
 /**\r
   [ATTENTION] This function is deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function is deprecated for security reason.\r
 \r

-  Copies up to a specified length one Null-terminated ASCII string to another \r
+  Copies up to a specified length one Null-terminated ASCII string to another\r

   Null-terminated ASCII string and returns the new ASCII string.\r
 \r
   This function copies the contents of the ASCII string Source to the ASCII\r
   Null-terminated ASCII string and returns the new ASCII string.\r
 \r
   This function copies the contents of the ASCII string Source to the ASCII\r


@@ -1965,7 +1965,7 @@ AsciiStrCpy (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero, and Length is greater than \r
+  If PcdMaximumAsciiStringLength is not zero, and Length is greater than\r

   PcdMaximumAsciiStringLength, then ASSERT().\r
   If PcdMaximumAsciiStringLength is not zero, and Source contains more than\r
   PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator,\r
   PcdMaximumAsciiStringLength, then ASSERT().\r
   If PcdMaximumAsciiStringLength is not zero, and Source contains more than\r
   PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator,\r


@@ -2119,7 +2119,7 @@ AsciiStriCmp (
 \r
   If Length > 0 and FirstString is NULL, then ASSERT().\r
   If Length > 0 and SecondString is NULL, then ASSERT().\r
 \r
   If Length > 0 and FirstString is NULL, then ASSERT().\r
   If Length > 0 and SecondString is NULL, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero, and Length is greater than \r
+  If PcdMaximumAsciiStringLength is not zero, and Length is greater than\r

   PcdMaximumAsciiStringLength, then ASSERT().\r
   If PcdMaximumAsciiStringLength is not zero, and FirstString contains more than\r
   PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator,\r
   PcdMaximumAsciiStringLength, then ASSERT().\r
   If PcdMaximumAsciiStringLength is not zero, and FirstString contains more than\r
   PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator,\r


@@ -2131,7 +2131,7 @@ AsciiStriCmp (
   @param  FirstString   The pointer to a Null-terminated ASCII string.\r
   @param  SecondString  The pointer to a Null-terminated ASCII string.\r
   @param  Length        The maximum number of ASCII characters for compare.\r
   @param  FirstString   The pointer to a Null-terminated ASCII string.\r
   @param  SecondString  The pointer to a Null-terminated ASCII string.\r
   @param  Length        The maximum number of ASCII characters for compare.\r

-  \r
+\r

   @retval ==0       FirstString is identical to SecondString.\r
   @retval !=0       FirstString is not identical to SecondString.\r
 \r
   @retval ==0       FirstString is identical to SecondString.\r
   @retval !=0       FirstString is not identical to SecondString.\r
 \r


@@ -2187,8 +2187,8 @@ AsciiStrCat (
 /**\r
   [ATTENTION] This function is deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function is deprecated for security reason.\r
 \r

-  Concatenates up to a specified length one Null-terminated ASCII string to \r
-  the end of another Null-terminated ASCII string, and returns the \r
+  Concatenates up to a specified length one Null-terminated ASCII string to\r
+  the end of another Null-terminated ASCII string, and returns the\r

   concatenated ASCII string.\r
 \r
   This function concatenates two Null-terminated ASCII strings. The contents\r
   concatenated ASCII string.\r
 \r
   This function concatenates two Null-terminated ASCII strings. The contents\r


@@ -2957,7 +2957,7 @@ InsertHeadList (
 \r
   If ListHead is NULL, then ASSERT().\r
   If Entry is NULL, then ASSERT().\r
 \r
   If ListHead is NULL, then ASSERT().\r
   If Entry is NULL, then ASSERT().\r

-  If ListHead was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or \r
+  If ListHead was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or\r

   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and prior to insertion the number\r
   of nodes in ListHead, including the ListHead node, is greater than or\r
   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and prior to insertion the number\r
   of nodes in ListHead, including the ListHead node, is greater than or\r


@@ -2981,12 +2981,12 @@ InsertTailList (
 /**\r
   Retrieves the first node of a doubly linked list.\r
 \r
 /**\r
   Retrieves the first node of a doubly linked list.\r
 \r

-  Returns the first node of a doubly linked list.  List must have been \r
+  Returns the first node of a doubly linked list.  List must have been\r

   initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead().\r
   If List is empty, then List is returned.\r
 \r
   If List is NULL, then ASSERT().\r
   initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead().\r
   If List is empty, then List is returned.\r
 \r
   If List is NULL, then ASSERT().\r

-  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or \r
+  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or\r

   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r
   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r


@@ -3008,13 +3008,13 @@ GetFirstNode (
 /**\r
   Retrieves the next node of a doubly linked list.\r
 \r
 /**\r
   Retrieves the next node of a doubly linked list.\r
 \r

-  Returns the node of a doubly linked list that follows Node.  \r
+  Returns the node of a doubly linked list that follows Node.\r

   List must have been initialized with INTIALIZE_LIST_HEAD_VARIABLE()\r
   or InitializeListHead().  If List is empty, then List is returned.\r
 \r
   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r
   List must have been initialized with INTIALIZE_LIST_HEAD_VARIABLE()\r
   or InitializeListHead().  If List is empty, then List is returned.\r
 \r
   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r

-  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or \r
+  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or\r

   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and List contains more than\r
   PcdMaximumLinkedListLength nodes, then ASSERT().\r
   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and List contains more than\r
   PcdMaximumLinkedListLength nodes, then ASSERT().\r


@@ -3033,27 +3033,27 @@ GetNextNode (
   IN      CONST LIST_ENTRY          *Node\r
   );\r
 \r
   IN      CONST LIST_ENTRY          *Node\r
   );\r
 \r

-  \r
+\r

 /**\r
   Retrieves the previous node of a doubly linked list.\r
 /**\r
   Retrieves the previous node of a doubly linked list.\r

- \r
-  Returns the node of a doubly linked list that precedes Node.  \r
+\r
+  Returns the node of a doubly linked list that precedes Node.\r

   List must have been initialized with INTIALIZE_LIST_HEAD_VARIABLE()\r
   or InitializeListHead().  If List is empty, then List is returned.\r
   List must have been initialized with INTIALIZE_LIST_HEAD_VARIABLE()\r
   or InitializeListHead().  If List is empty, then List is returned.\r

- \r
+\r

   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r
   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r

-  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or \r
+  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or\r

   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and List contains more than\r
   PcdMaximumLinkedListLength nodes, then ASSERT().\r
   If PcdVerifyNodeInList is TRUE and Node is not a node in List, then ASSERT().\r
   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and List contains more than\r
   PcdMaximumLinkedListLength nodes, then ASSERT().\r
   If PcdVerifyNodeInList is TRUE and Node is not a node in List, then ASSERT().\r

- \r
+\r

   @param  List  A pointer to the head node of a doubly linked list.\r
   @param  Node  A pointer to a node in the doubly linked list.\r
   @param  List  A pointer to the head node of a doubly linked list.\r
   @param  Node  A pointer to a node in the doubly linked list.\r

- \r
+\r

   @return The pointer to the previous node if one exists. Otherwise List is returned.\r
   @return The pointer to the previous node if one exists. Otherwise List is returned.\r

- \r
+\r

 **/\r
 LIST_ENTRY *\r
 EFIAPI\r
 **/\r
 LIST_ENTRY *\r
 EFIAPI\r


@@ -3062,7 +3062,7 @@ GetPreviousNode (
   IN      CONST LIST_ENTRY          *Node\r
   );\r
 \r
   IN      CONST LIST_ENTRY          *Node\r
   );\r
 \r

-  \r
+\r

 /**\r
   Checks to see if a doubly linked list is empty or not.\r
 \r
 /**\r
   Checks to see if a doubly linked list is empty or not.\r
 \r


@@ -3070,7 +3070,7 @@ GetPreviousNode (
   zero nodes, this function returns TRUE. Otherwise, it returns FALSE.\r
 \r
   If ListHead is NULL, then ASSERT().\r
   zero nodes, this function returns TRUE. Otherwise, it returns FALSE.\r
 \r
   If ListHead is NULL, then ASSERT().\r

-  If ListHead was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or \r
+  If ListHead was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or\r

   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r
   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r


@@ -3100,12 +3100,12 @@ IsListEmpty (
 \r
   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r
 \r
   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r

-  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead(), \r
+  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead(),\r

   then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r
   PcdMaximumLinkedListLength, then ASSERT().\r
   then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r
   PcdMaximumLinkedListLength, then ASSERT().\r

-  If PcdVerifyNodeInList is TRUE and Node is not a node in List the and Node is not equal \r
+  If PcdVerifyNodeInList is TRUE and Node is not a node in List the and Node is not equal\r

   to List, then ASSERT().\r
 \r
   @param  List  A pointer to the head node of a doubly linked list.\r
   to List, then ASSERT().\r
 \r
   @param  List  A pointer to the head node of a doubly linked list.\r


@@ -3162,12 +3162,12 @@ IsNodeAtEnd (
   Otherwise, the location of the FirstEntry node is swapped with the location\r
   of the SecondEntry node in a doubly linked list. SecondEntry must be in the\r
   same double linked list as FirstEntry and that double linked list must have\r
   Otherwise, the location of the FirstEntry node is swapped with the location\r
   of the SecondEntry node in a doubly linked list. SecondEntry must be in the\r
   same double linked list as FirstEntry and that double linked list must have\r

-  been initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead(). \r
+  been initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead().\r

   SecondEntry is returned after the nodes are swapped.\r
 \r
   If FirstEntry is NULL, then ASSERT().\r
   If SecondEntry is NULL, then ASSERT().\r
   SecondEntry is returned after the nodes are swapped.\r
 \r
   If FirstEntry is NULL, then ASSERT().\r
   If SecondEntry is NULL, then ASSERT().\r

-  If PcdVerifyNodeInList is TRUE and SecondEntry and FirstEntry are not in the \r
+  If PcdVerifyNodeInList is TRUE and SecondEntry and FirstEntry are not in the\r

   same linked list, then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes in the\r
   linked list containing the FirstEntry and SecondEntry nodes, including\r
   same linked list, then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes in the\r
   linked list containing the FirstEntry and SecondEntry nodes, including\r


@@ -3176,7 +3176,7 @@ IsNodeAtEnd (
 \r
   @param  FirstEntry  A pointer to a node in a linked list.\r
   @param  SecondEntry A pointer to another node in the same linked list.\r
 \r
   @param  FirstEntry  A pointer to a node in a linked list.\r
   @param  SecondEntry A pointer to another node in the same linked list.\r

-  \r
+\r

   @return SecondEntry.\r
 \r
 **/\r
   @return SecondEntry.\r
 \r
 **/\r


@@ -3744,7 +3744,7 @@ DivU64x64Remainder (
   function returns the 64-bit signed quotient.\r
 \r
   It is the caller's responsibility to not call this function with a Divisor of 0.\r
   function returns the 64-bit signed quotient.\r
 \r
   It is the caller's responsibility to not call this function with a Divisor of 0.\r

-  If Divisor is 0, then the quotient and remainder should be assumed to be \r
+  If Divisor is 0, then the quotient and remainder should be assumed to be\r

   the largest negative integer.\r
 \r
   If Divisor is 0, then ASSERT().\r
   the largest negative integer.\r
 \r
   If Divisor is 0, then ASSERT().\r


@@ -4076,7 +4076,7 @@ BitFieldAnd8 (
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r

-  in Operand and the value specified by AndData, followed by a bitwise \r
+  in Operand and the value specified by AndData, followed by a bitwise\r

   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 8-bit value is returned.\r
 \r
   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 8-bit value is returned.\r
 \r


@@ -4243,7 +4243,7 @@ BitFieldAnd16 (
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r

-  in Operand and the value specified by AndData, followed by a bitwise \r
+  in Operand and the value specified by AndData, followed by a bitwise\r

   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 16-bit value is returned.\r
 \r
   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 16-bit value is returned.\r
 \r


@@ -4410,7 +4410,7 @@ BitFieldAnd32 (
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r

-  in Operand and the value specified by AndData, followed by a bitwise \r
+  in Operand and the value specified by AndData, followed by a bitwise\r

   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 32-bit value is returned.\r
 \r
   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 32-bit value is returned.\r
 \r


@@ -4577,7 +4577,7 @@ BitFieldAnd64 (
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r

-  in Operand and the value specified by AndData, followed by a bitwise \r
+  in Operand and the value specified by AndData, followed by a bitwise\r

   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 64-bit value is returned.\r
 \r
   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 64-bit value is returned.\r
 \r


@@ -4892,11 +4892,11 @@ MemoryFence (
 \r
   If JumpBuffer is NULL, then ASSERT().\r
   For Itanium processors, if JumpBuffer is not aligned on a 16-byte boundary, then ASSERT().\r
 \r
   If JumpBuffer is NULL, then ASSERT().\r
   For Itanium processors, if JumpBuffer is not aligned on a 16-byte boundary, then ASSERT().\r

-  \r
+\r

   NOTE: The structure BASE_LIBRARY_JUMP_BUFFER is CPU architecture specific.\r
   The same structure must never be used for more than one CPU architecture context.\r
   NOTE: The structure BASE_LIBRARY_JUMP_BUFFER is CPU architecture specific.\r
   The same structure must never be used for more than one CPU architecture context.\r

-  For example, a BASE_LIBRARY_JUMP_BUFFER allocated by an IA-32 module must never be used from an x64 module. \r
-  SetJump()/LongJump() is not currently supported for the EBC processor type.   \r
+  For example, a BASE_LIBRARY_JUMP_BUFFER allocated by an IA-32 module must never be used from an x64 module.\r
+  SetJump()/LongJump() is not currently supported for the EBC processor type.\r

 \r
   @param  JumpBuffer  A pointer to CPU context buffer.\r
 \r
 \r
   @param  JumpBuffer  A pointer to CPU context buffer.\r
 \r


@@ -5058,9 +5058,9 @@ CpuPause (
                       function.\r
   @param  NewStack    A pointer to the new stack to use for the EntryPoint\r
                       function.\r
                       function.\r
   @param  NewStack    A pointer to the new stack to use for the EntryPoint\r
                       function.\r

-  @param  ...         This variable argument list is ignored for IA-32, x64, and \r
-                      EBC architectures.  For Itanium processors, this variable \r
-                      argument list is expected to contain a single parameter of \r
+  @param  ...         This variable argument list is ignored for IA-32, x64, and\r
+                      EBC architectures.  For Itanium processors, this variable\r
+                      argument list is expected to contain a single parameter of\r

                       type VOID * that specifies the new backing store pointer.\r
 \r
 \r
                       type VOID * that specifies the new backing store pointer.\r
 \r
 \r


@@ -5104,19 +5104,19 @@ EFIAPI
 CpuDeadLoop (\r
   VOID\r
   );\r
 CpuDeadLoop (\r
   VOID\r
   );\r

- \r
+\r

 #if defined (MDE_CPU_IPF)\r
 \r
 /**\r
   Flush a range of  cache lines in the cache coherency domain of the calling\r
   CPU.\r
 \r
 #if defined (MDE_CPU_IPF)\r
 \r
 /**\r
   Flush a range of  cache lines in the cache coherency domain of the calling\r
   CPU.\r
 \r

-  Flushes the cache lines specified by Address and Length.  If Address is not aligned \r
-  on a cache line boundary, then entire cache line containing Address is flushed.  \r
-  If Address + Length is not aligned on a cache line boundary, then the entire cache \r
-  line containing Address + Length - 1 is flushed.  This function may choose to flush \r
-  the entire cache if that is more efficient than flushing the specified range.  If \r
-  Length is 0, the no cache lines are flushed.  Address is returned.   \r
+  Flushes the cache lines specified by Address and Length.  If Address is not aligned\r
+  on a cache line boundary, then entire cache line containing Address is flushed.\r
+  If Address + Length is not aligned on a cache line boundary, then the entire cache\r
+  line containing Address + Length - 1 is flushed.  This function may choose to flush\r
+  the entire cache if that is more efficient than flushing the specified range.  If\r
+  Length is 0, the no cache lines are flushed.  Address is returned.\r

   This function is only available on Itanium processors.\r
 \r
   If Length is greater than (MAX_ADDRESS - Address + 1), then ASSERT().\r
   This function is only available on Itanium processors.\r
 \r
   If Length is greater than (MAX_ADDRESS - Address + 1), then ASSERT().\r


@@ -5177,8 +5177,8 @@ AsmFci (
 \r
 /**\r
   Reads the current value of a Processor Identifier Register (CPUID).\r
 \r
 /**\r
   Reads the current value of a Processor Identifier Register (CPUID).\r

-  \r
-  Reads and returns the current value of Processor Identifier Register specified by Index. \r
+\r
+  Reads and returns the current value of Processor Identifier Register specified by Index.\r

   The Index of largest implemented CPUID (One less than the number of implemented CPUID\r
   registers) is determined by CPUID [3] bits {7:0}.\r
   No parameter checking is performed on Index.  If the Index value is beyond the\r
   The Index of largest implemented CPUID (One less than the number of implemented CPUID\r
   registers) is determined by CPUID [3] bits {7:0}.\r
   No parameter checking is performed on Index.  If the Index value is beyond the\r


@@ -5234,8 +5234,8 @@ AsmWritePsr (
 \r
 /**\r
   Reads the current value of 64-bit Kernel Register #0 (KR0).\r
 \r
 /**\r
   Reads the current value of 64-bit Kernel Register #0 (KR0).\r

-  \r
-  Reads and returns the current value of KR0. \r
+\r
+  Reads and returns the current value of KR0.\r

   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR0.\r
   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR0.\r


@@ -5251,7 +5251,7 @@ AsmReadKr0 (
 /**\r
   Reads the current value of 64-bit Kernel Register #1 (KR1).\r
 \r
 /**\r
   Reads the current value of 64-bit Kernel Register #1 (KR1).\r
 \r

-  Reads and returns the current value of KR1. \r
+  Reads and returns the current value of KR1.\r

   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR1.\r
   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR1.\r


@@ -5267,7 +5267,7 @@ AsmReadKr1 (
 /**\r
   Reads the current value of 64-bit Kernel Register #2 (KR2).\r
 \r
 /**\r
   Reads the current value of 64-bit Kernel Register #2 (KR2).\r
 \r

-  Reads and returns the current value of KR2. \r
+  Reads and returns the current value of KR2.\r

   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR2.\r
   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR2.\r


@@ -5283,7 +5283,7 @@ AsmReadKr2 (
 /**\r
   Reads the current value of 64-bit Kernel Register #3 (KR3).\r
 \r
 /**\r
   Reads the current value of 64-bit Kernel Register #3 (KR3).\r
 \r

-  Reads and returns the current value of KR3. \r
+  Reads and returns the current value of KR3.\r

   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR3.\r
   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR3.\r


@@ -5299,9 +5299,9 @@ AsmReadKr3 (
 /**\r
   Reads the current value of 64-bit Kernel Register #4 (KR4).\r
 \r
 /**\r
   Reads the current value of 64-bit Kernel Register #4 (KR4).\r
 \r

-  Reads and returns the current value of KR4. \r
+  Reads and returns the current value of KR4.\r

   This function is only available on Itanium processors.\r
   This function is only available on Itanium processors.\r

-  \r
+\r

   @return The current value of KR4.\r
 \r
 **/\r
   @return The current value of KR4.\r
 \r
 **/\r


@@ -5315,7 +5315,7 @@ AsmReadKr4 (
 /**\r
   Reads the current value of 64-bit Kernel Register #5 (KR5).\r
 \r
 /**\r
   Reads the current value of 64-bit Kernel Register #5 (KR5).\r
 \r

-  Reads and returns the current value of KR5. \r
+  Reads and returns the current value of KR5.\r

   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR5.\r
   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR5.\r


@@ -5331,7 +5331,7 @@ AsmReadKr5 (
 /**\r
   Reads the current value of 64-bit Kernel Register #6 (KR6).\r
 \r
 /**\r
   Reads the current value of 64-bit Kernel Register #6 (KR6).\r
 \r

-  Reads and returns the current value of KR6. \r
+  Reads and returns the current value of KR6.\r

   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR6.\r
   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR6.\r


@@ -5347,7 +5347,7 @@ AsmReadKr6 (
 /**\r
   Reads the current value of 64-bit Kernel Register #7 (KR7).\r
 \r
 /**\r
   Reads the current value of 64-bit Kernel Register #7 (KR7).\r
 \r

-  Reads and returns the current value of KR7. \r
+  Reads and returns the current value of KR7.\r

   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR7.\r
   This function is only available on Itanium processors.\r
 \r
   @return The current value of KR7.\r


@@ -5362,8 +5362,8 @@ AsmReadKr7 (
 \r
 /**\r
   Write the current value of 64-bit Kernel Register #0 (KR0).\r
 \r
 /**\r
   Write the current value of 64-bit Kernel Register #0 (KR0).\r

-  \r
-  Writes the current value of KR0.  The 64-bit value written to \r
+\r
+  Writes the current value of KR0.  The 64-bit value written to\r

   the KR0 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR0.\r
   the KR0 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR0.\r


@@ -5381,7 +5381,7 @@ AsmWriteKr0 (
 /**\r
   Write the current value of 64-bit Kernel Register #1 (KR1).\r
 \r
 /**\r
   Write the current value of 64-bit Kernel Register #1 (KR1).\r
 \r

-  Writes the current value of KR1.  The 64-bit value written to \r
+  Writes the current value of KR1.  The 64-bit value written to\r

   the KR1 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR1.\r
   the KR1 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR1.\r


@@ -5399,7 +5399,7 @@ AsmWriteKr1 (
 /**\r
   Write the current value of 64-bit Kernel Register #2 (KR2).\r
 \r
 /**\r
   Write the current value of 64-bit Kernel Register #2 (KR2).\r
 \r

-  Writes the current value of KR2.  The 64-bit value written to \r
+  Writes the current value of KR2.  The 64-bit value written to\r

   the KR2 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR2.\r
   the KR2 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR2.\r


@@ -5417,7 +5417,7 @@ AsmWriteKr2 (
 /**\r
   Write the current value of 64-bit Kernel Register #3 (KR3).\r
 \r
 /**\r
   Write the current value of 64-bit Kernel Register #3 (KR3).\r
 \r

-  Writes the current value of KR3.  The 64-bit value written to \r
+  Writes the current value of KR3.  The 64-bit value written to\r

   the KR3 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR3.\r
   the KR3 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR3.\r


@@ -5435,7 +5435,7 @@ AsmWriteKr3 (
 /**\r
   Write the current value of 64-bit Kernel Register #4 (KR4).\r
 \r
 /**\r
   Write the current value of 64-bit Kernel Register #4 (KR4).\r
 \r

-  Writes the current value of KR4.  The 64-bit value written to \r
+  Writes the current value of KR4.  The 64-bit value written to\r

   the KR4 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR4.\r
   the KR4 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR4.\r


@@ -5453,7 +5453,7 @@ AsmWriteKr4 (
 /**\r
   Write the current value of 64-bit Kernel Register #5 (KR5).\r
 \r
 /**\r
   Write the current value of 64-bit Kernel Register #5 (KR5).\r
 \r

-  Writes the current value of KR5.  The 64-bit value written to \r
+  Writes the current value of KR5.  The 64-bit value written to\r

   the KR5 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR5.\r
   the KR5 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR5.\r


@@ -5471,7 +5471,7 @@ AsmWriteKr5 (
 /**\r
   Write the current value of 64-bit Kernel Register #6 (KR6).\r
 \r
 /**\r
   Write the current value of 64-bit Kernel Register #6 (KR6).\r
 \r

-  Writes the current value of KR6.  The 64-bit value written to \r
+  Writes the current value of KR6.  The 64-bit value written to\r

   the KR6 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR6.\r
   the KR6 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR6.\r


@@ -5489,7 +5489,7 @@ AsmWriteKr6 (
 /**\r
   Write the current value of 64-bit Kernel Register #7 (KR7).\r
 \r
 /**\r
   Write the current value of 64-bit Kernel Register #7 (KR7).\r
 \r

-  Writes the current value of KR7.  The 64-bit value written to \r
+  Writes the current value of KR7.  The 64-bit value written to\r

   the KR7 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR7.\r
   the KR7 is returned. This function is only available on Itanium processors.\r
 \r
   @param  Value   The 64-bit value to write to KR7.\r


@@ -5506,7 +5506,7 @@ AsmWriteKr7 (
 \r
 /**\r
   Reads the current value of Interval Timer Counter Register (ITC).\r
 \r
 /**\r
   Reads the current value of Interval Timer Counter Register (ITC).\r

-  \r
+\r

   Reads and returns the current value of ITC.\r
   This function is only available on Itanium processors.\r
 \r
   Reads and returns the current value of ITC.\r
   This function is only available on Itanium processors.\r
 \r


@@ -5522,8 +5522,8 @@ AsmReadItc (
 \r
 /**\r
   Reads the current value of Interval Timer Vector Register (ITV).\r
 \r
 /**\r
   Reads the current value of Interval Timer Vector Register (ITV).\r

-  \r
-  Reads and returns the current value of ITV. \r
+\r
+  Reads and returns the current value of ITV.\r

   This function is only available on Itanium processors.\r
 \r
   @return The current value of ITV.\r
   This function is only available on Itanium processors.\r
 \r
   @return The current value of ITV.\r


@@ -5538,7 +5538,7 @@ AsmReadItv (
 \r
 /**\r
   Reads the current value of Interval Timer Match Register (ITM).\r
 \r
 /**\r
   Reads the current value of Interval Timer Match Register (ITM).\r

-  \r
+\r

   Reads and returns the current value of ITM.\r
   This function is only available on Itanium processors.\r
 \r
   Reads and returns the current value of ITM.\r
   This function is only available on Itanium processors.\r
 \r


@@ -5553,8 +5553,8 @@ AsmReadItm (
 \r
 /**\r
   Writes the current value of 64-bit Interval Timer Counter Register (ITC).\r
 \r
 /**\r
   Writes the current value of 64-bit Interval Timer Counter Register (ITC).\r

-  \r
-  Writes the current value of ITC.  The 64-bit value written to the ITC is returned. \r
+\r
+  Writes the current value of ITC.  The 64-bit value written to the ITC is returned.\r

   This function is only available on Itanium processors.\r
 \r
   @param Value    The 64-bit value to write to ITC.\r
   This function is only available on Itanium processors.\r
 \r
   @param Value    The 64-bit value to write to ITC.\r


@@ -5571,8 +5571,8 @@ AsmWriteItc (
 \r
 /**\r
   Writes the current value of 64-bit Interval Timer Match Register (ITM).\r
 \r
 /**\r
   Writes the current value of 64-bit Interval Timer Match Register (ITM).\r

-  \r
-  Writes the current value of ITM.  The 64-bit value written to the ITM is returned. \r
+\r
+  Writes the current value of ITM.  The 64-bit value written to the ITM is returned.\r

   This function is only available on Itanium processors.\r
 \r
   @param Value    The 64-bit value to write to ITM.\r
   This function is only available on Itanium processors.\r
 \r
   @param Value    The 64-bit value to write to ITM.\r


@@ -5589,8 +5589,8 @@ AsmWriteItm (
 \r
 /**\r
   Writes the current value of 64-bit Interval Timer Vector Register (ITV).\r
 \r
 /**\r
   Writes the current value of 64-bit Interval Timer Vector Register (ITV).\r

-  \r
-  Writes the current value of ITV.  The 64-bit value written to the ITV is returned.  \r
+\r
+  Writes the current value of ITV.  The 64-bit value written to the ITV is returned.\r

   No parameter checking is performed on Value.  All bits of Value corresponding to\r
   reserved fields of ITV must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r
   No parameter checking is performed on Value.  All bits of Value corresponding to\r
   reserved fields of ITV must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r


@@ -5611,7 +5611,7 @@ AsmWriteItv (
 \r
 /**\r
   Reads the current value of Default Control Register (DCR).\r
 \r
 /**\r
   Reads the current value of Default Control Register (DCR).\r

-  \r
+\r

   Reads and returns the current value of DCR.  This function is only available on Itanium processors.\r
 \r
   @return The current value of DCR.\r
   Reads and returns the current value of DCR.  This function is only available on Itanium processors.\r
 \r
   @return The current value of DCR.\r


@@ -5626,7 +5626,7 @@ AsmReadDcr (
 \r
 /**\r
   Reads the current value of Interruption Vector Address Register (IVA).\r
 \r
 /**\r
   Reads the current value of Interruption Vector Address Register (IVA).\r

-  \r
+\r

   Reads and returns the current value of IVA.  This function is only available on Itanium processors.\r
 \r
   @return The current value of IVA.\r
   Reads and returns the current value of IVA.  This function is only available on Itanium processors.\r
 \r
   @return The current value of IVA.\r


@@ -5640,7 +5640,7 @@ AsmReadIva (
 \r
 /**\r
   Reads the current value of Page Table Address Register (PTA).\r
 \r
 /**\r
   Reads the current value of Page Table Address Register (PTA).\r

-  \r
+\r

   Reads and returns the current value of PTA.  This function is only available on Itanium processors.\r
 \r
   @return The current value of PTA.\r
   Reads and returns the current value of PTA.  This function is only available on Itanium processors.\r
 \r
   @return The current value of PTA.\r


@@ -5655,8 +5655,8 @@ AsmReadPta (
 \r
 /**\r
   Writes the current value of 64-bit Default Control Register (DCR).\r
 \r
 /**\r
   Writes the current value of 64-bit Default Control Register (DCR).\r

-  \r
-  Writes the current value of DCR.  The 64-bit value written to the DCR is returned. \r
+\r
+  Writes the current value of DCR.  The 64-bit value written to the DCR is returned.\r

   No parameter checking is performed on Value.  All bits of Value corresponding to\r
   reserved fields of DCR must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r
   No parameter checking is performed on Value.  All bits of Value corresponding to\r
   reserved fields of DCR must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r


@@ -5677,8 +5677,8 @@ AsmWriteDcr (
 \r
 /**\r
   Writes the current value of 64-bit Interruption Vector Address Register (IVA).\r
 \r
 /**\r
   Writes the current value of 64-bit Interruption Vector Address Register (IVA).\r

-  \r
-  Writes the current value of IVA.  The 64-bit value written to the IVA is returned.  \r
+\r
+  Writes the current value of IVA.  The 64-bit value written to the IVA is returned.\r

   The size of vector table is 32 K bytes and is 32 K bytes aligned\r
   the low 15 bits of Value is ignored when written.\r
   This function is only available on Itanium processors.\r
   The size of vector table is 32 K bytes and is 32 K bytes aligned\r
   the low 15 bits of Value is ignored when written.\r
   This function is only available on Itanium processors.\r


@@ -5697,8 +5697,8 @@ AsmWriteIva (
 \r
 /**\r
   Writes the current value of 64-bit Page Table Address Register (PTA).\r
 \r
 /**\r
   Writes the current value of 64-bit Page Table Address Register (PTA).\r

-  \r
-  Writes the current value of PTA.  The 64-bit value written to the PTA is returned. \r
+\r
+  Writes the current value of PTA.  The 64-bit value written to the PTA is returned.\r

   No parameter checking is performed on Value.  All bits of Value corresponding to\r
   reserved fields of DCR must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r
   No parameter checking is performed on Value.  All bits of Value corresponding to\r
   reserved fields of DCR must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r


@@ -5718,7 +5718,7 @@ AsmWritePta (
 \r
 /**\r
   Reads the current value of Local Interrupt ID Register (LID).\r
 \r
 /**\r
   Reads the current value of Local Interrupt ID Register (LID).\r

-  \r
+\r

   Reads and returns the current value of LID.  This function is only available on Itanium processors.\r
 \r
   @return The current value of LID.\r
   Reads and returns the current value of LID.  This function is only available on Itanium processors.\r
 \r
   @return The current value of LID.\r


@@ -5733,8 +5733,8 @@ AsmReadLid (
 \r
 /**\r
   Reads the current value of External Interrupt Vector Register (IVR).\r
 \r
 /**\r
   Reads the current value of External Interrupt Vector Register (IVR).\r

-  \r
-  Reads and returns the current value of IVR.  This function is only available on Itanium processors. \r
+\r
+  Reads and returns the current value of IVR.  This function is only available on Itanium processors.\r

 \r
   @return The current value of IVR.\r
 \r
 \r
   @return The current value of IVR.\r
 \r


@@ -5748,8 +5748,8 @@ AsmReadIvr (
 \r
 /**\r
   Reads the current value of Task Priority Register (TPR).\r
 \r
 /**\r
   Reads the current value of Task Priority Register (TPR).\r

-  \r
-  Reads and returns the current value of TPR.  This function is only available on Itanium processors. \r
+\r
+  Reads and returns the current value of TPR.  This function is only available on Itanium processors.\r

 \r
   @return The current value of TPR.\r
 \r
 \r
   @return The current value of TPR.\r
 \r


@@ -5763,8 +5763,8 @@ AsmReadTpr (
 \r
 /**\r
   Reads the current value of External Interrupt Request Register #0 (IRR0).\r
 \r
 /**\r
   Reads the current value of External Interrupt Request Register #0 (IRR0).\r

-  \r
-  Reads and returns the current value of IRR0.  This function is only available on Itanium processors.  \r
+\r
+  Reads and returns the current value of IRR0.  This function is only available on Itanium processors.\r

 \r
   @return The current value of IRR0.\r
 \r
 \r
   @return The current value of IRR0.\r
 \r


@@ -5778,8 +5778,8 @@ AsmReadIrr0 (
 \r
 /**\r
   Reads the current value of External Interrupt Request Register #1 (IRR1).\r
 \r
 /**\r
   Reads the current value of External Interrupt Request Register #1 (IRR1).\r

-  \r
-  Reads and returns the current value of IRR1.  This function is only available on Itanium processors. \r
+\r
+  Reads and returns the current value of IRR1.  This function is only available on Itanium processors.\r

 \r
   @return The current value of IRR1.\r
 \r
 \r
   @return The current value of IRR1.\r
 \r


@@ -5793,7 +5793,7 @@ AsmReadIrr1 (
 \r
 /**\r
   Reads the current value of External Interrupt Request Register #2 (IRR2).\r
 \r
 /**\r
   Reads the current value of External Interrupt Request Register #2 (IRR2).\r

-  \r
+\r

   Reads and returns the current value of IRR2.  This function is only available on Itanium processors.\r
 \r
   @return The current value of IRR2.\r
   Reads and returns the current value of IRR2.  This function is only available on Itanium processors.\r
 \r
   @return The current value of IRR2.\r


@@ -5808,8 +5808,8 @@ AsmReadIrr2 (
 \r
 /**\r
   Reads the current value of External Interrupt Request Register #3 (IRR3).\r
 \r
 /**\r
   Reads the current value of External Interrupt Request Register #3 (IRR3).\r

-  \r
-  Reads and returns the current value of IRR3.  This function is only available on Itanium processors.  \r
+\r
+  Reads and returns the current value of IRR3.  This function is only available on Itanium processors.\r

 \r
   @return The current value of IRR3.\r
 \r
 \r
   @return The current value of IRR3.\r
 \r


@@ -5823,8 +5823,8 @@ AsmReadIrr3 (
 \r
 /**\r
   Reads the current value of Performance Monitor Vector Register (PMV).\r
 \r
 /**\r
   Reads the current value of Performance Monitor Vector Register (PMV).\r

-  \r
-  Reads and returns the current value of PMV.  This function is only available on Itanium processors. \r
+\r
+  Reads and returns the current value of PMV.  This function is only available on Itanium processors.\r

 \r
   @return The current value of PMV.\r
 \r
 \r
   @return The current value of PMV.\r
 \r


@@ -5838,7 +5838,7 @@ AsmReadPmv (
 \r
 /**\r
   Reads the current value of Corrected Machine Check Vector Register (CMCV).\r
 \r
 /**\r
   Reads the current value of Corrected Machine Check Vector Register (CMCV).\r

-  \r
+\r

   Reads and returns the current value of CMCV.  This function is only available on Itanium processors.\r
 \r
   @return The current value of CMCV.\r
   Reads and returns the current value of CMCV.  This function is only available on Itanium processors.\r
 \r
   @return The current value of CMCV.\r


@@ -5853,8 +5853,8 @@ AsmReadCmcv (
 \r
 /**\r
   Reads the current value of Local Redirection Register #0 (LRR0).\r
 \r
 /**\r
   Reads the current value of Local Redirection Register #0 (LRR0).\r

-  \r
-  Reads and returns the current value of LRR0.  This function is only available on Itanium processors. \r
+\r
+  Reads and returns the current value of LRR0.  This function is only available on Itanium processors.\r

 \r
   @return The current value of LRR0.\r
 \r
 \r
   @return The current value of LRR0.\r
 \r


@@ -5868,7 +5868,7 @@ AsmReadLrr0 (
 \r
 /**\r
   Reads the current value of Local Redirection Register #1 (LRR1).\r
 \r
 /**\r
   Reads the current value of Local Redirection Register #1 (LRR1).\r

-  \r
+\r

   Reads and returns the current value of LRR1.  This function is only available on Itanium processors.\r
 \r
   @return The current value of LRR1.\r
   Reads and returns the current value of LRR1.  This function is only available on Itanium processors.\r
 \r
   @return The current value of LRR1.\r


@@ -5883,8 +5883,8 @@ AsmReadLrr1 (
 \r
 /**\r
   Writes the current value of 64-bit Page Local Interrupt ID Register (LID).\r
 \r
 /**\r
   Writes the current value of 64-bit Page Local Interrupt ID Register (LID).\r

-  \r
-  Writes the current value of LID.  The 64-bit value written to the LID is returned.  \r
+\r
+  Writes the current value of LID.  The 64-bit value written to the LID is returned.\r

   No parameter checking is performed on Value.  All bits of Value corresponding to\r
   reserved fields of LID must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r
   No parameter checking is performed on Value.  All bits of Value corresponding to\r
   reserved fields of LID must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r


@@ -5905,8 +5905,8 @@ AsmWriteLid (
 \r
 /**\r
   Writes the current value of 64-bit Task Priority Register (TPR).\r
 \r
 /**\r
   Writes the current value of 64-bit Task Priority Register (TPR).\r

-  \r
-  Writes the current value of TPR.  The 64-bit value written to the TPR is returned. \r
+\r
+  Writes the current value of TPR.  The 64-bit value written to the TPR is returned.\r

   No parameter checking is performed on Value.  All bits of Value corresponding to\r
   reserved fields of TPR must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r
   No parameter checking is performed on Value.  All bits of Value corresponding to\r
   reserved fields of TPR must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r


@@ -5927,7 +5927,7 @@ AsmWriteTpr (
 \r
 /**\r
   Performs a write operation on End OF External Interrupt Register (EOI).\r
 \r
 /**\r
   Performs a write operation on End OF External Interrupt Register (EOI).\r

-  \r
+\r

   Writes a value of 0 to the EOI Register.  This function is only available on Itanium processors.\r
 \r
 **/\r
   Writes a value of 0 to the EOI Register.  This function is only available on Itanium processors.\r
 \r
 **/\r


@@ -5940,8 +5940,8 @@ AsmWriteEoi (
 \r
 /**\r
   Writes the current value of 64-bit Performance Monitor Vector Register (PMV).\r
 \r
 /**\r
   Writes the current value of 64-bit Performance Monitor Vector Register (PMV).\r

-  \r
-  Writes the current value of PMV.  The 64-bit value written to the PMV is returned.  \r
+\r
+  Writes the current value of PMV.  The 64-bit value written to the PMV is returned.\r

   No parameter checking is performed on Value.  All bits of Value corresponding\r
   to reserved fields of PMV must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r
   No parameter checking is performed on Value.  All bits of Value corresponding\r
   to reserved fields of PMV must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r


@@ -5962,8 +5962,8 @@ AsmWritePmv (
 \r
 /**\r
   Writes the current value of 64-bit Corrected Machine Check Vector Register (CMCV).\r
 \r
 /**\r
   Writes the current value of 64-bit Corrected Machine Check Vector Register (CMCV).\r

-  \r
-  Writes the current value of CMCV.  The 64-bit value written to the CMCV is returned. \r
+\r
+  Writes the current value of CMCV.  The 64-bit value written to the CMCV is returned.\r

   No parameter checking is performed on Value.  All bits of Value corresponding\r
   to reserved fields of CMCV must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r
   No parameter checking is performed on Value.  All bits of Value corresponding\r
   to reserved fields of CMCV must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r


@@ -5984,8 +5984,8 @@ AsmWriteCmcv (
 \r
 /**\r
   Writes the current value of 64-bit Local Redirection Register #0 (LRR0).\r
 \r
 /**\r
   Writes the current value of 64-bit Local Redirection Register #0 (LRR0).\r

-  \r
-  Writes the current value of LRR0.  The 64-bit value written to the LRR0 is returned.  \r
+\r
+  Writes the current value of LRR0.  The 64-bit value written to the LRR0 is returned.\r

   No parameter checking is performed on Value.  All bits of Value corresponding\r
   to reserved fields of LRR0 must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r
   No parameter checking is performed on Value.  All bits of Value corresponding\r
   to reserved fields of LRR0 must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must set up\r


@@ -6006,8 +6006,8 @@ AsmWriteLrr0 (
 \r
 /**\r
   Writes the current value of 64-bit Local Redirection Register #1 (LRR1).\r
 \r
 /**\r
   Writes the current value of 64-bit Local Redirection Register #1 (LRR1).\r

-  \r
-  Writes the current value of LRR1.  The 64-bit value written to the LRR1 is returned. \r
+\r
+  Writes the current value of LRR1.  The 64-bit value written to the LRR1 is returned.\r

   No parameter checking is performed on Value.  All bits of Value corresponding\r
   to reserved fields of LRR1 must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must\r
   No parameter checking is performed on Value.  All bits of Value corresponding\r
   to reserved fields of LRR1 must be 0 or a Reserved Register/Field fault may occur.\r
   The caller must either guarantee that Value is valid, or the caller must\r


@@ -6028,7 +6028,7 @@ AsmWriteLrr1 (
 \r
 /**\r
   Reads the current value of Instruction Breakpoint Register (IBR).\r
 \r
 /**\r
   Reads the current value of Instruction Breakpoint Register (IBR).\r

-  \r
+\r

   The Instruction Breakpoint Registers are used in pairs.  The even numbered\r
   registers contain breakpoint addresses, and the odd numbered registers contain\r
   breakpoint mask conditions.  At least four instruction registers pairs are implemented\r
   The Instruction Breakpoint Registers are used in pairs.  The even numbered\r
   registers contain breakpoint addresses, and the odd numbered registers contain\r
   breakpoint mask conditions.  At least four instruction registers pairs are implemented\r


@@ -6321,9 +6321,9 @@ AsmReadSp (
 /**\r
   Reads a 64-bit control register.\r
 \r
 /**\r
   Reads a 64-bit control register.\r
 \r

-  Reads and returns the control register specified by Index. The valid Index valued \r
+  Reads and returns the control register specified by Index. The valid Index valued\r

   are defined above in "Related Definitions".\r
   are defined above in "Related Definitions".\r

-  If Index is invalid then 0xFFFFFFFFFFFFFFFF is returned.  This function is only \r
+  If Index is invalid then 0xFFFFFFFFFFFFFFFF is returned.  This function is only\r

   available on Itanium processors.\r
 \r
   @param  Index                     The index of the control register to read.\r
   available on Itanium processors.\r
 \r
   @param  Index                     The index of the control register to read.\r


@@ -6372,9 +6372,9 @@ AsmReadControlRegister (
 /**\r
   Reads a 64-bit application register.\r
 \r
 /**\r
   Reads a 64-bit application register.\r
 \r

-  Reads and returns the application register specified by Index. The valid Index \r
+  Reads and returns the application register specified by Index. The valid Index\r

   valued are defined above in "Related Definitions".\r
   valued are defined above in "Related Definitions".\r

-  If Index is invalid then 0xFFFFFFFFFFFFFFFF is returned.  This function is only \r
+  If Index is invalid then 0xFFFFFFFFFFFFFFFF is returned.  This function is only\r

   available on Itanium processors.\r
 \r
   @param  Index                     The index of the application register to read.\r
   available on Itanium processors.\r
 \r
   @param  Index                     The index of the application register to read.\r


@@ -6400,13 +6400,13 @@ AsmReadApplicationRegister (
 \r
   @param  Index                     The 8-bit Machine Specific Register index to read.\r
 \r
 \r
   @param  Index                     The 8-bit Machine Specific Register index to read.\r
 \r

-  @return The current value of the Machine Specific Register specified by Index.  \r
+  @return The current value of the Machine Specific Register specified by Index.\r

 \r
 **/\r
 UINT64\r
 EFIAPI\r
 AsmReadMsr (\r
 \r
 **/\r
 UINT64\r
 EFIAPI\r
 AsmReadMsr (\r

-  IN UINT8   Index  \r
+  IN UINT8   Index\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -6422,14 +6422,14 @@ AsmReadMsr (
   @param  Index                     The 8-bit Machine Specific Register index to write.\r
   @param  Value                     The 64-bit value to write to the Machine Specific Register.\r
 \r
   @param  Index                     The 8-bit Machine Specific Register index to write.\r
   @param  Value                     The 64-bit value to write to the Machine Specific Register.\r
 \r

-  @return The 64-bit value to write to the Machine Specific Register.  \r
+  @return The 64-bit value to write to the Machine Specific Register.\r

 \r
 **/\r
 UINT64\r
 EFIAPI\r
 AsmWriteMsr (\r
 \r
 **/\r
 UINT64\r
 EFIAPI\r
 AsmWriteMsr (\r

-  IN UINT8   Index, \r
-  IN UINT64  Value  \r
+  IN UINT8   Index,\r
+  IN UINT64  Value\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -6749,7 +6749,7 @@ typedef union {
   struct {\r
     UINT64  Uint64;\r
     UINT64  Uint64_1;\r
   struct {\r
     UINT64  Uint64;\r
     UINT64  Uint64_1;\r

-  } Uint128;   \r
+  } Uint128;\r

 } IA32_IDT_GATE_DESCRIPTOR;\r
 \r
 #pragma pack (1)\r
 } IA32_IDT_GATE_DESCRIPTOR;\r
 \r
 #pragma pack (1)\r


@@ -7171,8 +7171,8 @@ AsmMsrBitFieldRead32 (
   Writes Value to a bit field in the lower 32-bits of a 64-bit MSR. The bit\r
   field is specified by the StartBit and the EndBit. All other bits in the\r
   destination MSR are preserved. The lower 32-bits of the MSR written is\r
   Writes Value to a bit field in the lower 32-bits of a 64-bit MSR. The bit\r
   field is specified by the StartBit and the EndBit. All other bits in the\r
   destination MSR are preserved. The lower 32-bits of the MSR written is\r

-  returned. The caller must either guarantee that Index and the data written \r
-  is valid, or the caller must set up exception handlers to catch the exceptions. \r
+  returned. The caller must either guarantee that Index and the data written\r
+  is valid, or the caller must set up exception handlers to catch the exceptions.\r

   This function is only available on IA-32 and x64.\r
 \r
   If StartBit is greater than 31, then ASSERT().\r
   This function is only available on IA-32 and x64.\r
 \r
   If StartBit is greater than 31, then ASSERT().\r


@@ -7415,7 +7415,7 @@ AsmMsrAnd64 (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Reads a 64-bit MSR, performs a bitwise AND followed by a bitwise \r
+  Reads a 64-bit MSR, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 64-bit MSR.\r
 \r
   Reads the 64-bit MSR specified by Index, performs a bitwise AND between read\r
   OR, and writes the result back to the 64-bit MSR.\r
 \r
   Reads the 64-bit MSR specified by Index, performs a bitwise AND between read\r


@@ -7480,8 +7480,8 @@ AsmMsrBitFieldRead64 (
 \r
   Writes Value to a bit field in a 64-bit MSR. The bit field is specified by\r
   the StartBit and the EndBit. All other bits in the destination MSR are\r
 \r
   Writes Value to a bit field in a 64-bit MSR. The bit field is specified by\r
   the StartBit and the EndBit. All other bits in the destination MSR are\r

-  preserved. The MSR written is returned. The caller must either guarantee \r
-  that Index and the data written is valid, or the caller must set up exception \r
+  preserved. The MSR written is returned. The caller must either guarantee\r
+  that Index and the data written is valid, or the caller must set up exception\r

   handlers to catch the exceptions. This function is only available on IA-32 and x64.\r
 \r
   If StartBit is greater than 63, then ASSERT().\r
   handlers to catch the exceptions. This function is only available on IA-32 and x64.\r
 \r
   If StartBit is greater than 63, then ASSERT().\r


@@ -8893,7 +8893,7 @@ AsmDisablePaging64 (
   in ExtraStackSize. If parameters are passed to the 16-bit real mode code,\r
   then the actual minimum stack size is ExtraStackSize plus the maximum number\r
   of bytes that need to be passed to the 16-bit real mode code.\r
   in ExtraStackSize. If parameters are passed to the 16-bit real mode code,\r
   then the actual minimum stack size is ExtraStackSize plus the maximum number\r
   of bytes that need to be passed to the 16-bit real mode code.\r

-  \r
+\r

   If RealModeBufferSize is NULL, then ASSERT().\r
   If ExtraStackSize is NULL, then ASSERT().\r
 \r
   If RealModeBufferSize is NULL, then ASSERT().\r
   If ExtraStackSize is NULL, then ASSERT().\r
 \r


@@ -8917,7 +8917,7 @@ AsmGetThunk16Properties (
   Prepares all structures a code required to use AsmThunk16().\r
 \r
   Prepares all structures and code required to use AsmThunk16().\r
   Prepares all structures a code required to use AsmThunk16().\r
 \r
   Prepares all structures and code required to use AsmThunk16().\r

-  \r
+\r

   This interface is limited to be used in either physical mode or virtual modes with paging enabled where the\r
   virtual to physical mappings for ThunkContext.RealModeBuffer is mapped 1:1.\r
 \r
   This interface is limited to be used in either physical mode or virtual modes with paging enabled where the\r
   virtual to physical mappings for ThunkContext.RealModeBuffer is mapped 1:1.\r
 \r


@@ -8941,43 +8941,43 @@ AsmPrepareThunk16 (
   AsmPrepareThunk16() must be called with ThunkContext before this function is used.\r
   This function must be called with interrupts disabled.\r
 \r
   AsmPrepareThunk16() must be called with ThunkContext before this function is used.\r
   This function must be called with interrupts disabled.\r
 \r

-  The register state from the RealModeState field of ThunkContext is restored just prior \r
-  to calling the 16-bit real mode entry point.  This includes the EFLAGS field of RealModeState, \r
+  The register state from the RealModeState field of ThunkContext is restored just prior\r
+  to calling the 16-bit real mode entry point.  This includes the EFLAGS field of RealModeState,\r

   which is used to set the interrupt state when a 16-bit real mode entry point is called.\r
   Control is transferred to the 16-bit real mode entry point specified by the CS and Eip fields of RealModeState.\r
   which is used to set the interrupt state when a 16-bit real mode entry point is called.\r
   Control is transferred to the 16-bit real mode entry point specified by the CS and Eip fields of RealModeState.\r

-  The stack is initialized to the SS and ESP fields of RealModeState.  Any parameters passed to \r
-  the 16-bit real mode code must be populated by the caller at SS:ESP prior to calling this function.  \r
+  The stack is initialized to the SS and ESP fields of RealModeState.  Any parameters passed to\r
+  the 16-bit real mode code must be populated by the caller at SS:ESP prior to calling this function.\r

   The 16-bit real mode entry point is invoked with a 16-bit CALL FAR instruction,\r
   The 16-bit real mode entry point is invoked with a 16-bit CALL FAR instruction,\r

-  so when accessing stack contents, the 16-bit real mode code must account for the 16-bit segment \r
-  and 16-bit offset of the return address that were pushed onto the stack. The 16-bit real mode entry \r
-  point must exit with a RETF instruction. The register state is captured into RealModeState immediately \r
+  so when accessing stack contents, the 16-bit real mode code must account for the 16-bit segment\r
+  and 16-bit offset of the return address that were pushed onto the stack. The 16-bit real mode entry\r
+  point must exit with a RETF instruction. The register state is captured into RealModeState immediately\r

   after the RETF instruction is executed.\r
   after the RETF instruction is executed.\r

-  \r
-  If EFLAGS specifies interrupts enabled, or any of the 16-bit real mode code enables interrupts, \r
-  or any of the 16-bit real mode code makes a SW interrupt, then the caller is responsible for making sure \r
-  the IDT at address 0 is initialized to handle any HW or SW interrupts that may occur while in 16-bit real mode. \r
-  \r
-  If EFLAGS specifies interrupts enabled, or any of the 16-bit real mode code enables interrupts, \r
-  then the caller is responsible for making sure the 8259 PIC is in a state compatible with 16-bit real mode.  \r
+\r
+  If EFLAGS specifies interrupts enabled, or any of the 16-bit real mode code enables interrupts,\r
+  or any of the 16-bit real mode code makes a SW interrupt, then the caller is responsible for making sure\r
+  the IDT at address 0 is initialized to handle any HW or SW interrupts that may occur while in 16-bit real mode.\r
+\r
+  If EFLAGS specifies interrupts enabled, or any of the 16-bit real mode code enables interrupts,\r
+  then the caller is responsible for making sure the 8259 PIC is in a state compatible with 16-bit real mode.\r

   This includes the base vectors, the interrupt masks, and the edge/level trigger mode.\r
   This includes the base vectors, the interrupt masks, and the edge/level trigger mode.\r

-  \r
-  If THUNK_ATTRIBUTE_BIG_REAL_MODE is set in the ThunkAttributes field of ThunkContext, then the user code \r
+\r
+  If THUNK_ATTRIBUTE_BIG_REAL_MODE is set in the ThunkAttributes field of ThunkContext, then the user code\r

   is invoked in big real mode.  Otherwise, the user code is invoked in 16-bit real mode with 64KB segment limits.\r
   is invoked in big real mode.  Otherwise, the user code is invoked in 16-bit real mode with 64KB segment limits.\r

-  \r
-  If neither THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 nor THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL are set in \r
-  ThunkAttributes, then it is assumed that the user code did not enable the A20 mask, and no attempt is made to \r
+\r
+  If neither THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 nor THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL are set in\r
+  ThunkAttributes, then it is assumed that the user code did not enable the A20 mask, and no attempt is made to\r

   disable the A20 mask.\r
   disable the A20 mask.\r

-  \r
-  If THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 is set and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL is clear in \r
-  ThunkAttributes, then attempt to use the INT 15 service to disable the A20 mask.  If this INT 15 call fails, \r
+\r
+  If THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 is set and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL is clear in\r
+  ThunkAttributes, then attempt to use the INT 15 service to disable the A20 mask.  If this INT 15 call fails,\r

   then attempt to disable the A20 mask by directly accessing the 8042 keyboard controller I/O ports.\r
   then attempt to disable the A20 mask by directly accessing the 8042 keyboard controller I/O ports.\r

-  \r
-  If THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 is clear and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL is set in \r
+\r
+  If THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 is clear and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL is set in\r

   ThunkAttributes, then attempt to disable the A20 mask by directly accessing the 8042 keyboard controller I/O ports.\r
   ThunkAttributes, then attempt to disable the A20 mask by directly accessing the 8042 keyboard controller I/O ports.\r

-    \r
+\r

   If ThunkContext is NULL, then ASSERT().\r
   If AsmPrepareThunk16() was not previously called with ThunkContext, then ASSERT().\r
   If ThunkContext is NULL, then ASSERT().\r
   If AsmPrepareThunk16() was not previously called with ThunkContext, then ASSERT().\r

-  If both THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL are set in \r
+  If both THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL are set in\r

   ThunkAttributes, then ASSERT().\r
 \r
   This interface is limited to be used in either physical mode or virtual modes with paging enabled where the\r
   ThunkAttributes, then ASSERT().\r
 \r
   This interface is limited to be used in either physical mode or virtual modes with paging enabled where the\r

diff --git a/MdePkg/Include/Library/BaseMemoryLib.h b/MdePkg/Include/Library/BaseMemoryLib.h
index 0e565c15427ada29f788cb8c88b3826e55a98783..f865e8a59a48278cb3943b97b305ece13b6207ce 100644 (file)
--- a/MdePkg/Include/Library/BaseMemoryLib.h
+++ b/MdePkg/Include/Library/BaseMemoryLib.h
@@ -1,13 +1,13 @@
 /** @file\r
   Provides copy memory, fill memory, zero memory, and GUID functions.\r
 /** @file\r
   Provides copy memory, fill memory, zero memory, and GUID functions.\r

-   \r
-  The Base Memory Library provides optimized implementations for common memory-based operations. \r
-  These functions should be used in place of coding your own loops to do equivalent common functions. \r
-  This allows optimized library implementations to help increase performance. \r
-\r
-Copyright (c) 2006 - 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
+\r
+  The Base Memory Library provides optimized implementations for common memory-based operations.\r
+  These functions should be used in place of coding your own loops to do equivalent common functions.\r
+  This allows optimized library implementations to help increase performance.\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
 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


@@ -25,7 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r


@@ -48,7 +48,7 @@ CopyMem (
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r


@@ -178,7 +178,7 @@ SetMemN (
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r


@@ -202,7 +202,7 @@ ZeroMem (
   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 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r


@@ -215,7 +215,7 @@ ZeroMem (
   @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


@@ -233,7 +233,7 @@ CompareMem (
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r


@@ -260,7 +260,7 @@ ScanMem8 (
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -289,7 +289,7 @@ ScanMem16 (
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -318,7 +318,7 @@ ScanMem32 (
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r


@@ -340,14 +340,14 @@ ScanMem64 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching \r
+  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching\r

   UINTN sized value in the target buffer.\r
 \r
   This function searches target the buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   UINTN sized value in the target buffer.\r
 \r
   This function searches target the buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r


@@ -367,13 +367,13 @@ ScanMemN (
   IN UINTN       Length,\r
   IN UINTN       Value\r
   );\r
   IN UINTN       Length,\r
   IN UINTN       Value\r
   );\r

-  \r
+\r

 /**\r
   Copies a source GUID to a destination GUID.\r
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r
 /**\r
   Copies a source GUID to a destination GUID.\r
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r

-  \r
+\r

   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r
   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r


@@ -395,7 +395,7 @@ CopyGuid (
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r

-  \r
+\r

   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r
   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r


@@ -422,7 +422,7 @@ CompareGuid (
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Include/Library/CacheMaintenanceLib.h b/MdePkg/Include/Library/CacheMaintenanceLib.h
index 48e0fe5a1cf804d236255025f9c29f8f40772c69..9a0170dbd83f36e789af937e859fbdd4c1e46bed 100644 (file)
--- a/MdePkg/Include/Library/CacheMaintenanceLib.h
+++ b/MdePkg/Include/Library/CacheMaintenanceLib.h
@@ -1,10 +1,10 @@
 /** @file\r
   Provides services to maintain instruction and data caches.\r
 /** @file\r
   Provides services to maintain instruction and data caches.\r

-  \r
+\r

   The Cache Maintenance Library provides abstractions for basic processor cache operations.\r
   It removes the need to use assembly in C code.\r
   The Cache Maintenance Library provides abstractions for basic processor cache operations.\r
   It removes the need to use assembly in C code.\r

-    \r
-Copyright (c) 2006 - 2008, 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/MdePkg/Include/Library/CpuLib.h b/MdePkg/Include/Library/CpuLib.h
index 100020a6726902d35a2b616135aac29f4ef42c33..3f69b1fccc67c84400b893d809f778729e686bcb 100644 (file)
--- a/MdePkg/Include/Library/CpuLib.h
+++ b/MdePkg/Include/Library/CpuLib.h
@@ -1,13 +1,13 @@
 /** @file\r
   Provides CPU architecture specific functions that can not be defined\r
   in the Base Library due to dependencies on the PAL Library\r
 /** @file\r
   Provides CPU architecture specific functions that can not be defined\r
   in the Base Library due to dependencies on the PAL Library\r

-  \r
+\r

   The CPU Library provides services to flush CPU TLBs and place the CPU in a sleep state.\r
   The implementation of these services on Itanium processors requires the use of PAL Calls.\r
   PAL Calls require PEI and DXE specific mechanisms to look up PAL Entry Point.\r
   As a result, these services could not be defined in the Base Library.\r
 \r
   The CPU Library provides services to flush CPU TLBs and place the CPU in a sleep state.\r
   The implementation of these services on Itanium processors requires the use of PAL Calls.\r
   PAL Calls require PEI and DXE specific mechanisms to look up PAL Entry Point.\r
   As a result, these services could not be defined in the Base Library.\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

diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
index 3a910e6a208b71d57786fa2685aa49d641044cec..e6a7a357b2cd574a597f567047daed87b83c929c 100644 (file)
--- a/MdePkg/Include/Library/DebugLib.h
+++ b/MdePkg/Include/Library/DebugLib.h
@@ -1,6 +1,6 @@
 /** @file\r
   Provides services to print debug and assert messages to a debug output device.\r
 /** @file\r
   Provides services to print debug and assert messages to a debug output device.\r

-  \r
+\r

   The Debug library supports debug print and asserts based on a combination of macros and code.\r
   The debug library can be turned on and off so that the debug code does not increase the size of an image.\r
 \r
   The Debug library supports debug print and asserts based on a combination of macros and code.\r
   The debug library can be turned on and off so that the debug code does not increase the size of an image.\r
 \r


@@ -8,9 +8,9 @@
   of size reduction when compiler optimization is disabled. If MDEPKG_NDEBUG is\r
   defined, then debug and assert related macros wrapped by it are the NULL implementations.\r
 \r
   of size reduction when compiler optimization is disabled. If MDEPKG_NDEBUG is\r
   defined, then debug and assert related macros wrapped by it are the NULL implementations.\r
 \r

-Copyright (c) 2006 - 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) 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
 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


@@ -80,15 +80,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\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
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      The format string for the debug message to print.\r
   associated variable argument list to the debug output device.\r
 \r
   If Format is NULL, then ASSERT().\r
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      The format string for the debug message to print.\r

-  @param  ...         The variable argument list whose contents are accessed \r
+  @param  ...         The 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


@@ -102,14 +102,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


@@ -134,14 +134,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  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r
 \r
   @param   Buffer  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r

-  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. \r
+  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue.\r

 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r
 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r


@@ -157,7 +157,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


@@ -171,10 +171,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


@@ -188,10 +188,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


@@ -205,10 +205,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


@@ -236,7 +236,7 @@ DebugPrintLevelEnabled (
   IN  CONST UINTN        ErrorLevel\r
   );\r
 \r
   IN  CONST UINTN        ErrorLevel\r
   );\r
 \r

-/**  \r
+/**\r

   Internal worker macro that calls DebugAssert().\r
 \r
   This macro calls DebugAssert(), passing in the filename, line number, and an\r
   Internal worker macro that calls DebugAssert().\r
 \r
   This macro calls DebugAssert(), passing in the filename, line number, and an\r


@@ -248,15 +248,15 @@ DebugPrintLevelEnabled (
 #define _ASSERT(Expression)  DebugAssert (__FILE__, __LINE__, #Expression)\r
 \r
 \r
 #define _ASSERT(Expression)  DebugAssert (__FILE__, __LINE__, #Expression)\r
 \r
 \r

-/**  \r
+/**\r

   Internal worker macro that calls DebugPrint().\r
 \r
   Internal worker macro that calls DebugPrint().\r
 \r

-  This macro calls DebugPrint() passing in the debug error level, a format \r
+  This macro calls DebugPrint() passing in the debug error level, a format\r

   string, and a variable argument list.\r
   __VA_ARGS__ is not supported by EBC compiler, Microsoft Visual Studio .NET 2003\r
   and Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830.\r
 \r
   string, and a variable argument list.\r
   __VA_ARGS__ is not supported by EBC compiler, Microsoft Visual Studio .NET 2003\r
   and Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830.\r
 \r

-  @param  Expression  Expression containing an error level, a format string, \r
+  @param  Expression  Expression containing an error level, a format string,\r

                       and a variable argument list based on the format string.\r
 \r
 **/\r
                       and a variable argument list based on the format string.\r
 \r
 **/\r


@@ -273,19 +273,19 @@ DebugPrintLevelEnabled (
 #define _DEBUG(Expression)   DebugPrint Expression\r
 #endif\r
 \r
 #define _DEBUG(Expression)   DebugPrint Expression\r
 #endif\r
 \r

-/**  \r
+/**\r

   Macro that calls DebugAssert() if an expression evaluates to FALSE.\r
 \r
   Macro that calls DebugAssert() if an expression evaluates to FALSE.\r
 \r

-  If MDEPKG_NDEBUG is not defined and the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED \r
-  bit of PcdDebugProperyMask is set, then this macro evaluates the Boolean \r
-  expression specified by Expression.  If Expression evaluates to FALSE, then \r
-  DebugAssert() is called passing in the source filename, source line number, \r
+  If MDEPKG_NDEBUG is not defined and the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED\r
+  bit of PcdDebugProperyMask is set, then this macro evaluates the Boolean\r
+  expression specified by Expression.  If Expression evaluates to FALSE, then\r
+  DebugAssert() is called passing in the source filename, source line number,\r

   and Expression.\r
 \r
   @param  Expression  Boolean expression.\r
 \r
 **/\r
   and Expression.\r
 \r
   @param  Expression  Boolean expression.\r
 \r
 **/\r

-#if !defined(MDEPKG_NDEBUG)       \r
+#if !defined(MDEPKG_NDEBUG)\r

   #define ASSERT(Expression)        \\r
     do {                            \\r
       if (DebugAssertEnabled ()) {  \\r
   #define ASSERT(Expression)        \\r
     do {                            \\r
       if (DebugAssertEnabled ()) {  \\r


@@ -299,19 +299,19 @@ DebugPrintLevelEnabled (
   #define ASSERT(Expression)\r
 #endif\r
 \r
   #define ASSERT(Expression)\r
 #endif\r
 \r

-/**  \r
+/**\r

   Macro that calls DebugPrint().\r
 \r
   Macro that calls DebugPrint().\r
 \r

-  If MDEPKG_NDEBUG is not defined and the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED \r
-  bit of PcdDebugProperyMask is set, then this macro passes Expression to \r
+  If MDEPKG_NDEBUG is not defined and the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED\r
+  bit of PcdDebugProperyMask is set, then this macro passes Expression to\r

   DebugPrint().\r
 \r
   DebugPrint().\r
 \r

-  @param  Expression  Expression containing an error level, a format string, \r
+  @param  Expression  Expression containing an error level, a format string,\r

                       and a variable argument list based on the format string.\r
                       and a variable argument list based on the format string.\r

-  \r
+\r

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

-#if !defined(MDEPKG_NDEBUG)      \r
+#if !defined(MDEPKG_NDEBUG)\r

   #define DEBUG(Expression)        \\r
     do {                           \\r
       if (DebugPrintEnabled ()) {  \\r
   #define DEBUG(Expression)        \\r
     do {                           \\r
       if (DebugPrintEnabled ()) {  \\r


@@ -322,13 +322,13 @@ DebugPrintLevelEnabled (
   #define DEBUG(Expression)\r
 #endif\r
 \r
   #define DEBUG(Expression)\r
 #endif\r
 \r

-/**  \r
+/**\r

   Macro that calls DebugAssert() if an EFI_STATUS evaluates to an error code.\r
 \r
   Macro that calls DebugAssert() if an EFI_STATUS evaluates to an error code.\r
 \r

-  If MDEPKG_NDEBUG is not defined and the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED \r
-  bit of PcdDebugProperyMask is set, then this macro evaluates the EFI_STATUS \r
-  value specified by StatusParameter.  If StatusParameter is an error code, \r
-  then DebugAssert() is called passing in the source filename, source line \r
+  If MDEPKG_NDEBUG is not defined and the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED\r
+  bit of PcdDebugProperyMask is set, then this macro evaluates the EFI_STATUS\r
+  value specified by StatusParameter.  If StatusParameter is an error code,\r
+  then DebugAssert() is called passing in the source filename, source line\r

   number, and StatusParameter.\r
 \r
   @param  StatusParameter  EFI_STATUS value to evaluate.\r
   number, and StatusParameter.\r
 \r
   @param  StatusParameter  EFI_STATUS value to evaluate.\r


@@ -375,23 +375,23 @@ DebugPrintLevelEnabled (
   #define ASSERT_RETURN_ERROR(StatusParameter)\r
 #endif\r
 \r
   #define ASSERT_RETURN_ERROR(StatusParameter)\r
 #endif\r
 \r

-/**  \r
-  Macro that calls DebugAssert() if a protocol is already installed in the \r
+/**\r
+  Macro that calls DebugAssert() if a protocol is already installed in the\r

   handle database.\r
 \r
   handle database.\r
 \r

-  If MDEPKG_NDEBUG is defined or the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit \r
+  If MDEPKG_NDEBUG is defined or the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit\r

   of PcdDebugProperyMask is clear, then return.\r
 \r
   of PcdDebugProperyMask is clear, then return.\r
 \r

-  If Handle is NULL, then a check is made to see if the protocol specified by Guid \r
-  is present on any handle in the handle database.  If Handle is not NULL, then \r
-  a check is made to see if the protocol specified by Guid is present on the \r
-  handle specified by Handle.  If the check finds the protocol, then DebugAssert() \r
+  If Handle is NULL, then a check is made to see if the protocol specified by Guid\r
+  is present on any handle in the handle database.  If Handle is not NULL, then\r
+  a check is made to see if the protocol specified by Guid is present on the\r
+  handle specified by Handle.  If the check finds the protocol, then DebugAssert()\r

   is called passing in the source filename, source line number, and Guid.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   is called passing in the source filename, source line number, and Guid.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param  Handle  The handle to check for the protocol.  This is an optional \r
-                  parameter that may be NULL.  If it is NULL, then the entire \r
+  @param  Handle  The handle to check for the protocol.  This is an optional\r
+                  parameter that may be NULL.  If it is NULL, then the entire\r

                   handle database is searched.\r
 \r
   @param  Guid    The pointer to a protocol GUID.\r
                   handle database is searched.\r
 \r
   @param  Guid    The pointer to a protocol GUID.\r


@@ -421,32 +421,32 @@ DebugPrintLevelEnabled (
 /**\r
   Macro that marks the beginning of debug source code.\r
 \r
 /**\r
   Macro that marks the beginning of debug source code.\r
 \r

-  If the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set, \r
+  If the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set,\r

   then this macro marks the beginning of source code that is included in a module.\r
   then this macro marks the beginning of source code that is included in a module.\r

-  Otherwise, the source lines between DEBUG_CODE_BEGIN() and DEBUG_CODE_END() \r
+  Otherwise, the source lines between DEBUG_CODE_BEGIN() and DEBUG_CODE_END()\r

   are not included in a module.\r
 \r
 **/\r
 #define DEBUG_CODE_BEGIN()  do { if (DebugCodeEnabled ()) { UINT8  __DebugCodeLocal\r
 \r
 \r
   are not included in a module.\r
 \r
 **/\r
 #define DEBUG_CODE_BEGIN()  do { if (DebugCodeEnabled ()) { UINT8  __DebugCodeLocal\r
 \r
 \r

-/**  \r
+/**\r

   The macro that marks the end of debug source code.\r
 \r
   The macro that marks the end of debug source code.\r
 \r

-  If the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set, \r
-  then this macro marks the end of source code that is included in a module.  \r
-  Otherwise, the source lines between DEBUG_CODE_BEGIN() and DEBUG_CODE_END() \r
+  If the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set,\r
+  then this macro marks the end of source code that is included in a module.\r
+  Otherwise, the source lines between DEBUG_CODE_BEGIN() and DEBUG_CODE_END()\r

   are not included in a module.\r
 \r
 **/\r
 #define DEBUG_CODE_END()    __DebugCodeLocal = 0; __DebugCodeLocal++; } } while (FALSE)\r
 \r
 \r
   are not included in a module.\r
 \r
 **/\r
 #define DEBUG_CODE_END()    __DebugCodeLocal = 0; __DebugCodeLocal++; } } while (FALSE)\r
 \r
 \r

-/**  \r
+/**\r

   The macro that declares a section of debug source code.\r
 \r
   The macro that declares a section of debug source code.\r
 \r

-  If the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set, \r
-  then the source code specified by Expression is included in a module.  \r
+  If the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set,\r
+  then the source code specified by Expression is included in a module.\r

   Otherwise, the source specified by Expression is not included in a module.\r
 \r
 **/\r
   Otherwise, the source specified by Expression is not included in a module.\r
 \r
 **/\r


@@ -456,10 +456,10 @@ DebugPrintLevelEnabled (
   DEBUG_CODE_END ()\r
 \r
 \r
   DEBUG_CODE_END ()\r
 \r
 \r

-/**  \r
+/**\r

   The macro that calls DebugClearMemory() to clear a buffer to a default value.\r
 \r
   The macro that calls DebugClearMemory() to clear a buffer to a default value.\r
 \r

-  If the DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set, \r
+  If the DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set,\r

   then this macro calls DebugClearMemory() passing in Address and Length.\r
 \r
   @param  Address  The pointer to a buffer.\r
   then this macro calls DebugClearMemory() passing in Address and Length.\r
 \r
   @param  Address  The pointer to a buffer.\r


@@ -475,42 +475,42 @@ DebugPrintLevelEnabled (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Macro that calls DebugAssert() if the containing record does not have a \r
-  matching signature.  If the signatures matches, then a pointer to the data \r
-  structure that contains a specified field of that data structure is returned.  \r
-  This is a lightweight method hide information by placing a public data \r
-  structure inside a larger private data structure and using a pointer to the \r
+  Macro that calls DebugAssert() if the containing record does not have a\r
+  matching signature.  If the signatures matches, then a pointer to the data\r
+  structure that contains a specified field of that data structure is returned.\r
+  This is a lightweight method hide information by placing a public data\r
+  structure inside a larger private data structure and using a pointer to the\r

   public data structure to retrieve a pointer to the private data structure.\r
 \r
   public data structure to retrieve a pointer to the private data structure.\r
 \r

-  If MDEPKG_NDEBUG is defined or the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit \r
+  If MDEPKG_NDEBUG is defined or the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit\r

   of PcdDebugProperyMask is clear, then this macro computes the offset, in bytes,\r
   of PcdDebugProperyMask is clear, then this macro computes the offset, in bytes,\r

-  of the field specified by Field from the beginning of the data structure specified \r
-  by TYPE.  This offset is subtracted from Record, and is used to return a pointer \r
+  of the field specified by Field from the beginning of the data structure specified\r
+  by TYPE.  This offset is subtracted from Record, and is used to return a pointer\r

   to a data structure of the type specified by TYPE.\r
 \r
   If MDEPKG_NDEBUG is not defined and the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit\r
   to a data structure of the type specified by TYPE.\r
 \r
   If MDEPKG_NDEBUG is not defined and the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit\r

-  of PcdDebugProperyMask is set, then this macro computes the offset, in bytes, \r
-  of field specified by Field from the beginning of the data structure specified \r
+  of PcdDebugProperyMask is set, then this macro computes the offset, in bytes,\r
+  of field specified by Field from the beginning of the data structure specified\r

   by TYPE.  This offset is subtracted from Record, and is used to compute a pointer\r
   by TYPE.  This offset is subtracted from Record, and is used to compute a pointer\r

-  to a data structure of the type specified by TYPE.  The Signature field of the \r
-  data structure specified by TYPE is compared to TestSignature.  If the signatures \r
-  match, then a pointer to the pointer to a data structure of the type specified by \r
-  TYPE is returned.  If the signatures do not match, then DebugAssert() is called \r
-  with a description of "CR has a bad signature" and Record is returned.  \r
+  to a data structure of the type specified by TYPE.  The Signature field of the\r
+  data structure specified by TYPE is compared to TestSignature.  If the signatures\r
+  match, then a pointer to the pointer to a data structure of the type specified by\r
+  TYPE is returned.  If the signatures do not match, then DebugAssert() is called\r
+  with a description of "CR has a bad signature" and Record is returned.\r

 \r
 \r

-  If the data type specified by TYPE does not contain the field specified by Field, \r
+  If the data type specified by TYPE does not contain the field specified by Field,\r

   then the module will not compile.\r
 \r
   then the module will not compile.\r
 \r

-  If TYPE does not contain a field called Signature, then the module will not \r
+  If TYPE does not contain a field called Signature, then the module will not\r

   compile.\r
 \r
   compile.\r
 \r

-  @param  Record         The pointer to the field specified by Field within a data \r
+  @param  Record         The pointer to the field specified by Field within a data\r

                          structure of type TYPE.\r
 \r
                          structure of type TYPE.\r
 \r

-  @param  TYPE           The name of the data structure type to return  This \r
-                         data structure must contain the field specified by Field. \r
+  @param  TYPE           The name of the data structure type to return  This\r
+                         data structure must contain the field specified by Field.\r

 \r
 \r

-  @param  Field          The name of the field in the data structure specified \r
+  @param  Field          The name of the field in the data structure specified\r

                          by TYPE to which Record points.\r
 \r
   @param  TestSignature  The 32-bit signature value to match.\r
                          by TYPE to which Record points.\r
 \r
   @param  TestSignature  The 32-bit signature value to match.\r


@@ -525,5 +525,5 @@ DebugPrintLevelEnabled (
   #define CR(Record, TYPE, Field, TestSignature)                                              \\r
     BASE_CR (Record, TYPE, Field)\r
 #endif\r
   #define CR(Record, TYPE, Field, TestSignature)                                              \\r
     BASE_CR (Record, TYPE, Field)\r
 #endif\r

-    \r
+\r

 #endif\r
 #endif\r

diff --git a/MdePkg/Include/Library/DebugPrintErrorLevelLib.h b/MdePkg/Include/Library/DebugPrintErrorLevelLib.h
index 5a866d5fcaf3f022ee059ee2388a43a779caa9bf..0b0df804b5a59c5bfbc1459a1fad88655ac16fe7 100644 (file)
--- a/MdePkg/Include/Library/DebugPrintErrorLevelLib.h
+++ b/MdePkg/Include/Library/DebugPrintErrorLevelLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Debug Print Error Level Library class\r
 \r
 /** @file\r
   Debug Print Error Level Library class\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


@@ -28,9 +28,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 successfully 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 successfully set.\r
   @retval  FALSE          The debug print error level mask could not be set.\r
 \r

diff --git a/MdePkg/Include/Library/DevicePathLib.h b/MdePkg/Include/Library/DevicePathLib.h
index 78aac35f81614f56012ffe9d10fe2efde272f471..959299704a5d3742c8607f8915b52419fef2b5f7 100644 (file)
--- a/MdePkg/Include/Library/DevicePathLib.h
+++ b/MdePkg/Include/Library/DevicePathLib.h
@@ -1,12 +1,12 @@
 /** @file\r
   Provides library functions to construct and parse UEFI Device Paths.\r
 \r
 /** @file\r
   Provides library functions to construct and parse UEFI Device Paths.\r
 \r

-  This library provides defines, macros, and functions to help create and parse \r
+  This library provides defines, macros, and functions to help create and parse\r

   EFI_DEVICE_PATH_PROTOCOL structures.\r
 \r
   EFI_DEVICE_PATH_PROTOCOL structures.\r
 \r

-Copyright (c) 2006 - 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) 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
 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


@@ -81,9 +81,9 @@ DevicePathSubType (
 /**\r
   Returns the 16-bit Length field of a device path node.\r
 \r
 /**\r
   Returns the 16-bit Length field of a device path node.\r
 \r

-  Returns the 16-bit Length field of the device path node specified by Node.  \r
+  Returns the 16-bit Length field of the device path node specified by Node.\r

   Node is not required to be aligned on a 16-bit boundary, so it is recommended\r
   Node is not required to be aligned on a 16-bit boundary, so it is recommended\r

-  that a function such as ReadUnaligned16() be used to extract the contents of \r
+  that a function such as ReadUnaligned16() be used to extract the contents of\r

   the Length field.\r
 \r
   If Node is NULL, then ASSERT().\r
   the Length field.\r
 \r
   If Node is NULL, then ASSERT().\r


@@ -119,12 +119,12 @@ NextDevicePathNode (
 \r
 /**\r
   Determines if a device path node is an end node of a device path.\r
 \r
 /**\r
   Determines if a device path node is an end node of a device path.\r

-  This includes nodes that are the end of a device path instance and nodes that \r
+  This includes nodes that are the end of a device path instance and nodes that\r

   are the end of an entire device path.\r
 \r
   are the end of an entire device path.\r
 \r

-  Determines if the device path node specified by Node is an end node of a device path.  \r
-  This includes nodes that are the end of a device path instance and nodes that are the \r
-  end of an entire device path.  If Node represents an end node of a device path, \r
+  Determines if the device path node specified by Node is an end node of a device path.\r
+  This includes nodes that are the end of a device path instance and nodes that are the\r
+  end of an entire device path.  If Node represents an end node of a device path,\r

   then TRUE is returned.  Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r
   then TRUE is returned.  Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r


@@ -133,7 +133,7 @@ NextDevicePathNode (
 \r
   @retval TRUE      The device path node specified by Node is an end node of a device path.\r
   @retval FALSE     The device path node specified by Node is not an end node of a device path.\r
 \r
   @retval TRUE      The device path node specified by Node is an end node of a device path.\r
   @retval FALSE     The device path node specified by Node is not an end node of a device path.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -186,8 +186,8 @@ IsDevicePathEndInstance (
 /**\r
   Sets the length, in bytes, of a device path node.\r
 \r
 /**\r
   Sets the length, in bytes, of a device path node.\r
 \r

-  Sets the length of the device path node specified by Node to the value specified \r
-  by NodeLength.  NodeLength is returned.  Node is not required to be aligned on \r
+  Sets the length of the device path node specified by Node to the value specified\r
+  by NodeLength.  NodeLength is returned.  Node is not required to be aligned on\r

   a 16-bit boundary, so it is recommended that a function such as WriteUnaligned16()\r
   be used to set the contents of the Length field.\r
 \r
   a 16-bit boundary, so it is recommended that a function such as WriteUnaligned16()\r
   be used to set the contents of the Length field.\r
 \r


@@ -211,15 +211,15 @@ SetDevicePathNodeLength (
 /**\r
   Fills in all the fields of a device path node that is the end of an entire device path.\r
 \r
 /**\r
   Fills in all the fields of a device path node that is the end of an entire device path.\r
 \r

-  Fills in all the fields of a device path node specified by Node so Node represents \r
-  the end of an entire device path.  The Type field of Node is set to \r
-  END_DEVICE_PATH_TYPE, the SubType field of Node is set to \r
-  END_ENTIRE_DEVICE_PATH_SUBTYPE, and the Length field of Node is set to \r
-  END_DEVICE_PATH_LENGTH.  Node is not required to be aligned on a 16-bit boundary, \r
-  so it is recommended that a function such as WriteUnaligned16() be used to set \r
-  the contents of the Length field. \r
+  Fills in all the fields of a device path node specified by Node so Node represents\r
+  the end of an entire device path.  The Type field of Node is set to\r
+  END_DEVICE_PATH_TYPE, the SubType field of Node is set to\r
+  END_ENTIRE_DEVICE_PATH_SUBTYPE, and the Length field of Node is set to\r
+  END_DEVICE_PATH_LENGTH.  Node is not required to be aligned on a 16-bit boundary,\r
+  so it is recommended that a function such as WriteUnaligned16() be used to set\r
+  the contents of the Length field.\r

 \r
 \r

-  If Node is NULL, then ASSERT(). \r
+  If Node is NULL, then ASSERT().\r

 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r


@@ -233,7 +233,7 @@ SetDevicePathEndNode (
 /**\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
+  This function returns the size, in bytes, of the device path data structure\r

   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r
   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r


@@ -255,15 +255,15 @@ GetDevicePathSize (
   This function allocates space for a new copy of the device path specified by DevicePath.  If\r
   DevicePath is NULL, then NULL is returned.  If the memory is successfully allocated, then the\r
   contents of DevicePath are copied to the newly allocated buffer, and a pointer to that buffer\r
   This function allocates space for a new copy of the device path specified by DevicePath.  If\r
   DevicePath is NULL, then NULL is returned.  If the memory is successfully allocated, then the\r
   contents of DevicePath are copied to the newly allocated buffer, and a pointer to that buffer\r

-  is returned.  Otherwise, NULL is returned.  \r
-  The memory for the new device path is allocated from EFI boot services memory. \r
-  It is the responsibility of the caller to free the memory allocated. \r
-  \r
+  is returned.  Otherwise, NULL is returned.\r
+  The memory for the new device path is allocated from EFI boot services memory.\r
+  It is the responsibility of the caller to free the memory allocated.\r
+\r

   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval NULL    DevicePath is NULL or invalid.\r
   @retval Others  A pointer to the duplicated device path.\r
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval NULL    DevicePath is NULL or invalid.\r
   @retval Others  A pointer to the duplicated device path.\r

-  \r
+\r

 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r


@@ -276,18 +276,18 @@ DuplicateDevicePath (
 \r
   This function creates a new device path by appending a copy of SecondDevicePath to a copy of\r
   FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path device node from\r
 \r
   This function creates a new device path by appending a copy of SecondDevicePath to a copy of\r
   FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path device node from\r

-  SecondDevicePath is retained. The newly created device path is returned.  \r
-  If FirstDevicePath is NULL, then it is ignored, and a duplicate of SecondDevicePath is returned.  \r
-  If SecondDevicePath is NULL, then it is ignored, and a duplicate of FirstDevicePath is returned.  \r
+  SecondDevicePath is retained. The newly created device path is returned.\r
+  If FirstDevicePath is NULL, then it is ignored, and a duplicate of SecondDevicePath is returned.\r
+  If SecondDevicePath is NULL, then it is ignored, and a duplicate of FirstDevicePath is returned.\r

   If both FirstDevicePath and SecondDevicePath are NULL, then a copy of an end-of-device-path is\r
   If both FirstDevicePath and SecondDevicePath are NULL, then a copy of an end-of-device-path is\r

-  returned.  \r
+  returned.\r

   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r
   The memory for the new device path is allocated from EFI boot services memory. It is the\r
   responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r
   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r
   The memory for the new device path is allocated from EFI boot services memory. It is the\r
   responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r

-  \r
+\r

   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r
   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r


@@ -312,7 +312,7 @@ AppendDevicePath (
   node is returned.\r
   If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path device node\r
   is returned.\r
   node is returned.\r
   If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path device node\r
   is returned.\r

-  If there is not enough memory to allocate space for the new device path, then NULL is returned.  \r
+  If there is not enough memory to allocate space for the new device path, then NULL is returned.\r

   The memory is allocated from EFI boot services memory. It is the responsibility of the caller to\r
   free the memory allocated.\r
 \r
   The memory is allocated from EFI boot services memory. It is the responsibility of the caller to\r
   free the memory allocated.\r
 \r


@@ -321,7 +321,7 @@ AppendDevicePath (
 \r
   @retval NULL      There is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r
 \r
   @retval NULL      There is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r

-                    A copy of DevicePathNode followed by an end-of-device-path node \r
+                    A copy of DevicePathNode followed by an end-of-device-path node\r

                     if both FirstDevicePath and SecondDevicePath are NULL.\r
                     A copy of an end-of-device-path node if both FirstDevicePath and SecondDevicePath are NULL.\r
 \r
                     if both FirstDevicePath and SecondDevicePath are NULL.\r
                     A copy of an end-of-device-path node if both FirstDevicePath and SecondDevicePath are NULL.\r
 \r


@@ -336,18 +336,18 @@ AppendDevicePathNode (
 /**\r
   Creates a new device path by appending the specified device path instance to the specified device\r
   path.\r
 /**\r
   Creates a new device path by appending the specified device path instance to the specified device\r
   path.\r

- \r
+\r

   This function creates a new device path by appending a copy of the device path instance specified\r
   by DevicePathInstance to a copy of the device path secified by DevicePath in a allocated buffer.\r
   The end-of-device-path device node is moved after the end of the appended device path instance\r
   This function creates a new device path by appending a copy of the device path instance specified\r
   by DevicePathInstance to a copy of the device path secified by DevicePath in a allocated buffer.\r
   The end-of-device-path device node is moved after the end of the appended device path instance\r

-  and a new end-of-device-path-instance node is inserted between. \r
+  and a new end-of-device-path-instance node is inserted between.\r

   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r
   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then NULL is returned.  \r
+  If there is not enough memory to allocate space for the new device path, then NULL is returned.\r

   The memory is allocated from EFI boot services memory. It is the responsibility of the caller to\r
   free the memory allocated.\r
   The memory is allocated from EFI boot services memory. It is the responsibility of the caller to\r
   free the memory allocated.\r

-  \r
+\r

   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r


@@ -370,11 +370,11 @@ AppendDevicePathInstance (
   to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r
   If DevicePath points to a invalid device path, then NULL is returned.\r
   to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r
   If DevicePath points to a invalid device path, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then NULL is returned.  \r
+  If there is not enough memory to allocate space for the new device path, then NULL is returned.\r

   The memory is allocated from EFI boot services memory. It is the responsibility of the caller to\r
   free the memory allocated.\r
   If Size is NULL, then ASSERT().\r
   The memory is allocated from EFI boot services memory. It is the responsibility of the caller to\r
   free the memory allocated.\r
   If Size is NULL, then ASSERT().\r

- \r
+\r

   @param  DevicePath                 On input, this holds the pointer to the current device path\r
                                      instance. On output, this holds the pointer to the next device\r
                                      path instance or NULL if there are no more device path\r
   @param  DevicePath                 On input, this holds the pointer to the current device path\r
                                      instance. On output, this holds the pointer to the next device\r
                                      path instance or NULL if there are no more device path\r


@@ -399,8 +399,8 @@ GetNextDevicePathInstance (
   This function creates a new device node in a newly allocated buffer of size NodeLength and\r
   initializes the device path node header with NodeType and NodeSubType.  The new device path node\r
   is returned.\r
   This function creates a new device node in a newly allocated buffer of size NodeLength and\r
   initializes the device path node header with NodeType and NodeSubType.  The new device path node\r
   is returned.\r

-  If NodeLength is smaller than a device path header, then NULL is returned.  \r
-  If there is not enough memory to allocate space for the new device path, then NULL is returned.  \r
+  If NodeLength is smaller than a device path header, then NULL is returned.\r
+  If there is not enough memory to allocate space for the new device path, then NULL is returned.\r

   The memory is allocated from EFI boot services memory. It is the responsibility of the caller to\r
   free the memory allocated.\r
 \r
   The memory is allocated from EFI boot services memory. It is the responsibility of the caller to\r
   free the memory allocated.\r
 \r


@@ -443,7 +443,7 @@ IsDevicePathMultiInstance (
 \r
   This function returns the device path protocol from the handle specified by Handle.  If Handle is\r
   NULL or Handle does not contain a device path protocol, then NULL is returned.\r
 \r
   This function returns the device path protocol from the handle specified by Handle.  If Handle is\r
   NULL or Handle does not contain a device path protocol, then NULL is returned.\r

- \r
+\r

   @param  Handle                     The handle from which to retrieve the device path protocol.\r
 \r
   @return The device path protocol from the handle specified by Handle.\r
   @param  Handle                     The handle from which to retrieve the device path protocol.\r
 \r
   @return The device path protocol from the handle specified by Handle.\r


@@ -465,7 +465,7 @@ DevicePathFromHandle (
   path node for the file specified by FileName is allocated and returned.\r
   The memory for the new device path is allocated from EFI boot services memory. It is the responsibility\r
   of the caller to free the memory allocated.\r
   path node for the file specified by FileName is allocated and returned.\r
   The memory for the new device path is allocated from EFI boot services memory. It is the responsibility\r
   of the caller to free the memory allocated.\r

-  \r
+\r

   If FileName is NULL, then ASSERT().\r
   If FileName is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If FileName is NULL, then ASSERT().\r
   If FileName is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

diff --git a/MdePkg/Include/Library/DxeCoreEntryPoint.h b/MdePkg/Include/Library/DxeCoreEntryPoint.h
index acf514a616653f477d90515c56f4df833779e90b..8b2302bdfe2b9aaed50a8cd2a4e1bde8bd3be7fe 100644 (file)
--- a/MdePkg/Include/Library/DxeCoreEntryPoint.h
+++ b/MdePkg/Include/Library/DxeCoreEntryPoint.h
@@ -1,7 +1,7 @@
 /** @file\r
   Module entry point library for DXE core.\r
 \r
 /** @file\r
   Module entry point library for DXE core.\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,13 +16,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __MODULE_ENTRY_POINT_H__\r
 \r
 ///\r
 #define __MODULE_ENTRY_POINT_H__\r
 \r
 ///\r

-/// Global variable that contains a pointer to the Hob List passed into the DXE Core entry point. \r
-/// \r
+/// Global variable that contains a pointer to the Hob List passed into the DXE Core entry point.\r
+///\r

 extern VOID  *gHobList;\r
 \r
 \r
 /**\r
 extern VOID  *gHobList;\r
 \r
 \r
 /**\r

-  The entry point of PE/COFF Image for the DXE Core. \r
+  The entry point of PE/COFF Image for the DXE Core.\r

 \r
   This function is the entry point for the DXE Core. This function is required to call\r
   ProcessModuleEntryPointList() and ProcessModuleEntryPointList() is never expected to return.\r
 \r
   This function is the entry point for the DXE Core. This function is required to call\r
   ProcessModuleEntryPointList() and ProcessModuleEntryPointList() is never expected to return.\r


@@ -30,7 +30,7 @@ extern VOID  *gHobList;
   System Table and the image handle for the DXE Core itself have been established.\r
   If ProcessModuleEntryPointList() returns, then ASSERT() and halt the system.\r
 \r
   System Table and the image handle for the DXE Core itself have been established.\r
   If ProcessModuleEntryPointList() returns, then ASSERT() and halt the system.\r
 \r

-  @param  HobStart  Pointer to the beginning of the HOB List passed in from the PEI Phase. \r
+  @param  HobStart  Pointer to the beginning of the HOB List passed in from the PEI Phase.\r

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


@@ -45,7 +45,7 @@ _ModuleEntryPoint (
 \r
   This function is required to call _ModuleEntryPoint() passing in HobStart.\r
 \r
 \r
   This function is required to call _ModuleEntryPoint() passing in HobStart.\r
 \r

-  @param  HobStart  Pointer to the beginning of the HOB List passed in from the PEI Phase. \r
+  @param  HobStart  Pointer to the beginning of the HOB List passed in from the PEI Phase.\r

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


@@ -83,12 +83,12 @@ ProcessLibraryConstructorList (
   Autogenerated function that calls a set of module entry points.\r
 \r
   This function must be called by _ModuleEntryPoint().\r
   Autogenerated function that calls a set of module entry points.\r
 \r
   This function must be called by _ModuleEntryPoint().\r

-  This function calls the set of module entry points.  \r
+  This function calls the set of module entry points.\r

   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the module entry points and calling them in a specified order.\r
 \r
   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the module entry points and calling them in a specified order.\r
 \r

-  @param  HobStart  Pointer to the beginning of the HOB List passed in from the PEI Phase. \r
- \r
+  @param  HobStart  Pointer to the beginning of the HOB List passed in from the PEI Phase.\r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Include/Library/DxeServicesLib.h b/MdePkg/Include/Library/DxeServicesLib.h
index 20aee68af55821507f982de312a99a7d786bb97a..3764d153122b463d9b9215a2292f15d18ae9b96f 100644 (file)
--- a/MdePkg/Include/Library/DxeServicesLib.h
+++ b/MdePkg/Include/Library/DxeServicesLib.h
@@ -1,16 +1,16 @@
 /** @file\r
 /** @file\r

-  MDE DXE Services Library provides functions that simplify the development of DXE Drivers.  \r
+  MDE DXE Services Library provides functions that simplify the development of DXE Drivers.\r

   These functions help access data from sections of FFS files or from file path.\r
 \r
   These functions help access data from sections of FFS files or from file path.\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 2015 Hewlett Packard Enterprise Development LP<BR>\r
 (C) Copyright 2015 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
+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


@@ -18,20 +18,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __DXE_SERVICES_LIB_H__\r
 \r
 /**\r
 #define __DXE_SERVICES_LIB_H__\r
 \r
 /**\r

-  Searches all the available firmware volumes and returns the first matching FFS section. \r
+  Searches all the available firmware volumes and returns the first matching FFS section.\r

 \r
   This function searches all the firmware volumes for FFS files with FV file type specified by FileType\r
 \r
   This function searches all the firmware volumes for FFS files with FV file type specified by FileType\r

-  The order that the firmware volumes is searched is not deterministic. For each available FV a search \r
-  is made for FFS file of type FileType. If the FV contains more than one FFS file with the same FileType, \r
-  the FileInstance instance will be the matched FFS file. For each FFS file found a search \r
-  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance instances \r
-  of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer. \r
-  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size. \r
-  It is the caller's responsibility to use FreePool() to free the allocated buffer.  \r
-  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections \r
+  The order that the firmware volumes is searched is not deterministic. For each available FV a search\r
+  is made for FFS file of type FileType. If the FV contains more than one FFS file with the same FileType,\r
+  the FileInstance instance will be the matched FFS file. For each FFS file found a search\r
+  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance instances\r
+  of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer.\r
+  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size.\r
+  It is the caller's responsibility to use FreePool() to free the allocated buffer.\r
+  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections\r

   are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r
   are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r

-  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails, \r
+  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails,\r

   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r
 \r
   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r
 \r


@@ -41,9 +41,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param  FileType             Indicates the FV file type to search for within all available FVs.\r
   @param  FileInstance         Indicates which file instance within all available FVs specified by FileType.\r
                                FileInstance starts from zero.\r
   @param  FileType             Indicates the FV file type to search for within all available FVs.\r
   @param  FileInstance         Indicates which file instance within all available FVs specified by FileType.\r
                                FileInstance starts from zero.\r

-  @param  SectionType          Indicates the FFS section type to search for within the FFS file \r
+  @param  SectionType          Indicates the FFS section type to search for within the FFS file\r

                                specified by FileType with FileInstance.\r
                                specified by FileType with FileInstance.\r

-  @param  SectionInstance      Indicates which section instance within the FFS file \r
+  @param  SectionInstance      Indicates which section instance within the FFS file\r

                                specified by FileType with FileInstance to retrieve. SectionInstance starts from zero.\r
   @param  Buffer               On output, a pointer to a callee allocated buffer containing the FFS file section that was found.\r
                                Is it the caller's responsibility to free this buffer using FreePool().\r
                                specified by FileType with FileInstance to retrieve. SectionInstance starts from zero.\r
   @param  Buffer               On output, a pointer to a callee allocated buffer containing the FFS file section that was found.\r
                                Is it the caller's responsibility to free this buffer using FreePool().\r


@@ -53,7 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r
   @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve the matching FFS section.\r
   @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a device error.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r
   @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve the matching FFS section.\r
   @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a device error.\r

-  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the firmware volume that \r
+  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the firmware volume that\r

                                 contains the matching FFS section does not allow reads.\r
 **/\r
 EFI_STATUS\r
                                 contains the matching FFS section does not allow reads.\r
 **/\r
 EFI_STATUS\r


@@ -68,18 +68,18 @@ GetSectionFromAnyFvByFileType  (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Searches all the available firmware volumes and returns the first matching FFS section. \r
-\r
-  This function searches all the firmware volumes for FFS files with an FFS filename specified by NameGuid.  \r
-  The order in which the firmware volumes are searched is not deterministic. For each FFS file found, a search \r
-  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance instances \r
-  of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer. \r
-  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size. \r
-  It is the caller's responsibility to use FreePool() to free the allocated buffer.  \r
-  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections \r
+  Searches all the available firmware volumes and returns the first matching FFS section.\r
+\r
+  This function searches all the firmware volumes for FFS files with an FFS filename specified by NameGuid.\r
+  The order in which the firmware volumes are searched is not deterministic. For each FFS file found, a search\r
+  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance instances\r
+  of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer.\r
+  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size.\r
+  It is the caller's responsibility to use FreePool() to free the allocated buffer.\r
+  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections\r

   are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r
   are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r

-  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails, \r
+  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails,\r

   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r
 \r
   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r
 \r


@@ -88,26 +88,26 @@ GetSectionFromAnyFvByFileType  (
   If Size is NULL, then ASSERT().\r
 \r
 \r
   If Size is NULL, then ASSERT().\r
 \r
 \r

-  @param  NameGuid             A pointer to to the FFS filename GUID to search for  \r
-                               within any of the firmware volumes in the platform. \r
-  @param  SectionType          Indicates the FFS section type to search for within \r
+  @param  NameGuid             A pointer to to the FFS filename GUID to search for\r
+                               within any of the firmware volumes in the platform.\r
+  @param  SectionType          Indicates the FFS section type to search for within\r

                                the FFS file specified by NameGuid.\r
                                the FFS file specified by NameGuid.\r

-  @param  SectionInstance      Indicates which section instance within the FFS file \r
+  @param  SectionInstance      Indicates which section instance within the FFS file\r

                                specified by NameGuid to retrieve.\r
                                specified by NameGuid to retrieve.\r

-  @param  Buffer               On output, a pointer to a callee-allocated buffer \r
-                               containing the FFS file section that was found.  \r
-                               It is the caller's responsibility to free this \r
+  @param  Buffer               On output, a pointer to a callee-allocated buffer\r
+                               containing the FFS file section that was found.\r
+                               It is the caller's responsibility to free this\r

                                buffer using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r
                                buffer using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r

-  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve \r
+  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve\r

                                 the matching FFS section.\r
                                 the matching FFS section.\r

-  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a \r
+  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a\r

                                 device error.\r
                                 device error.\r

-  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the \r
-                                firmware volume that contains the matching FFS \r
+  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the\r
+                                firmware volume that contains the matching FFS\r

                                 section does not allow reads.\r
 **/\r
 EFI_STATUS\r
                                 section does not allow reads.\r
 **/\r
 EFI_STATUS\r


@@ -121,49 +121,49 @@ GetSectionFromAnyFv  (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Searches the firmware volume that the currently executing module was loaded from and returns the first matching FFS section. \r
+  Searches the firmware volume that the currently executing module was loaded from and returns the first matching FFS section.\r

 \r
 \r

-  This function searches the firmware volume that the currently executing module was loaded \r
-  from for an FFS file with an FFS filename specified by NameGuid. If the FFS file is found, a search \r
-  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance \r
+  This function searches the firmware volume that the currently executing module was loaded\r
+  from for an FFS file with an FFS filename specified by NameGuid. If the FFS file is found, a search\r
+  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance\r

   instances of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer.\r
   instances of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer.\r

-  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size. \r
-  It is the caller's responsibility to use FreePool() to free the allocated buffer. \r
-  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections are retrieved from \r
+  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size.\r
+  It is the caller's responsibility to use FreePool() to free the allocated buffer.\r
+  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections are retrieved from\r

   an FFS file based on SectionType and SectionInstance.\r
 \r
   If the currently executing module was not loaded from a firmware volume, then EFI_NOT_FOUND is returned.\r
   an FFS file based on SectionType and SectionInstance.\r
 \r
   If the currently executing module was not loaded from a firmware volume, then EFI_NOT_FOUND is returned.\r

-  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails, \r
+  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails,\r

   the search will be retried with a section type of EFI_SECTION_PE32.\r
   the search will be retried with a section type of EFI_SECTION_PE32.\r

-  \r
+\r

   This function must be called with a TPL <= TPL_NOTIFY.\r
   If NameGuid is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If Size is NULL, then ASSERT().\r
 \r
   This function must be called with a TPL <= TPL_NOTIFY.\r
   If NameGuid is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If Size is NULL, then ASSERT().\r
 \r

-  @param  NameGuid             A pointer to to the FFS filename GUID to search for  \r
-                               within the firmware volumes that the currently \r
+  @param  NameGuid             A pointer to to the FFS filename GUID to search for\r
+                               within the firmware volumes that the currently\r

                                executing module was loaded from.\r
                                executing module was loaded from.\r

-  @param  SectionType          Indicates the FFS section type to search for within \r
+  @param  SectionType          Indicates the FFS section type to search for within\r

                                the FFS file specified by NameGuid.\r
                                the FFS file specified by NameGuid.\r

-  @param  SectionInstance      Indicates which section instance within the FFS \r
+  @param  SectionInstance      Indicates which section instance within the FFS\r

                                file specified by NameGuid to retrieve.\r
                                file specified by NameGuid to retrieve.\r

-  @param  Buffer               On output, a pointer to a callee allocated buffer \r
-                               containing the FFS file section that was found.  \r
-                               It is the caller's responsibility to free this buffer \r
+  @param  Buffer               On output, a pointer to a callee allocated buffer\r
+                               containing the FFS file section that was found.\r
+                               It is the caller's responsibility to free this buffer\r

                                using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r
                                using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r

-  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve \r
+  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve\r

                                 the matching FFS section.\r
                                 the matching FFS section.\r

-  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a \r
+  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a\r

                                 device error.\r
                                 device error.\r

-  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the \r
-                                firmware volume that contains the matching FFS \r
-                                section does not allow reads.  \r
+  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the\r
+                                firmware volume that contains the matching FFS\r
+                                section does not allow reads.\r

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


@@ -180,43 +180,43 @@ GetSectionFromFv (
   Searches the FFS file the the currently executing module was loaded from and returns the first matching FFS section.\r
 \r
   This function searches the FFS file that the currently executing module was loaded from for a FFS sections of type SectionType.\r
   Searches the FFS file the the currently executing module was loaded from and returns the first matching FFS section.\r
 \r
   This function searches the FFS file that the currently executing module was loaded from for a FFS sections of type SectionType.\r

-  If the FFS file contains at least SectionInstance instances of the FFS section specified by SectionType, \r
-  then the SectionInstance instance is returned in Buffer. Buffer is allocated using AllocatePool(), \r
-  and the size of the allocated buffer is returned in Size. It is the caller's responsibility \r
-  to use FreePool() to free the allocated buffer. See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for \r
+  If the FFS file contains at least SectionInstance instances of the FFS section specified by SectionType,\r
+  then the SectionInstance instance is returned in Buffer. Buffer is allocated using AllocatePool(),\r
+  and the size of the allocated buffer is returned in Size. It is the caller's responsibility\r
+  to use FreePool() to free the allocated buffer. See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for\r

   details on how sections are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r
   If the currently executing module was not loaded from an FFS file, then EFI_NOT_FOUND is returned.\r
   details on how sections are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r
   If the currently executing module was not loaded from an FFS file, then EFI_NOT_FOUND is returned.\r

-  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails, \r
+  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails,\r

   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r
   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Size is NULL, then ASSERT().\r
 \r
 \r
   If Buffer is NULL, then ASSERT().\r
   If Size is NULL, then ASSERT().\r
 \r
 \r

-  @param  SectionType          Indicates the FFS section type to search for within  \r
-                               the FFS file that the currently executing module \r
+  @param  SectionType          Indicates the FFS section type to search for within\r
+                               the FFS file that the currently executing module\r

                                was loaded from.\r
                                was loaded from.\r

-  @param  SectionInstance      Indicates which section instance to retrieve within \r
-                               the FFS file that the currently executing module \r
+  @param  SectionInstance      Indicates which section instance to retrieve within\r
+                               the FFS file that the currently executing module\r

                                was loaded from.\r
                                was loaded from.\r

-  @param  Buffer               On output, a pointer to a callee allocated buffer \r
-                               containing the FFS file section that was found.  \r
-                               It is the caller's responsibility to free this buffer \r
+  @param  Buffer               On output, a pointer to a callee allocated buffer\r
+                               containing the FFS file section that was found.\r
+                               It is the caller's responsibility to free this buffer\r

                                using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r
                                using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r

-  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve \r
+  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve\r

                                 the matching FFS section.\r
                                 the matching FFS section.\r

-  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a \r
+  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a\r

                                 device error.\r
                                 device error.\r

-  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the \r
-                                firmware volume that contains the matching FFS \r
-                                section does not allow reads.  \r
-  \r
+  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the\r
+                                firmware volume that contains the matching FFS\r
+                                section does not allow reads.\r
+\r

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


@@ -229,22 +229,22 @@ GetSectionFromFfs (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Get the image file buffer data and buffer size by its device path. \r
-  \r
-  Access the file either from a firmware volume, from a file system interface, \r
+  Get the image file buffer data and buffer size by its device path.\r
+\r
+  Access the file either from a firmware volume, from a file system interface,\r

   or from the load file interface.\r
   or from the load file interface.\r

-  \r
+\r

   Allocate memory to store the found image. The caller is responsible to free memory.\r
 \r
   If FilePath is NULL, then NULL is returned.\r
   If FileSize is NULL, then NULL is returned.\r
   If AuthenticationStatus is NULL, then NULL is returned.\r
 \r
   Allocate memory to store the found image. The caller is responsible to free memory.\r
 \r
   If FilePath is NULL, then NULL is returned.\r
   If FileSize is NULL, then NULL is returned.\r
   If AuthenticationStatus is NULL, then NULL is returned.\r
 \r

-  @param[in]       BootPolicy           The policy for Open Image File.If TRUE, \r
-                                        indicates that the request originates from \r
+  @param[in]       BootPolicy           The policy for Open Image File.If TRUE,\r
+                                        indicates that the request originates from\r

                                         the boot manager, and that the boot manager is\r
                                         the boot manager, and that the boot manager is\r

-                                        attempting to load FilePath as a boot selection. \r
-                                        If FALSE, then FilePath must match an exact \r
+                                        attempting to load FilePath as a boot selection.\r
+                                        If FALSE, then FilePath must match an exact\r

                                         file to be loaded.\r
   @param[in]       FilePath             Pointer to the device path of the file that is abstracted to\r
                                         the file buffer.\r
                                         file to be loaded.\r
   @param[in]       FilePath             Pointer to the device path of the file that is abstracted to\r
                                         the file buffer.\r

diff --git a/MdePkg/Include/Library/DxeServicesTableLib.h b/MdePkg/Include/Library/DxeServicesTableLib.h
index ff13d3fcaa4d532429261c6d5854b9ceab6c73f4..9a3b036f6d5dd426c059897185d754f20db8e6c0 100644 (file)
--- a/MdePkg/Include/Library/DxeServicesTableLib.h
+++ b/MdePkg/Include/Library/DxeServicesTableLib.h
@@ -1,17 +1,17 @@
 /** @file\r
   Provides a service to retrieve a pointer to the DXE Services Table.\r
   Only available to DXE module types.\r
 /** @file\r
   Provides a service to retrieve a pointer to the DXE Services Table.\r
   Only available to DXE module types.\r

-  \r
-  This library does not contain any functions or macros.  It simply exports a global \r
-  pointer to the DXE Services Table as defined in the Platform Initialization Driver \r
-  Execution Environment Core Interface Specification.  The library constructor must \r
+\r
+  This library does not contain any functions or macros.  It simply exports a global\r
+  pointer to the DXE Services Table as defined in the Platform Initialization Driver\r
+  Execution Environment Core Interface Specification.  The library constructor must\r

   initialize this global pointer to the DX Services Table, so it is available at the\r
   initialize this global pointer to the DX Services Table, so it is available at the\r

-  module's entry point.  Since there is overhead in looking up the pointer to the DXE \r
-  Services Table, only those modules that actually require access to the DXE Services \r
-  Table should use this library.  This will typically be DXE Drivers that require GCD \r
+  module's entry point.  Since there is overhead in looking up the pointer to the DXE\r
+  Services Table, only those modules that actually require access to the DXE Services\r
+  Table should use this library.  This will typically be DXE Drivers that require GCD\r

   or Dispatcher services.\r
   or Dispatcher services.\r

-   \r
-Copyright (c) 2006 - 2008, 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/MdePkg/Include/Library/ExtendedSalLib.h b/MdePkg/Include/Library/ExtendedSalLib.h
index 6f28eeb7f6b238f0761493c0572652e0f78641c8..3f2b0a921af217b771180aaac4854916b2c64d24 100644 (file)
--- a/MdePkg/Include/Library/ExtendedSalLib.h
+++ b/MdePkg/Include/Library/ExtendedSalLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Library class definition of Extended SAL Library.\r
 \r
 /** @file\r
   Library class definition of Extended SAL Library.\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


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Register ESAL Class and its associated global.\r
 \r
 /**\r
   Register ESAL Class and its associated global.\r

-  \r
+\r

   This function Registers one or more Extended SAL services in a given\r
   class along with the associated global context.\r
   This function is only available prior to ExitBootServices().\r
   This function Registers one or more Extended SAL services in a given\r
   class along with the associated global context.\r
   This function is only available prior to ExitBootServices().\r


@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval EFI_SUCCESS          The Extended SAL services were registered.\r
   @retval EFI_UNSUPPORTED      This function was called after ExitBootServices().\r
   @retval EFI_OUT_OF_RESOURCES There are not enough resources available to register one or more of the specified services.\r
   @retval EFI_SUCCESS          The Extended SAL services were registered.\r
   @retval EFI_UNSUPPORTED      This function was called after ExitBootServices().\r
   @retval EFI_OUT_OF_RESOURCES There are not enough resources available to register one or more of the specified services.\r

-  @retval Other                ClassGuid could not be installed onto a new handle.  \r
+  @retval Other                ClassGuid could not be installed onto a new handle.\r

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


@@ -46,7 +46,7 @@ RegisterEsalClass (
 \r
 /**\r
   Calls an Extended SAL Class service that was previously registered with RegisterEsalClass().\r
 \r
 /**\r
   Calls an Extended SAL Class service that was previously registered with RegisterEsalClass().\r

-  \r
+\r

   This function calls an Extended SAL Class service that was previously registered with RegisterEsalClass().\r
 \r
   @param  ClassGuidLo    GUID of function, lower 64-bits\r
   This function calls an Extended SAL Class service that was previously registered with RegisterEsalClass().\r
 \r
   @param  ClassGuidLo    GUID of function, lower 64-bits\r


@@ -59,11 +59,11 @@ RegisterEsalClass (
   @param  Arg6           Argument 6 ClassGuid/FunctionId defined\r
   @param  Arg7           Argument 7 ClassGuid/FunctionId defined\r
   @param  Arg8           Argument 8 ClassGuid/FunctionId defined\r
   @param  Arg6           Argument 6 ClassGuid/FunctionId defined\r
   @param  Arg7           Argument 7 ClassGuid/FunctionId defined\r
   @param  Arg8           Argument 8 ClassGuid/FunctionId defined\r

-  \r
+\r

   @retval EFI_SAL_ERROR  The address of ExtendedSalProc() can not be determined\r
                          for the current CPU execution mode.\r
   @retval Other          See the return status from ExtendedSalProc() in the\r
   @retval EFI_SAL_ERROR  The address of ExtendedSalProc() can not be determined\r
                          for the current CPU execution mode.\r
   @retval Other          See the return status from ExtendedSalProc() in the\r

-                         EXTENDED_SAL_BOOT_SERVICE_PROTOCOL.  \r
+                         EXTENDED_SAL_BOOT_SERVICE_PROTOCOL.\r

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


@@ -83,7 +83,7 @@ EsalCall (
 \r
 /**\r
   Wrapper for the EsalStallFunctionId service of Extended SAL Stall Services Class.\r
 \r
 /**\r
   Wrapper for the EsalStallFunctionId service of Extended SAL Stall Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalStallFunctionId service of Extended SAL\r
   Stall Services Class. See EsalStallFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalStallFunctionId service of Extended SAL\r
   Stall Services Class. See EsalStallFunctionId of Extended SAL Specification.\r
 \r


@@ -102,7 +102,7 @@ EsalStall (
 \r
 /**\r
   Wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r
 \r
 /**\r
   Wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalSetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalSetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r


@@ -125,7 +125,7 @@ EsalSetNewPalEntry (
 \r
 /**\r
   Wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r
 \r
 /**\r
   Wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalGetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalGetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r


@@ -148,7 +148,7 @@ EsalGetNewPalEntry (
 \r
 /**\r
   Wrapper for the EsalGetStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r
 \r
 /**\r
   Wrapper for the EsalGetStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalGetStateBufferFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalGetStateBufferFunctionId of Extended SAL Specification.\r
 \r


@@ -174,7 +174,7 @@ EsalGetStateBuffer (
 \r
 /**\r
   Wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r
 \r
 /**\r
   Wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalSaveStateBufferFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalSaveStateBufferFunctionId of Extended SAL Specification.\r
 \r


@@ -191,7 +191,7 @@ EsalSaveStateBuffer (
 \r
 /**\r
   Wrapper for the EsalGetVectorsFunctionId service of Extended SAL Base Services Class.\r
 \r
 /**\r
   Wrapper for the EsalGetVectorsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetVectorsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetVectorsFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetVectorsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetVectorsFunctionId of Extended SAL Specification.\r
 \r


@@ -212,7 +212,7 @@ EsalGetVectors (
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r
 \r


@@ -235,7 +235,7 @@ EsalMcGetParams (
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r
 \r


@@ -252,7 +252,7 @@ EsalMcGetMcParams (
 \r
 /**\r
   Wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL Base Services Class.\r
 \r
 /**\r
   Wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetMcCheckinFlagsFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetMcCheckinFlagsFunctionId of Extended SAL Specification.\r
 \r


@@ -269,7 +269,7 @@ EsalGetMcCheckinFlags (
 \r
 /**\r
   Wrapper for the EsalAddCpuDataFunctionId service of Extended SAL MP Services Class.\r
 \r
 /**\r
   Wrapper for the EsalAddCpuDataFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalAddCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalAddCpuDataFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalAddCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalAddCpuDataFunctionId of Extended SAL Specification.\r
 \r


@@ -293,7 +293,7 @@ EsalAddCpuData (
 \r
 /**\r
   Wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL MP Services Class.\r
 \r
 /**\r
   Wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalRemoveCpuDataFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalRemoveCpuDataFunctionId of Extended SAL Specification.\r
 \r


@@ -311,7 +311,7 @@ EsalRemoveCpuData (
 \r
 /**\r
   Wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL MP Services Class.\r
 \r
 /**\r
   Wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalModifyCpuDataFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalModifyCpuDataFunctionId of Extended SAL Specification.\r
 \r


@@ -335,7 +335,7 @@ EsalModifyCpuData (
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL MP Services Class.\r
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIdFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIdFunctionId of Extended SAL Specification.\r
 \r


@@ -356,7 +356,7 @@ EsalGetCpuDataById (
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL MP Services Class.\r
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIndexFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIndexFunctionId of Extended SAL Specification.\r
 \r


@@ -377,7 +377,7 @@ EsalGetCpuDataByIndex (
 \r
 /**\r
   Wrapper for the EsalWhoAmIFunctionId service of Extended SAL MP Services Class.\r
 \r
 /**\r
   Wrapper for the EsalWhoAmIFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalWhoAmIFunctionId service of Extended SAL\r
   MP Services Class. See EsalWhoAmIFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalWhoAmIFunctionId service of Extended SAL\r
   MP Services Class. See EsalWhoAmIFunctionId of Extended SAL Specification.\r
 \r


@@ -396,7 +396,7 @@ EsalWhoAmI (
 \r
 /**\r
   Wrapper for the EsalNumProcessors service of Extended SAL MP Services Class.\r
 \r
 /**\r
   Wrapper for the EsalNumProcessors service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalNumProcessors service of Extended SAL\r
   MP Services Class. See EsalNumProcessors of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalNumProcessors service of Extended SAL\r
   MP Services Class. See EsalNumProcessors of Extended SAL Specification.\r
 \r


@@ -412,7 +412,7 @@ EsalNumProcessors (
 \r
 /**\r
   Wrapper for the EsalSetMinStateFnctionId service of Extended SAL MP Services Class.\r
 \r
 /**\r
   Wrapper for the EsalSetMinStateFnctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalSetMinStateFnctionId service of Extended SAL\r
   MP Services Class. See EsalSetMinStateFnctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalSetMinStateFnctionId service of Extended SAL\r
   MP Services Class. See EsalSetMinStateFnctionId of Extended SAL Specification.\r
 \r


@@ -433,7 +433,7 @@ EsalSetMinState (
 \r
 /**\r
   Wrapper for the EsalGetMinStateFunctionId service of Extended SAL MP Services Class.\r
 \r
 /**\r
   Wrapper for the EsalGetMinStateFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetMinStateFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetMinStateFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetMinStateFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetMinStateFunctionId of Extended SAL Specification.\r
 \r


@@ -451,7 +451,7 @@ EsalGetMinState (
 \r
 /**\r
   Wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL MCA Services Class.\r
 \r
 /**\r
   Wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL MCA Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcsGetStateInfoFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcsGetStateInfoFunctionId of Extended SAL Specification.\r
 \r


@@ -473,7 +473,7 @@ EsalMcaGetStateInfo (
 \r
 /**\r
   Wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL MCA Services Class.\r
 \r
 /**\r
   Wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL MCA Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcaRegisterCpuFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcaRegisterCpuFunctionId of Extended SAL Specification.\r
 \r

diff --git a/MdePkg/Include/Library/ExtractGuidedSectionLib.h b/MdePkg/Include/Library/ExtractGuidedSectionLib.h
index 539b98d41a2c9b4c2d3d38f17669ca4513c13571..cc6c6fff24d6fc359691ec4493a2595f0d096048 100644 (file)
--- a/MdePkg/Include/Library/ExtractGuidedSectionLib.h
+++ b/MdePkg/Include/Library/ExtractGuidedSectionLib.h
@@ -1,16 +1,16 @@
 /** @file\r
 /** @file\r

-  This library provides common functions to process the different guided section data. \r
-  \r
-  This library provides functions to process GUIDed sections of FFS files.  Handlers may \r
-  be registered to decode GUIDed sections of FFS files.  Services are provided to determine \r
-  the set of supported section GUIDs, collection information about a specific GUIDed section, \r
-  and decode a specific GUIDed section. \r
-  \r
-  A library instance that produces this library class may be used to produce a \r
-  EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI or a EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL \r
+  This library provides common functions to process the different guided section data.\r
+\r
+  This library provides functions to process GUIDed sections of FFS files.  Handlers may\r
+  be registered to decode GUIDed sections of FFS files.  Services are provided to determine\r
+  the set of supported section GUIDs, collection information about a specific GUIDed section,\r
+  and decode a specific GUIDed section.\r
+\r
+  A library instance that produces this library class may be used to produce a\r
+  EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI or a EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL\r

   providing a simple method to extend the number of GUIDed sections types a platform supports.\r
 \r
   providing a simple method to extend the number of GUIDed sections types a platform supports.\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


@@ -27,16 +27,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Examines a GUIDed section and returns the size of the decoded buffer and the\r
   size of an optional 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 optional 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


@@ -67,16 +67,16 @@ RETURN_STATUS
 \r
 /**\r
   Decodes a GUIDed section into a caller allocated output buffer.\r
 \r
 /**\r
   Decodes a 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


@@ -84,10 +84,10 @@ RETURN_STATUS
 \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


@@ -114,7 +114,7 @@ RETURN_STATUS
   Registers the handlers specified by GetInfoHandler and DecodeHandler with the GUID specified by SectionGuid.\r
   If the GUID value specified by SectionGuid has already been registered, then return RETURN_ALREADY_STARTED.\r
   If there are not enough resources available to register the handlers  then RETURN_OUT_OF_RESOURCES is returned.\r
   Registers the handlers specified by GetInfoHandler and DecodeHandler with the GUID specified by SectionGuid.\r
   If the GUID value specified by SectionGuid has already been registered, then return RETURN_ALREADY_STARTED.\r
   If there are not enough resources available to register the handlers  then RETURN_OUT_OF_RESOURCES is returned.\r

-  \r
+\r

   If SectionGuid is NULL, then ASSERT().\r
   If GetInfoHandler is NULL, then ASSERT().\r
   If DecodeHandler is NULL, then ASSERT().\r
   If SectionGuid is NULL, then ASSERT().\r
   If GetInfoHandler is NULL, then ASSERT().\r
   If DecodeHandler is NULL, then ASSERT().\r


@@ -125,7 +125,7 @@ RETURN_STATUS
                              size of the decoded buffer and the size of an optional scratch buffer\r
                              required to actually decode the data in a GUIDed section.\r
   @param[in]  DecodeHandler  Pointer to a function that decodes a GUIDed section into a caller\r
                              size of the decoded buffer and the size of an optional scratch buffer\r
                              required to actually decode the data in a GUIDed section.\r
   @param[in]  DecodeHandler  Pointer to a function that decodes a GUIDed section into a caller\r

-                             allocated output buffer. \r
+                             allocated output buffer.\r

 \r
   @retval  RETURN_SUCCESS           The handlers were registered.\r
   @retval  RETURN_OUT_OF_RESOURCES  There are not enough resources available to register the handlers.\r
 \r
   @retval  RETURN_SUCCESS           The handlers were registered.\r
   @retval  RETURN_OUT_OF_RESOURCES  There are not enough resources available to register the handlers.\r


@@ -144,7 +144,7 @@ ExtractGuidedSectionRegisterHandlers (
 \r
   Sets ExtractHandlerGuidTable so it points at a callee allocated array of registered GUIDs.\r
   The total number of GUIDs in the array are returned. Since the array of GUIDs is callee allocated\r
 \r
   Sets ExtractHandlerGuidTable so it points at a callee allocated array of registered GUIDs.\r
   The total number of GUIDs in the array are returned. Since the array of GUIDs is callee allocated\r

-  and caller must treat this array of GUIDs as read-only data. \r
+  and caller must treat this array of GUIDs as read-only data.\r

   If ExtractHandlerGuidTable is NULL, then ASSERT().\r
 \r
   @param[out]  ExtractHandlerGuidTable  A pointer to the array of GUIDs that have been registered through\r
   If ExtractHandlerGuidTable is NULL, then ASSERT().\r
 \r
   @param[out]  ExtractHandlerGuidTable  A pointer to the array of GUIDs that have been registered through\r


@@ -165,14 +165,14 @@ ExtractGuidedSectionGetGuidList (
   The selected handler is used to retrieve and return the size of the decoded buffer and the size of an\r
   optional scratch buffer required to actually decode the data in a GUIDed section.\r
 \r
   The selected handler is used to retrieve and return the size of the decoded buffer and the size of an\r
   optional 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 any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r
   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r

-  then RETURN_UNSUPPORTED is returned.  \r
-  If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler \r
+  then RETURN_UNSUPPORTED is returned.\r
+  If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r

   of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to retrieve the OututBufferSize, ScratchSize, and Attributes values. The return status from the handler of\r
   type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER is returned.\r
   of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to retrieve the OututBufferSize, ScratchSize, and Attributes values. The return status from the handler of\r
   type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER is returned.\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


@@ -199,7 +199,7 @@ ExtractGuidedSectionGetInfo (
   IN  CONST VOID    *InputSection,\r
   OUT       UINT32  *OutputBufferSize,\r
   OUT       UINT32  *ScratchBufferSize,\r
   IN  CONST VOID    *InputSection,\r
   OUT       UINT32  *OutputBufferSize,\r
   OUT       UINT32  *ScratchBufferSize,\r

-  OUT       UINT16  *SectionAttribute   \r
+  OUT       UINT16  *SectionAttribute\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -208,26 +208,26 @@ ExtractGuidedSectionGetInfo (
   The selected handler is used to decode the data in a GUIDed section and return the result in a caller\r
   allocated output buffer.\r
 \r
   The selected handler is used to decode the data in a GUIDed section and return the result in a caller\r
   allocated output buffer.\r
 \r

-  Decodes the GUIDed section specified by InputSection.  \r
+  Decodes the GUIDed section specified by InputSection.\r

   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r
   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r

-  then RETURN_UNSUPPORTED is returned.  \r
+  then RETURN_UNSUPPORTED is returned.\r

   If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r
   of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to decode InputSection 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 data in InputSection,\r
   then OutputBuffer is set to point at the data in InputSection.  Otherwise, the decoded data will be placed in caller\r
   allocated buffer specified by OutputBuffer.    This function is responsible for computing the  EFI_AUTH_STATUS_PLATFORM_OVERRIDE\r
   If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r
   of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to decode InputSection 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 data in InputSection,\r
   then OutputBuffer is set to point at the data in InputSection.  Otherwise, the decoded data will be placed in caller\r
   allocated buffer specified by OutputBuffer.    This function is responsible for computing the  EFI_AUTH_STATUS_PLATFORM_OVERRIDE\r

-  bit of in AuthenticationStatus.  The return status from the handler of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER is returned. \r
-   \r
+  bit of in AuthenticationStatus.  The return status from the handler of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER is returned.\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

-  If AuthenticationStatus is NULL, then ASSERT().  \r
+  If AuthenticationStatus is NULL, then ASSERT().\r

 \r
   @param[in]  InputSection   A pointer to a GUIDed section of an FFS formatted file.\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[in]  ScratchBuffer  A caller allocated buffer that may be required by this function as a scratch buffer to perform the decode operation. \r
-  @param[out] AuthenticationStatus \r
+  @param[out] OutputBuffer   A pointer to a buffer that contains the result of a decode operation.\r
+  @param[in]  ScratchBuffer  A caller allocated buffer that may be required by this function 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. See the definition\r
                              of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI\r
                              Specification.\r
                              A pointer to the authentication status of the decoded output buffer. See the definition\r
                              of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI\r
                              Specification.\r


@@ -243,27 +243,27 @@ ExtractGuidedSectionDecode (
   IN  CONST VOID    *InputSection,\r
   OUT       VOID    **OutputBuffer,\r
   IN        VOID    *ScratchBuffer,        OPTIONAL\r
   IN  CONST VOID    *InputSection,\r
   OUT       VOID    **OutputBuffer,\r
   IN        VOID    *ScratchBuffer,        OPTIONAL\r

-  OUT       UINT32  *AuthenticationStatus  \r
+  OUT       UINT32  *AuthenticationStatus\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Retrieves handlers of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER and \r
+  Retrieves handlers of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER and\r

   EXTRACT_GUIDED_SECTION_DECODE_HANDLER for a specific GUID section type.\r
   EXTRACT_GUIDED_SECTION_DECODE_HANDLER for a specific GUID section type.\r

-  \r
-  Retrieves the handlers associated with SectionGuid and returns them in \r
+\r
+  Retrieves the handlers associated with SectionGuid and returns them in\r

   GetInfoHandler and DecodeHandler.\r
 \r
   GetInfoHandler and DecodeHandler.\r
 \r

-  If the GUID value specified by SectionGuid has not been registered, then \r
+  If the GUID value specified by SectionGuid has not been registered, then\r

   return RETURN_NOT_FOUND.\r
   return RETURN_NOT_FOUND.\r

-  \r
+\r

   If SectionGuid is NULL, then ASSERT().\r
 \r
   If SectionGuid is NULL, then ASSERT().\r
 \r

-  @param[in]  SectionGuid    A pointer to the GUID associated with the handlersof the GUIDed \r
+  @param[in]  SectionGuid    A pointer to the GUID associated with the handlersof the GUIDed\r

                              section type being retrieved.\r
                              section type being retrieved.\r

-  @param[out] GetInfoHandler Pointer to a function that examines a GUIDed section and returns \r
-                             the size of the decoded buffer and the size of an optional scratch \r
-                             buffer required to actually decode the data in a GUIDed section.  \r
-                             This is an optional parameter that may be NULL. If it is NULL, then \r
+  @param[out] GetInfoHandler Pointer to a function that examines a GUIDed section and returns\r
+                             the size of the decoded buffer and the size of an optional scratch\r
+                             buffer required to actually decode the data in a GUIDed section.\r
+                             This is an optional parameter that may be NULL. If it is NULL, then\r

                              the previously registered handler is not returned.\r
   @param[out] DecodeHandler  Pointer to a function that decodes a GUIDed section into a caller\r
                              allocated output buffer. This is an optional parameter that may be NULL.\r
                              the previously registered handler is not returned.\r
   @param[out] DecodeHandler  Pointer to a function that decodes a GUIDed section into a caller\r
                              allocated output buffer. This is an optional parameter that may be NULL.\r

diff --git a/MdePkg/Include/Library/FileHandleLib.h b/MdePkg/Include/Library/FileHandleLib.h
index f3423d841c2b1c0aeeeae360ab588e96b66ef1b7..055177348186a3a27549f4c135ef1373934f1534 100644 (file)
--- a/MdePkg/Include/Library/FileHandleLib.h
+++ b/MdePkg/Include/Library/FileHandleLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Provides interface to EFI_FILE_HANDLE functionality.\r
 \r
 /** @file\r
   Provides interface to EFI_FILE_HANDLE functionality.\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


@@ -249,8 +249,8 @@ FileHandleFlush (
   @param[in] DirHandle          Handle to open file.\r
 \r
   @retval EFI_SUCCESS           DirHandle is a directory.\r
   @param[in] DirHandle          Handle to open file.\r
 \r
   @retval EFI_SUCCESS           DirHandle is a directory.\r

-  @retval EFI_INVALID_PARAMETER DirHandle is NULL. \r
-                                The file information returns from FileHandleGetInfo is NULL. \r
+  @retval EFI_INVALID_PARAMETER DirHandle is NULL.\r
+                                The file information returns from FileHandleGetInfo is NULL.\r

   @retval EFI_NOT_FOUND         DirHandle is not a directory.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_NOT_FOUND         DirHandle is not a directory.\r
 **/\r
 EFI_STATUS\r


@@ -357,8 +357,8 @@ FileHandleSetSize (
 \r
 /**\r
   Function to get a full filename given a EFI_FILE_HANDLE somewhere lower on the\r
 \r
 /**\r
   Function to get a full filename given a EFI_FILE_HANDLE somewhere lower on the\r

-  directory 'stack'. If the file is a directory, then append the '\' char at the \r
-  end of name string. If it's not a directory, then the last '\' should not be \r
+  directory 'stack'. If the file is a directory, then append the '\' char at the\r
+  end of name string. If it's not a directory, then the last '\' should not be\r

   added.\r
 \r
   @param[in] Handle             Handle to the Directory or File to create path to.\r
   added.\r
 \r
   @param[in] Handle             Handle to the Directory or File to create path to.\r


@@ -439,11 +439,11 @@ FileHandleReturnLine(
 \r
 /**\r
   Function to write a line of text to a file.\r
 \r
 /**\r
   Function to write a line of text to a file.\r

-  \r
-  If the file is a Unicode file (with UNICODE file tag) then write the unicode \r
+\r
+  If the file is a Unicode file (with UNICODE file tag) then write the unicode\r

   text.\r
   If the file is an ASCII file then write the ASCII text.\r
   text.\r
   If the file is an ASCII file then write the ASCII text.\r

-  If the size of file is zero (without file tag at the beginning) then write \r
+  If the size of file is zero (without file tag at the beginning) then write\r

   ASCII text as default.\r
 \r
   @param[in]     Handle         FileHandle to write to.\r
   ASCII text as default.\r
 \r
   @param[in]     Handle         FileHandle to write to.\r


@@ -453,7 +453,7 @@ FileHandleReturnLine(
   @retval  EFI_SUCCESS            The data was written.\r
                                   Buffer is NULL.\r
   @retval  EFI_INVALID_PARAMETER  Handle is NULL.\r
   @retval  EFI_SUCCESS            The data was written.\r
                                   Buffer is NULL.\r
   @retval  EFI_INVALID_PARAMETER  Handle is NULL.\r

-  @retval  EFI_OUT_OF_RESOURCES   Unable to allocate temporary space for ASCII \r
+  @retval  EFI_OUT_OF_RESOURCES   Unable to allocate temporary space for ASCII\r

                                   string due to out of resources.\r
 \r
   @sa FileHandleWrite\r
                                   string due to out of resources.\r
 \r
   @sa FileHandleWrite\r

diff --git a/MdePkg/Include/Library/HobLib.h b/MdePkg/Include/Library/HobLib.h
index 7cbf1343f654494a86ef8ec2c4a3cb302039ad4c..383f605a9d4188a9b813ad217d6780d5bdb19194 100644 (file)
--- a/MdePkg/Include/Library/HobLib.h
+++ b/MdePkg/Include/Library/HobLib.h
@@ -8,7 +8,7 @@
   allows the PEI phase to pass information to the DXE phase. HOBs are position\r
   independent and can be relocated easily to different memory locations.\r
 \r
   allows the PEI phase to pass information to the DXE phase. HOBs are position\r
   independent and can be relocated easily to different memory locations.\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


@@ -190,7 +190,7 @@ BuildModuleHob (
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r

diff --git a/MdePkg/Include/Library/IoLib.h b/MdePkg/Include/Library/IoLib.h
index b6df4c10b92938c349f3dbfadbf21b6fd479b50a..a16594d5d441f2ce723afb3a0f6263ef54a1717a 100644 (file)
--- a/MdePkg/Include/Library/IoLib.h
+++ b/MdePkg/Include/Library/IoLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Provide services to access I/O Ports and MMIO registers.\r
 \r
 /** @file\r
   Provide services to access I/O Ports and MMIO registers.\r
 \r

-Copyright (c) 2006 - 2012, 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


@@ -20,14 +20,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Macro that converts PCI Segment and I/O Port to an address that can be\r
   passed to the I/O Library functions.\r
 /**\r
   Macro that converts PCI Segment and I/O Port to an address that can be\r
   passed to the I/O Library functions.\r

-  \r
-  Computes an address that is compatible with the I/O Library functions.  \r
-  The unused upper bits of Segment, and Port are stripped prior to the \r
+\r
+  Computes an address that is compatible with the I/O Library functions.\r
+  The unused upper bits of Segment, and Port are stripped prior to the\r

   generation of the address.\r
   generation of the address.\r

-  \r
+\r

   @param  Segment   PCI Segment number.  Range 0..65535.\r
   @param  Port      I/O Port number.  Range 0..65535.\r
   @param  Segment   PCI Segment number.  Range 0..65535.\r
   @param  Port      I/O Port number.  Range 0..65535.\r

-  \r
+\r

   @return An address that the I/o Library functions need.\r
 \r
 **/\r
   @return An address that the I/o Library functions need.\r
 \r
 **/\r


@@ -178,7 +178,7 @@ IoAnd8 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 8-bit I/O port.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 8-bit I/O port.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -238,7 +238,7 @@ IoBitFieldRead8 (
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r
   by the StartBit and the EndBit. All other bits in the destination I/O\r
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r
   by the StartBit and the EndBit. All other bits in the destination I/O\r

-  register are preserved. The value written to the I/O port is returned. \r
+  register are preserved. The value written to the I/O port is returned.\r

 \r
   If 8-bit I/O port operations are not supported, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r
 \r
   If 8-bit I/O port operations are not supported, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r


@@ -405,7 +405,7 @@ IoRead16 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r


@@ -507,7 +507,7 @@ IoOr16 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
 \r
   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
 \r


@@ -522,7 +522,7 @@ IoAnd16 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a 16-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads a 16-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 16-bit I/O port.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 16-bit I/O port.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -534,7 +534,7 @@ IoAnd16 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
   @param  OrData  The value to OR with the result of the AND operation.\r
   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
   @param  OrData  The value to OR with the result of the AND operation.\r


@@ -735,7 +735,7 @@ IoBitFieldAndThenOr16 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r
   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r


@@ -756,7 +756,7 @@ IoRead32 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r


@@ -873,7 +873,7 @@ IoAnd32 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 32-bit I/O port.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 32-bit I/O port.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -1174,7 +1174,7 @@ IoAnd64 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a 64-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads a 64-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 64-bit I/O port.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 64-bit I/O port.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -1409,7 +1409,7 @@ MmioRead8 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r


@@ -1424,7 +1424,7 @@ MmioWrite8 (
   Reads an 8-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 8-bit MMIO register.\r
 \r
   Reads an 8-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 8-bit MMIO register.\r
 \r

-  Reads the 8-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 8-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1471,7 +1471,7 @@ MmioAnd8 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 8-bit MMIO register.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 8-bit MMIO register.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1563,7 +1563,7 @@ MmioBitFieldWrite8 (
   Reads a bit field in an 8-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 8-bit MMIO register.\r
 \r
   Reads a bit field in an 8-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 8-bit MMIO register.\r
 \r

-  Reads the 8-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 8-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1704,7 +1704,7 @@ MmioRead16 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r


@@ -1719,7 +1719,7 @@ MmioWrite16 (
   Reads a 16-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 16-bit MMIO register.\r
 \r
   Reads a 16-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 16-bit MMIO register.\r
 \r

-  Reads the 16-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 16-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1768,7 +1768,7 @@ MmioAnd16 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 16-bit MMIO register.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 16-bit MMIO register.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1862,7 +1862,7 @@ MmioBitFieldWrite16 (
   Reads a bit field in a 16-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 16-bit MMIO register.\r
 \r
   Reads a bit field in a 16-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 16-bit MMIO register.\r
 \r

-  Reads the 16-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 16-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -2006,7 +2006,7 @@ MmioRead32 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r


@@ -2021,7 +2021,7 @@ MmioWrite32 (
   Reads a 32-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 32-bit MMIO register.\r
 \r
   Reads a 32-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 32-bit MMIO register.\r
 \r

-  Reads the 32-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 32-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -2070,7 +2070,7 @@ MmioAnd32 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 32-bit MMIO register.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 32-bit MMIO register.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2164,7 +2164,7 @@ MmioBitFieldWrite32 (
   Reads a bit field in a 32-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 32-bit MMIO register.\r
 \r
   Reads a bit field in a 32-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 32-bit MMIO register.\r
 \r

-  Reads the 32-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 32-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -2321,7 +2321,7 @@ MmioWrite64 (
   Reads a 64-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 64-bit MMIO register.\r
 \r
   Reads a 64-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 64-bit MMIO register.\r
 \r

-  Reads the 64-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 64-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -2370,7 +2370,7 @@ MmioAnd64 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 64-bit MMIO register.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 64-bit MMIO register.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2464,7 +2464,7 @@ MmioBitFieldWrite64 (
   Reads a bit field in a 64-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 64-bit MMIO register.\r
 \r
   Reads a bit field in a 64-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 64-bit MMIO register.\r
 \r

-  Reads the 64-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 64-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -2578,11 +2578,11 @@ MmioBitFieldAndThenOr64 (
 /**\r
   Copy data from MMIO region to system memory by using 8-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 8-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 8-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 8-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -2604,13 +2604,13 @@ MmioReadBuffer8 (
 /**\r
   Copy data from MMIO region to system memory by using 16-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 16-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 16-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 16-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -2634,13 +2634,13 @@ MmioReadBuffer16 (
 /**\r
   Copy data from MMIO region to system memory by using 32-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 32-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 32-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 32-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -2664,13 +2664,13 @@ MmioReadBuffer32 (
 /**\r
   Copy data from MMIO region to system memory by using 64-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 64-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 64-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 64-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r


@@ -2694,11 +2694,11 @@ MmioReadBuffer64 (
 /**\r
   Copy data from system memory to MMIO region by using 8-bit access.\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 8-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 8-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 8-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -2720,13 +2720,13 @@ MmioWriteBuffer8 (
 /**\r
   Copy data from system memory to MMIO region by using 16-bit access.\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 16-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 16-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 16-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -2751,13 +2751,13 @@ MmioWriteBuffer16 (
 /**\r
   Copy data from system memory to MMIO region by using 32-bit access.\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 32-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 32-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 32-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -2782,13 +2782,13 @@ MmioWriteBuffer32 (
 /**\r
   Copy data from system memory to MMIO region by using 64-bit access.\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 64-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 64-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 64-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Include/Library/MemoryAllocationLib.h b/MdePkg/Include/Library/MemoryAllocationLib.h
index 0df59e60a38608c4b27fde71a60a24b5cd81d5dd..d24d1d663ea8400170bbc360b9855c033556b37b 100644 (file)
--- a/MdePkg/Include/Library/MemoryAllocationLib.h
+++ b/MdePkg/Include/Library/MemoryAllocationLib.h
@@ -1,12 +1,12 @@
 /** @file\r
   Provides services to allocate and free memory buffers of various memory types and alignments.\r
 /** @file\r
   Provides services to allocate and free memory buffers of various memory types and alignments.\r

-  \r
-  The Memory Allocation Library abstracts various common memory allocation operations. This library \r
-  allows code to be written in a phase-independent manner because the allocation of memory in PEI, DXE, \r
-  and SMM (for example) is done via a different mechanism. Using a common library interface makes it \r
-  much easier to port algorithms from phase to phase. \r
-  \r
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+\r
+  The Memory Allocation Library abstracts various common memory allocation operations. This library\r
+  allows code to be written in a phase-independent manner because the allocation of memory in PEI, DXE,\r
+  and SMM (for example) is done via a different mechanism. Using a common library interface makes it\r
+  much easier to port algorithms from phase to phase.\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


@@ -85,11 +85,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


@@ -108,7 +108,7 @@ FreePages (
   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


@@ -133,7 +133,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


@@ -158,7 +158,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


@@ -182,13 +182,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


@@ -318,9 +318,9 @@ AllocateReservedZeroPool (
   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


@@ -342,9 +342,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


@@ -366,9 +366,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


@@ -387,18 +387,18 @@ AllocateReservedCopyPool (
   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


@@ -416,10 +416,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


@@ -427,7 +427,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


@@ -445,10 +445,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


@@ -456,7 +456,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


@@ -477,7 +477,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/MdePkg/Include/Library/PalLib.h b/MdePkg/Include/Library/PalLib.h
index 4458047231e9e5b96aa2b31aa9b0e41d98481026..ab0fa992e00b3480627c593120cebfcea844e4e7 100644 (file)
--- a/MdePkg/Include/Library/PalLib.h
+++ b/MdePkg/Include/Library/PalLib.h
@@ -1,22 +1,22 @@
 /** @file\r
   Provides library services to make PAL Calls.\r
 /** @file\r
   Provides library services to make PAL Calls.\r

-  \r
+\r

   The PAL Library provides a service to make a PAL CALL.  This service is identical\r
   in functionality to AsmPalCall() in the functions of the Base Library specific to Intel Itanium architecture.\r
   The only difference is that the PAL Entry Point is not passed in.  Implementations\r
   of this library class must manage PAL Entry Point on their own.  For example, a PEI\r
   implementation can use a PPI to lookup the PAL Entry Point, and a DXE implementation\r
   The PAL Library provides a service to make a PAL CALL.  This service is identical\r
   in functionality to AsmPalCall() in the functions of the Base Library specific to Intel Itanium architecture.\r
   The only difference is that the PAL Entry Point is not passed in.  Implementations\r
   of this library class must manage PAL Entry Point on their own.  For example, a PEI\r
   implementation can use a PPI to lookup the PAL Entry Point, and a DXE implementation\r

-  can contain a constructor to look up the PAL Entry Point from a HOB.  This library class \r
+  can contain a constructor to look up the PAL Entry Point from a HOB.  This library class\r

   is only available on Intel Itanium-based platforms.\r
   is only available on Intel Itanium-based platforms.\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/MdePkg/Include/Library/PcdLib.h b/MdePkg/Include/Library/PcdLib.h
index 9e7e09f52cdc3dc7d2c0b474f5804c06b0d410a3..73f63ae8c6e43e375796fbfa58c167dd9c8a8555 100644 (file)
--- a/MdePkg/Include/Library/PcdLib.h
+++ b/MdePkg/Include/Library/PcdLib.h
@@ -8,13 +8,13 @@
   LibPatchPcdSetPtr() interface. For FeatureFlag/Fixed PCD, the macro interface is\r
   translated to a variable or macro that is auto-generated by build tool in\r
   module's autogen.h/autogen.c.\r
   LibPatchPcdSetPtr() interface. For FeatureFlag/Fixed PCD, the macro interface is\r
   translated to a variable or macro that is auto-generated by build tool in\r
   module's autogen.h/autogen.c.\r

-  The PcdGetXX(), PcdSetXX(), PcdToken(), and PcdGetNextTokenSpace() operations are \r
-  only available prior to ExitBootServices().  If access to PCD values are required \r
+  The PcdGetXX(), PcdSetXX(), PcdToken(), and PcdGetNextTokenSpace() operations are\r
+  only available prior to ExitBootServices().  If access to PCD values are required\r

   at runtime, then their values must be collected prior to ExitBootServices().\r
   There are no restrictions on the use of FeaturePcd(), FixedPcdGetXX(),\r
   PatchPcdGetXX(), and PatchPcdSetXX().\r
 \r
   at runtime, then their values must be collected prior to ExitBootServices().\r
   There are no restrictions on the use of FeaturePcd(), FixedPcdGetXX(),\r
   PatchPcdGetXX(), and PatchPcdSetXX().\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


@@ -127,7 +127,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   @param   TokenName  The name of the PCD token to retrieve a current value for.\r
 \r
 \r
   @param   TokenName  The name of the PCD token to retrieve a current value for.\r
 \r

-  @return  The Boolean value for the token. \r
+  @return  The Boolean value for the token.\r

 \r
 **/\r
 #define FixedPcdGetBool(TokenName)          _PCD_VALUE_##TokenName\r
 \r
 **/\r
 #define FixedPcdGetBool(TokenName)          _PCD_VALUE_##TokenName\r


@@ -142,7 +142,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   @param   TokenName  The name of the PCD token to retrieve a current value for.\r
 \r
 \r
   @param   TokenName  The name of the PCD token to retrieve a current value for.\r
 \r

-  @return  A pointer to the buffer. \r
+  @return  A pointer to the buffer.\r

 \r
 **/\r
 #define FixedPcdGetPtr(TokenName)           ((VOID *)_PCD_VALUE_##TokenName)\r
 \r
 **/\r
 #define FixedPcdGetPtr(TokenName)           ((VOID *)_PCD_VALUE_##TokenName)\r


@@ -246,7 +246,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   @param   TokenName  The name of the binary patchable PCD token to set the current value for.\r
   @param   Value      The 8-bit value to set.\r
 \r
   @param   TokenName  The name of the binary patchable PCD token to set the current value for.\r
   @param   Value      The 8-bit value to set.\r

-  \r
+\r

   @return Return the Value that was set.\r
 \r
 **/\r
   @return Return the Value that was set.\r
 \r
 **/\r


@@ -320,17 +320,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Sets a pointer to a binary patchable PCD token buffer based on a token name.\r
 \r
 /**\r
   Sets a pointer to a binary patchable PCD token buffer based on a token name.\r
 \r

-  Sets the buffer for the token specified by TokenName.  Buffer is returned.  \r
+  Sets the buffer for the token specified by TokenName.  Buffer is returned.\r

   If SizeOfBuffer is greater than the maximum size supported by TokenName, then set SizeOfBuffer\r
   If SizeOfBuffer is greater than the maximum size supported by TokenName, then set SizeOfBuffer\r

-  to the maximum size supported by TokenName and return NULL to indicate that the set operation \r
-  was not actually performed.  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be \r
+  to the maximum size supported by TokenName and return NULL to indicate that the set operation\r
+  was not actually performed.  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be\r

   set to the maximum size supported by TokenName and NULL must be returned.\r
   If TokenName is not a valid token in the token space, then the module will not build.\r
   If TokenName is not a patchable in module PCD, then the module will not build.\r
   set to the maximum size supported by TokenName and NULL must be returned.\r
   If TokenName is not a valid token in the token space, then the module will not build.\r
   If TokenName is not a patchable in module PCD, then the module will not build.\r

-  \r
+\r

   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
+\r

   @param   TokenName      The name of the binary patchable PCD token to set the current value for.\r
   @param   SizeOfBuffer   A pointer to the size, in bytes, of Buffer.\r
   @param   Buffer         Pointer to the value to set.\r
   @param   TokenName      The name of the binary patchable PCD token to set the current value for.\r
   @param   SizeOfBuffer   A pointer to the size, in bytes, of Buffer.\r
   @param   Buffer         Pointer to the value to set.\r


@@ -348,10 +348,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                                               )\r
 /**\r
   Retrieves an 8-bit PCD token value based on a token name.\r
                                               )\r
 /**\r
   Retrieves an 8-bit PCD token value based on a token name.\r

-  \r
+\r

   Returns the 8-bit value for the token specified by TokenName.\r
   If TokenName is not a valid token in the token space, then the module will not build.\r
   Returns the 8-bit value for the token specified by TokenName.\r
   If TokenName is not a valid token in the token space, then the module will not build.\r

-  \r
+\r

   @param   TokenName  The name of the PCD token to retrieve a current value for.\r
 \r
   @return  8-bit value for the token specified by TokenName.\r
   @param   TokenName  The name of the PCD token to retrieve a current value for.\r
 \r
   @return  8-bit value for the token specified by TokenName.\r


@@ -460,10 +460,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Retrieves the size of the PCD token based on a token name.\r
 \r
 /**\r
   Retrieves the size of the PCD token based on a token name.\r

-  \r
+\r

   Returns the size of the token specified by TokenName.\r
   If TokenName is not a valid token in the token space, then the module will not build.\r
   Returns the size of the token specified by TokenName.\r
   If TokenName is not a valid token in the token space, then the module will not build.\r

-  \r
+\r

   @param[in]   TokenName  The name of the PCD token to retrieve a current value size for.\r
 \r
   @return      Return the size\r
   @param[in]   TokenName  The name of the PCD token to retrieve a current value size for.\r
 \r
   @return      Return the size\r


@@ -474,11 +474,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Retrieve the size of a given PCD token.\r
 \r
 /**\r
   Retrieve the size of a given PCD token.\r

-  \r
-  Returns the size of the token specified by TokenNumber and Guid. \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that designates \r
+  Returns the size of the token specified by TokenNumber and Guid.\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          Pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value size for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value size for.\r
 \r


@@ -496,7 +496,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   @param   TokenName  The name of the PCD token to retrieve a current value for.\r
   @param   Value      The 8-bit value to set.\r
 \r
   @param   TokenName  The name of the PCD token to retrieve a current value for.\r
   @param   Value      The 8-bit value to set.\r

-  \r
+\r

   @return Return the Value that was set.\r
 \r
 **/\r
   @return Return the Value that was set.\r
 \r
 **/\r


@@ -551,17 +551,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Sets a pointer to a PCD token buffer based on a token name.\r
 \r
 /**\r
   Sets a pointer to a PCD token buffer based on a token name.\r
 \r

-  Sets the buffer for the token specified by TokenName. Buffer is returned.  \r
-  If SizeOfBuffer is greater than the maximum size supported by TokenName, \r
-  then set SizeOfBuffer to the maximum size supported by TokenName and return NULL \r
-  to indicate that the set operation was not actually performed.  If SizeOfBuffer \r
-  is set to MAX_ADDRESS, then SizeOfBuffer must be set to the maximum size supported \r
+  Sets the buffer for the token specified by TokenName. Buffer is returned.\r
+  If SizeOfBuffer is greater than the maximum size supported by TokenName,\r
+  then set SizeOfBuffer to the maximum size supported by TokenName and return NULL\r
+  to indicate that the set operation was not actually performed.  If SizeOfBuffer\r
+  is set to MAX_ADDRESS, then SizeOfBuffer must be set to the maximum size supported\r

   by TokenName and NULL must be returned.\r
   If TokenName is not a valid token in the token space, then the module will not build.\r
   by TokenName and NULL must be returned.\r
   If TokenName is not a valid token in the token space, then the module will not build.\r

-  \r
+\r

   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
+\r

   @param   TokenName      The name of the PCD token to set the current value for.\r
   @param   SizeOfBuffer   A pointer to the size, in bytes, of Buffer.\r
   @param   Buffer         A pointer to the buffer to set.\r
   @param   TokenName      The name of the PCD token to set the current value for.\r
   @param   SizeOfBuffer   A pointer to the size, in bytes, of Buffer.\r
   @param   Buffer         A pointer to the buffer to set.\r


@@ -571,11 +571,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 #define PcdSetPtr(TokenName, SizeOfBuffer, Buffer) \\r
                                             _PCD_SET_MODE_PTR_##TokenName   ((SizeOfBuffer), (Buffer))\r
 **/\r
 #define PcdSetPtr(TokenName, SizeOfBuffer, Buffer) \\r
                                             _PCD_SET_MODE_PTR_##TokenName   ((SizeOfBuffer), (Buffer))\r

-                                            \r
+\r

 /**\r
   Sets a Boolean PCD token value based on a token name.\r
 \r
 /**\r
   Sets a Boolean PCD token value based on a token name.\r
 \r

-  Sets the Boolean value for the token specified by TokenName. Value is returned. \r
+  Sets the Boolean value for the token specified by TokenName. Value is returned.\r

   If TokenName is not a valid token in the token space, then the module will not build.\r
 \r
   @param   TokenName      The name of the PCD token to set the current value for.\r
   If TokenName is not a valid token in the token space, then the module will not build.\r
 \r
   @param   TokenName      The name of the PCD token to set the current value for.\r


@@ -689,9 +689,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Returns the token number for the token specified by Guid and TokenName.\r
   If TokenName is not a valid token in the token space, then the module will not build.\r
 \r
   Returns the token number for the token specified by Guid and TokenName.\r
   If TokenName is not a valid token in the token space, then the module will not build.\r
 \r

-  @param   Guid        Pointer to a 128-bit unique value that designates \r
+  @param   Guid        Pointer to a 128-bit unique value that designates\r

                        which namespace to retrieve a value from.\r
                        which namespace to retrieve a value from.\r

-  @param   TokenName   The name of the PCD token to retrieve a current value for.                 \r
+  @param   TokenName   The name of the PCD token to retrieve a current value for.\r

 \r
   @return  Return the token number.\r
 \r
 \r
   @return  Return the token number.\r
 \r


@@ -702,14 +702,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Retrieves an 8-bit PCD token value based on a GUID and a token name.\r
 \r
   Returns the 8-bit value for the token specified by Guid and TokenName.\r
   Retrieves an 8-bit PCD token value based on a GUID and a token name.\r
 \r
   Returns the 8-bit value for the token specified by Guid and TokenName.\r

-  If TokenName is not a valid token in the token space specified by Guid, \r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
   then the module will not build.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param   Guid        Pointer to a 128-bit unique value that designates \r
+  @param   Guid        Pointer to a 128-bit unique value that designates\r

                        which namespace to retrieve a value from.\r
                        which namespace to retrieve a value from.\r

-  @param   TokenName   The name of the PCD token to retrieve a current value for.                 \r
+  @param   TokenName   The name of the PCD token to retrieve a current value for.\r

 \r
   @return  An 8-bit PCD token value.\r
 \r
 \r
   @return  An 8-bit PCD token value.\r
 \r


@@ -720,14 +720,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Retrieves a 16-bit PCD token value based on a GUID and a token name.\r
 \r
   Returns the 16-bit value for the token specified by Guid and TokenName.\r
   Retrieves a 16-bit PCD token value based on a GUID and a token name.\r
 \r
   Returns the 16-bit value for the token specified by Guid and TokenName.\r

-  If TokenName is not a valid token in the token space specified by Guid, \r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param   Guid        Pointer to a 128-bit unique value that designates \r
+  @param   Guid        Pointer to a 128-bit unique value that designates\r

                        which namespace to retrieve a value from.\r
                        which namespace to retrieve a value from.\r

-  @param   TokenName   The name of the PCD token to retrieve a current value for.                 \r
+  @param   TokenName   The name of the PCD token to retrieve a current value for.\r

 \r
   @return  A 16-bit PCD token value.\r
 \r
 \r
   @return  A 16-bit PCD token value.\r
 \r


@@ -739,14 +739,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Retrieves a 32-bit PCD token value based on a GUID and a token name.\r
 \r
   Returns the 32-bit value for the token specified by Guid and TokenName.\r
   Retrieves a 32-bit PCD token value based on a GUID and a token name.\r
 \r
   Returns the 32-bit value for the token specified by Guid and TokenName.\r

-  If TokenName is not a valid token in the token space specified by Guid, \r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param   Guid        Pointer to a 128-bit unique value that designates \r
+  @param   Guid        Pointer to a 128-bit unique value that designates\r

                        which namespace to retrieve a value from.\r
                        which namespace to retrieve a value from.\r

-  @param   TokenName   The name of the PCD token to retrieve a current value for.                 \r
+  @param   TokenName   The name of the PCD token to retrieve a current value for.\r

 \r
   @return  A 32-bit PCD token value.\r
 \r
 \r
   @return  A 32-bit PCD token value.\r
 \r


@@ -758,14 +758,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Retrieves a 64-bit PCD token value based on a GUID and a token name.\r
 \r
   Returns the 64-bit value for the token specified by Guid and TokenName.\r
   Retrieves a 64-bit PCD token value based on a GUID and a token name.\r
 \r
   Returns the 64-bit value for the token specified by Guid and TokenName.\r

-  If TokenName is not a valid token in the token space specified by Guid, \r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param   Guid        Pointer to a 128-bit unique value that designates \r
+  @param   Guid        Pointer to a 128-bit unique value that designates\r

                        which namespace to retrieve a value from.\r
                        which namespace to retrieve a value from.\r

-  @param   TokenName   The name of the PCD token to retrieve a current value for.                 \r
+  @param   TokenName   The name of the PCD token to retrieve a current value for.\r

 \r
   @return  A 64-bit PCD token value.\r
 \r
 \r
   @return  A 64-bit PCD token value.\r
 \r


@@ -777,14 +777,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Retrieves a pointer to a PCD token buffer based on a GUID and a token name.\r
 \r
   Returns a pointer to the buffer for the token specified by Guid and TokenName.\r
   Retrieves a pointer to a PCD token buffer based on a GUID and a token name.\r
 \r
   Returns a pointer to the buffer for the token specified by Guid and TokenName.\r

-  If TokenName is not a valid token in the token space specified by Guid, \r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param   Guid        Pointer to a 128-bit unique value that designates \r
+  @param   Guid        Pointer to a 128-bit unique value that designates\r

                        which namespace to retrieve a value from.\r
                        which namespace to retrieve a value from.\r

-  @param   TokenName   The name of the PCD token to retrieve a current value for.                 \r
+  @param   TokenName   The name of the PCD token to retrieve a current value for.\r

 \r
   @return  A pointer to a PCD token buffer.\r
 \r
 \r
   @return  A pointer to a PCD token buffer.\r
 \r


@@ -796,14 +796,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Retrieves a Boolean PCD token value based on a GUID and a token name.\r
 \r
   Returns the Boolean value for the token specified by Guid and TokenName.\r
   Retrieves a Boolean PCD token value based on a GUID and a token name.\r
 \r
   Returns the Boolean value for the token specified by Guid and TokenName.\r

-  If TokenName is not a valid token in the token space specified by Guid, \r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param   Guid        Pointer to a 128-bit unique value that designates \r
+  @param   Guid        Pointer to a 128-bit unique value that designates\r

                        which namespace to retrieve a value from.\r
                        which namespace to retrieve a value from.\r

-  @param   TokenName   The name of the PCD token to retrieve a current value for.                 \r
+  @param   TokenName   The name of the PCD token to retrieve a current value for.\r

 \r
   @return  A Boolean PCD token value.\r
 \r
 \r
   @return  A Boolean PCD token value.\r
 \r


@@ -817,15 +817,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Sets an 8-bit PCD token value based on a GUID and a token name.\r
 \r
   Sets the 8-bit value for the token specified by Guid and TokenName. Value is returned.\r
   Sets an 8-bit PCD token value based on a GUID and a token name.\r
 \r
   Sets the 8-bit value for the token specified by Guid and TokenName. Value is returned.\r

-  If TokenName is not a valid token in the token space specified by Guid, \r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param   Guid        Pointer to a 128-bit unique value that designates \r
+  @param   Guid        Pointer to a 128-bit unique value that designates\r

                        which namespace to retrieve a value from.\r
   @param   TokenName   The name of the PCD token to set the current value for.\r
                        which namespace to retrieve a value from.\r
   @param   TokenName   The name of the PCD token to set the current value for.\r

-  @param   Value       The 8-bit value to set.                   \r
+  @param   Value       The 8-bit value to set.\r

 \r
   @return Return the Value that was set.\r
 \r
 \r
   @return Return the Value that was set.\r
 \r


@@ -837,15 +837,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Sets a 16-bit PCD token value based on a GUID and a token name.\r
 \r
   Sets the 16-bit value for the token specified by Guid and TokenName. Value is returned.\r
   Sets a 16-bit PCD token value based on a GUID and a token name.\r
 \r
   Sets the 16-bit value for the token specified by Guid and TokenName. Value is returned.\r

-  If TokenName is not a valid token in the token space specified by Guid, \r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param   Guid        Pointer to a 128-bit unique value that designates \r
+  @param   Guid        Pointer to a 128-bit unique value that designates\r

                        which namespace to retrieve a value from.\r
   @param   TokenName   The name of the PCD token to set the current value for.\r
                        which namespace to retrieve a value from.\r
   @param   TokenName   The name of the PCD token to set the current value for.\r

-  @param   Value       The 16-bit value to set.                   \r
+  @param   Value       The 16-bit value to set.\r

 \r
   @return Return the Value that was set.\r
 \r
 \r
   @return Return the Value that was set.\r
 \r


@@ -857,15 +857,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Sets a 32-bit PCD token value based on a GUID and a token name.\r
 \r
   Sets the 32-bit value for the token specified by Guid and TokenName. Value is returned.\r
   Sets a 32-bit PCD token value based on a GUID and a token name.\r
 \r
   Sets the 32-bit value for the token specified by Guid and TokenName. Value is returned.\r

-  If TokenName is not a valid token in the token space specified by Guid, \r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param   Guid        Pointer to a 128-bit unique value that designates \r
+  @param   Guid        Pointer to a 128-bit unique value that designates\r

                        which namespace to retrieve a value from.\r
   @param   TokenName   The name of the PCD token to set the current value for.\r
                        which namespace to retrieve a value from.\r
   @param   TokenName   The name of the PCD token to set the current value for.\r

-  @param   Value       The 32-bit value to set.                   \r
+  @param   Value       The 32-bit value to set.\r

 \r
   @return Return the Value that was set.\r
 \r
 \r
   @return Return the Value that was set.\r
 \r


@@ -877,15 +877,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Sets a 64-bit PCD token value based on a GUID and a token name.\r
 \r
   Sets the 64-bit value for the token specified by Guid and TokenName. Value is returned.\r
   Sets a 64-bit PCD token value based on a GUID and a token name.\r
 \r
   Sets the 64-bit value for the token specified by Guid and TokenName. Value is returned.\r

-  If TokenName is not a valid token in the token space specified by Guid, \r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param   Guid        Pointer to a 128-bit unique value that designates \r
+  @param   Guid        Pointer to a 128-bit unique value that designates\r

   which namespace to retrieve a value from.\r
   @param   TokenName   The name of the PCD token to set the current value for.\r
   which namespace to retrieve a value from.\r
   @param   TokenName   The name of the PCD token to set the current value for.\r

-  @param   Value       The 64-bit value to set.                   \r
+  @param   Value       The 64-bit value to set.\r

 \r
   @return Return the Value that was set.\r
 \r
 \r
   @return Return the Value that was set.\r
 \r


@@ -896,25 +896,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Sets a pointer to a PCD token buffer based on a GUID and a token name.\r
 \r
 /**\r
   Sets a pointer to a PCD token buffer based on a GUID and a token name.\r
 \r

-  Sets the buffer for the token specified by Guid and TokenName. Buffer is returned.  \r
-  If SizeOfBuffer is greater than the maximum size supported by Guid and TokenName, \r
-  then set SizeOfBuffer to the maximum size supported by Guid and TokenName and return \r
-  NULL to indicate that the set operation was not actually performed. If SizeOfBuffer \r
+  Sets the buffer for the token specified by Guid and TokenName. Buffer is returned.\r
+  If SizeOfBuffer is greater than the maximum size supported by Guid and TokenName,\r
+  then set SizeOfBuffer to the maximum size supported by Guid and TokenName and return\r
+  NULL to indicate that the set operation was not actually performed. If SizeOfBuffer\r

   is set to MAX_ADDRESS, then SizeOfBuffer must be set to the maximum size supported by\r
   Guid and TokenName and NULL must be returned.\r
   is set to MAX_ADDRESS, then SizeOfBuffer must be set to the maximum size supported by\r
   Guid and TokenName and NULL must be returned.\r

-  If TokenName is not a valid token in the token space specified by Guid, \r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
   then the module will not build.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r
   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r

-  @param   Guid           Pointer to a 128-bit unique value that designates \r
+  @param   Guid           Pointer to a 128-bit unique value that designates\r

                           which namespace to retrieve a value from.\r
   @param   TokenName      The name of the PCD token to set the current value for.\r
                           which namespace to retrieve a value from.\r
   @param   TokenName      The name of the PCD token to set the current value for.\r

-  @param   SizeOfBuffer   A pointer to the size, in bytes, of Buffer.                  \r
+  @param   SizeOfBuffer   A pointer to the size, in bytes, of Buffer.\r

   @param   Buffer         Pointer to the buffer to set.\r
   @param   Buffer         Pointer to the buffer to set.\r

-    \r
+\r

   @return Return the pointer to the Buffer that was set.\r
 \r
 **/\r
   @return Return the pointer to the Buffer that was set.\r
 \r
 **/\r


@@ -925,20 +925,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Sets a Boolean PCD token value based on a GUID and a token name.\r
 \r
 /**\r
   Sets a Boolean PCD token value based on a GUID and a token name.\r
 \r

-  Sets the Boolean value for the token specified by Guid and TokenName. Value is returned. \r
-  If TokenName is not a valid token in the token space specified by Guid, \r
+  Sets the Boolean value for the token specified by Guid and TokenName. Value is returned.\r
+  If TokenName is not a valid token in the token space specified by Guid,\r

   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   then the module will not build.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param   Guid           Pointer to a 128-bit unique value that designates \r
+  @param   Guid           Pointer to a 128-bit unique value that designates\r

                           which namespace to retrieve a value from.\r
                           which namespace to retrieve a value from.\r

-  @param   TokenName      The name of the PCD token to set the current value for.              \r
+  @param   TokenName      The name of the PCD token to set the current value for.\r

   @param   Value          The Boolean value to set.\r
 \r
   @return Return the Value that was set.\r
 \r
   @param   Value          The Boolean value to set.\r
 \r
   @return Return the Value that was set.\r
 \r

-**/                                         \r
+**/\r

 #define PcdSetExBool(Guid, TokenName, Value) \\r
                                             LibPcdSetExBool((Guid), PcdTokenEx(Guid,TokenName), (Value))\r
 #endif\r
 #define PcdSetExBool(Guid, TokenName, Value) \\r
                                             LibPcdSetExBool((Guid), PcdTokenEx(Guid,TokenName), (Value))\r
 #endif\r


@@ -1088,12 +1088,12 @@ LibPcdSetSku (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 8-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 8-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the 8-bit value for the token specified by TokenNumber. \r
+  @return Returns the 8-bit value for the token specified by TokenNumber.\r

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


@@ -1105,12 +1105,12 @@ LibPcdGet8 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 16-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 16-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the 16-bit value for the token specified by TokenNumber. \r
+  @return Returns the 16-bit value for the token specified by TokenNumber.\r

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


@@ -1122,8 +1122,8 @@ LibPcdGet16 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 32-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 32-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r


@@ -1139,7 +1139,7 @@ LibPcdGet32 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 64-bit value for the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
   Returns the 64-bit value for the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r


@@ -1156,7 +1156,7 @@ LibPcdGet64 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the pointer to the buffer of the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
   Returns the pointer to the buffer of the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r


@@ -1173,15 +1173,15 @@ LibPcdGetPtr (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the Boolean value of the token specified by TokenNumber. \r
+\r
+  Returns the Boolean value of the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the Boolean value of the token specified by TokenNumber. \r
+  @return Returns the Boolean value of the token specified by TokenNumber.\r

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

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 LibPcdGetBool (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 LibPcdGetBool (\r
   IN UINTN             TokenNumber\r


@@ -1193,7 +1193,7 @@ LibPcdGetBool (
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the size of the token specified by TokenNumber. \r
+  @return Returns the size of the token specified by TokenNumber.\r

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


@@ -1205,12 +1205,12 @@ LibPcdGetSize (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 8-bit value for the token specified by TokenNumber and Guid.\r
   Returns the 8-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid         Pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid         Pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -1229,10 +1229,10 @@ LibPcdGetEx8 (
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
   Returns the 16-bit value for the token specified by TokenNumber and Guid.\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
   Returns the 16-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid         Pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid         Pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -1249,9 +1249,9 @@ LibPcdGetEx16 (
 \r
 /**\r
   Returns the 32-bit value for the token specified by TokenNumber and Guid.\r
 \r
 /**\r
   Returns the 32-bit value for the token specified by TokenNumber and Guid.\r

-  If Guid is NULL, then ASSERT(). \r
+  If Guid is NULL, then ASSERT().\r

 \r
 \r

-  @param[in]  Guid         Pointer to a 128-bit unique value that designates \r
+  @param[in]  Guid         Pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -1268,12 +1268,12 @@ LibPcdGetEx32 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 64-bit value for the token specified by TokenNumber and Guid.\r
   Returns the 64-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          Pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -1290,12 +1290,12 @@ LibPcdGetEx64 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the pointer to the buffer of token specified by TokenNumber and Guid.\r
   Returns the pointer to the buffer of token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          Pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -1312,12 +1312,12 @@ LibPcdGetExPtr (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the Boolean value of the token specified by TokenNumber and Guid. \r
-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that designates \r
+  Returns the Boolean value of the token specified by TokenNumber and Guid.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          Pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -1334,12 +1334,12 @@ LibPcdGetExBool (
 \r
 /**\r
   This function provides a means by which to retrieve the size of a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve the size of a given PCD token.\r

-  \r
-  Returns the size of the token specified by TokenNumber and Guid. \r
-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that designates \r
+  Returns the size of the token specified by TokenNumber and Guid.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          Pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -1357,8 +1357,8 @@ LibPcdGetExSize (
 #ifndef DISABLE_NEW_DEPRECATED_INTERFACES\r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 #ifndef DISABLE_NEW_DEPRECATED_INTERFACES\r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 8-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -1377,8 +1377,8 @@ LibPcdSet8 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 16-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -1397,8 +1397,8 @@ LibPcdSet16 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 32-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -1417,8 +1417,8 @@ LibPcdSet32 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 64-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -1437,19 +1437,19 @@ LibPcdSet64 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets a buffer for the token specified by TokenNumber to the value \r
-  specified by Buffer and SizeOfBuffer.  Buffer is returned.  \r
-  If SizeOfBuffer is greater than the maximum size support by TokenNumber, \r
-  then set SizeOfBuffer to the maximum size supported by TokenNumber and \r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value\r
+  specified by Buffer and SizeOfBuffer.  Buffer is returned.\r
+  If SizeOfBuffer is greater than the maximum size support by TokenNumber,\r
+  then set SizeOfBuffer to the maximum size supported by TokenNumber and\r

   return NULL to indicate that the set operation was not actually performed.\r
 \r
   return NULL to indicate that the set operation was not actually performed.\r
 \r

-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the \r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the\r

   maximum size supported by TokenName and NULL must be returned.\r
   maximum size supported by TokenName and NULL must be returned.\r

-  \r
+\r

   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
+\r

   @param[in]      TokenNumber   The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
   @param[in]      Buffer        A pointer to the buffer to set.\r
   @param[in]      TokenNumber   The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
   @param[in]      Buffer        A pointer to the buffer to set.\r


@@ -1468,8 +1468,8 @@ LibPcdSetPtr (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the Boolean value for the token specified by TokenNumber \r
+\r
+  Sets the Boolean value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -1488,13 +1488,13 @@ LibPcdSetBool (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 8-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that \r
+  @param[in]  Guid          Pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r


@@ -1513,13 +1513,13 @@ LibPcdSetEx8 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 16-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that \r
+  @param[in]  Guid          Pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r


@@ -1538,13 +1538,13 @@ LibPcdSetEx16 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 32-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that \r
+  @param[in]  Guid          Pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r


@@ -1563,13 +1563,13 @@ LibPcdSetEx32 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 64-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that \r
+  @param[in]  Guid          Pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r


@@ -1588,18 +1588,18 @@ LibPcdSetEx64 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets a buffer for the token specified by TokenNumber to the value specified by \r
-  Buffer and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  the maximum size support by TokenNumber, then set SizeOfBuffer to the maximum size \r
-  supported by TokenNumber and return NULL to indicate that the set operation \r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value specified by\r
+  Buffer and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  the maximum size support by TokenNumber, then set SizeOfBuffer to the maximum size\r
+  supported by TokenNumber and return NULL to indicate that the set operation\r

   was not actually performed.\r
   was not actually performed.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
-  @param[in]  Guid              Pointer to a 128-bit unique value that \r
+\r
+  @param[in]  Guid              Pointer to a 128-bit unique value that\r

                                 designates which namespace to set a value from.\r
   @param[in]  TokenNumber       The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
                                 designates which namespace to set a value from.\r
   @param[in]  TokenNumber       The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r


@@ -1620,13 +1620,13 @@ LibPcdSetExPtr (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the Boolean value for the token specified by TokenNumber and \r
+\r
+  Sets the Boolean value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that \r
+  @param[in]  Guid          Pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The Boolean value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The Boolean value to set.\r


@@ -1927,7 +1927,7 @@ LibPcdSetExBoolS (
   Secondly, it provides a mechanism for the module that did the registration to intercept\r
   the set operation and override the value been set if necessary. After the invocation of\r
   the callback function, TokenData will be used by PCD service PEIM or driver to modify th\r
   Secondly, it provides a mechanism for the module that did the registration to intercept\r
   the set operation and override the value been set if necessary. After the invocation of\r
   the callback function, TokenData will be used by PCD service PEIM or driver to modify th\r

-  internal data in PCD database. \r
+  internal data in PCD database.\r

 \r
   @param[in]      CallBackGuid    The PCD token GUID being set.\r
   @param[in]      CallBackToken   The PCD token number being set.\r
 \r
   @param[in]      CallBackGuid    The PCD token GUID being set.\r
   @param[in]      CallBackToken   The PCD token number being set.\r


@@ -1947,17 +1947,17 @@ VOID
 \r
 /**\r
   Set up a notification function that is called when a specified token is set.\r
 \r
 /**\r
   Set up a notification function that is called when a specified token is set.\r

-  \r
-  When the token specified by TokenNumber and Guid is set, \r
-  then notification function specified by NotificationFunction is called.  \r
+\r
+  When the token specified by TokenNumber and Guid is set,\r
+  then notification function specified by NotificationFunction is called.\r

   If Guid is NULL, then the default token space is used.\r
   If NotificationFunction is NULL, then ASSERT().\r
 \r
   If Guid is NULL, then the default token space is used.\r
   If NotificationFunction is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid                  Pointer to a 128-bit unique value that designates which \r
-                                    namespace to set a value from.  If NULL, then the default \r
+  @param[in]  Guid                  Pointer to a 128-bit unique value that designates which\r
+                                    namespace to set a value from.  If NULL, then the default\r

                                     token space is used.\r
   @param[in]  TokenNumber           The PCD token number to monitor.\r
                                     token space is used.\r
   @param[in]  TokenNumber           The PCD token number to monitor.\r

-  @param[in]  NotificationFunction  The function to call when the token \r
+  @param[in]  NotificationFunction  The function to call when the token\r

                                     specified by Guid and TokenNumber is set.\r
 \r
 **/\r
                                     specified by Guid and TokenNumber is set.\r
 \r
 **/\r


@@ -1972,12 +1972,12 @@ LibPcdCallbackOnSet (
 \r
 /**\r
   Disable a notification function that was established with LibPcdCallbackonSet().\r
 \r
 /**\r
   Disable a notification function that was established with LibPcdCallbackonSet().\r

-  \r
+\r

   Disable a notification function that was previously established with LibPcdCallbackOnSet().\r
   If NotificationFunction is NULL, then ASSERT().\r
   Disable a notification function that was previously established with LibPcdCallbackOnSet().\r
   If NotificationFunction is NULL, then ASSERT().\r

-  If LibPcdCallbackOnSet() was not previously called with Guid, TokenNumber, \r
+  If LibPcdCallbackOnSet() was not previously called with Guid, TokenNumber,\r

   and NotificationFunction, then ASSERT().\r
   and NotificationFunction, then ASSERT().\r

-  \r
+\r

   @param[in]  Guid                 Specify the GUID token space.\r
   @param[in]  TokenNumber          Specify the token number.\r
   @param[in]  NotificationFunction The callback function to be unregistered.\r
   @param[in]  Guid                 Specify the GUID token space.\r
   @param[in]  TokenNumber          Specify the token number.\r
   @param[in]  NotificationFunction The callback function to be unregistered.\r


@@ -1994,24 +1994,24 @@ LibPcdCancelCallback (
 \r
 /**\r
   Retrieves the next token in a token space.\r
 \r
 /**\r
   Retrieves the next token in a token space.\r

-  \r
-  Retrieves the next PCD token number from the token space specified by Guid.  \r
-  If Guid is NULL, then the default token space is used.  If TokenNumber is 0, \r
-  then the first token number is returned.  Otherwise, the token number that \r
-  follows TokenNumber in the token space is returned.  If TokenNumber is the last \r
-  token number in the token space, then 0 is returned.  \r
-  \r
+\r
+  Retrieves the next PCD token number from the token space specified by Guid.\r
+  If Guid is NULL, then the default token space is used.  If TokenNumber is 0,\r
+  then the first token number is returned.  Otherwise, the token number that\r
+  follows TokenNumber in the token space is returned.  If TokenNumber is the last\r
+  token number in the token space, then 0 is returned.\r
+\r

   If TokenNumber is not 0 and is not in the token space specified by Guid, then ASSERT().\r
 \r
   If TokenNumber is not 0 and is not in the token space specified by Guid, then ASSERT().\r
 \r

-  @param[in]  Guid        Pointer to a 128-bit unique value that designates which namespace \r
+  @param[in]  Guid        Pointer to a 128-bit unique value that designates which namespace\r

                           to set a value from.  If NULL, then the default token space is used.\r
                           to set a value from.  If NULL, then the default token space is used.\r

-  @param[in]  TokenNumber The previous PCD token number.  If 0, then retrieves the first PCD \r
+  @param[in]  TokenNumber The previous PCD token number.  If 0, then retrieves the first PCD\r

                           token number.\r
 \r
   @return The next valid token number.\r
 \r
 **/\r
                           token number.\r
 \r
   @return The next valid token number.\r
 \r
 **/\r

-UINTN           \r
+UINTN\r

 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r


@@ -2022,12 +2022,12 @@ LibPcdGetNextToken (
 \r
 /**\r
   Used to retrieve the list of available PCD token space GUIDs.\r
 \r
 /**\r
   Used to retrieve the list of available PCD token space GUIDs.\r

-  \r
+\r

   Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces\r
   in the platform.\r
   If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.\r
   If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.\r
   Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces\r
   in the platform.\r
   If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.\r
   If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.\r

-  \r
+\r

   @param  TokenSpaceGuid  Pointer to the a PCD token space GUID\r
 \r
   @return The next valid token namespace.\r
   @param  TokenSpaceGuid  Pointer to the a PCD token space GUID\r
 \r
   @return The next valid token namespace.\r


@@ -2042,24 +2042,24 @@ LibPcdGetNextTokenSpace (
 \r
 /**\r
   Sets a value of a patchable PCD entry that is type pointer.\r
 \r
 /**\r
   Sets a value of a patchable PCD entry that is type pointer.\r

-  \r
-  Sets the PCD entry specified by PatchVariable to the value specified by Buffer \r
-  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return \r
-  NULL to indicate that the set operation was not actually performed.  \r
-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to \r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified by Buffer\r
+  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return\r
+  NULL to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r

   MaximumDatumSize and NULL must be returned.\r
   MaximumDatumSize and NULL must be returned.\r

-  \r
+\r

   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r
   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r

-  @param[out] PatchVariable     A pointer to the global variable in a module that is \r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r

                                 the target of the set operation.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
                                 the target of the set operation.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return Return the pointer to the Buffer that was set.\r
 \r
 **/\r
   @return Return the pointer to the Buffer that was set.\r
 \r
 **/\r


@@ -2091,7 +2091,7 @@ LibPatchPcdSetPtr (
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return The status of the set operation.\r
 \r
 **/\r
   @return The status of the set operation.\r
 \r
 **/\r


@@ -2106,26 +2106,26 @@ LibPatchPcdSetPtrS (
 \r
 /**\r
   Sets a value and size of a patchable PCD entry that is type pointer.\r
 \r
 /**\r
   Sets a value and size of a patchable PCD entry that is type pointer.\r

-  \r
-  Sets the PCD entry specified by PatchVariable to the value specified by Buffer \r
-  and SizeOfBuffer. Buffer is returned.  If SizeOfBuffer is greater than \r
-  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return \r
-  NULL to indicate that the set operation was not actually performed.  \r
-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to \r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified by Buffer\r
+  and SizeOfBuffer. Buffer is returned.  If SizeOfBuffer is greater than\r
+  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return\r
+  NULL to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r

   MaximumDatumSize and NULL must be returned.\r
   MaximumDatumSize and NULL must be returned.\r

-  \r
+\r

   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfPatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r
   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfPatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r

-  @param[out] PatchVariable     A pointer to the global variable in a module that is \r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r

                                 the target of the set operation.\r
   @param[out] SizeOfPatchVariable A pointer to the size, in bytes, of PatchVariable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
                                 the target of the set operation.\r
   @param[out] SizeOfPatchVariable A pointer to the size, in bytes, of PatchVariable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return Return the pointer to the Buffer that was set.\r
 \r
 **/\r
   @return Return the pointer to the Buffer that was set.\r
 \r
 **/\r


@@ -2160,7 +2160,7 @@ LibPatchPcdSetPtrAndSize (
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return The status of the set operation.\r
 \r
 **/\r
   @return The status of the set operation.\r
 \r
 **/\r

diff --git a/MdePkg/Include/Library/PciCf8Lib.h b/MdePkg/Include/Library/PciCf8Lib.h
index 52fb142a9cbea3a6773cb4a818a7786c62279385..3aafe5a9bb7dfb284d98db97029a235f3652177b 100644 (file)
--- a/MdePkg/Include/Library/PciCf8Lib.h
+++ b/MdePkg/Include/Library/PciCf8Lib.h
@@ -1,11 +1,11 @@
 /** @file\r
   Provides services to access PCI Configuration Space using the I/O ports 0xCF8 and 0xCFC.\r
 /** @file\r
   Provides services to access PCI Configuration Space using the I/O ports 0xCF8 and 0xCFC.\r

-  \r
-  This library is identical to the PCI Library, except the access method for performing PCI \r
-  configuration cycles must be through I/O ports 0xCF8 and 0xCFC.  This library only allows \r
+\r
+  This library is identical to the PCI Library, except the access method for performing PCI\r
+  configuration cycles must be through I/O ports 0xCF8 and 0xCFC.  This library only allows\r

   access to PCI Segment #0.\r
 \r
   access to PCI Segment #0.\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


@@ -40,20 +40,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   (((Offset) & 0xfff) | (((Function) & 0x07) << 12) | (((Device) & 0x1f) << 15) | (((Bus) & 0xff) << 20))\r
 \r
 /**\r
   (((Offset) & 0xfff) | (((Function) & 0x07) << 12) | (((Device) & 0x1f) << 15) | (((Bus) & 0xff) << 20))\r
 \r
 /**\r

-  Registers a PCI device so PCI configuration registers may be accessed after \r
+  Registers a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
-  Registers the PCI device specified by Address so all the PCI configuration registers \r
+\r
+  Registers the PCI device specified by Address so all the PCI configuration registers\r

   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r
   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r

-  \r
+\r

   If Address > 0x0FFFFFFF, then ASSERT().\r
   If the register specified by Address >= 0x100, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If Address > 0x0FFFFFFF, then ASSERT().\r
   If the register specified by Address >= 0x100, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r

diff --git a/MdePkg/Include/Library/PciExpressLib.h b/MdePkg/Include/Library/PciExpressLib.h
index 6ce3fbc139a653292e4fd904d08766d3de209387..38d2d58ecf15fb397dc111cf5caafb8b6e6c4d53 100644 (file)
--- a/MdePkg/Include/Library/PciExpressLib.h
+++ b/MdePkg/Include/Library/PciExpressLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Provides services to access PCI Configuration Space using the MMIO PCI Express window.\r
 /** @file\r
   Provides services to access PCI Configuration Space using the MMIO PCI Express window.\r

-  \r
-  This library is identical to the PCI Library, except the access method for performing PCI \r
+\r
+  This library is identical to the PCI Library, except the access method for performing PCI\r

   configuration cycles must be through the 256 MB PCI Express MMIO window whose base address\r
   is defined by PcdPciExpressBaseAddress.\r
 \r
   configuration cycles must be through the 256 MB PCI Express MMIO window whose base address\r
   is defined by PcdPciExpressBaseAddress.\r
 \r


@@ -40,20 +40,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define PCI_EXPRESS_LIB_ADDRESS(Bus,Device,Function,Offset) PCI_ECAM_ADDRESS ((Bus), (Device), (Function), (Offset))\r
 \r
 /**\r
 #define PCI_EXPRESS_LIB_ADDRESS(Bus,Device,Function,Offset) PCI_ECAM_ADDRESS ((Bus), (Device), (Function), (Offset))\r
 \r
 /**\r

-  Registers a PCI device so PCI configuration registers may be accessed after \r
+  Registers a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
-  Registers the PCI device specified by Address so all the PCI configuration \r
-  registers associated with that PCI device may be accessed after SetVirtualAddressMap() \r
+\r
+  Registers the PCI device specified by Address so all the PCI configuration\r
+  registers associated with that PCI device may be accessed after SetVirtualAddressMap()\r

   is called.\r
   is called.\r

-  \r
+\r

   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r

diff --git a/MdePkg/Include/Library/PciLib.h b/MdePkg/Include/Library/PciLib.h
index b113ddf487830f7a80b6ea1e328d8205fec783e5..d77c8b2c61dd7b958b1656c69977a48926616103 100644 (file)
--- a/MdePkg/Include/Library/PciLib.h
+++ b/MdePkg/Include/Library/PciLib.h
@@ -1,16 +1,16 @@
 /** @file\r
   Provides services to access PCI Configuration Space.\r
 /** @file\r
   Provides services to access PCI Configuration Space.\r

-  \r
-  These functions perform PCI configuration cycles using the default PCI configuration \r
-  access method. This may use I/O ports 0xCF8 and 0xCFC to perform PCI configuration accesses, \r
-  or it may use MMIO registers relative to the PcdPciExpressBaseAddress, or it may use some \r
-  alternate access method.  Modules will typically use the PCI Library for its PCI configuration \r
-  accesses.  However, if a module requires a mix of PCI access methods, the PCI CF8 Library or \r
-  PCI Express Library may be used in conjunction with the PCI Library.  The functionality of \r
-  these three libraries is identical.  The PCI CF8 Library and PCI Express Library simply use \r
+\r
+  These functions perform PCI configuration cycles using the default PCI configuration\r
+  access method. This may use I/O ports 0xCF8 and 0xCFC to perform PCI configuration accesses,\r
+  or it may use MMIO registers relative to the PcdPciExpressBaseAddress, or it may use some\r
+  alternate access method.  Modules will typically use the PCI Library for its PCI configuration\r
+  accesses.  However, if a module requires a mix of PCI access methods, the PCI CF8 Library or\r
+  PCI Express Library may be used in conjunction with the PCI Library.  The functionality of\r
+  these three libraries is identical.  The PCI CF8 Library and PCI Express Library simply use\r

   explicit access methods.\r
 \r
   explicit access methods.\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


@@ -41,19 +41,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   (((Register) & 0xfff) | (((Function) & 0x07) << 12) | (((Device) & 0x1f) << 15) | (((Bus) & 0xff) << 20))\r
 \r
 /**\r
   (((Register) & 0xfff) | (((Function) & 0x07) << 12) | (((Device) & 0x1f) << 15) | (((Bus) & 0xff) << 20))\r
 \r
 /**\r

-  Registers a PCI device so PCI configuration registers may be accessed after \r
+  Registers a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
-  Registers the PCI device specified by Address so all the PCI configuration registers \r
+\r
+  Registers the PCI device specified by Address so all the PCI configuration registers\r

   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r
   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r

-  \r
+\r

   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r

diff --git a/MdePkg/Include/Library/PciSegmentLib.h b/MdePkg/Include/Library/PciSegmentLib.h
index 6e4fecb0b1c94be8e074ba3365ea655a1e1b1edf..5eeda03988e3fd87bbd6117f05ac6453c16aa756 100644 (file)
--- a/MdePkg/Include/Library/PciSegmentLib.h
+++ b/MdePkg/Include/Library/PciSegmentLib.h
@@ -1,11 +1,11 @@
 /** @file\r
   Provides services to access PCI Configuration Space on a platform with multiple PCI segments.\r
 /** @file\r
   Provides services to access PCI Configuration Space on a platform with multiple PCI segments.\r

-  \r
+\r

   The PCI Segment Library function provide services to read, write, and modify the PCI configuration\r
   The PCI Segment Library function provide services to read, write, and modify the PCI configuration\r

-  registers on PCI root bridges on any supported PCI segment.  These library services take a single \r
-  address parameter that encodes the PCI Segment, PCI Bus, PCI Device, PCI Function, and PCI Register.  \r
+  registers on PCI root bridges on any supported PCI segment.  These library services take a single\r
+  address parameter that encodes the PCI Segment, PCI Bus, PCI Device, PCI Function, and PCI Register.\r

   The layout of this address parameter is as follows:\r
   The layout of this address parameter is as follows:\r

-  \r
+\r

             PCI Register: Bits 0..11\r
             PCI Function  Bits 12..14\r
             PCI Device  Bits 15..19\r
             PCI Register: Bits 0..11\r
             PCI Function  Bits 12..14\r
             PCI Device  Bits 15..19\r


@@ -13,17 +13,17 @@
             Reserved  Bits 28..31.  Must be 0.\r
             PCI Segment Bits 32..47\r
             Reserved  Bits 48..63.  Must be 0.\r
             Reserved  Bits 28..31.  Must be 0.\r
             PCI Segment Bits 32..47\r
             Reserved  Bits 48..63.  Must be 0.\r

-            \r
+\r

   | Reserved (MBZ) | Segment | Reserved (MBZ) |     Bus     | Device | Function | Register |\r
   63             48  47    32  31           28 27         20 19    15 14      12 11         0\r
 \r
   | Reserved (MBZ) | Segment | Reserved (MBZ) |     Bus     | Device | Function | Register |\r
   63             48  47    32  31           28 27         20 19    15 14      12 11         0\r
 \r

-  These functions perform PCI configuration cycles using the default PCI configuration access \r
-  method.  This may use I/O ports 0xCF8 and 0xCFC to perform PCI configuration accesses, or it \r
-  may use MMIO registers relative to the PcdPciExpressBaseAddress, or it may use some alternate \r
-  access method.  Modules will typically use the PCI Segment Library for its PCI configuration \r
-  accesses when PCI Segments other than Segment #0 must be accessed.  \r
+  These functions perform PCI configuration cycles using the default PCI configuration access\r
+  method.  This may use I/O ports 0xCF8 and 0xCFC to perform PCI configuration accesses, or it\r
+  may use MMIO registers relative to the PcdPciExpressBaseAddress, or it may use some alternate\r
+  access method.  Modules will typically use the PCI Segment Library for its PCI configuration\r
+  accesses when PCI Segments other than Segment #0 must be accessed.\r

 \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


@@ -71,16 +71,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   )\r
 \r
 /**\r
   )\r
 \r
 /**\r

-  Register a PCI device so PCI configuration registers may be accessed after \r
+  Register a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
+\r

   If any reserved bits in Address are set, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If any reserved bits in Address are set, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r

diff --git a/MdePkg/Include/Library/PeCoffExtraActionLib.h b/MdePkg/Include/Library/PeCoffExtraActionLib.h
index 6136786312a045fba701de97a3af8a5f692dc418..21a296d6532214b8b62a2639930c5d87550770e2 100644 (file)
--- a/MdePkg/Include/Library/PeCoffExtraActionLib.h
+++ b/MdePkg/Include/Library/PeCoffExtraActionLib.h
@@ -1,9 +1,9 @@
 /** @file\r
   Provides services to perform additional actions when a PE/COFF image is loaded\r
 /** @file\r
   Provides services to perform additional actions when a PE/COFF image is loaded\r

-  or unloaded.  This is useful for environment where symbols need to be loaded \r
+  or unloaded.  This is useful for environment where symbols need to be loaded\r

   and unloaded to support source level debugging.\r
 \r
   and unloaded to support source level debugging.\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


@@ -37,9 +37,9 @@ PeCoffLoaderRelocateImageExtraAction (
 /**\r
   Performs additional actions just before a PE/COFF image is unloaded.  Any resources\r
   that were allocated by PeCoffLoaderRelocateImageExtraAction() must be freed.\r
 /**\r
   Performs additional actions just before a PE/COFF image is unloaded.  Any resources\r
   that were allocated by PeCoffLoaderRelocateImageExtraAction() must be freed.\r

-  \r
+\r

   If ImageContext is NULL, then ASSERT().\r
   If ImageContext is NULL, then ASSERT().\r

-  \r
+\r

   @param  ImageContext  Pointer to the image context structure that describes the\r
                         PE/COFF image that is being unloaded.\r
 \r
   @param  ImageContext  Pointer to the image context structure that describes the\r
                         PE/COFF image that is being unloaded.\r
 \r

diff --git a/MdePkg/Include/Library/PeCoffGetEntryPointLib.h b/MdePkg/Include/Library/PeCoffGetEntryPointLib.h
index f211cf54268e96ede7fc297d5af6ffad05c8787f..280fb186852430bbd8ae31ab534d30d43094acc6 100644 (file)
--- a/MdePkg/Include/Library/PeCoffGetEntryPointLib.h
+++ b/MdePkg/Include/Library/PeCoffGetEntryPointLib.h
@@ -1,14 +1,14 @@
 /** @file\r
   Provides a service to retrieve the PE/COFF entry point from a PE/COFF image.\r
 \r
 /** @file\r
   Provides a service to retrieve the PE/COFF entry point from a PE/COFF image.\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
-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,7 +59,7 @@ PeCoffLoaderGetMachineType (
 \r
 /**\r
   Returns a pointer to the PDB file name for a PE/COFF image that has been\r
 \r
 /**\r
   Returns a pointer to the PDB file name for a PE/COFF image that has been\r

-  loaded into system memory with the PE/COFF Loader Library functions. \r
+  loaded into system memory with the PE/COFF Loader Library functions.\r

 \r
   Returns the PDB file name for the PE/COFF image specified by Pe32Data.  If\r
   the PE/COFF image specified by Pe32Data is not a valid, then NULL is\r
 \r
   Returns the PDB file name for the PE/COFF image specified by Pe32Data.  If\r
   the PE/COFF image specified by Pe32Data is not a valid, then NULL is\r

diff --git a/MdePkg/Include/Library/PeCoffLib.h b/MdePkg/Include/Library/PeCoffLib.h
index 5a3f98810af64cf5476ec9f8e97021bb725ca119..d1db92e17751c37bf13f1829f36e0d7bac3ef648 100644 (file)
--- a/MdePkg/Include/Library/PeCoffLib.h
+++ b/MdePkg/Include/Library/PeCoffLib.h
@@ -2,17 +2,17 @@
   Provides services to load and relocate a PE/COFF image.\r
 \r
   The PE/COFF Loader Library abstracts the implementation of a PE/COFF loader for\r
   Provides services to load and relocate a PE/COFF image.\r
 \r
   The PE/COFF Loader Library abstracts the implementation of a PE/COFF loader for\r

-  IA-32, x86, IPF, and EBC processor types. The library functions are memory-based \r
+  IA-32, x86, IPF, and EBC processor types. The library functions are memory-based\r

   and can be ported easily to any environment.\r
   and can be ported easily to any environment.\r

-  \r
-Copyright (c) 2006 - 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
+\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


@@ -24,7 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // Return status codes from the PE/COFF Loader services\r
 //\r
 #define IMAGE_ERROR_SUCCESS                      0\r
 // Return status codes from the PE/COFF Loader services\r
 //\r
 #define IMAGE_ERROR_SUCCESS                      0\r

-#define IMAGE_ERROR_IMAGE_READ                   1  \r
+#define IMAGE_ERROR_IMAGE_READ                   1\r

 #define IMAGE_ERROR_INVALID_PE_HEADER_SIGNATURE  2\r
 #define IMAGE_ERROR_INVALID_MACHINE_TYPE         3\r
 #define IMAGE_ERROR_INVALID_SUBSYSTEM            4\r
 #define IMAGE_ERROR_INVALID_PE_HEADER_SIGNATURE  2\r
 #define IMAGE_ERROR_INVALID_MACHINE_TYPE         3\r
 #define IMAGE_ERROR_INVALID_SUBSYSTEM            4\r


@@ -39,30 +39,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Reads contents of a PE/COFF image.\r
 \r
 /**\r
   Reads contents of a PE/COFF image.\r
 \r

-  A function of this type reads contents of the PE/COFF image specified by FileHandle. The read \r
-  operation copies ReadSize bytes from the PE/COFF image starting at byte offset FileOffset into \r
-  the buffer specified by Buffer. The size of the buffer actually read is returned in ReadSize.  \r
+  A function of this type reads contents of the PE/COFF image specified by FileHandle. The read\r
+  operation copies ReadSize bytes from the PE/COFF image starting at byte offset FileOffset into\r
+  the buffer specified by Buffer. The size of the buffer actually read is returned in ReadSize.\r

   If FileOffset specifies an offset past the end of the PE/COFF image, a ReadSize of 0 is returned.\r
   If FileOffset specifies an offset past the end of the PE/COFF image, a ReadSize of 0 is returned.\r

-  A function of this type must be registered in the ImageRead field of a PE_COFF_LOADER_IMAGE_CONTEXT \r
-  structure for the PE/COFF Loader Library service to function correctly.  This function abstracts access \r
-  to a PE/COFF image so it can be implemented in an environment specific manner.  For example, SEC and PEI \r
-  environments may access memory directly to read the contents of a PE/COFF image, and DXE or UEFI \r
-  environments may require protocol services to read the contents of PE/COFF image \r
+  A function of this type must be registered in the ImageRead field of a PE_COFF_LOADER_IMAGE_CONTEXT\r
+  structure for the PE/COFF Loader Library service to function correctly.  This function abstracts access\r
+  to a PE/COFF image so it can be implemented in an environment specific manner.  For example, SEC and PEI\r
+  environments may access memory directly to read the contents of a PE/COFF image, and DXE or UEFI\r
+  environments may require protocol services to read the contents of PE/COFF image\r

   stored on FLASH, disk, or network devices.\r
   stored on FLASH, disk, or network devices.\r

-  \r
+\r

   If FileHandle is not a valid handle, then ASSERT().\r
   If ReadSize is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
 \r
   @param  FileHandle      Pointer to the file handle to read the PE/COFF image.\r
   @param  FileOffset      Offset into the PE/COFF image to begin the read operation.\r
   If FileHandle is not a valid handle, then ASSERT().\r
   If ReadSize is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
 \r
   @param  FileHandle      Pointer to the file handle to read the PE/COFF image.\r
   @param  FileOffset      Offset into the PE/COFF image to begin the read operation.\r

-  @param  ReadSize        On input, the size in bytes of the requested read operation.  \r
+  @param  ReadSize        On input, the size in bytes of the requested read operation.\r

                           On output, the number of bytes actually read.\r
   @param  Buffer          Output buffer that contains the data read from the PE/COFF image.\r
                           On output, the number of bytes actually read.\r
   @param  Buffer          Output buffer that contains the data read from the PE/COFF image.\r

-  \r
-  @retval RETURN_SUCCESS            The specified portion of the PE/COFF image was \r
+\r
+  @retval RETURN_SUCCESS            The specified portion of the PE/COFF image was\r

                                     read and the size return in ReadSize.\r
                                     read and the size return in ReadSize.\r

-  @retval RETURN_DEVICE_ERROR       The specified portion of the PE/COFF image \r
+  @retval RETURN_DEVICE_ERROR       The specified portion of the PE/COFF image\r

                                     could not be read due to a device error.\r
 \r
 **/\r
                                     could not be read due to a device error.\r
 \r
 **/\r


@@ -110,8 +110,8 @@ typedef struct {
   VOID                              *Handle;\r
   ///\r
   /// Caller allocated buffer of size FixupDataSize that can be optionally allocated\r
   VOID                              *Handle;\r
   ///\r
   /// Caller allocated buffer of size FixupDataSize that can be optionally allocated\r

-  /// prior to calling PeCoffLoaderRelocateImage(). \r
-  /// This buffer is filled with the information used to fix up the image. \r
+  /// prior to calling PeCoffLoaderRelocateImage().\r
+  /// This buffer is filled with the information used to fix up the image.\r

   /// The fixups have been applied to the image and this entry is just for information.\r
   ///\r
   VOID                              *FixupData;\r
   /// The fixups have been applied to the image and this entry is just for information.\r
   ///\r
   VOID                              *FixupData;\r


@@ -122,7 +122,7 @@ typedef struct {
   UINT32                            SectionAlignment;\r
   ///\r
   /// Set by PeCoffLoaderGetImageInfo() to offset to the PE/COFF header.\r
   UINT32                            SectionAlignment;\r
   ///\r
   /// Set by PeCoffLoaderGetImageInfo() to offset to the PE/COFF header.\r

-  /// If the PE/COFF image does not start with a DOS header, this value is zero. \r
+  /// If the PE/COFF image does not start with a DOS header, this value is zero.\r

   /// Otherwise, it's the offset to the PE/COFF header.\r
   ///\r
   UINT32                            PeCoffHeaderOffset;\r
   /// Otherwise, it's the offset to the PE/COFF header.\r
   ///\r
   UINT32                            PeCoffHeaderOffset;\r


@@ -137,7 +137,7 @@ typedef struct {
   VOID                              *CodeView;\r
   ///\r
   /// Set by PeCoffLoaderLoadImage() to point to the PDB entry contained in the CodeView area.\r
   VOID                              *CodeView;\r
   ///\r
   /// Set by PeCoffLoaderLoadImage() to point to the PDB entry contained in the CodeView area.\r

-  /// The PdbPointer points to the filename of the PDB file used for source-level debug of \r
+  /// The PdbPointer points to the filename of the PDB file used for source-level debug of\r

   /// the image by a debugger.\r
   ///\r
   CHAR8                             *PdbPointer;\r
   /// the image by a debugger.\r
   ///\r
   CHAR8                             *PdbPointer;\r


@@ -147,20 +147,20 @@ typedef struct {
   UINTN                             SizeOfHeaders;\r
   ///\r
   /// Not used by this library class. Other library classes that layer on  top of this library\r
   UINTN                             SizeOfHeaders;\r
   ///\r
   /// Not used by this library class. Other library classes that layer on  top of this library\r

-  /// class fill in this value as part of their GetImageInfo call. \r
+  /// class fill in this value as part of their GetImageInfo call.\r

   /// This allows the caller of the library to know what type of memory needs to be allocated\r
   /// to load and relocate the image.\r
   ///\r
   UINT32                            ImageCodeMemoryType;\r
   ///\r
   /// This allows the caller of the library to know what type of memory needs to be allocated\r
   /// to load and relocate the image.\r
   ///\r
   UINT32                            ImageCodeMemoryType;\r
   ///\r

-  /// Not used by this library class. Other library classes that layer on top of this library \r
+  /// Not used by this library class. Other library classes that layer on top of this library\r

   /// class fill in this value as part of their GetImageInfo call.\r
   /// This allows the caller of the library to know what type of memory needs to be allocated\r
   /// to load and relocate the image.\r
   ///\r
   UINT32                            ImageDataMemoryType;\r
   ///\r
   /// class fill in this value as part of their GetImageInfo call.\r
   /// This allows the caller of the library to know what type of memory needs to be allocated\r
   /// to load and relocate the image.\r
   ///\r
   UINT32                            ImageDataMemoryType;\r
   ///\r

-  /// Set by any of the library functions if they encounter an error. \r
+  /// Set by any of the library functions if they encounter an error.\r

   ///\r
   UINT32                            ImageError;\r
   ///\r
   ///\r
   UINT32                            ImageError;\r
   ///\r


@@ -182,7 +182,7 @@ typedef struct {
   ///\r
   BOOLEAN                           RelocationsStripped;\r
   ///\r
   ///\r
   BOOLEAN                           RelocationsStripped;\r
   ///\r

-  /// Set by PeCoffLoaderGetImageInfo() to TRUE if the image is a TE image. \r
+  /// Set by PeCoffLoaderGetImageInfo() to TRUE if the image is a TE image.\r

   /// For a definition of the TE Image format, see the Platform Initialization Pre-EFI\r
   /// Initialization Core Interface Specification.\r
   ///\r
   /// For a definition of the TE Image format, see the Platform Initialization Pre-EFI\r
   /// Initialization Core Interface Specification.\r
   ///\r


@@ -194,28 +194,28 @@ typedef struct {
   ///\r
   PHYSICAL_ADDRESS                  HiiResourceData;\r
   ///\r
   ///\r
   PHYSICAL_ADDRESS                  HiiResourceData;\r
   ///\r

-  /// Private storage for implementation specific data. \r
+  /// Private storage for implementation specific data.\r

   ///\r
   ///\r

-  UINT64                            Context;      \r
+  UINT64                            Context;\r

 } PE_COFF_LOADER_IMAGE_CONTEXT;\r
 \r
 /**\r
   Retrieves information about a PE/COFF image.\r
 \r
 } PE_COFF_LOADER_IMAGE_CONTEXT;\r
 \r
 /**\r
   Retrieves information about a PE/COFF image.\r
 \r

-  Computes the PeCoffHeaderOffset, IsTeImage, ImageType, ImageAddress, ImageSize, \r
-  DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders, and \r
-  DebugDirectoryEntryRva fields of the ImageContext structure.  \r
-  If ImageContext is NULL, then return RETURN_INVALID_PARAMETER.  \r
-  If the PE/COFF image accessed through the ImageRead service in the ImageContext \r
-  structure is not a supported PE/COFF image type, then return RETURN_UNSUPPORTED.  \r
-  If any errors occur while computing the fields of ImageContext, \r
-  then the error status is returned in the ImageError field of ImageContext.  \r
+  Computes the PeCoffHeaderOffset, IsTeImage, ImageType, ImageAddress, ImageSize,\r
+  DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders, and\r
+  DebugDirectoryEntryRva fields of the ImageContext structure.\r
+  If ImageContext is NULL, then return RETURN_INVALID_PARAMETER.\r
+  If the PE/COFF image accessed through the ImageRead service in the ImageContext\r
+  structure is not a supported PE/COFF image type, then return RETURN_UNSUPPORTED.\r
+  If any errors occur while computing the fields of ImageContext,\r
+  then the error status is returned in the ImageError field of ImageContext.\r

   If the image is a TE image, then SectionAlignment is set to 0.\r
   If the image is a TE image, then SectionAlignment is set to 0.\r

-  The ImageRead and Handle fields of ImageContext structure must be valid prior \r
+  The ImageRead and Handle fields of ImageContext structure must be valid prior\r

   to invoking this service.\r
 \r
   to invoking this service.\r
 \r

-  @param  ImageContext              The pointer to the image context structure that \r
-                                    describes the PE/COFF image that needs to be \r
+  @param  ImageContext              The pointer to the image context structure that\r
+                                    describes the PE/COFF image that needs to be\r

                                     examined by this function.\r
 \r
   @retval RETURN_SUCCESS            The information on the PE/COFF image was collected.\r
                                     examined by this function.\r
 \r
   @retval RETURN_SUCCESS            The information on the PE/COFF image was collected.\r


@@ -236,12 +236,12 @@ PeCoffLoaderGetImageInfo (
   ImageContext as the relocation base address.  Otherwise, use the DestinationAddress field\r
   of ImageContext as the relocation base address.  The caller must allocate the relocation\r
   fixup log buffer and fill in the FixupData field of ImageContext prior to calling this function.\r
   ImageContext as the relocation base address.  Otherwise, use the DestinationAddress field\r
   of ImageContext as the relocation base address.  The caller must allocate the relocation\r
   fixup log buffer and fill in the FixupData field of ImageContext prior to calling this function.\r

-  \r
-  The ImageRead, Handle, PeCoffHeaderOffset, IsTeImage, Machine, ImageType, ImageAddress, \r
-  ImageSize, DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders, \r
-  DebugDirectoryEntryRva, EntryPoint, FixupDataSize, CodeView, PdbPointer, and FixupData of \r
+\r
+  The ImageRead, Handle, PeCoffHeaderOffset, IsTeImage, Machine, ImageType, ImageAddress,\r
+  ImageSize, DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders,\r
+  DebugDirectoryEntryRva, EntryPoint, FixupDataSize, CodeView, PdbPointer, and FixupData of\r

   the ImageContext structure must be valid prior to invoking this service.\r
   the ImageContext structure must be valid prior to invoking this service.\r

-    \r
+\r

   If ImageContext is NULL, then ASSERT().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r
   If ImageContext is NULL, then ASSERT().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r


@@ -272,10 +272,10 @@ PeCoffLoaderRelocateImage (
   specified by the ImageAddress and ImageSize fields of ImageContext.  The caller must allocate\r
   the load buffer and fill in the ImageAddress and ImageSize fields prior to calling this function.\r
   The EntryPoint, FixupDataSize, CodeView, PdbPointer and HiiResourceData fields of ImageContext are computed.\r
   specified by the ImageAddress and ImageSize fields of ImageContext.  The caller must allocate\r
   the load buffer and fill in the ImageAddress and ImageSize fields prior to calling this function.\r
   The EntryPoint, FixupDataSize, CodeView, PdbPointer and HiiResourceData fields of ImageContext are computed.\r

-  The ImageRead, Handle, PeCoffHeaderOffset, IsTeImage, Machine, ImageType, ImageAddress, ImageSize, \r
-  DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders, and DebugDirectoryEntryRva \r
+  The ImageRead, Handle, PeCoffHeaderOffset, IsTeImage, Machine, ImageType, ImageAddress, ImageSize,\r
+  DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders, and DebugDirectoryEntryRva\r

   fields of the ImageContext structure must be valid prior to invoking this service.\r
   fields of the ImageContext structure must be valid prior to invoking this service.\r

-  \r
+\r

   If ImageContext is NULL, then ASSERT().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r
   If ImageContext is NULL, then ASSERT().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r


@@ -305,25 +305,25 @@ PeCoffLoaderLoadImage (
 \r
 /**\r
   Reads contents of a PE/COFF image from a buffer in system memory.\r
 \r
 /**\r
   Reads contents of a PE/COFF image from a buffer in system memory.\r

-   \r
-  This is the default implementation of a PE_COFF_LOADER_READ_FILE function \r
-  that assumes FileHandle pointer to the beginning of a PE/COFF image.   \r
-  This function reads contents of the PE/COFF image that starts at the system memory \r
-  address specified by FileHandle. The read operation copies ReadSize bytes from the \r
-  PE/COFF image starting at byte offset FileOffset into the buffer specified by Buffer.  \r
+\r
+  This is the default implementation of a PE_COFF_LOADER_READ_FILE function\r
+  that assumes FileHandle pointer to the beginning of a PE/COFF image.\r
+  This function reads contents of the PE/COFF image that starts at the system memory\r
+  address specified by FileHandle. The read operation copies ReadSize bytes from the\r
+  PE/COFF image starting at byte offset FileOffset into the buffer specified by Buffer.\r

   The size of the buffer actually read is returned in ReadSize.\r
   The size of the buffer actually read is returned in ReadSize.\r

-  \r
+\r

   If FileHandle is NULL, then ASSERT().\r
   If ReadSize is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
 \r
   @param  FileHandle        The pointer to base of the input stream\r
   @param  FileOffset        Offset into the PE/COFF image to begin the read operation.\r
   If FileHandle is NULL, then ASSERT().\r
   If ReadSize is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
 \r
   @param  FileHandle        The pointer to base of the input stream\r
   @param  FileOffset        Offset into the PE/COFF image to begin the read operation.\r

-  @param  ReadSize          On input, the size in bytes of the requested read operation.  \r
+  @param  ReadSize          On input, the size in bytes of the requested read operation.\r

                             On output, the number of bytes actually read.\r
   @param  Buffer            Output buffer that contains the data read from the PE/COFF image.\r
 \r
                             On output, the number of bytes actually read.\r
   @param  Buffer            Output buffer that contains the data read from the PE/COFF image.\r
 \r

-  @retval RETURN_SUCCESS    The data is read from FileOffset from the Handle into \r
+  @retval RETURN_SUCCESS    The data is read from FileOffset from the Handle into\r

                             the buffer.\r
 **/\r
 RETURN_STATUS\r
                             the buffer.\r
 **/\r
 RETURN_STATUS\r


@@ -338,26 +338,26 @@ PeCoffLoaderImageReadFromMemory (
 \r
 /**\r
   Reapply fixups on a fixed up PE32/PE32+ image to allow virtual calling at EFI\r
 \r
 /**\r
   Reapply fixups on a fixed up PE32/PE32+ image to allow virtual calling at EFI\r

-  runtime. \r
-  \r
-  This function reapplies relocation fixups to the PE/COFF image specified by ImageBase \r
-  and ImageSize so the image will execute correctly when the PE/COFF image is mapped \r
-  to the address specified by VirtualImageBase. RelocationData must be identical \r
-  to the FiuxupData buffer from the PE_COFF_LOADER_IMAGE_CONTEXT structure \r
+  runtime.\r
+\r
+  This function reapplies relocation fixups to the PE/COFF image specified by ImageBase\r
+  and ImageSize so the image will execute correctly when the PE/COFF image is mapped\r
+  to the address specified by VirtualImageBase. RelocationData must be identical\r
+  to the FiuxupData buffer from the PE_COFF_LOADER_IMAGE_CONTEXT structure\r

   after this PE/COFF image was relocated with PeCoffLoaderRelocateImage().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r
   cache(s) in hardware, then the caller is responsible for performing cache maintenance operations\r
   prior to transferring control to a PE/COFF image that is loaded using this library.\r
 \r
   after this PE/COFF image was relocated with PeCoffLoaderRelocateImage().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r
   cache(s) in hardware, then the caller is responsible for performing cache maintenance operations\r
   prior to transferring control to a PE/COFF image that is loaded using this library.\r
 \r

-  @param  ImageBase          The base address of a PE/COFF image that has been loaded \r
+  @param  ImageBase          The base address of a PE/COFF image that has been loaded\r

                              and relocated into system memory.\r
   @param  VirtImageBase      The request virtual address that the PE/COFF image is to\r
                              be fixed up for.\r
   @param  ImageSize          The size, in bytes, of the PE/COFF image.\r
                              and relocated into system memory.\r
   @param  VirtImageBase      The request virtual address that the PE/COFF image is to\r
                              be fixed up for.\r
   @param  ImageSize          The size, in bytes, of the PE/COFF image.\r

-  @param  RelocationData     A pointer to the relocation data that was collected when the PE/COFF \r
+  @param  RelocationData     A pointer to the relocation data that was collected when the PE/COFF\r

                              image was relocated using PeCoffLoaderRelocateImage().\r
                              image was relocated using PeCoffLoaderRelocateImage().\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -370,15 +370,15 @@ PeCoffLoaderRelocateImageForRuntime (
 \r
 /**\r
   Unloads a loaded PE/COFF image from memory and releases its taken resource.\r
 \r
 /**\r
   Unloads a loaded PE/COFF image from memory and releases its taken resource.\r

-  Releases any environment specific resources that were allocated when the image \r
-  specified by ImageContext was loaded using PeCoffLoaderLoadImage(). \r
- \r
+  Releases any environment specific resources that were allocated when the image\r
+  specified by ImageContext was loaded using PeCoffLoaderLoadImage().\r
+\r

   For NT32 emulator, the PE/COFF image loaded by system needs to release.\r
   For NT32 emulator, the PE/COFF image loaded by system needs to release.\r

-  For real platform, the PE/COFF image loaded by Core doesn't needs to be unloaded, \r
+  For real platform, the PE/COFF image loaded by Core doesn't needs to be unloaded,\r

   this function can simply return RETURN_SUCCESS.\r
   this function can simply return RETURN_SUCCESS.\r

-  \r
+\r

   If ImageContext is NULL, then ASSERT().\r
   If ImageContext is NULL, then ASSERT().\r

-  \r
+\r

   @param  ImageContext              Pointer to the image context structure that describes the PE/COFF\r
                                     image to be unloaded.\r
 \r
   @param  ImageContext              Pointer to the image context structure that describes the PE/COFF\r
                                     image to be unloaded.\r
 \r

diff --git a/MdePkg/Include/Library/PeiCoreEntryPoint.h b/MdePkg/Include/Library/PeiCoreEntryPoint.h
index 7485f7a40e98cfde9ee9bdc78891142afc7c49c2..c3d22f12b9173559b8856bc85736b83983230f4d 100644 (file)
--- a/MdePkg/Include/Library/PeiCoreEntryPoint.h
+++ b/MdePkg/Include/Library/PeiCoreEntryPoint.h
@@ -1,7 +1,7 @@
 /** @file\r
   Module entry point library for PEI core.\r
 \r
 /** @file\r
   Module entry point library for PEI core.\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


@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   @param SecCoreData  Points to a data structure containing information about the PEI\r
                       core's operating environment, such as the size and location of\r
 \r
   @param SecCoreData  Points to a data structure containing information about the PEI\r
                       core's operating environment, such as the size and location of\r

-                      temporary RAM, the stack location and the BFV location. \r
+                      temporary RAM, the stack location and the BFV location.\r

 \r
   @param PpiList      Points to a list of one or more PPI descriptors to be installed\r
                       initially by the PEI core. An empty PPI list consists of a single\r
 \r
   @param PpiList      Points to a list of one or more PPI descriptors to be installed\r
                       initially by the PEI core. An empty PPI list consists of a single\r


@@ -46,7 +46,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r

-EFIAPI \r
+EFIAPI\r

 _ModuleEntryPoint(\r
   IN CONST  EFI_SEC_PEI_HAND_OFF    *SecCoreData,\r
   IN CONST  EFI_PEI_PPI_DESCRIPTOR  *PpiList\r
 _ModuleEntryPoint(\r
   IN CONST  EFI_SEC_PEI_HAND_OFF    *SecCoreData,\r
   IN CONST  EFI_PEI_PPI_DESCRIPTOR  *PpiList\r


@@ -59,7 +59,7 @@ _ModuleEntryPoint(
 \r
   @param SecCoreData  Points to a data structure containing information about the PEI core's\r
                       operating environment, such as the size and location of temporary RAM,\r
 \r
   @param SecCoreData  Points to a data structure containing information about the PEI core's\r
                       operating environment, such as the size and location of temporary RAM,\r

-                      the stack location and the BFV location. \r
+                      the stack location and the BFV location.\r

 \r
   @param PpiList      Points to a list of one or more PPI descriptors to be installed\r
                       initially by the PEI core.  An empty PPI list consists of a single\r
 \r
   @param PpiList      Points to a list of one or more PPI descriptors to be installed\r
                       initially by the PEI core.  An empty PPI list consists of a single\r


@@ -84,7 +84,7 @@ EfiMain (
   This function must be called by the PEI Core once an initial PEI Services Table has been established.\r
   This function calls the set of library constructors for the set of library instances that a\r
   module depends on.  This include library instances that a module depends on directly and library\r
   This function must be called by the PEI Core once an initial PEI Services Table has been established.\r
   This function calls the set of library constructors for the set of library instances that a\r
   module depends on.  This include library instances that a module depends on directly and library\r

-  instances that a module depends on indirectly through other libraries.  \r
+  instances that a module depends on indirectly through other libraries.\r

   This function is autogenerated by build tools and those build tools are responsible for collecting\r
   the set of library instances, determining which ones have constructors, and calling the library\r
   constructors in the proper order based upon the dependencies of each of the library instances.\r
   This function is autogenerated by build tools and those build tools are responsible for collecting\r
   the set of library instances, determining which ones have constructors, and calling the library\r
   constructors in the proper order based upon the dependencies of each of the library instances.\r


@@ -107,13 +107,13 @@ ProcessLibraryConstructorList (
   Autogenerated function that calls a set of module entry points.\r
 \r
   This function must be called by _ModuleEntryPoint().\r
   Autogenerated function that calls a set of module entry points.\r
 \r
   This function must be called by _ModuleEntryPoint().\r

-  This function calls the set of module entry points.  \r
+  This function calls the set of module entry points.\r

   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the module entry points and calling them in a specified order.\r
 \r
   @param SecCoreData    Points to a data structure containing information about the PEI\r
                         core's operating environment, such as the size and location of\r
   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the module entry points and calling them in a specified order.\r
 \r
   @param SecCoreData    Points to a data structure containing information about the PEI\r
                         core's operating environment, such as the size and location of\r

-                        temporary RAM, the stack location and the BFV location. \r
+                        temporary RAM, the stack location and the BFV location.\r

 \r
   @param PpiList        Points to a list of one or more PPI descriptors to be installed\r
                         initially by the PEI core. An empty PPI list consists of a single\r
 \r
   @param PpiList        Points to a list of one or more PPI descriptors to be installed\r
                         initially by the PEI core. An empty PPI list consists of a single\r


@@ -121,7 +121,7 @@ ProcessLibraryConstructorList (
                         As part of its initialization phase, the PEI Foundation will add\r
                         these SEC-hosted PPIs to its PPI database such that both the PEI\r
                         Foundation and any modules can leverage the associated service calls\r
                         As part of its initialization phase, the PEI Foundation will add\r
                         these SEC-hosted PPIs to its PPI database such that both the PEI\r
                         Foundation and any modules can leverage the associated service calls\r

-                        and/or code in these early PPIs. \r
+                        and/or code in these early PPIs.\r

   @param  Context       A pointer to a private context structure defined by the PEI Core\r
                         implementation. The implementation of _ModuleEntryPoint() must set\r
                         this parameter is NULL to indicate that this is the first PEI phase.\r
   @param  Context       A pointer to a private context structure defined by the PEI Core\r
                         implementation. The implementation of _ModuleEntryPoint() must set\r
                         this parameter is NULL to indicate that this is the first PEI phase.\r

diff --git a/MdePkg/Include/Library/PeiServicesLib.h b/MdePkg/Include/Library/PeiServicesLib.h
index 7cea34000c2f653689cda73a6854ac2cb5a58261..8db35e6431e0d31638fc5ae36f5504795c298443 100644 (file)
--- a/MdePkg/Include/Library/PeiServicesLib.h
+++ b/MdePkg/Include/Library/PeiServicesLib.h
@@ -225,7 +225,7 @@ PeiServicesFfsFindSectionData (
 \r
   @param  SectionType           The value of the section type to find.\r
   @param  SectionInstance       Section instance to find.\r
 \r
   @param  SectionType           The value of the section type to find.\r
   @param  SectionInstance       Section instance to find.\r

-  @param  FileHandle            A pointer to the file header that contains the set \r
+  @param  FileHandle            A pointer to the file header that contains the set\r

                                 of sections to be searched.\r
   @param  SectionData           A pointer to the discovered section, if successful.\r
   @param  AuthenticationStatus  A pointer to the authentication status for this section.\r
                                 of sections to be searched.\r
   @param  SectionData           A pointer to the discovered section, if successful.\r
   @param  AuthenticationStatus  A pointer to the authentication status for this section.\r


@@ -337,9 +337,9 @@ PeiServicesResetSystem (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  This service is a wrapper for the PEI Service FfsFindByName(), except the pointer to the PEI Services \r
-  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface \r
-  Specification for details. \r
+  This service is a wrapper for the PEI Service FfsFindByName(), except the pointer to the PEI Services\r
+  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface\r
+  Specification for details.\r

 \r
   @param FileName       A pointer to the name of the file to\r
                         find within the firmware volume.\r
 \r
   @param FileName       A pointer to the name of the file to\r
                         find within the firmware volume.\r


@@ -347,7 +347,7 @@ PeiServicesResetSystem (
   @param VolumeHandle   The firmware volume to search FileHandle\r
                         Upon exit, points to the found file's\r
                         handle or NULL if it could not be found.\r
   @param VolumeHandle   The firmware volume to search FileHandle\r
                         Upon exit, points to the found file's\r
                         handle or NULL if it could not be found.\r

-  @param FileHandle     Pointer to found file handle \r
+  @param FileHandle     Pointer to found file handle\r

 \r
   @retval EFI_SUCCESS             File was found.\r
 \r
 \r
   @retval EFI_SUCCESS             File was found.\r
 \r


@@ -367,9 +367,9 @@ PeiServicesFfsFindFileByName (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  This service is a wrapper for the PEI Service FfsGetFileInfo(), except the pointer to the PEI Services \r
-  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface \r
-  Specification for details. \r
+  This service is a wrapper for the PEI Service FfsGetFileInfo(), except the pointer to the PEI Services\r
+  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface\r
+  Specification for details.\r

 \r
   @param FileHandle   Handle of the file.\r
 \r
 \r
   @param FileHandle   Handle of the file.\r
 \r


@@ -377,15 +377,15 @@ PeiServicesFfsFindFileByName (
                       information.\r
 \r
   @retval EFI_SUCCESS             File information returned.\r
                       information.\r
 \r
   @retval EFI_SUCCESS             File information returned.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r
   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r
   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r

-  \r
+\r

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

-EFIAPI \r
+EFIAPI\r

 PeiServicesFfsGetFileInfo (\r
   IN CONST  EFI_PEI_FILE_HANDLE   FileHandle,\r
   OUT EFI_FV_FILE_INFO            *FileInfo\r
 PeiServicesFfsGetFileInfo (\r
   IN CONST  EFI_PEI_FILE_HANDLE   FileHandle,\r
   OUT EFI_FV_FILE_INFO            *FileInfo\r


@@ -402,12 +402,12 @@ PeiServicesFfsGetFileInfo (
                       information.\r
 \r
   @retval EFI_SUCCESS             File information returned.\r
                       information.\r
 \r
   @retval EFI_SUCCESS             File information returned.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r
   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r
   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r

-  \r
+\r

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


@@ -417,9 +417,9 @@ PeiServicesFfsGetFileInfo2 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This service is a wrapper for the PEI Service FfsGetVolumeInfo(), except the pointer to the PEI Services \r
-  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface \r
-  Specification for details. \r
+  This service is a wrapper for the PEI Service FfsGetVolumeInfo(), except the pointer to the PEI Services\r
+  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface\r
+  Specification for details.\r

 \r
   @param VolumeHandle   Handle of the volume.\r
 \r
 \r
   @param VolumeHandle   Handle of the volume.\r
 \r


@@ -427,10 +427,10 @@ PeiServicesFfsGetFileInfo2 (
                         information.\r
 \r
   @retval EFI_SUCCESS             File information returned.\r
                         information.\r
 \r
   @retval EFI_SUCCESS             File information returned.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r
   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r
 \r
 **/\r


@@ -443,13 +443,13 @@ PeiServicesFfsGetVolumeInfo (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  This service is a wrapper for the PEI Service RegisterForShadow(), except the pointer to the PEI Services \r
-  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface \r
-  Specification for details. \r
+  This service is a wrapper for the PEI Service RegisterForShadow(), except the pointer to the PEI Services\r
+  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface\r
+  Specification for details.\r

 \r
   @param FileHandle   PEIM's file handle. Must be the currently\r
                       executing PEIM.\r
 \r
   @param FileHandle   PEIM's file handle. Must be the currently\r
                       executing PEIM.\r

-  \r
+\r

   @retval EFI_SUCCESS   The PEIM was successfully registered for\r
                         shadowing.\r
 \r
   @retval EFI_SUCCESS   The PEIM was successfully registered for\r
                         shadowing.\r
 \r


@@ -467,25 +467,25 @@ PeiServicesRegisterForShadow (
 \r
 /**\r
   Install a EFI_PEI_FIRMWARE_VOLUME_INFO_PPI instance so the PEI Core will be notified about a new firmware volume.\r
 \r
 /**\r
   Install a EFI_PEI_FIRMWARE_VOLUME_INFO_PPI instance so the PEI Core will be notified about a new firmware volume.\r

-  \r
-  This function allocates, initializes, and installs a new EFI_PEI_FIRMWARE_VOLUME_INFO_PPI using \r
+\r
+  This function allocates, initializes, and installs a new EFI_PEI_FIRMWARE_VOLUME_INFO_PPI using\r

   the parameters passed in to initialize the fields of the EFI_PEI_FIRMWARE_VOLUME_INFO_PPI instance.\r
   If the resources can not be allocated for EFI_PEI_FIRMWARE_VOLUME_INFO_PPI, then ASSERT().\r
   If the EFI_PEI_FIRMWARE_VOLUME_INFO_PPI can not be installed, then ASSERT().\r
 \r
   the parameters passed in to initialize the fields of the EFI_PEI_FIRMWARE_VOLUME_INFO_PPI instance.\r
   If the resources can not be allocated for EFI_PEI_FIRMWARE_VOLUME_INFO_PPI, then ASSERT().\r
   If the EFI_PEI_FIRMWARE_VOLUME_INFO_PPI can not be installed, then ASSERT().\r
 \r

-  \r
+\r

   @param  FvFormat             Unique identifier of the format of the memory-mapped firmware volume.\r
   @param  FvFormat             Unique identifier of the format of the memory-mapped firmware volume.\r

-                               This parameter is optional and may be NULL.  \r
+                               This parameter is optional and may be NULL.\r

                                If NULL is specified, the EFI_FIRMWARE_FILE_SYSTEM2_GUID format is assumed.\r
                                If NULL is specified, the EFI_FIRMWARE_FILE_SYSTEM2_GUID format is assumed.\r

-  @param  FvInfo               Points to a buffer which allows the EFI_PEI_FIRMWARE_VOLUME_PPI to process the volume. \r
-                               The format of this buffer is specific to the FvFormat. For memory-mapped firmware volumes, \r
+  @param  FvInfo               Points to a buffer which allows the EFI_PEI_FIRMWARE_VOLUME_PPI to process the volume.\r
+                               The format of this buffer is specific to the FvFormat. For memory-mapped firmware volumes,\r

                                this typically points to the first byte of the firmware volume.\r
                                this typically points to the first byte of the firmware volume.\r

-  @param  FvInfoSize           The size, in bytes, of FvInfo. For memory-mapped firmware volumes, \r
+  @param  FvInfoSize           The size, in bytes, of FvInfo. For memory-mapped firmware volumes,\r

                                this is typically the size of the firmware volume.\r
                                this is typically the size of the firmware volume.\r

-  @param  ParentFvName         If the new firmware volume originated from a file in a different firmware volume, \r
+  @param  ParentFvName         If the new firmware volume originated from a file in a different firmware volume,\r

                                then this parameter specifies the GUID name of the originating firmware volume.\r
                                Otherwise, this parameter must be NULL.\r
                                then this parameter specifies the GUID name of the originating firmware volume.\r
                                Otherwise, this parameter must be NULL.\r

-  @param  ParentFileName       If the new firmware volume originated from a file in a different firmware volume, \r
+  @param  ParentFileName       If the new firmware volume originated from a file in a different firmware volume,\r

                                then this parameter specifies the GUID file name of the originating firmware file.\r
                                Otherwise, this parameter must be NULL.\r
 **/\r
                                then this parameter specifies the GUID file name of the originating firmware file.\r
                                Otherwise, this parameter must be NULL.\r
 **/\r

diff --git a/MdePkg/Include/Library/PeiServicesTablePointerLib.h b/MdePkg/Include/Library/PeiServicesTablePointerLib.h
index 7ea6cc10c54043589971cd2447298cf7480202a6..ff05fcafaec0ef2545528cabc9c491a78680910d 100644 (file)
--- a/MdePkg/Include/Library/PeiServicesTablePointerLib.h
+++ b/MdePkg/Include/Library/PeiServicesTablePointerLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Provides a service to retrieve a pointer to the PEI Services Table.\r
 \r
 /** @file\r
   Provides a service to retrieve a pointer to the PEI 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

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under 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,10 +18,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Retrieves the cached value of the PEI Services Table pointer.\r
 \r
 /**\r
   Retrieves the cached value of the PEI Services Table pointer.\r
 \r

-  Returns the cached value of the PEI Services Table pointer in a CPU specific manner \r
-  as specified in the CPU binding section of the Platform Initialization Pre-EFI \r
+  Returns the cached value of the PEI Services Table pointer in a CPU specific manner\r
+  as specified in the CPU binding section of the Platform Initialization Pre-EFI\r

   Initialization Core Interface Specification.\r
   Initialization Core Interface Specification.\r

-  \r
+\r

   If the cached PEI Services Table pointer is NULL, then ASSERT().\r
 \r
   @return  The pointer to PeiServices.\r
   If the cached PEI Services Table pointer is NULL, then ASSERT().\r
 \r
   @return  The pointer to PeiServices.\r


@@ -34,14 +34,14 @@ GetPeiServicesTablePointer (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Caches a pointer PEI Services Table. \r
- \r
-  Caches the pointer to the PEI Services Table specified by PeiServicesTablePointer \r
-  in a CPU specific manner as specified in the CPU binding section of the Platform Initialization \r
-  Pre-EFI Initialization Core Interface Specification. \r
-  \r
+  Caches a pointer PEI Services Table.\r
+\r
+  Caches the pointer to the PEI Services Table specified by PeiServicesTablePointer\r
+  in a CPU specific manner as specified in the CPU binding section of the Platform Initialization\r
+  Pre-EFI Initialization Core Interface Specification.\r
+\r

   If PeiServicesTablePointer is NULL, then ASSERT().\r
   If PeiServicesTablePointer is NULL, then ASSERT().\r

-  \r
+\r

   @param    PeiServicesTablePointer   The address of PeiServices pointer.\r
 **/\r
 VOID\r
   @param    PeiServicesTablePointer   The address of PeiServices pointer.\r
 **/\r
 VOID\r


@@ -51,16 +51,16 @@ SetPeiServicesTablePointer (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Perform CPU specific actions required to migrate the PEI Services Table \r
+  Perform CPU specific actions required to migrate the PEI Services Table\r

   pointer from temporary RAM to permanent RAM.\r
 \r
   pointer from temporary RAM to permanent RAM.\r
 \r

-  For IA32 CPUs, the PEI Services Table pointer is stored in the 4 bytes \r
+  For IA32 CPUs, the PEI Services Table pointer is stored in the 4 bytes\r

   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r

-  For X64 CPUs, the PEI Services Table pointer is stored in the 8 bytes \r
+  For X64 CPUs, the PEI Services Table pointer is stored in the 8 bytes\r

   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   For Itanium and ARM CPUs, a the PEI Services Table Pointer is stored in\r
   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   For Itanium and ARM CPUs, a the PEI Services Table Pointer is stored in\r

-  a dedicated CPU register.  This means that there is no memory storage \r
-  associated with storing the PEI Services Table pointer, so no additional \r
+  a dedicated CPU register.  This means that there is no memory storage\r
+  associated with storing the PEI Services Table pointer, so no additional\r

   migration actions are required for Itanium or ARM CPUs.\r
 \r
 **/\r
   migration actions are required for Itanium or ARM CPUs.\r
 \r
 **/\r

diff --git a/MdePkg/Include/Library/PeimEntryPoint.h b/MdePkg/Include/Library/PeimEntryPoint.h
index f4b752ef960926bbd0c11caa87fac67d23a50ae2..7eb844dd937def90addf273c7ae459b32e724522 100644 (file)
--- a/MdePkg/Include/Library/PeimEntryPoint.h
+++ b/MdePkg/Include/Library/PeimEntryPoint.h
@@ -1,7 +1,7 @@
 /** @file\r
   Module entry point library for PEIM.\r
 \r
 /** @file\r
   Module entry point library for PEIM.\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,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __MODULE_ENTRY_POINT_H__\r
 \r
 ///\r
 #define __MODULE_ENTRY_POINT_H__\r
 \r
 ///\r

-/// Declare the EFI/UEFI Specification Revision to which this driver is implemented \r
+/// Declare the EFI/UEFI Specification Revision to which this driver is implemented\r

 ///\r
 extern CONST UINT32       _gPeimRevision;\r
 \r
 ///\r
 extern CONST UINT32       _gPeimRevision;\r
 \r


@@ -24,11 +24,11 @@ extern CONST UINT32       _gPeimRevision;
 /**\r
   The entry point of PE/COFF Image for a PEIM.\r
 \r
 /**\r
   The entry point of PE/COFF Image for a PEIM.\r
 \r

-  This function is the entry point for a PEIM.  This function must call ProcessLibraryConstructorList() \r
+  This function is the entry point for a PEIM.  This function must call ProcessLibraryConstructorList()\r

   and ProcessModuleEntryPointList().  The return value from ProcessModuleEntryPointList() is returned.\r
   If _gPeimRevision is not zero and PeiServices->Hdr.Revision is less than _gPeimRevison, then ASSERT().\r
 \r
   and ProcessModuleEntryPointList().  The return value from ProcessModuleEntryPointList() is returned.\r
   If _gPeimRevision is not zero and PeiServices->Hdr.Revision is less than _gPeimRevison, then ASSERT().\r
 \r

-  @param  FileHandle  Handle of the file being invoked. \r
+  @param  FileHandle  Handle of the file being invoked.\r

   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval  EFI_SUCCESS   The PEIM executed normally.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval  EFI_SUCCESS   The PEIM executed normally.\r


@@ -44,10 +44,10 @@ _ModuleEntryPoint (
 \r
 /**\r
   Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().\r
 \r
 /**\r
   Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().\r

-  \r
+\r

   This function is required to call _ModuleEntryPoint() passing in FileHandle and PeiServices.\r
 \r
   This function is required to call _ModuleEntryPoint() passing in FileHandle and PeiServices.\r
 \r

-  @param  FileHandle  Handle of the file being invoked. \r
+  @param  FileHandle  Handle of the file being invoked.\r

   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval EFI_SUCCESS  The PEIM executed normally.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval EFI_SUCCESS  The PEIM executed normally.\r


@@ -68,7 +68,7 @@ EfiMain (
   This function must be called by _ModuleEntryPoint().\r
   This function calls the set of library constructors for the set of library instances that a\r
   module depends on. This includes library instances that a module depends on directly and library\r
   This function must be called by _ModuleEntryPoint().\r
   This function calls the set of library constructors for the set of library instances that a\r
   module depends on. This includes library instances that a module depends on directly and library\r

-  instances that a module depends on indirectly through other libraries.  \r
+  instances that a module depends on indirectly through other libraries.\r

   This function is autogenerated by build tools and those build tools are responsible for collecting\r
   the set of library instances, determine which ones have constructors, and calling the library\r
   constructors in the proper order based upon each of the library instances own dependencies.\r
   This function is autogenerated by build tools and those build tools are responsible for collecting\r
   the set of library instances, determine which ones have constructors, and calling the library\r
   constructors in the proper order based upon each of the library instances own dependencies.\r


@@ -88,16 +88,16 @@ ProcessLibraryConstructorList (
   Autogenerated function that calls a set of module entry points.\r
 \r
   This function must be called by _ModuleEntryPoint().\r
   Autogenerated function that calls a set of module entry points.\r
 \r
   This function must be called by _ModuleEntryPoint().\r

-  This function calls the set of module entry points.  \r
+  This function calls the set of module entry points.\r

   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the module entry points and calling them in a specified order.\r
 \r
   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the module entry points and calling them in a specified order.\r
 \r

-  @param  FileHandle  Handle of the file being invoked. \r
+  @param  FileHandle  Handle of the file being invoked.\r

   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval EFI_SUCCESS  The PEIM executed normally.\r
   @retval !EFI_SUCCESS The PEIM failed to execute normally.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval EFI_SUCCESS  The PEIM executed normally.\r
   @retval !EFI_SUCCESS The PEIM failed to execute normally.\r

- \r
+\r

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

diff --git a/MdePkg/Include/Library/PerformanceLib.h b/MdePkg/Include/Library/PerformanceLib.h
index 8a8f5e3694ae2b53821ae6c7889e5c4163661e2a..100fd8d0cadc94e6a846480c920398db37504f25 100644 (file)
--- a/MdePkg/Include/Library/PerformanceLib.h
+++ b/MdePkg/Include/Library/PerformanceLib.h
@@ -60,8 +60,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define PERF_GENERAL_TYPE                0x0040\r
 \r
 /**\r
 #define PERF_GENERAL_TYPE                0x0040\r
 \r
 /**\r

-  Creates a record for the beginning of a performance measurement. \r
-  \r
+  Creates a record for the beginning of a performance measurement.\r
+\r

   Creates a record that contains the Handle, Token, and Module.\r
   If TimeStamp is not zero, then TimeStamp is added to the record as the start time.\r
   If TimeStamp is zero, then this function reads the current time stamp\r
   Creates a record that contains the Handle, Token, and Module.\r
   If TimeStamp is not zero, then TimeStamp is added to the record as the start time.\r
   If TimeStamp is zero, then this function reads the current time stamp\r


@@ -90,8 +90,8 @@ StartPerformanceMeasurement (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Fills in the end time of a performance measurement. \r
-  \r
+  Fills in the end time of a performance measurement.\r
+\r

   Looks up the record that matches Handle, Token, and Module.\r
   If the record can not be found then return RETURN_NOT_FOUND.\r
   If the record is found and TimeStamp is not zero,\r
   Looks up the record that matches Handle, Token, and Module.\r
   If the record can not be found then return RETURN_NOT_FOUND.\r
   If the record is found and TimeStamp is not zero,\r


@@ -122,7 +122,7 @@ EndPerformanceMeasurement (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Attempts to retrieve a performance measurement log entry from the performance measurement log. \r
+  Attempts to retrieve a performance measurement log entry from the performance measurement log.\r

   It can also retrieve the log created by StartPerformanceMeasurementEx and EndPerformanceMeasurementEx,\r
   and then eliminate the Identifier.\r
 \r
   It can also retrieve the log created by StartPerformanceMeasurementEx and EndPerformanceMeasurementEx,\r
   and then eliminate the Identifier.\r
 \r


@@ -147,9 +147,9 @@ EndPerformanceMeasurement (
                                   0, then the first performance measurement log entry is retrieved.\r
                                   On exit, the key of the next performance lof entry entry.\r
   @param  Handle                  Pointer to environment specific context used to identify the component\r
                                   0, then the first performance measurement log entry is retrieved.\r
                                   On exit, the key of the next performance lof entry entry.\r
   @param  Handle                  Pointer to environment specific context used to identify the component\r

-                                  being measured.  \r
+                                  being measured.\r

   @param  Token                   Pointer to a Null-terminated ASCII string that identifies the component\r
   @param  Token                   Pointer to a Null-terminated ASCII string that identifies the component\r

-                                  being measured. \r
+                                  being measured.\r

   @param  Module                  Pointer to a Null-terminated ASCII string that identifies the module\r
                                   being measured.\r
   @param  StartTimeStamp          Pointer to the 64-bit time stamp that was recorded when the measurement\r
   @param  Module                  Pointer to a Null-terminated ASCII string that identifies the module\r
                                   being measured.\r
   @param  StartTimeStamp          Pointer to the 64-bit time stamp that was recorded when the measurement\r


@@ -163,7 +163,7 @@ EndPerformanceMeasurement (
 UINTN\r
 EFIAPI\r
 GetPerformanceMeasurement (\r
 UINTN\r
 EFIAPI\r
 GetPerformanceMeasurement (\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


@@ -283,7 +283,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


@@ -293,8 +293,8 @@ GetPerformanceMeasurementEx (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Returns TRUE if the performance measurement macros are enabled. \r
-  \r
+  Returns TRUE if the performance measurement macros are enabled.\r
+\r

   This function returns TRUE if the PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED bit of\r
   PcdPerformanceLibraryPropertyMask is set.  Otherwise FALSE is returned.\r
 \r
   This function returns TRUE if the PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED bit of\r
   PcdPerformanceLibraryPropertyMask is set.  Otherwise FALSE is returned.\r
 \r

diff --git a/MdePkg/Include/Library/PostCodeLib.h b/MdePkg/Include/Library/PostCodeLib.h
index 9a7a9e6a9967962dad9c3d81b63662f1aac1ea87..74b5ad7f8b9d60559d4370cf30008376a1eb5e1f 100644 (file)
--- a/MdePkg/Include/Library/PostCodeLib.h
+++ b/MdePkg/Include/Library/PostCodeLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Provides services to send progress/error codes to a POST card.\r
 \r
 /** @file\r
   Provides services to send progress/error codes to a POST card.\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


@@ -21,14 +21,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Sends a 32-bit value to a POST card.\r
 \r
 /**\r
   Sends a 32-bit value to a POST card.\r
 \r

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.  \r
-  Some implementations of this library function may perform I/O operations \r
-  directly to a POST card device.  Other implementations may send Value to \r
-  ReportStatusCode(), and the status code reporting mechanism will eventually \r
+  Sends the 32-bit value specified by Value to a POST card, and returns Value.\r
+  Some implementations of this library function may perform I/O operations\r
+  directly to a POST card device.  Other implementations may send Value to\r
+  ReportStatusCode(), and the status code reporting mechanism will eventually\r

   display the 32-bit value on the status reporting device.\r
   display the 32-bit value on the status reporting device.\r

-  \r
-  PostCode() must actively prevent recursion.  If PostCode() is called while \r
-  processing another Post Code Library function, then \r
+\r
+  PostCode() must actively prevent recursion.  If PostCode() is called while\r
+  processing another Post Code Library function, then\r

   PostCode() must return Value immediately.\r
 \r
   @param  Value  The 32-bit value to write to the POST card.\r
   PostCode() must return Value immediately.\r
 \r
   @param  Value  The 32-bit value to write to the POST card.\r


@@ -47,21 +47,21 @@ PostCode (
   Sends a 32-bit value to a POST and associated ASCII string.\r
 \r
   Sends the 32-bit value specified by Value to a POST card, and returns Value.\r
   Sends a 32-bit value to a POST and associated ASCII string.\r
 \r
   Sends the 32-bit value specified by Value to a POST card, and returns Value.\r

-  If Description is not NULL, then the ASCII string specified by Description is \r
-  also passed to the handler that displays the POST card value.  Some \r
-  implementations of this library function may perform I/O operations directly \r
-  to a POST card device.  Other implementations may send Value to ReportStatusCode(), \r
-  and the status code reporting mechanism will eventually display the 32-bit \r
-  value on the status reporting device.  \r
-\r
-  PostCodeWithDescription()must actively prevent recursion.  If \r
-  PostCodeWithDescription() is called while processing another any other Post \r
-  Code Library function, then PostCodeWithDescription() must return Value \r
+  If Description is not NULL, then the ASCII string specified by Description is\r
+  also passed to the handler that displays the POST card value.  Some\r
+  implementations of this library function may perform I/O operations directly\r
+  to a POST card device.  Other implementations may send Value to ReportStatusCode(),\r
+  and the status code reporting mechanism will eventually display the 32-bit\r
+  value on the status reporting device.\r
+\r
+  PostCodeWithDescription()must actively prevent recursion.  If\r
+  PostCodeWithDescription() is called while processing another any other Post\r
+  Code Library function, then PostCodeWithDescription() must return Value\r

   immediately.\r
 \r
   @param  Value        The 32-bit value to write to the POST card.\r
   immediately.\r
 \r
   @param  Value        The 32-bit value to write to the POST card.\r

-  @param  Description  Pointer to an ASCII string that is a description of the \r
-                       POST code value.  This is an optional parameter that may \r
+  @param  Description  Pointer to an ASCII string that is a description of the\r
+                       POST code value.  This is an optional parameter that may\r

                        be NULL.\r
 \r
   @return The 32-bit value to write to the POST card.\r
                        be NULL.\r
 \r
   @return The 32-bit value to write to the POST card.\r


@@ -78,12 +78,12 @@ PostCodeWithDescription (
 /**\r
   Returns TRUE if POST Codes are enabled.\r
 \r
 /**\r
   Returns TRUE if POST Codes are enabled.\r
 \r

-  This function returns TRUE if the POST_CODE_PROPERTY_POST_CODE_ENABLED \r
+  This function returns TRUE if the POST_CODE_PROPERTY_POST_CODE_ENABLED\r

   bit of PcdPostCodePropertyMask is set.  Otherwise FALSE is returned.\r
 \r
   bit of PcdPostCodePropertyMask is set.  Otherwise FALSE is returned.\r
 \r

-  @retval  TRUE   The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of \r
+  @retval  TRUE   The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of\r

                   PcdPostCodeProperyMask is set.\r
                   PcdPostCodeProperyMask is set.\r

-  @retval  FALSE  The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of \r
+  @retval  FALSE  The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of\r

                   PcdPostCodeProperyMask is clear.\r
 \r
 **/\r
                   PcdPostCodeProperyMask is clear.\r
 \r
 **/\r


@@ -116,7 +116,7 @@ PostCodeDescriptionEnabled (
 /**\r
   Sends a 32-bit value to a POST card.\r
 \r
 /**\r
   Sends a 32-bit value to a POST card.\r
 \r

-  If POST codes are enabled in PcdPostCodeProperyMask, then call PostCode() \r
+  If POST codes are enabled in PcdPostCodeProperyMask, then call PostCode()\r

   passing in Value.  Value is returned.\r
 \r
   @param  Value  The 32-bit value to write to the POST card.\r
   passing in Value.  Value is returned.\r
 \r
   @param  Value  The 32-bit value to write to the POST card.\r


@@ -129,13 +129,13 @@ PostCodeDescriptionEnabled (
 /**\r
   Sends a 32-bit value to a POST and associated ASCII string.\r
 \r
 /**\r
   Sends a 32-bit value to a POST and associated ASCII string.\r
 \r

-  If POST codes and POST code descriptions are enabled in \r
-  PcdPostCodeProperyMask, then call PostCodeWithDescription() passing in \r
-  Value and Description.  If only POST codes are enabled, then call PostCode() \r
+  If POST codes and POST code descriptions are enabled in\r
+  PcdPostCodeProperyMask, then call PostCodeWithDescription() passing in\r
+  Value and Description.  If only POST codes are enabled, then call PostCode()\r

   passing in Value.  Value is returned.\r
 \r
   @param  Value        The 32-bit value to write to the POST card.\r
   passing in Value.  Value is returned.\r
 \r
   @param  Value        The 32-bit value to write to the POST card.\r

-  @param  Description  Pointer to an ASCII string that is a description of the \r
+  @param  Description  Pointer to an ASCII string that is a description of the\r

                        POST code value.\r
 \r
   @return Value        The 32-bit value to write to the POST card.\r
                        POST code value.\r
 \r
   @return Value        The 32-bit value to write to the POST card.\r

diff --git a/MdePkg/Include/Library/PrintLib.h b/MdePkg/Include/Library/PrintLib.h
index 80a4fd21d3b6d1ba1f2a5d9f5bfeef0bbab3d045..13dc565248efca0f7865f28a747ec0c3699a7e09 100644 (file)
--- a/MdePkg/Include/Library/PrintLib.h
+++ b/MdePkg/Include/Library/PrintLib.h
@@ -2,45 +2,45 @@
   Provides services to print a formatted string to a buffer. All combinations of\r
   Unicode and ASCII strings are supported.\r
 \r
   Provides services to print a formatted string to a buffer. All combinations of\r
   Unicode and ASCII strings are supported.\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
 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 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 Print Library functions provide a simple means to produce formatted output \r
-  strings.  Many of the output functions use a format string to describe how to \r
-  format the output of variable arguments.  The format string consists of normal \r
-  text and argument descriptors.  There are no restrictions for how the normal \r
-  text and argument descriptors can be mixed.  The following end of line(EOL) \r
+  The Print Library functions provide a simple means to produce formatted output\r
+  strings.  Many of the output functions use a format string to describe how to\r
+  format the output of variable arguments.  The format string consists of normal\r
+  text and argument descriptors.  There are no restrictions for how the normal\r
+  text and argument descriptors can be mixed.  The following end of line(EOL)\r

   translations must be performed on the contents of the format string:\r
   translations must be performed on the contents of the format string:\r

-  \r
+\r

      - '\\r' is translated to '\\r'\r
      - '\\r\\n' is translated to '\\r\\n'\r
      - '\\r' is translated to '\\r'\r
      - '\\r\\n' is translated to '\\r\\n'\r

-     - '\\n' is translated to '\\r\\n' \r
+     - '\\n' is translated to '\\r\\n'\r

      - '\\n\\r' is translated to '\\r\\n'\r
      - '\\n\\r' is translated to '\\r\\n'\r

-  \r
-  This does not follow the ANSI C standard for sprint().  The format of argument \r
-  descriptors is described below.  The ANSI C standard for sprint() has been \r
-  followed for some of the format types, and has not been followed for others.  \r
+\r
+  This does not follow the ANSI C standard for sprint().  The format of argument\r
+  descriptors is described below.  The ANSI C standard for sprint() has been\r
+  followed for some of the format types, and has not been followed for others.\r

   The exceptions are noted below.\r
 \r
     %[flags][width][.precision]type\r
 \r
   [flags]:\r
   The exceptions are noted below.\r
 \r
     %[flags][width][.precision]type\r
 \r
   [flags]:\r

-    - -       \r
-      - The field is left justified.  If not flag is not specified, then the \r
+    - -\r
+      - The field is left justified.  If not flag is not specified, then the\r

         field is right justified.\r
         field is right justified.\r

-    - space   \r
+    - space\r

       - Prefix a space character to a number.  Only valid for types X, x, and d.\r
       - Prefix a space character to a number.  Only valid for types X, x, and d.\r

-    - + \r
-      - Prefix a plus character to a number.  Only valid for types X, x, and d.  \r
+    - +\r
+      - Prefix a plus character to a number.  Only valid for types X, x, and d.\r

         If both space and + are specified, then space is ignored.\r
     - 0\r
         If both space and + are specified, then space is ignored.\r
     - 0\r

-      - Pad with 0 characters to the left of a number.  Only valid for types \r
+      - Pad with 0 characters to the left of a number.  Only valid for types\r

         X, x, and d.\r
     - ,\r
       - Place a comma every 3rd digit of the number.  Only valid for type d.\r
         X, x, and d.\r
     - ,\r
       - Place a comma every 3rd digit of the number.  Only valid for type d.\r


@@ -53,20 +53,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   [width]:\r
 \r
     - *\r
   [width]:\r
 \r
     - *\r

-      - The width of the field is specified by a UINTN argument in the \r
+      - The width of the field is specified by a UINTN argument in the\r

         argument list.\r
     - number\r
         argument list.\r
     - number\r

-      - The number specified as a decimal value represents the width of \r
+      - The number specified as a decimal value represents the width of\r

         the field.\r
     - NOTE: If [width] is not specified, then a field width of 0 is assumed.\r
 \r
   [.precision]:\r
 \r
     - *\r
         the field.\r
     - NOTE: If [width] is not specified, then a field width of 0 is assumed.\r
 \r
   [.precision]:\r
 \r
     - *\r

-      - The precision of the field is specified by a UINTN argument in the \r
+      - The precision of the field is specified by a UINTN argument in the\r

         argument list.\r
     - number\r
         argument list.\r
     - number\r

-      - The number specified as a decimal value represents the precision of \r
+      - The number specified as a decimal value represents the precision of\r

         the field.\r
     - NOTE: If [.precision] is not specified, then a precision of 0 is assumed.\r
 \r
         the field.\r
     - NOTE: If [.precision] is not specified, then a precision of 0 is assumed.\r
 \r


@@ -75,102 +75,102 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     - %\r
       - Print a %%.\r
     - c\r
     - %\r
       - Print a %%.\r
     - c\r

-      - The argument is a Unicode character.  ASCII characters can be printed \r
+      - The argument is a Unicode character.  ASCII characters can be printed\r

         using this type too by making sure bits 8..15 of the argument are set to 0.\r
     - x\r
         using this type too by making sure bits 8..15 of the argument are set to 0.\r
     - x\r

-      - The argument is an unsigned hexadecimal number.  The characters used are 0..9 and \r
-        A..F.  If the flag 'L' is not specified, then the argument is assumed \r
+      - The argument is an unsigned hexadecimal number.  The characters used are 0..9 and\r
+        A..F.  If the flag 'L' is not specified, then the argument is assumed\r

         to be size int.  This does not follow ANSI C.\r
     - X\r
         to be size int.  This does not follow ANSI C.\r
     - X\r

-      - The argument is an unsigned hexadecimal number and the number is padded with \r
-        zeros.  This is equivalent to a format string of "0x". If the flag \r
-        'L' is not specified, then the argument is assumed to be size int.  \r
+      - The argument is an unsigned hexadecimal number and the number is padded with\r
+        zeros.  This is equivalent to a format string of "0x". If the flag\r
+        'L' is not specified, then the argument is assumed to be size int.\r

         This does not follow ANSI C.\r
     - d\r
         This does not follow ANSI C.\r
     - d\r

-      - The argument is a signed decimal number.  If the flag 'L' is not specified, \r
-        then the argument is assumed to be size int.  \r
+      - The argument is a signed decimal number.  If the flag 'L' is not specified,\r
+        then the argument is assumed to be size int.\r

     - u\r
     - u\r

-      - The argument is a unsigned decimal number.  If the flag 'L' is not specified, \r
+      - The argument is a unsigned decimal number.  If the flag 'L' is not specified,\r

         then the argument is assumed to be size int.\r
     - p\r
         then the argument is assumed to be size int.\r
     - p\r

-      - The argument is a pointer that is a (VOID *), and it is printed as an \r
+      - The argument is a pointer that is a (VOID *), and it is printed as an\r

         unsigned hexadecimal number  The characters used are 0..9 and A..F.\r
     - a\r
         unsigned hexadecimal number  The characters used are 0..9 and A..F.\r
     - a\r

-      - The argument is a pointer to an ASCII string.  \r
+      - The argument is a pointer to an ASCII string.\r

         This does not follow ANSI C.\r
     - S, s\r
         This does not follow ANSI C.\r
     - S, s\r

-      - The argument is a pointer to a Unicode string.  \r
+      - The argument is a pointer to a Unicode string.\r

         This does not follow ANSI C.\r
     - g\r
         This does not follow ANSI C.\r
     - g\r

-      - The argument is a pointer to a GUID structure.  The GUID is printed \r
-        in the format XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX.  \r
+      - The argument is a pointer to a GUID structure.  The GUID is printed\r
+        in the format XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX.\r

         This does not follow ANSI C.\r
     - t\r
         This does not follow ANSI C.\r
     - t\r

-      - The argument is a pointer to an EFI_TIME structure.  The time and \r
-        date are printed in the format "mm/dd/yyyy hh:mm" where mm is the \r
-        month zero padded, dd is the day zero padded, yyyy is the year zero \r
-        padded, hh is the hour zero padded, and mm is minutes zero padded.  \r
-        This does not follow ANSI C. \r
+      - The argument is a pointer to an EFI_TIME structure.  The time and\r
+        date are printed in the format "mm/dd/yyyy hh:mm" where mm is the\r
+        month zero padded, dd is the day zero padded, yyyy is the year zero\r
+        padded, hh is the hour zero padded, and mm is minutes zero padded.\r
+        This does not follow ANSI C.\r

     - r\r
     - r\r

-      - The argument is a RETURN_STATUS value.  This value is converted to \r
-        a string following the table below.  This does not follow ANSI C. \r
-      - RETURN_SUCCESS               \r
+      - The argument is a RETURN_STATUS value.  This value is converted to\r
+        a string following the table below.  This does not follow ANSI C.\r
+      - RETURN_SUCCESS\r

         - "Success"\r
         - "Success"\r

-      - RETURN_LOAD_ERROR            \r
+      - RETURN_LOAD_ERROR\r

         - "Load Error"\r
         - "Load Error"\r

-      - RETURN_INVALID_PARAMETER     \r
+      - RETURN_INVALID_PARAMETER\r

         - "Invalid Parameter"\r
         - "Invalid Parameter"\r

-      - RETURN_UNSUPPORTED           \r
+      - RETURN_UNSUPPORTED\r

         - "Unsupported"\r
         - "Unsupported"\r

-      - RETURN_BAD_BUFFER_SIZE       \r
+      - RETURN_BAD_BUFFER_SIZE\r

         - "Bad Buffer Size"\r
         - "Bad Buffer Size"\r

-      - RETURN_BUFFER_TOO_SMALL      \r
+      - RETURN_BUFFER_TOO_SMALL\r

         - "Buffer Too Small"\r
         - "Buffer Too Small"\r

-      - RETURN_NOT_READY             \r
+      - RETURN_NOT_READY\r

         - "Not Ready"\r
         - "Not Ready"\r

-      - RETURN_DEVICE_ERROR          \r
+      - RETURN_DEVICE_ERROR\r

         - "Device Error"\r
         - "Device Error"\r

-      - RETURN_WRITE_PROTECTED       \r
+      - RETURN_WRITE_PROTECTED\r

         - "Write Protected"\r
         - "Write Protected"\r

-      - RETURN_OUT_OF_RESOURCES      \r
+      - RETURN_OUT_OF_RESOURCES\r

         - "Out of Resources"\r
         - "Out of Resources"\r

-      - RETURN_VOLUME_CORRUPTED      \r
+      - RETURN_VOLUME_CORRUPTED\r

         - "Volume Corrupt"\r
         - "Volume Corrupt"\r

-      - RETURN_VOLUME_FULL           \r
+      - RETURN_VOLUME_FULL\r

         - "Volume Full"\r
         - "Volume Full"\r

-      - RETURN_NO_MEDIA              \r
+      - RETURN_NO_MEDIA\r

         - "No Media"\r
         - "No Media"\r

-      - RETURN_MEDIA_CHANGED         \r
+      - RETURN_MEDIA_CHANGED\r

         - "Media changed"\r
         - "Media changed"\r

-      - RETURN_NOT_FOUND             \r
+      - RETURN_NOT_FOUND\r

         - "Not Found"\r
         - "Not Found"\r

-      - RETURN_ACCESS_DENIED         \r
+      - RETURN_ACCESS_DENIED\r

         - "Access Denied"\r
         - "Access Denied"\r

-      - RETURN_NO_RESPONSE           \r
+      - RETURN_NO_RESPONSE\r

         - "No Response"\r
         - "No Response"\r

-      - RETURN_NO_MAPPING            \r
+      - RETURN_NO_MAPPING\r

         - "No mapping"\r
         - "No mapping"\r

-      - RETURN_TIMEOUT               \r
+      - RETURN_TIMEOUT\r

         - "Time out"\r
         - "Time out"\r

-      - RETURN_NOT_STARTED           \r
+      - RETURN_NOT_STARTED\r

         - "Not started"\r
         - "Not started"\r

-      - RETURN_ALREADY_STARTED       \r
+      - RETURN_ALREADY_STARTED\r

         - "Already started"\r
         - "Already started"\r

-      - RETURN_ABORTED               \r
+      - RETURN_ABORTED\r

         - "Aborted"\r
         - "Aborted"\r

-      - RETURN_ICMP_ERROR            \r
+      - RETURN_ICMP_ERROR\r

         - "ICMP Error"\r
         - "ICMP Error"\r

-      - RETURN_TFTP_ERROR            \r
+      - RETURN_TFTP_ERROR\r

         - "TFTP Error"\r
         - "TFTP Error"\r

-      - RETURN_PROTOCOL_ERROR        \r
+      - RETURN_PROTOCOL_ERROR\r

         - "Protocol Error"\r
         - "Protocol Error"\r

-      - RETURN_WARN_UNKNOWN_GLYPH    \r
+      - RETURN_WARN_UNKNOWN_GLYPH\r

         - "Warning Unknown Glyph"\r
         - "Warning Unknown Glyph"\r

-      - RETURN_WARN_DELETE_FAILURE   \r
+      - RETURN_WARN_DELETE_FAILURE\r

         - "Warning Delete Failure"\r
         - "Warning Delete Failure"\r

-      - RETURN_WARN_WRITE_FAILURE    \r
+      - RETURN_WARN_WRITE_FAILURE\r

         - "Warning Write Failure"\r
         - "Warning Write Failure"\r

-      - RETURN_WARN_BUFFER_TOO_SMALL \r
+      - RETURN_WARN_BUFFER_TOO_SMALL\r

         - "Warning Buffer Too Small"\r
 \r
 **/\r
         - "Warning Buffer Too Small"\r
 \r
 **/\r


@@ -180,9 +180,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 ///\r
 /// Define the maximum number of characters that are required to\r
 \r
 ///\r
 /// Define the maximum number of characters that are required to\r

-/// encode with a NULL terminator a decimal, hexadecimal, GUID,   \r
+/// encode with a NULL terminator a decimal, hexadecimal, GUID,\r

 /// or TIME value.\r
 /// or TIME value.\r

-///  \r
+///\r

 ///  Maximum Length Decimal String     = 28\r
 ///    "-9,223,372,036,854,775,808"\r
 ///  Maximum Length Hexadecimal String = 17\r
 ///  Maximum Length Decimal String     = 28\r
 ///    "-9,223,372,036,854,775,808"\r
 ///  Maximum Length Hexadecimal String = 17\r


@@ -195,7 +195,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define MAXIMUM_VALUE_CHARACTERS  38\r
 \r
 ///\r
 #define MAXIMUM_VALUE_CHARACTERS  38\r
 \r
 ///\r

-/// Flags bitmask values use in UnicodeValueToString() and \r
+/// Flags bitmask values use in UnicodeValueToString() and\r

 /// AsciiValueToString()\r
 ///\r
 #define LEFT_JUSTIFY      0x01\r
 /// AsciiValueToString()\r
 ///\r
 #define LEFT_JUSTIFY      0x01\r


@@ -497,26 +497,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


@@ -532,7 +532,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


@@ -894,29 +894,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


@@ -928,7 +928,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


@@ -1003,7 +1003,7 @@ AsciiValueToStringS (
   );\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


@@ -1016,7 +1016,7 @@ AsciiValueToStringS (
   @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


@@ -1027,7 +1027,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


@@ -1038,7 +1038,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/MdePkg/Include/Library/ReportStatusCodeLib.h b/MdePkg/Include/Library/ReportStatusCodeLib.h
index 3924fa20e8dcaf5076c407a117c4dc149fa59701..e60aff01df5f7354fbd19ce0424a2d33a108dd8b 100644 (file)
--- a/MdePkg/Include/Library/ReportStatusCodeLib.h
+++ b/MdePkg/Include/Library/ReportStatusCodeLib.h
@@ -1,9 +1,9 @@
 /** @file\r
   Provides services to log status code records.\r
 \r
 /** @file\r
   Provides services to log status code records.\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
 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


@@ -29,21 +29,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Converts a status code to an 8-bit POST code value.\r
 \r
 /**\r
   Converts a status code to an 8-bit POST code value.\r
 \r

-  Converts the status code specified by CodeType and Value to an 8-bit POST code \r
-  and returns the 8-bit POST code in PostCode.  If CodeType is an \r
-  EFI_PROGRESS_CODE or CodeType is an EFI_ERROR_CODE, then bits 0..4 of PostCode \r
-  are set to bits 16..20 of Value, and bits 5..7 of PostCode are set to bits \r
-  24..26 of Value., and TRUE is returned.  Otherwise, FALSE is returned.  \r
+  Converts the status code specified by CodeType and Value to an 8-bit POST code\r
+  and returns the 8-bit POST code in PostCode.  If CodeType is an\r
+  EFI_PROGRESS_CODE or CodeType is an EFI_ERROR_CODE, then bits 0..4 of PostCode\r
+  are set to bits 16..20 of Value, and bits 5..7 of PostCode are set to bits\r
+  24..26 of Value., and TRUE is returned.  Otherwise, FALSE is returned.\r

 \r
   If PostCode is NULL, then ASSERT().\r
 \r
   @param  CodeType  The type of status code being converted.\r
   @param  Value     The status code value being converted.\r
 \r
   If PostCode is NULL, then ASSERT().\r
 \r
   @param  CodeType  The type of status code being converted.\r
   @param  Value     The status code value being converted.\r

-  @param  PostCode  A pointer to the 8-bit POST code value to return. \r
+  @param  PostCode  A pointer to the 8-bit POST code value to return.\r

 \r
 \r

-  @retval  TRUE   The status code specified by CodeType and Value was converted \r
+  @retval  TRUE   The status code specified by CodeType and Value was converted\r

                   to an 8-bit POST code and returned in PostCode.\r
                   to an 8-bit POST code and returned in PostCode.\r

-  @retval  FALSE  The status code specified by CodeType and Value could not be \r
+  @retval  FALSE  The status code specified by CodeType and Value could not be\r

                   converted to an 8-bit POST code value.\r
 \r
 **/\r
                   converted to an 8-bit POST code value.\r
 \r
 **/\r


@@ -60,15 +60,15 @@ CodeTypeToPostCode (
   Extracts ASSERT() information from a status code structure.\r
 \r
   Converts the status code specified by CodeType, Value, and Data to the ASSERT()\r
   Extracts ASSERT() information from a status code structure.\r
 \r
   Converts the status code specified by CodeType, Value, and Data to the ASSERT()\r

-  arguments specified by Filename, Description, and LineNumber.  If CodeType is \r
-  an EFI_ERROR_CODE, and CodeType has a severity of EFI_ERROR_UNRECOVERED, and \r
-  Value has an operation mask of EFI_SW_EC_ILLEGAL_SOFTWARE_STATE, extract \r
-  Filename, Description, and LineNumber from the optional data area of the \r
-  status code buffer specified by Data.  The optional data area of Data contains \r
-  a Null-terminated ASCII string for the FileName, followed by a Null-terminated \r
-  ASCII string for the Description, followed by a 32-bit LineNumber.  If the \r
-  ASSERT() information could be extracted from Data, then return TRUE.  \r
-  Otherwise, FALSE is returned.  \r
+  arguments specified by Filename, Description, and LineNumber.  If CodeType is\r
+  an EFI_ERROR_CODE, and CodeType has a severity of EFI_ERROR_UNRECOVERED, and\r
+  Value has an operation mask of EFI_SW_EC_ILLEGAL_SOFTWARE_STATE, extract\r
+  Filename, Description, and LineNumber from the optional data area of the\r
+  status code buffer specified by Data.  The optional data area of Data contains\r
+  a Null-terminated ASCII string for the FileName, followed by a Null-terminated\r
+  ASCII string for the Description, followed by a 32-bit LineNumber.  If the\r
+  ASSERT() information could be extracted from Data, then return TRUE.\r
+  Otherwise, FALSE is returned.\r

 \r
   If Data is NULL, then ASSERT().\r
   If Filename is NULL, then ASSERT().\r
 \r
   If Data is NULL, then ASSERT().\r
   If Filename is NULL, then ASSERT().\r


@@ -77,15 +77,15 @@ CodeTypeToPostCode (
 \r
   @param  CodeType     The type of status code being converted.\r
   @param  Value        The status code value being converted.\r
 \r
   @param  CodeType     The type of status code being converted.\r
   @param  Value        The status code value being converted.\r

-  @param  Data         The pointer to status code data buffer. \r
+  @param  Data         The pointer to status code data buffer.\r

   @param  Filename     The pointer to the source file name that generated the ASSERT().\r
   @param  Description  The pointer to the description of the ASSERT().\r
   @param  LineNumber   The pointer to source line number that generated the ASSERT().\r
 \r
   @param  Filename     The pointer to the source file name that generated the ASSERT().\r
   @param  Description  The pointer to the description of the ASSERT().\r
   @param  LineNumber   The pointer to source line number that generated the ASSERT().\r
 \r

-  @retval  TRUE   The status code specified by CodeType, Value, and Data was \r
-                  converted ASSERT() arguments specified by Filename, Description, \r
+  @retval  TRUE   The status code specified by CodeType, Value, and Data was\r
+                  converted ASSERT() arguments specified by Filename, Description,\r

                   and LineNumber.\r
                   and LineNumber.\r

-  @retval  FALSE  The status code specified by CodeType, Value, and Data could \r
+  @retval  FALSE  The status code specified by CodeType, Value, and Data could\r

                   not be converted to ASSERT() arguments.\r
 \r
 **/\r
                   not be converted to ASSERT() arguments.\r
 \r
 **/\r


@@ -93,8 +93,8 @@ BOOLEAN
 EFIAPI\r
 ReportStatusCodeExtractAssertInfo (\r
   IN EFI_STATUS_CODE_TYPE        CodeType,\r
 EFIAPI\r
 ReportStatusCodeExtractAssertInfo (\r
   IN EFI_STATUS_CODE_TYPE        CodeType,\r

-  IN EFI_STATUS_CODE_VALUE       Value,  \r
-  IN CONST EFI_STATUS_CODE_DATA  *Data, \r
+  IN EFI_STATUS_CODE_VALUE       Value,\r
+  IN CONST EFI_STATUS_CODE_DATA  *Data,\r

   OUT CHAR8                      **Filename,\r
   OUT CHAR8                      **Description,\r
   OUT UINT32                     *LineNumber\r
   OUT CHAR8                      **Filename,\r
   OUT CHAR8                      **Description,\r
   OUT UINT32                     *LineNumber\r


@@ -104,13 +104,13 @@ ReportStatusCodeExtractAssertInfo (
 /**\r
   Extracts DEBUG() information from a status code structure.\r
 \r
 /**\r
   Extracts DEBUG() information from a status code structure.\r
 \r

-  Converts the status code specified by Data to the DEBUG() arguments specified \r
-  by ErrorLevel, Marker, and Format.  If type GUID in Data is \r
-  EFI_STATUS_CODE_DATA_TYPE_DEBUG_GUID, then extract ErrorLevel, Marker, and \r
-  Format from the optional data area of the status code buffer specified by Data.  \r
-  The optional data area of Data contains a 32-bit ErrorLevel followed by Marker \r
-  which is 12 UINTN parameters, followed by a Null-terminated ASCII string for \r
-  the Format.  If the DEBUG() information could be extracted from Data, then \r
+  Converts the status code specified by Data to the DEBUG() arguments specified\r
+  by ErrorLevel, Marker, and Format.  If type GUID in Data is\r
+  EFI_STATUS_CODE_DATA_TYPE_DEBUG_GUID, then extract ErrorLevel, Marker, and\r
+  Format from the optional data area of the status code buffer specified by Data.\r
+  The optional data area of Data contains a 32-bit ErrorLevel followed by Marker\r
+  which is 12 UINTN parameters, followed by a Null-terminated ASCII string for\r
+  the Format.  If the DEBUG() information could be extracted from Data, then\r

   return TRUE.  Otherwise, FALSE is returned.\r
 \r
   If Data is NULL, then ASSERT().\r
   return TRUE.  Otherwise, FALSE is returned.\r
 \r
   If Data is NULL, then ASSERT().\r


@@ -118,22 +118,22 @@ ReportStatusCodeExtractAssertInfo (
   If Marker is NULL, then ASSERT().\r
   If Format is NULL, then ASSERT().\r
 \r
   If Marker is NULL, then ASSERT().\r
   If Format is NULL, then ASSERT().\r
 \r

-  @param  Data        The pointer to status code data buffer. \r
+  @param  Data        The pointer to status code data buffer.\r

   @param  ErrorLevel  The pointer to error level mask for a debug message.\r
   @param  Marker      The pointer to the variable argument list associated with Format.\r
   @param  ErrorLevel  The pointer to error level mask for a debug message.\r
   @param  Marker      The pointer to the variable argument list associated with Format.\r

-  @param  Format      The pointer to a Null-terminated ASCII format string of a \r
+  @param  Format      The pointer to a Null-terminated ASCII format string of a\r

                       debug message.\r
 \r
                       debug message.\r
 \r

-  @retval  TRUE   The status code specified by Data was converted DEBUG() arguments \r
+  @retval  TRUE   The status code specified by Data was converted DEBUG() arguments\r

                   specified by ErrorLevel, Marker, and Format.\r
                   specified by ErrorLevel, Marker, and Format.\r

-  @retval  FALSE  The status code specified by Data could not be converted to \r
+  @retval  FALSE  The status code specified by Data could not be converted to\r

                   DEBUG() arguments.\r
 \r
 **/\r
 BOOLEAN\r
 EFIAPI\r
 ReportStatusCodeExtractDebugInfo (\r
                   DEBUG() arguments.\r
 \r
 **/\r
 BOOLEAN\r
 EFIAPI\r
 ReportStatusCodeExtractDebugInfo (\r

-  IN CONST EFI_STATUS_CODE_DATA  *Data, \r
+  IN CONST EFI_STATUS_CODE_DATA  *Data,\r

   OUT UINT32                     *ErrorLevel,\r
   OUT BASE_LIST                  *Marker,\r
   OUT CHAR8                      **Format\r
   OUT UINT32                     *ErrorLevel,\r
   OUT BASE_LIST                  *Marker,\r
   OUT CHAR8                      **Format\r


@@ -143,20 +143,20 @@ ReportStatusCodeExtractDebugInfo (
 /**\r
   Reports a status code.\r
 \r
 /**\r
   Reports a status code.\r
 \r

-  Reports the status code specified by the parameters Type and Value.  Status \r
-  code also require an instance, caller ID, and extended data.  This function \r
-  passed in a zero instance, NULL extended data, and a caller ID of \r
-  gEfiCallerIdGuid, which is the GUID for the module.  \r
-  \r
-  ReportStatusCode()must actively prevent recursion.  If ReportStatusCode() \r
+  Reports the status code specified by the parameters Type and Value.  Status\r
+  code also require an instance, caller ID, and extended data.  This function\r
+  passed in a zero instance, NULL extended data, and a caller ID of\r
+  gEfiCallerIdGuid, which is the GUID for the module.\r
+\r
+  ReportStatusCode()must actively prevent recursion.  If ReportStatusCode()\r

   is called while processing another any other Report Status Code Library function,\r
   then ReportStatusCode() must return immediately.\r
 \r
   is called while processing another any other Report Status Code Library function,\r
   then ReportStatusCode() must return immediately.\r
 \r

-  @param  Type   Status code type. \r
+  @param  Type   Status code type.\r

   @param  Value  Status code value.\r
 \r
   @retval  EFI_SUCCESS       The status code was reported.\r
   @param  Value  Status code value.\r
 \r
   @retval  EFI_SUCCESS       The status code was reported.\r

-  @retval  EFI_DEVICE_ERROR  There status code could not be reported due to a \r
+  @retval  EFI_DEVICE_ERROR  There status code could not be reported due to a\r

                              device error.\r
   @retval  EFI_UNSUPPORTED   The report status code is not supported.\r
 \r
                              device error.\r
   @retval  EFI_UNSUPPORTED   The report status code is not supported.\r
 \r


@@ -172,26 +172,26 @@ ReportStatusCode (
 /**\r
   Reports a status code with a Device Path Protocol as the extended data.\r
 \r
 /**\r
   Reports a status code with a Device Path Protocol as the extended data.\r
 \r

-  Allocates and fills in the extended data section of a status code with the \r
-  Device Path Protocol specified by DevicePath.  This function is responsible \r
-  for allocating a buffer large enough for the standard header and the device \r
+  Allocates and fills in the extended data section of a status code with the\r
+  Device Path Protocol specified by DevicePath.  This function is responsible\r
+  for allocating a buffer large enough for the standard header and the device\r

   path.  The standard header is filled in with an implementation dependent GUID.\r
   The status code is reported with a zero instance and a caller ID of gEfiCallerIdGuid.\r
 \r
   path.  The standard header is filled in with an implementation dependent GUID.\r
   The status code is reported with a zero instance and a caller ID of gEfiCallerIdGuid.\r
 \r

-  ReportStatusCodeWithDevicePath()must actively prevent recursion.  If \r
-  ReportStatusCodeWithDevicePath() is called while processing another any other \r
-  Report Status Code Library function, then ReportStatusCodeWithDevicePath() \r
+  ReportStatusCodeWithDevicePath()must actively prevent recursion.  If\r
+  ReportStatusCodeWithDevicePath() is called while processing another any other\r
+  Report Status Code Library function, then ReportStatusCodeWithDevicePath()\r

   must return EFI_DEVICE_ERROR immediately.\r
 \r
   If DevicePath is NULL, then ASSERT().\r
 \r
   must return EFI_DEVICE_ERROR immediately.\r
 \r
   If DevicePath is NULL, then ASSERT().\r
 \r

-  @param  Type        The status code type. \r
+  @param  Type        The status code type.\r

   @param  Value       The status code value.\r
   @param  DevicePath  The pointer to the Device Path Protocol to be reported.\r
 \r
   @param  Value       The status code value.\r
   @param  DevicePath  The pointer to the Device Path Protocol to be reported.\r
 \r

-  @retval  EFI_SUCCESS           The status code was reported with the extended \r
+  @retval  EFI_SUCCESS           The status code was reported with the extended\r

                                  data specified by DevicePath.\r
                                  data specified by DevicePath.\r

-  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the \r
+  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the\r

                                  extended data section.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r
                                  extended data section.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r


@@ -210,32 +210,32 @@ ReportStatusCodeWithDevicePath (
 /**\r
   Reports a status code with an extended data buffer.\r
 \r
 /**\r
   Reports a status code with an extended data buffer.\r
 \r

-  Allocates and fills in the extended data section of a status code with the \r
-  extended data specified by ExtendedData and ExtendedDataSize.  ExtendedData \r
-  is assumed to be one of the data structures specified in Related Definitions.  \r
-  These data structure do not have the standard header, so this function is \r
-  responsible for allocating a buffer large enough for the standard header and \r
-  the extended data passed into this function.  The standard header is filled \r
-  in with an implementation dependent GUID.  The status code is reported \r
+  Allocates and fills in the extended data section of a status code with the\r
+  extended data specified by ExtendedData and ExtendedDataSize.  ExtendedData\r
+  is assumed to be one of the data structures specified in Related Definitions.\r
+  These data structure do not have the standard header, so this function is\r
+  responsible for allocating a buffer large enough for the standard header and\r
+  the extended data passed into this function.  The standard header is filled\r
+  in with an implementation dependent GUID.  The status code is reported\r

   with a zero instance and a caller ID of gEfiCallerIdGuid.\r
 \r
   with a zero instance and a caller ID of gEfiCallerIdGuid.\r
 \r

-  ReportStatusCodeWithExtendedData()must actively prevent recursion.  If \r
-  ReportStatusCodeWithExtendedData() is called while processing another any other \r
-  Report Status Code Library function, then ReportStatusCodeWithExtendedData() \r
+  ReportStatusCodeWithExtendedData()must actively prevent recursion.  If\r
+  ReportStatusCodeWithExtendedData() is called while processing another any other\r
+  Report Status Code Library function, then ReportStatusCodeWithExtendedData()\r

   must return EFI_DEVICE_ERROR immediately.\r
 \r
   If ExtendedData is NULL, then ASSERT().\r
   If ExtendedDataSize is 0, then ASSERT().\r
 \r
   must return EFI_DEVICE_ERROR immediately.\r
 \r
   If ExtendedData is NULL, then ASSERT().\r
   If ExtendedDataSize is 0, then ASSERT().\r
 \r

-  @param  Type              The status code type. \r
+  @param  Type              The status code type.\r

   @param  Value             The status code value.\r
   @param  ExtendedData      The pointer to the extended data buffer to be reported.\r
   @param  Value             The status code value.\r
   @param  ExtendedData      The pointer to the extended data buffer to be reported.\r

-  @param  ExtendedDataSize  The size, in bytes, of the extended data buffer to \r
+  @param  ExtendedDataSize  The size, in bytes, of the extended data buffer to\r

                             be reported.\r
 \r
                             be reported.\r
 \r

-  @retval  EFI_SUCCESS           The status code was reported with the extended \r
+  @retval  EFI_SUCCESS           The status code was reported with the extended\r

                                  data specified by ExtendedData and ExtendedDataSize.\r
                                  data specified by ExtendedData and ExtendedDataSize.\r

-  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the \r
+  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the\r

                                  extended data section.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r
                                  extended data section.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r


@@ -255,39 +255,39 @@ ReportStatusCodeWithExtendedData (
 /**\r
   Reports a status code with full parameters.\r
 \r
 /**\r
   Reports a status code with full parameters.\r
 \r

-  The function reports a status code.  If ExtendedData is NULL and ExtendedDataSize \r
-  is 0, then an extended data buffer is not reported.  If ExtendedData is not \r
-  NULL and ExtendedDataSize is not 0, then an extended data buffer is allocated.  \r
-  ExtendedData is assumed not have the standard status code header, so this function \r
-  is responsible for allocating a buffer large enough for the standard header and \r
-  the extended data passed into this function.  The standard header is filled in \r
-  with a GUID specified by ExtendedDataGuid.  If ExtendedDataGuid is NULL, then a \r
-  GUID of gEfiStatusCodeSpecificDataGuid is used.  The status code is reported with \r
-  an instance specified by Instance and a caller ID specified by CallerId.  If \r
+  The function reports a status code.  If ExtendedData is NULL and ExtendedDataSize\r
+  is 0, then an extended data buffer is not reported.  If ExtendedData is not\r
+  NULL and ExtendedDataSize is not 0, then an extended data buffer is allocated.\r
+  ExtendedData is assumed not have the standard status code header, so this function\r
+  is responsible for allocating a buffer large enough for the standard header and\r
+  the extended data passed into this function.  The standard header is filled in\r
+  with a GUID specified by ExtendedDataGuid.  If ExtendedDataGuid is NULL, then a\r
+  GUID of gEfiStatusCodeSpecificDataGuid is used.  The status code is reported with\r
+  an instance specified by Instance and a caller ID specified by CallerId.  If\r

   CallerId is NULL, then a caller ID of gEfiCallerIdGuid is used.\r
 \r
   CallerId is NULL, then a caller ID of gEfiCallerIdGuid is used.\r
 \r

-  ReportStatusCodeEx()must actively prevent recursion.  If ReportStatusCodeEx() \r
-  is called while processing another any other Report Status Code Library function, \r
+  ReportStatusCodeEx()must actively prevent recursion.  If ReportStatusCodeEx()\r
+  is called while processing another any other Report Status Code Library function,\r

   then ReportStatusCodeEx() must return EFI_DEVICE_ERROR immediately.\r
 \r
   If ExtendedData is NULL and ExtendedDataSize is not zero, then ASSERT().\r
   If ExtendedData is not NULL and ExtendedDataSize is zero, then ASSERT().\r
 \r
   then ReportStatusCodeEx() must return EFI_DEVICE_ERROR immediately.\r
 \r
   If ExtendedData is NULL and ExtendedDataSize is not zero, then ASSERT().\r
   If ExtendedData is not NULL and ExtendedDataSize is zero, then ASSERT().\r
 \r

-  @param  Type              The status code type. \r
+  @param  Type              The status code type.\r

   @param  Value             The status code value.\r
   @param  Instance          The status code instance number.\r
   @param  Value             The status code value.\r
   @param  Instance          The status code instance number.\r

-  @param  CallerId          The pointer to a GUID that identifies the caller of this \r
-                            function.  If this parameter is NULL, then a caller \r
+  @param  CallerId          The pointer to a GUID that identifies the caller of this\r
+                            function.  If this parameter is NULL, then a caller\r

                             ID of gEfiCallerIdGuid is used.\r
                             ID of gEfiCallerIdGuid is used.\r

-  @param  ExtendedDataGuid  The pointer to the GUID for the extended data buffer.  \r
-                            If this parameter is NULL, then a the status code \r
+  @param  ExtendedDataGuid  The pointer to the GUID for the extended data buffer.\r
+                            If this parameter is NULL, then a the status code\r

                             standard header is filled in with an implementation dependent GUID.\r
                             standard header is filled in with an implementation dependent GUID.\r

-  @param  ExtendedData      The pointer to the extended data buffer.  This is an \r
+  @param  ExtendedData      The pointer to the extended data buffer.  This is an\r

                             optional parameter that may be NULL.\r
   @param  ExtendedDataSize  The size, in bytes, of the extended data buffer.\r
 \r
   @retval  EFI_SUCCESS           The status code was reported.\r
                             optional parameter that may be NULL.\r
   @param  ExtendedDataSize  The size, in bytes, of the extended data buffer.\r
 \r
   @retval  EFI_SUCCESS           The status code was reported.\r

-  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate \r
+  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate\r

                                  the extended data section if it was specified.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r
                                  the extended data section if it was specified.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r


@@ -310,12 +310,12 @@ ReportStatusCodeEx (
 /**\r
   Returns TRUE if status codes of type EFI_PROGRESS_CODE are enabled\r
 \r
 /**\r
   Returns TRUE if status codes of type EFI_PROGRESS_CODE are enabled\r
 \r

-  This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_PROGRESS_CODE_ENABLED \r
+  This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_PROGRESS_CODE_ENABLED\r

   bit of PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.\r
 \r
   bit of PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.\r
 \r

-  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_PROGRESS_CODE_ENABLED bit of \r
+  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_PROGRESS_CODE_ENABLED bit of\r

                   PcdReportStatusCodeProperyMask is set.\r
                   PcdReportStatusCodeProperyMask is set.\r

-  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_PROGRESS_CODE_ENABLED bit of \r
+  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_PROGRESS_CODE_ENABLED bit of\r

                   PcdReportStatusCodeProperyMask is clear.\r
 \r
 **/\r
                   PcdReportStatusCodeProperyMask is clear.\r
 \r
 **/\r


@@ -329,12 +329,12 @@ ReportProgressCodeEnabled (
 /**\r
   Returns TRUE if status codes of type EFI_ERROR_CODE are enabled\r
 \r
 /**\r
   Returns TRUE if status codes of type EFI_ERROR_CODE are enabled\r
 \r

-  This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_ERROR_CODE_ENABLED \r
+  This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_ERROR_CODE_ENABLED\r

   bit of PcdReportStatusCodeProperyMask is set.  Otherwise, FALSE is returned.\r
 \r
   bit of PcdReportStatusCodeProperyMask is set.  Otherwise, FALSE is returned.\r
 \r

-  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_ERROR_CODE_ENABLED bit of \r
+  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_ERROR_CODE_ENABLED bit of\r

                   PcdReportStatusCodeProperyMask is set.\r
                   PcdReportStatusCodeProperyMask is set.\r

-  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_ERROR_CODE_ENABLED bit of \r
+  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_ERROR_CODE_ENABLED bit of\r

                   PcdReportStatusCodeProperyMask is clear.\r
 \r
 **/\r
                   PcdReportStatusCodeProperyMask is clear.\r
 \r
 **/\r


@@ -348,12 +348,12 @@ ReportErrorCodeEnabled (
 /**\r
   Returns TRUE if status codes of type EFI_DEBUG_CODE are enabled\r
 \r
 /**\r
   Returns TRUE if status codes of type EFI_DEBUG_CODE are enabled\r
 \r

-  This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_DEBUG_CODE_ENABLED \r
+  This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_DEBUG_CODE_ENABLED\r

   bit of PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.\r
 \r
   bit of PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.\r
 \r

-  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_DEBUG_CODE_ENABLED bit of \r
+  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_DEBUG_CODE_ENABLED bit of\r

                   PcdReportStatusCodeProperyMask is set.\r
                   PcdReportStatusCodeProperyMask is set.\r

-  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_DEBUG_CODE_ENABLED bit of \r
+  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_DEBUG_CODE_ENABLED bit of\r

                   PcdReportStatusCodeProperyMask is clear.\r
 \r
 **/\r
                   PcdReportStatusCodeProperyMask is clear.\r
 \r
 **/\r


@@ -367,11 +367,11 @@ ReportDebugCodeEnabled (
 /**\r
   Reports a status code with minimal parameters if the status code type is enabled.\r
 \r
 /**\r
   Reports a status code with minimal parameters if the status code type is enabled.\r
 \r

-  If the status code type specified by Type is enabled in \r
-  PcdReportStatusCodeProperyMask, then call ReportStatusCode() passing in Type \r
+  If the status code type specified by Type is enabled in\r
+  PcdReportStatusCodeProperyMask, then call ReportStatusCode() passing in Type\r

   and Value.\r
 \r
   and Value.\r
 \r

-  @param  Type   The status code type. \r
+  @param  Type   The status code type.\r

   @param  Value  The status code value.\r
 \r
   @retval  EFI_SUCCESS       The status code was reported.\r
   @param  Value  The status code value.\r
 \r
   @retval  EFI_SUCCESS       The status code was reported.\r


@@ -390,20 +390,20 @@ ReportDebugCodeEnabled (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Reports a status code with a Device Path Protocol as the extended data if the \r
+  Reports a status code with a Device Path Protocol as the extended data if the\r

   status code type is enabled.\r
 \r
   status code type is enabled.\r
 \r

-  If the status code type specified by Type is enabled in \r
-  PcdReportStatusCodeProperyMask, then call ReportStatusCodeWithDevicePath() \r
+  If the status code type specified by Type is enabled in\r
+  PcdReportStatusCodeProperyMask, then call ReportStatusCodeWithDevicePath()\r

   passing in Type, Value, and DevicePath.\r
 \r
   passing in Type, Value, and DevicePath.\r
 \r

-  @param  Type        The status code type. \r
+  @param  Type        The status code type.\r

   @param  Value       The status code value.\r
   @param  DevicePath  Pointer to the Device Path Protocol to be reported.\r
 \r
   @param  Value       The status code value.\r
   @param  DevicePath  Pointer to the Device Path Protocol to be reported.\r
 \r

-  @retval  EFI_SUCCESS           The status code was reported with the extended \r
+  @retval  EFI_SUCCESS           The status code was reported with the extended\r

                                  data specified by DevicePath.\r
                                  data specified by DevicePath.\r

-  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the \r
+  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the\r

                                  extended data section.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r
                                  extended data section.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r


@@ -421,22 +421,22 @@ ReportDebugCodeEnabled (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Reports a status code with an extended data buffer if the status code type \r
+  Reports a status code with an extended data buffer if the status code type\r

   is enabled.\r
 \r
   is enabled.\r
 \r

-  If the status code type specified by Type is enabled in \r
-  PcdReportStatusCodeProperyMask, then call ReportStatusCodeWithExtendedData() \r
+  If the status code type specified by Type is enabled in\r
+  PcdReportStatusCodeProperyMask, then call ReportStatusCodeWithExtendedData()\r

   passing in Type, Value, ExtendedData, and ExtendedDataSize.\r
 \r
   passing in Type, Value, ExtendedData, and ExtendedDataSize.\r
 \r

-  @param  Type              The status code type. \r
+  @param  Type              The status code type.\r

   @param  Value             The status code value.\r
   @param  ExtendedData      The pointer to the extended data buffer to be reported.\r
   @param  ExtendedDataSize  The size, in bytes, of the extended data buffer to\r
                             be reported.\r
 \r
   @param  Value             The status code value.\r
   @param  ExtendedData      The pointer to the extended data buffer to be reported.\r
   @param  ExtendedDataSize  The size, in bytes, of the extended data buffer to\r
                             be reported.\r
 \r

-  @retval  EFI_SUCCESS           The status code was reported with the extended \r
+  @retval  EFI_SUCCESS           The status code was reported with the extended\r

                                  data specified by ExtendedData and ExtendedDataSize.\r
                                  data specified by ExtendedData and ExtendedDataSize.\r

-  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the \r
+  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the\r

                                  extended data section.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r
                                  extended data section.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r


@@ -455,25 +455,25 @@ ReportDebugCodeEnabled (
 /**\r
   Reports a status code specifying all parameters if the status code type is enabled.\r
 \r
 /**\r
   Reports a status code specifying all parameters if the status code type is enabled.\r
 \r

-  If the status code type specified by Type is enabled in \r
-  PcdReportStatusCodeProperyMask, then call ReportStatusCodeEx() passing in Type, \r
+  If the status code type specified by Type is enabled in\r
+  PcdReportStatusCodeProperyMask, then call ReportStatusCodeEx() passing in Type,\r

   Value, Instance, CallerId, ExtendedDataGuid, ExtendedData, and ExtendedDataSize.\r
 \r
   Value, Instance, CallerId, ExtendedDataGuid, ExtendedData, and ExtendedDataSize.\r
 \r

-  @param  Type              The status code type. \r
+  @param  Type              The status code type.\r

   @param  Value             The status code value.\r
   @param  Instance          The status code instance number.\r
   @param  Value             The status code value.\r
   @param  Instance          The status code instance number.\r

-  @param  CallerId          The pointer to a GUID that identifies the caller of this \r
-                            function.  If this parameter is NULL, then a caller \r
+  @param  CallerId          The pointer to a GUID that identifies the caller of this\r
+                            function.  If this parameter is NULL, then a caller\r

                             ID of gEfiCallerIdGuid is used.\r
                             ID of gEfiCallerIdGuid is used.\r

-  @param  ExtendedDataGuid  Pointer to the GUID for the extended data buffer.  \r
-                            If this parameter is NULL, then a the status code \r
+  @param  ExtendedDataGuid  Pointer to the GUID for the extended data buffer.\r
+                            If this parameter is NULL, then a the status code\r

                             standard header is filled in with an implementation dependent GUID.\r
                             standard header is filled in with an implementation dependent GUID.\r

-  @param  ExtendedData      Pointer to the extended data buffer.  This is an \r
+  @param  ExtendedData      Pointer to the extended data buffer.  This is an\r

                             optional parameter that may be NULL.\r
   @param  ExtendedDataSize  The size, in bytes, of the extended data buffer.\r
 \r
   @retval  EFI_SUCCESS           The status code was reported.\r
                             optional parameter that may be NULL.\r
   @param  ExtendedDataSize  The size, in bytes, of the extended data buffer.\r
 \r
   @retval  EFI_SUCCESS           The status code was reported.\r

-  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the \r
+  @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the\r

                                  extended data section if it was specified.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r
                                  extended data section if it was specified.\r
   @retval  EFI_UNSUPPORTED       The report status code is not supported.\r
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function\r

diff --git a/MdePkg/Include/Library/ResourcePublicationLib.h b/MdePkg/Include/Library/ResourcePublicationLib.h
index cd51c7f65f018f313e68253aeaeacb3f7754f727..08e779d68c128791aed0c5e7d352d66717ed9f92 100644 (file)
--- a/MdePkg/Include/Library/ResourcePublicationLib.h
+++ b/MdePkg/Include/Library/ResourcePublicationLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Provides a service to publish discovered system resources.\r
 \r
 /** @file\r
   Provides a service to publish discovered system resources.\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


@@ -21,9 +21,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Declares that the system memory buffer specified by MemoryBegin and MemoryLength\r
   as permanent memory that may be used for general purpose use by software.\r
   The amount of memory available to software may be less than MemoryLength\r
   Declares that the system memory buffer specified by MemoryBegin and MemoryLength\r
   as permanent memory that may be used for general purpose use by software.\r
   The amount of memory available to software may be less than MemoryLength\r

-  if published memory has alignment restrictions. \r
+  if published memory has alignment restrictions.\r

   If MemoryLength is 0, then ASSERT().\r
   If MemoryLength is 0, then ASSERT().\r

-  If MemoryLength is greater than (MAX_ADDRESS - MemoryBegin + 1), then ASSERT(). \r
+  If MemoryLength is greater than (MAX_ADDRESS - MemoryBegin + 1), then ASSERT().\r

 \r
   @param  MemoryBegin               The start address of the memory being declared.\r
   @param  MemoryLength              The number of bytes of memory being declared.\r
 \r
   @param  MemoryBegin               The start address of the memory being declared.\r
   @param  MemoryLength              The number of bytes of memory being declared.\r

diff --git a/MdePkg/Include/Library/S3BootScriptLib.h b/MdePkg/Include/Library/S3BootScriptLib.h
index 3f43da8794693900de49f7121c597475ca13439f..89a4a5666983dc95e9b46698b917252130d2c5d7 100644 (file)
--- a/MdePkg/Include/Library/S3BootScriptLib.h
+++ b/MdePkg/Include/Library/S3BootScriptLib.h
@@ -1,11 +1,11 @@
-/** @file \r
-  Defines library APIs used by modules to save EFI Boot Script Opcodes.  \r
-  These OpCode will be restored by S3 related modules. \r
-  Note that some of the API defined in the Library class may not \r
-  be provided in the Framework version library instance, which means some of these \r
+/** @file\r
+  Defines library APIs used by modules to save EFI Boot Script Opcodes.\r
+  These OpCode will be restored by S3 related modules.\r
+  Note that some of the API defined in the Library class may not\r
+  be provided in the Framework version library instance, which means some of these\r

   APIs cannot be used if the underlying firmware is Framework and not PI.\r
 \r
   APIs cannot be used if the underlying firmware is Framework and not PI.\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


@@ -43,14 +43,14 @@
   (((UINTN) Device) << 16) | \\r
   (((UINTN) Function) << 8) | \\r
   (((UINTN) (Register)) < 256 ? ((UINTN) (Register)) : (UINT64) (LShiftU64 ((UINT64) (Register), 32))))\r
   (((UINTN) Device) << 16) | \\r
   (((UINTN) Function) << 8) | \\r
   (((UINTN) (Register)) < 256 ? ((UINTN) (Register)) : (UINT64) (LShiftU64 ((UINT64) (Register), 32))))\r

- \r
+\r

 ///\r
 /// S3 Boot Script Width.\r
 ///\r
 typedef enum {\r
   S3BootScriptWidthUint8,        ///< 8-bit operation.\r
   S3BootScriptWidthUint16,       ///< 16-bit operation.\r
 ///\r
 /// S3 Boot Script Width.\r
 ///\r
 typedef enum {\r
   S3BootScriptWidthUint8,        ///< 8-bit operation.\r
   S3BootScriptWidthUint16,       ///< 16-bit operation.\r

-  S3BootScriptWidthUint32,       ///< 32-bit operation.  \r
+  S3BootScriptWidthUint32,       ///< 32-bit operation.\r

   S3BootScriptWidthUint64,       ///< 64-bit operation.\r
   S3BootScriptWidthFifoUint8,    ///< 8-bit FIFO operation.\r
   S3BootScriptWidthFifoUint16,   ///< 16-bit FIFO operation.\r
   S3BootScriptWidthUint64,       ///< 64-bit operation.\r
   S3BootScriptWidthFifoUint8,    ///< 8-bit FIFO operation.\r
   S3BootScriptWidthFifoUint16,   ///< 16-bit FIFO operation.\r


@@ -71,7 +71,7 @@ typedef enum {
   @param[in] Count     The number of I/O operations to perform.\r
   @param[in] Buffer    The source buffer from which to write data.\r
 \r
   @param[in] Count     The number of I/O operations to perform.\r
   @param[in] Buffer    The source buffer from which to write data.\r
 \r

-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 \r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 \r


@@ -94,7 +94,7 @@ S3BootScriptSaveIoWrite (
   @param[in] DataMask   A pointer to the data mask to be AND-ed with the data\r
                         read from the register.\r
 \r
   @param[in] DataMask   A pointer to the data mask to be AND-ed with the data\r
                         read from the register.\r
 \r

-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 \r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 \r


@@ -116,7 +116,7 @@ S3BootScriptSaveIoReadWrite (
   @param[in] Count     The number of memory operations to perform.\r
   @param[in] Buffer    The source buffer from which to write the data.\r
 \r
   @param[in] Count     The number of memory operations to perform.\r
   @param[in] Buffer    The source buffer from which to write the data.\r
 \r

-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r


@@ -133,13 +133,13 @@ S3BootScriptSaveMemWrite (
   Adds a record for a memory modify operation into a specified boot script table.\r
 \r
   @param[in] Width      The width of the I/O operations.\r
   Adds a record for a memory modify operation into a specified boot script table.\r
 \r
   @param[in] Width      The width of the I/O operations.\r

-  @param[in] Address    The base address of the memory operations. Address needs \r
+  @param[in] Address    The base address of the memory operations. Address needs\r

                         alignment, if required\r
   @param[in] Data       A pointer to the data to be OR-ed.\r
                         alignment, if required\r
   @param[in] Data       A pointer to the data to be OR-ed.\r

-  @param[in] DataMask   A pointer to the data mask to be AND-ed with the data \r
+  @param[in] DataMask   A pointer to the data mask to be AND-ed with the data\r

                         read from the register.\r
 \r
                         read from the register.\r
 \r

-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r


@@ -160,7 +160,7 @@ S3BootScriptSaveMemReadWrite (
   @param[in] Count     The number of PCI operations to perform.\r
   @param[in] Buffer    The source buffer from which to write the data.\r
 \r
   @param[in] Count     The number of PCI operations to perform.\r
   @param[in] Buffer    The source buffer from which to write the data.\r
 \r

-  @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table to perform \r
+  @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table to perform\r

                                    the operation.\r
   @retval RETURN_SUCCESS           The opcode was added.\r
 **/\r
                                    the operation.\r
   @retval RETURN_SUCCESS           The opcode was added.\r
 **/\r


@@ -181,7 +181,7 @@ S3BootScriptSavePciCfgWrite (
   @param[in] Data       A pointer to the data to be OR-ed.The size depends on Width.\r
   @param[in] DataMask   A pointer to the data mask to be AND-ed.\r
 \r
   @param[in] Data       A pointer to the data to be OR-ed.The size depends on Width.\r
   @param[in] DataMask   A pointer to the data mask to be AND-ed.\r
 \r

-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN__SUCCESS           The opcode was added.\r
 **/\r
                                     the operation.\r
   @retval RETURN__SUCCESS           The opcode was added.\r
 **/\r


@@ -203,7 +203,7 @@ S3BootScriptSavePciCfgReadWrite (
   @param[in] Count     The number of PCI operations to perform.\r
   @param[in] Buffer    The source buffer from which to write the data.\r
 \r
   @param[in] Count     The number of PCI operations to perform.\r
   @param[in] Buffer    The source buffer from which to write the data.\r
 \r

-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r


@@ -226,7 +226,7 @@ S3BootScriptSavePciCfg2Write (
   @param[in] Data       A pointer to the data to be OR-ed. The size depends on Width.\r
   @param[in] DataMask   A pointer to the data mask to be AND-ed.\r
 \r
   @param[in] Data       A pointer to the data to be OR-ed. The size depends on Width.\r
   @param[in] DataMask   A pointer to the data mask to be AND-ed.\r
 \r

-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r


@@ -243,23 +243,23 @@ S3BootScriptSavePciCfg2ReadWrite (
 /**\r
   Adds a record for an SMBus command execution into a specified boot script table.\r
 \r
 /**\r
   Adds a record for an SMBus command execution into a specified boot script table.\r
 \r

-  @param[in] SmBusAddress   Address that encodes the SMBUS Slave Address, SMBUS \r
+  @param[in] SmBusAddress   Address that encodes the SMBUS Slave Address, SMBUS\r

                             Command, SMBUS Data Length, and PEC.\r
                             Command, SMBUS Data Length, and PEC.\r

-  @param[in] Operation      Indicates which particular SMBus protocol it will use \r
+  @param[in] Operation      Indicates which particular SMBus protocol it will use\r

                             to execute the SMBus transactions.\r
                             to execute the SMBus transactions.\r

-  @param[in] Length         A pointer to signify the number of bytes that this \r
+  @param[in] Length         A pointer to signify the number of bytes that this\r

                             operation will do.\r
                             operation will do.\r

-  @param[in] Buffer         Contains the value of data to execute to the SMBUS \r
+  @param[in] Buffer         Contains the value of data to execute to the SMBUS\r

                             slave device.\r
                             slave device.\r

-  \r
-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+\r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r
 RETURN_STATUS\r
 EFIAPI\r
 S3BootScriptSaveSmbusExecute (\r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r
 RETURN_STATUS\r
 EFIAPI\r
 S3BootScriptSaveSmbusExecute (\r

-  IN  UINTN                SmBusAddress, \r
+  IN  UINTN                SmBusAddress,\r

   IN  EFI_SMBUS_OPERATION  Operation,\r
   IN  UINTN                *Length,\r
   IN  VOID                 *Buffer\r
   IN  EFI_SMBUS_OPERATION  Operation,\r
   IN  UINTN                *Length,\r
   IN  VOID                 *Buffer\r


@@ -269,8 +269,8 @@ S3BootScriptSaveSmbusExecute (
   Adds a record for an execution stall on the processor into a specified boot script table.\r
 \r
   @param[in] Duration   The duration in microseconds of the stall.\r
   Adds a record for an execution stall on the processor into a specified boot script table.\r
 \r
   @param[in] Duration   The duration in microseconds of the stall.\r

-  \r
-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+\r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r


@@ -284,10 +284,10 @@ S3BootScriptSaveStall (
   Adds a record for dispatching specified arbitrary code into a specified boot script table.\r
 \r
   @param[in] EntryPoint   The entry point of the code to be dispatched.\r
   Adds a record for dispatching specified arbitrary code into a specified boot script table.\r
 \r
   @param[in] EntryPoint   The entry point of the code to be dispatched.\r

-  @param[in] Context      The argument to be passed into the EntryPoint of the code \r
+  @param[in] Context      The argument to be passed into the EntryPoint of the code\r

                           to be dispatched.\r
                           to be dispatched.\r

-  \r
-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+\r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r


@@ -302,8 +302,8 @@ S3BootScriptSaveDispatch2 (
   Adds a record for dispatching specified arbitrary code into a specified boot script table.\r
 \r
   @param[in] EntryPoint   The entry point of the code to be dispatched.\r
   Adds a record for dispatching specified arbitrary code into a specified boot script table.\r
 \r
   @param[in] EntryPoint   The entry point of the code to be dispatched.\r

-  \r
-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+\r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 **/\r


@@ -314,7 +314,7 @@ S3BootScriptSaveDispatch (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Adds a record for memory reads of the memory location and continues when the exit \r
+  Adds a record for memory reads of the memory location and continues when the exit\r

   criteria is satisfied, or after a defined duration.\r
 \r
   Please aware, below interface is different with PI specification, Vol 5:\r
   criteria is satisfied, or after a defined duration.\r
 \r
   Please aware, below interface is different with PI specification, Vol 5:\r


@@ -324,13 +324,13 @@ S3BootScriptSaveDispatch (
 \r
   @param[in] Width       The width of the memory operations.\r
   @param[in] Address     The base address of the memory operations.\r
 \r
   @param[in] Width       The width of the memory operations.\r
   @param[in] Address     The base address of the memory operations.\r

-  @param[in] BitMask     A pointer to the bit mask to be AND-ed with the data read \r
+  @param[in] BitMask     A pointer to the bit mask to be AND-ed with the data read\r

                          from the register.\r
   @param[in] BitValue    A pointer to the data value after to be Masked.\r
   @param[in] Duration    The duration in microseconds of the stall.\r
   @param[in] LoopTimes   The times of the register polling.\r
 \r
                          from the register.\r
   @param[in] BitValue    A pointer to the data value after to be Masked.\r
   @param[in] Duration    The duration in microseconds of the stall.\r
   @param[in] LoopTimes   The times of the register polling.\r
 \r

-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 \r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 \r


@@ -347,13 +347,13 @@ S3BootScriptSaveMemPoll (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Store arbitrary information in the boot script table. This opcode is a no-op on \r
+  Store arbitrary information in the boot script table. This opcode is a no-op on\r

   dispatch and is only used for debugging script issues.\r
   dispatch and is only used for debugging script issues.\r

-  \r
+\r

   @param[in] InformationLength   Length of the data in bytes\r
   @param[in] Information        Information to be logged in the boot scrpit\r
   @param[in] InformationLength   Length of the data in bytes\r
   @param[in] Information        Information to be logged in the boot scrpit\r

- \r
-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+\r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 \r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 \r


@@ -361,27 +361,27 @@ S3BootScriptSaveMemPoll (
 RETURN_STATUS\r
 EFIAPI\r
 S3BootScriptSaveInformation (\r
 RETURN_STATUS\r
 EFIAPI\r
 S3BootScriptSaveInformation (\r

-  IN  UINT32  InformationLength, \r
+  IN  UINT32  InformationLength,\r

   IN  VOID    *Information\r
   );\r
 /**\r
   Adds a record for I/O reads the I/O location and continues when the exit criteria\r
    is satisfied, or after a defined duration.\r
   IN  VOID    *Information\r
   );\r
 /**\r
   Adds a record for I/O reads the I/O location and continues when the exit criteria\r
    is satisfied, or after a defined duration.\r

-  \r
-  @param  Width                 The width of the I/O operations. \r
+\r
+  @param  Width                 The width of the I/O operations.\r

   @param  Address               The base address of the I/O operations.\r
   @param  Data                  The comparison value used for the polling exit criteria.\r
   @param  Address               The base address of the I/O operations.\r
   @param  Data                  The comparison value used for the polling exit criteria.\r

-  @param  DataMask              The mask used for the polling criteria. The bits in \r
-                                the bytes below Width which are zero in Data are \r
+  @param  DataMask              The mask used for the polling criteria. The bits in\r
+                                the bytes below Width which are zero in Data are\r

                                 ignored when polling the memory address.\r
                                 ignored when polling the memory address.\r

-  @param  Delay                 The number of 100ns units to poll. Note that timer \r
-                                available may be of insufficient granularity, so the \r
+  @param  Delay                 The number of 100ns units to poll. Note that timer\r
+                                available may be of insufficient granularity, so the\r

                                 delay may be longer.\r
 \r
                                 delay may be longer.\r
 \r

- @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table to perform the \r
+ @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table to perform the\r

                                   operation.\r
  @retval RETURN_SUCCESS           The opcode was added.\r
                                   operation.\r
  @retval RETURN_SUCCESS           The opcode was added.\r

- @note   The FRAMEWORK version implementation does not support this API \r
+ @note   The FRAMEWORK version implementation does not support this API\r

 **/\r
 RETURN_STATUS\r
 EFIAPI\r
 **/\r
 RETURN_STATUS\r
 EFIAPI\r


@@ -389,29 +389,29 @@ S3BootScriptSaveIoPoll (
   IN S3_BOOT_SCRIPT_LIB_WIDTH       Width,\r
   IN UINT64                     Address,\r
   IN VOID                      *Data,\r
   IN S3_BOOT_SCRIPT_LIB_WIDTH       Width,\r
   IN UINT64                     Address,\r
   IN VOID                      *Data,\r

-  IN VOID                      *DataMask, \r
-  IN UINT64                     Delay   \r
+  IN VOID                      *DataMask,\r
+  IN UINT64                     Delay\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Adds a record for PCI configuration space reads and continues when the exit \r
+  Adds a record for PCI configuration space reads and continues when the exit\r

   criteria is satisfied ,or after a defined duration.\r
 \r
   criteria is satisfied ,or after a defined duration.\r
 \r

-  @param  Width                 The width of the I/O operations. \r
+  @param  Width                 The width of the I/O operations.\r

   @param  Address               The address within the PCI configuration space.\r
   @param  Address               The address within the PCI configuration space.\r

-  @param  Data                  The comparison value used for the polling exit \r
+  @param  Data                  The comparison value used for the polling exit\r

                                 criteria.\r
                                 criteria.\r

-  @param  DataMask              Mask used for the polling criteria. The bits in \r
+  @param  DataMask              Mask used for the polling criteria. The bits in\r

                                 the bytes below Width which are zero in Data are\r
                                 ignored when polling the memory address.\r
                                 the bytes below Width which are zero in Data are\r
                                 ignored when polling the memory address.\r

-  @param  Delay                 The number of 100ns units to poll. Note that timer \r
-                                available may be of insufficient granularity, so the \r
+  @param  Delay                 The number of 100ns units to poll. Note that timer\r
+                                available may be of insufficient granularity, so the\r

                                 delay may be longer.\r
 \r
                                 delay may be longer.\r
 \r

- @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table to perform the \r
+ @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table to perform the\r

                                  operation.\r
  @retval RETURN_SUCCESS           The opcode was added.\r
                                  operation.\r
  @retval RETURN_SUCCESS           The opcode was added.\r

- @note   The FRAMEWORK version implementation does not support this API \r
+ @note   The FRAMEWORK version implementation does not support this API\r

 **/\r
 RETURN_STATUS\r
 EFIAPI\r
 **/\r
 RETURN_STATUS\r
 EFIAPI\r


@@ -423,27 +423,27 @@ S3BootScriptSavePciPoll (
    IN UINT64                     Delay\r
   );\r
 /**\r
    IN UINT64                     Delay\r
   );\r
 /**\r

-  Adds a record for PCI configuration space reads and continues when the exit criteria \r
+  Adds a record for PCI configuration space reads and continues when the exit criteria\r

   is satisfied, or after a defined duration.\r
 \r
   is satisfied, or after a defined duration.\r
 \r

-  @param  Width                 The width of the I/O operations. \r
+  @param  Width                 The width of the I/O operations.\r

   @param  Segment               The PCI segment number for Address.\r
   @param  Address               The address within the PCI configuration space.\r
   @param  Segment               The PCI segment number for Address.\r
   @param  Address               The address within the PCI configuration space.\r

-  @param  Data                  The comparison value used for the polling exit \r
+  @param  Data                  The comparison value used for the polling exit\r

                                 criteria.\r
                                 criteria.\r

-  @param  DataMask              Mask used for the polling criteria. The bits in \r
+  @param  DataMask              Mask used for the polling criteria. The bits in\r

                                 the bytes below Width which are zero\r
                                 in Data are ignored when polling the memory address\r
                                 the bytes below Width which are zero\r
                                 in Data are ignored when polling the memory address\r

-  @param  Delay                 The number of 100ns units to poll. Note that timer \r
-                                available may be of insufficient granularity so the delay \r
+  @param  Delay                 The number of 100ns units to poll. Note that timer\r
+                                available may be of insufficient granularity so the delay\r

                                 may be longer.\r
 \r
                                 may be longer.\r
 \r

-  @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table to perform the \r
+  @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table to perform the\r

                                    operation.\r
   @retval RETURN_SUCCESS           The opcode was added.\r
                                    operation.\r
   @retval RETURN_SUCCESS           The opcode was added.\r

-  @note  A known Limitations in the implementation: When interpreting the opcode  \r
+  @note  A known Limitations in the implementation: When interpreting the opcode\r

          EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE, EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE\r
          EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE, EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE\r

-         and EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE, the 'Segment' parameter is assumed as \r
+         and EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE, the 'Segment' parameter is assumed as\r

          Zero, or else, assert.\r
          The FRAMEWORK version implementation does not support this API.\r
 \r
          Zero, or else, assert.\r
          The FRAMEWORK version implementation does not support this API.\r
 \r


@@ -459,13 +459,13 @@ S3BootScriptSavePci2Poll (
    IN UINT64                        Delay\r
   );\r
 /**\r
    IN UINT64                        Delay\r
   );\r
 /**\r

-  Save ASCII string information specified by Buffer to boot script with opcode \r
+  Save ASCII string information specified by Buffer to boot script with opcode\r

   EFI_BOOT_SCRIPT_INFORMATION_OPCODE.\r
 \r
   EFI_BOOT_SCRIPT_INFORMATION_OPCODE.\r
 \r

-  @param[in] String   The Null-terminated ASCII string to store into the S3 boot \r
+  @param[in] String   The Null-terminated ASCII string to store into the S3 boot\r

                       script table.\r
 \r
                       script table.\r
 \r

-  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform \r
+  @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table to perform\r

                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 \r
                                     the operation.\r
   @retval RETURN_SUCCESS            The opcode was added.\r
 \r


@@ -477,27 +477,27 @@ S3BootScriptSaveInformationAsciiString (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This is an function to close the S3 boot script table. The function could only \r
-  be called in BOOT time phase. To comply with the Framework spec definition on \r
+  This is an function to close the S3 boot script table. The function could only\r
+  be called in BOOT time phase. To comply with the Framework spec definition on\r

   EFI_BOOT_SCRIPT_SAVE_PROTOCOL.CloseTable(), this function will fulfill following things:\r
   1. Closes the specified boot script table\r
   EFI_BOOT_SCRIPT_SAVE_PROTOCOL.CloseTable(), this function will fulfill following things:\r
   1. Closes the specified boot script table\r

-  2. It allocates a new memory pool to duplicate all the boot scripts in the specified table. \r
-     Once this function is called, the table maintained by the library will be destroyed \r
+  2. It allocates a new memory pool to duplicate all the boot scripts in the specified table.\r
+     Once this function is called, the table maintained by the library will be destroyed\r

      after it is copied into the allocated pool.\r
      after it is copied into the allocated pool.\r

-  3. Any attempts to add a script record after calling this function will cause a \r
+  3. Any attempts to add a script record after calling this function will cause a\r

      new table to be created by the library.\r
      new table to be created by the library.\r

-  4. The base address of the allocated pool will be returned in Address. Note that \r
-     after using the boot script table, the CALLER is responsible for freeing the \r
-     pool that is allocated by this function. \r
+  4. The base address of the allocated pool will be returned in Address. Note that\r
+     after using the boot script table, the CALLER is responsible for freeing the\r
+     pool that is allocated by this function.\r

 \r
 \r

-  In Spec PI1.1, this EFI_BOOT_SCRIPT_SAVE_PROTOCOL.CloseTable() is retired. This \r
+  In Spec PI1.1, this EFI_BOOT_SCRIPT_SAVE_PROTOCOL.CloseTable() is retired. This\r

   API is supplied here to meet the requirements of the Framework Spec.\r
   API is supplied here to meet the requirements of the Framework Spec.\r

-  \r
+\r

   If anyone does call CloseTable() on a real platform, then the caller is responsible\r
   If anyone does call CloseTable() on a real platform, then the caller is responsible\r

-  for figuring out how to get the script to run on an S3 resume because the boot script \r
+  for figuring out how to get the script to run on an S3 resume because the boot script\r

   maintained by the lib will be destroyed.\r
   maintained by the lib will be destroyed.\r

- \r
-  @return the base address of the new copy of the boot script table.   \r
+\r
+  @return the base address of the new copy of the boot script table.\r

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


@@ -510,7 +510,7 @@ S3BootScriptCloseTable (
   Executes the S3 boot script table.\r
 \r
   @retval RETURN_SUCCESS       The boot script table was executed successfully.\r
   Executes the S3 boot script table.\r
 \r
   @retval RETURN_SUCCESS       The boot script table was executed successfully.\r

-  @retval RETURN_UNSUPPORTED   Invalid script table or opcode.  \r
+  @retval RETURN_UNSUPPORTED   Invalid script table or opcode.\r

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


@@ -519,25 +519,25 @@ S3BootScriptExecute (
   VOID\r
   );\r
 /**\r
   VOID\r
   );\r
 /**\r

-  Move the last boot script entry to the position \r
+  Move the last boot script entry to the position\r

 \r
 \r

-  @param  BeforeOrAfter         Specifies whether the opcode is stored before \r
-                                (TRUE) or after (FALSE) the positionin the boot \r
-                                script table specified by Position. If Position \r
-                                is NULL or points to NULL then the new opcode is \r
-                                inserted at the beginning of the table (if TRUE) \r
+  @param  BeforeOrAfter         Specifies whether the opcode is stored before\r
+                                (TRUE) or after (FALSE) the positionin the boot\r
+                                script table specified by Position. If Position\r
+                                is NULL or points to NULL then the new opcode is\r
+                                inserted at the beginning of the table (if TRUE)\r

                                 or end of the table (if FALSE).\r
                                 or end of the table (if FALSE).\r

-  @param  Position              On entry, specifies the position in the boot script \r
-                                table where the opcode will be inserted, either \r
-                                before or after, depending on BeforeOrAfter. On \r
-                                exit, specifies the position of the inserted opcode \r
+  @param  Position              On entry, specifies the position in the boot script\r
+                                table where the opcode will be inserted, either\r
+                                before or after, depending on BeforeOrAfter. On\r
+                                exit, specifies the position of the inserted opcode\r

                                 in the boot script table.\r
 \r
   @retval RETURN_OUT_OF_RESOURCES  The table is not available.\r
                                 in the boot script table.\r
 \r
   @retval RETURN_OUT_OF_RESOURCES  The table is not available.\r

-  @retval RETURN_INVALID_PARAMETER The Position is not a valid position in the \r
+  @retval RETURN_INVALID_PARAMETER The Position is not a valid position in the\r

                                    boot script table.\r
   @retval RETURN_SUCCESS           The opcode was inserted.\r
                                    boot script table.\r
   @retval RETURN_SUCCESS           The opcode was inserted.\r

-  @note   The FRAMEWORK version implementation does not support this API. \r
+  @note   The FRAMEWORK version implementation does not support this API.\r

 **/\r
 RETURN_STATUS\r
 EFIAPI\r
 **/\r
 RETURN_STATUS\r
 EFIAPI\r


@@ -549,28 +549,28 @@ S3BootScriptMoveLastOpcode (
   Find a label within the boot script table and, if not present, optionally create it.\r
 \r
   @param  BeforeOrAfter         Specifies whether the opcode is stored before (TRUE)\r
   Find a label within the boot script table and, if not present, optionally create it.\r
 \r
   @param  BeforeOrAfter         Specifies whether the opcode is stored before (TRUE)\r

-                                or after (FALSE) the position in the boot script table \r
+                                or after (FALSE) the position in the boot script table\r

                                 specified by Position.\r
                                 specified by Position.\r

-  @param  CreateIfNotFound      Specifies whether the label will be created if the  \r
+  @param  CreateIfNotFound      Specifies whether the label will be created if the\r

                                 label does not exists (TRUE) or not (FALSE).\r
                                 label does not exists (TRUE) or not (FALSE).\r

-  @param  Position              On entry, specifies the position in the boot script \r
-                                table where the opcode will be inserted, either \r
-                                before or after, depending on BeforeOrAfter. On exit, \r
-                                specifies the positionof the inserted opcode in \r
+  @param  Position              On entry, specifies the position in the boot script\r
+                                table where the opcode will be inserted, either\r
+                                before or after, depending on BeforeOrAfter. On exit,\r
+                                specifies the positionof the inserted opcode in\r

                                 the boot script table.\r
                                 the boot script table.\r

-  @param  Label                 Points to the label which will be inserted in the \r
+  @param  Label                 Points to the label which will be inserted in the\r

                                 boot script table.\r
                                 boot script table.\r

-  @retval EFI_SUCCESS           The operation succeeded. A record was added into \r
+  @retval EFI_SUCCESS           The operation succeeded. A record was added into\r

                                 the specified script table.\r
                                 the specified script table.\r

-  @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script \r
-                                is not supported. If the opcode is unknow or not \r
+  @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script\r
+                                is not supported. If the opcode is unknow or not\r

                                 supported because of the PCD Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
                                 supported because of the PCD Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r

-  @note   The FRAMEWORK version implementation does not support this API \r
+  @note   The FRAMEWORK version implementation does not support this API\r

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

-EFIAPI \r
+EFIAPI\r

 S3BootScriptLabel (\r
   IN       BOOLEAN                      BeforeOrAfter,\r
   IN       BOOLEAN                      CreateIfNotFound,\r
 S3BootScriptLabel (\r
   IN       BOOLEAN                      BeforeOrAfter,\r
   IN       BOOLEAN                      CreateIfNotFound,\r


@@ -585,14 +585,14 @@ S3BootScriptLabel (
 \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

-  @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script \r
+  @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script\r

                                 is not supported. If the opcode is unknow or not s\r
                                 upported because of the PCD Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
                                 is not supported. If the opcode is unknow or not s\r
                                 upported because of the PCD Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r

-  @note   The FRAMEWORK version implementation does not support this API \r
+  @note   The FRAMEWORK version implementation does not support this API\r

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

-EFIAPI \r
+EFIAPI\r

 S3BootScriptCompare (\r
   IN  UINT8                       *Position1,\r
   IN  UINT8                       *Position2,\r
 S3BootScriptCompare (\r
   IN  UINT8                       *Position1,\r
   IN  UINT8                       *Position2,\r

diff --git a/MdePkg/Include/Library/S3IoLib.h b/MdePkg/Include/Library/S3IoLib.h
index 47c4ff96b5cb47e8a064ccaac55a0eb9f3bd0ecf..e6e0fb6f504d4d4b446e1da65e4843ebb78bd9e6 100644 (file)
--- a/MdePkg/Include/Library/S3IoLib.h
+++ b/MdePkg/Include/Library/S3IoLib.h
@@ -1,9 +1,9 @@
 /** @file\r
   I/O and MMIO Library Services that do I/O and also enable the I/O operation\r
   to be replayed during an S3 resume. This library class maps directly on top\r
 /** @file\r
   I/O and MMIO Library Services that do I/O and also enable the I/O operation\r
   to be replayed during an S3 resume. This library class maps directly on top\r

-  of the IoLib class. \r
+  of the IoLib class.\r

 \r
 \r

-  Copyright (c) 2006 - 2012, 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


@@ -117,7 +117,7 @@ S3IoAnd8 (
 \r
 /**\r
   Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, writes the result back to the 8-bit I/O port, and saves \r
+  inclusive OR, writes the result back to the 8-bit I/O port, and saves\r

   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r
   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -179,7 +179,7 @@ S3IoBitFieldRead8 (
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r
   by the StartBit and the EndBit. All other bits in the destination I/O\r
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r
   by the StartBit and the EndBit. All other bits in the destination I/O\r

-  register are preserved. The value written to the I/O port is returned. \r
+  register are preserved. The value written to the I/O port is returned.\r

   Remaining bits in Value are stripped.\r
 \r
   If 8-bit I/O port operations are not supported, then ASSERT().\r
   Remaining bits in Value are stripped.\r
 \r
   If 8-bit I/O port operations are not supported, then ASSERT().\r


@@ -209,7 +209,7 @@ S3IoBitFieldWrite8 (
 \r
 /**\r
   Reads a bit field in an 8-bit port, performs a bitwise OR, writes the\r
 \r
 /**\r
   Reads a bit field in an 8-bit port, performs a bitwise OR, writes the\r

-  result back to the bit field in the 8-bit port, and saves the value in the \r
+  result back to the bit field in the 8-bit port, and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise OR\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise OR\r


@@ -245,7 +245,7 @@ S3IoBitFieldOr8 (
 \r
 /**\r
   Reads a bit field in an 8-bit port, performs a bitwise AND, writes the\r
 \r
 /**\r
   Reads a bit field in an 8-bit port, performs a bitwise AND, writes the\r

-  result back to the bit field in the 8-bit port, and saves the value in the \r
+  result back to the bit field in the 8-bit port, and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -365,7 +365,7 @@ S3IoWrite16 (
 \r
 /**\r
   Reads a 16-bit I/O port, performs a bitwise OR, writes the\r
 \r
 /**\r
   Reads a 16-bit I/O port, performs a bitwise OR, writes the\r

-  result back to the 16-bit I/O port, and saves the value in the S3 script to \r
+  result back to the 16-bit I/O port, and saves the value in the S3 script to\r

   be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise OR\r
   be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise OR\r


@@ -474,7 +474,7 @@ S3IoBitFieldRead16 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Writes a bit field to an I/O register, and saves the value in the S3 script \r
+  Writes a bit field to an I/O register, and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r
   to be replayed on S3 resume.\r
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r


@@ -509,7 +509,7 @@ S3IoBitFieldWrite16 (
 \r
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise OR, writes the\r
 \r
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise OR, writes the\r

-  result back to the bit field in the 16-bit port, and saves the value in the \r
+  result back to the bit field in the 16-bit port, and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise OR\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise OR\r


@@ -545,7 +545,7 @@ S3IoBitFieldOr16 (
 \r
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise AND, writes the\r
 \r
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise AND, writes the\r

-  result back to the bit field in the 16-bit port, and saves the value in the \r
+  result back to the bit field in the 16-bit port, and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND between\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -582,7 +582,7 @@ S3IoBitFieldAnd16 (
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise AND followed by a\r
   bitwise OR, writes the result back to the bit field in the\r
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise AND followed by a\r
   bitwise OR, writes the result back to the bit field in the\r

-  16-bit port, and saves the value in the S3 script to be replayed on S3 \r
+  16-bit port, and saves the value in the S3 script to be replayed on S3\r

   resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND followed\r
   resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND followed\r


@@ -666,7 +666,7 @@ S3IoWrite32 (
 \r
 /**\r
   Reads a 32-bit I/O port, performs a bitwise OR, writes the\r
 \r
 /**\r
   Reads a 32-bit I/O port, performs a bitwise OR, writes the\r

-  result back to the 32-bit I/O port, and saves the value in the S3 script to \r
+  result back to the 32-bit I/O port, and saves the value in the S3 script to\r

   be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise OR\r
   be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise OR\r


@@ -718,7 +718,7 @@ S3IoAnd32 (
 \r
 /**\r
   Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, writes the result back to the 32-bit I/O port, and saves \r
+  inclusive OR, writes the result back to the 32-bit I/O port, and saves\r

   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r
   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -810,7 +810,7 @@ S3IoBitFieldWrite32 (
 \r
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise OR, writes the\r
 \r
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise OR, writes the\r

-  result back to the bit field in the 32-bit port, and saves the value in the \r
+  result back to the bit field in the 32-bit port, and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise OR\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise OR\r


@@ -846,7 +846,7 @@ S3IoBitFieldOr32 (
 \r
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise AND, writes the\r
 \r
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise AND, writes the\r

-  result back to the bit field in the 32-bit port, and saves the value in the \r
+  result back to the bit field in the 32-bit port, and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -883,7 +883,7 @@ S3IoBitFieldAnd32 (
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise AND followed by a\r
   bitwise OR, writes the result back to the bit field in the\r
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise AND followed by a\r
   bitwise OR, writes the result back to the bit field in the\r

-  32-bit port, and saves the value in the S3 script to be replayed on S3 \r
+  32-bit port, and saves the value in the S3 script to be replayed on S3\r

   resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND followed\r
   resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND followed\r


@@ -967,7 +967,7 @@ S3IoWrite64 (
 \r
 /**\r
   Reads a 64-bit I/O port, performs a bitwise OR, writes the\r
 \r
 /**\r
   Reads a 64-bit I/O port, performs a bitwise OR, writes the\r

-  result back to the 64-bit I/O port, and saves the value in the S3 script to \r
+  result back to the 64-bit I/O port, and saves the value in the S3 script to\r

   be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise OR\r
   be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise OR\r


@@ -1111,7 +1111,7 @@ S3IoBitFieldWrite64 (
 \r
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise OR, writes the\r
 \r
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise OR, writes the\r

-  result back to the bit field in the 64-bit port, and saves the value in the \r
+  result back to the bit field in the 64-bit port, and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise OR\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise OR\r


@@ -1147,7 +1147,7 @@ S3IoBitFieldOr64 (
 \r
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise AND, writes the\r
 \r
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise AND, writes the\r

-  result back to the bit field in the 64-bit port, and saves the value in the \r
+  result back to the bit field in the 64-bit port, and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND between\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -1184,7 +1184,7 @@ S3IoBitFieldAnd64 (
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise AND followed by a\r
   bitwise OR, writes the result back to the bit field in the\r
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise AND followed by a\r
   bitwise OR, writes the result back to the bit field in the\r

-  64-bit port, and saves the value in the S3 script to be replayed on S3 \r
+  64-bit port, and saves the value in the S3 script to be replayed on S3\r

   resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND followed\r
   resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND followed\r


@@ -1223,7 +1223,7 @@ S3IoBitFieldAndThenOr64 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads an 8-bit MMIO register, and saves the value in the S3 script to be \r
+  Reads an 8-bit MMIO register, and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address. The 8-bit read value is\r
   replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address. The 8-bit read value is\r


@@ -1244,7 +1244,7 @@ S3MmioRead8 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Writes an 8-bit MMIO register, and saves the value in the S3 script to be \r
+  Writes an 8-bit MMIO register, and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Writes the 8-bit MMIO register specified by Address with the value specified\r
   replayed on S3 resume.\r
 \r
   Writes the 8-bit MMIO register specified by Address with the value specified\r


@@ -1268,7 +1268,7 @@ S3MmioWrite8 (
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise OR, writes the\r
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise OR, writes the\r

-  result back to the 8-bit MMIO register, and saves the value in the S3 script \r
+  result back to the 8-bit MMIO register, and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise\r
   to be replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise\r


@@ -1294,7 +1294,7 @@ S3MmioOr8 (
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise AND, writes the result\r
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise AND, writes the result\r

-  back to the 8-bit MMIO register, and saves the value in the S3 script to be \r
+  back to the 8-bit MMIO register, and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r
   replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1320,7 +1320,7 @@ S3MmioAnd8 (
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, writes the result back to the 8-bit MMIO register, and saves \r
+  inclusive OR, writes the result back to the 8-bit MMIO register, and saves\r

   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r
   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1410,7 +1410,7 @@ S3MmioBitFieldWrite8 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a bit field in an 8-bit MMIO register, performs a bitwise OR, \r
+  Reads a bit field in an 8-bit MMIO register, performs a bitwise OR,\r

   writes the result back to the bit field in the 8-bit MMIO register, and saves\r
   the value in the S3 script to be replayed on S3 resume.\r
 \r
   writes the result back to the bit field in the 8-bit MMIO register, and saves\r
   the value in the S3 script to be replayed on S3 resume.\r
 \r


@@ -1571,7 +1571,7 @@ S3MmioWrite16 (
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise OR, writes the\r
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise OR, writes the\r

-  result back to the 16-bit MMIO register, and saves the value in the S3 script \r
+  result back to the 16-bit MMIO register, and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise\r
   to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise\r


@@ -1597,7 +1597,7 @@ S3MmioOr16 (
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise AND, writes the result\r
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise AND, writes the result\r

-  back to the 16-bit MMIO register, and saves the value in the S3 script to be \r
+  back to the 16-bit MMIO register, and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r
   replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1623,7 +1623,7 @@ S3MmioAnd16 (
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, writes the result back to the 16-bit MMIO register, and \r
+  inclusive OR, writes the result back to the 16-bit MMIO register, and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1713,8 +1713,8 @@ S3MmioBitFieldWrite16 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a bit field in a 16-bit MMIO register, performs a bitwise OR, \r
-  writes the result back to the bit field in the 16-bit MMIO register, and \r
+  Reads a bit field in a 16-bit MMIO register, performs a bitwise OR,\r
+  writes the result back to the bit field in the 16-bit MMIO register, and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise\r


@@ -1751,7 +1751,7 @@ S3MmioBitFieldOr16 (
 \r
 /**\r
   Reads a bit field in a 16-bit MMIO register, performs a bitwise AND, and\r
 \r
 /**\r
   Reads a bit field in a 16-bit MMIO register, performs a bitwise AND, and\r

-  writes the result back to the bit field in the 16-bit MMIO register and \r
+  writes the result back to the bit field in the 16-bit MMIO register and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1828,7 +1828,7 @@ S3MmioBitFieldAndThenOr16 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a 32-bit MMIO register saves the value in the S3 script to be \r
+  Reads a 32-bit MMIO register saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address. The 32-bit read value is\r
   replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address. The 32-bit read value is\r


@@ -1849,7 +1849,7 @@ S3MmioRead32 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Writes a 32-bit MMIO register, and saves the value in the S3 script to be \r
+  Writes a 32-bit MMIO register, and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Writes the 32-bit MMIO register specified by Address with the value specified\r
   replayed on S3 resume.\r
 \r
   Writes the 32-bit MMIO register specified by Address with the value specified\r


@@ -1873,7 +1873,7 @@ S3MmioWrite32 (
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise OR, writes the\r
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise OR, writes the\r

-  result back to the 32-bit MMIO register, and saves the value in the S3 script \r
+  result back to the 32-bit MMIO register, and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise\r
   to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise\r


@@ -1899,7 +1899,7 @@ S3MmioOr32 (
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise AND, writes the result\r
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise AND, writes the result\r

-  back to the 32-bit MMIO register, and saves the value in the S3 script to be \r
+  back to the 32-bit MMIO register, and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r
   replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1925,7 +1925,7 @@ S3MmioAnd32 (
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, writes the result back to the 32-bit MMIO register, and \r
+  inclusive OR, writes the result back to the 32-bit MMIO register, and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1953,7 +1953,7 @@ S3MmioAndThenOr32 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a bit field of a MMIO register, and saves the value in the S3 script \r
+  Reads a bit field of a MMIO register, and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Reads the bit field in a 32-bit MMIO register. The bit field is specified by\r
   to be replayed on S3 resume.\r
 \r
   Reads the bit field in a 32-bit MMIO register. The bit field is specified by\r


@@ -1982,7 +1982,7 @@ S3MmioBitFieldRead32 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Writes a bit field to a MMIO register, and saves the value in the S3 script \r
+  Writes a bit field to a MMIO register, and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Writes Value to the bit field of the MMIO register. The bit field is\r
   to be replayed on S3 resume.\r
 \r
   Writes Value to the bit field of the MMIO register. The bit field is\r


@@ -2015,8 +2015,8 @@ S3MmioBitFieldWrite32 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a bit field in a 32-bit MMIO register, performs a bitwise OR, \r
-  writes the result back to the bit field in the 32-bit MMIO register, and \r
+  Reads a bit field in a 32-bit MMIO register, performs a bitwise OR,\r
+  writes the result back to the bit field in the 32-bit MMIO register, and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise\r


@@ -2053,7 +2053,7 @@ S3MmioBitFieldOr32 (
 \r
 /**\r
   Reads a bit field in a 32-bit MMIO register, performs a bitwise AND, and\r
 \r
 /**\r
   Reads a bit field in a 32-bit MMIO register, performs a bitwise AND, and\r

-  writes the result back to the bit field in the 32-bit MMIO register and \r
+  writes the result back to the bit field in the 32-bit MMIO register and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2130,7 +2130,7 @@ S3MmioBitFieldAndThenOr32 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a 64-bit MMIO register, and saves the value in the S3 script to be \r
+  Reads a 64-bit MMIO register, and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address. The 64-bit read value is\r
   replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address. The 64-bit read value is\r


@@ -2151,7 +2151,7 @@ S3MmioRead64 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Writes a 64-bit MMIO register, and saves the value in the S3 script to be \r
+  Writes a 64-bit MMIO register, and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Writes the 64-bit MMIO register specified by Address with the value specified\r
   replayed on S3 resume.\r
 \r
   Writes the 64-bit MMIO register specified by Address with the value specified\r


@@ -2175,7 +2175,7 @@ S3MmioWrite64 (
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise OR, writes the\r
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise OR, writes the\r

-  result back to the 64-bit MMIO register, and saves the value in the S3 script \r
+  result back to the 64-bit MMIO register, and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise\r
   to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise\r


@@ -2201,7 +2201,7 @@ S3MmioOr64 (
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise AND, writes the result\r
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise AND, writes the result\r

-  back to the 64-bit MMIO register, and saves the value in the S3 script to be \r
+  back to the 64-bit MMIO register, and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r
   replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2227,7 +2227,7 @@ S3MmioAnd64 (
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, writes the result back to the 64-bit MMIO register, and \r
+  inclusive OR, writes the result back to the 64-bit MMIO register, and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2317,8 +2317,8 @@ S3MmioBitFieldWrite64 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads a bit field in a 64-bit MMIO register, performs a bitwise OR, \r
-  writes the result back to the bit field in the 64-bit MMIO register, and \r
+  Reads a bit field in a 64-bit MMIO register, performs a bitwise OR,\r
+  writes the result back to the bit field in the 64-bit MMIO register, and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise\r


@@ -2435,11 +2435,11 @@ S3MmioBitFieldAndThenOr64 (
   Copies data from MMIO region to system memory by using 8-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copies data from MMIO region to system memory by using 8-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 8-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 8-bit access. The total\r

   number of bytes to be copied is specified by Length. Buffer is returned.\r
   number of bytes to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -2462,13 +2462,13 @@ S3MmioReadBuffer8 (
   Copies data from MMIO region to system memory by using 16-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copies data from MMIO region to system memory by using 16-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 16-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 16-bit access. The total\r

   number of bytes to be copied is specified by Length. Buffer is returned.\r
   number of bytes to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -2493,13 +2493,13 @@ S3MmioReadBuffer16 (
   Copies data from MMIO region to system memory by using 32-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copies data from MMIO region to system memory by using 32-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 32-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 32-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -2524,13 +2524,13 @@ S3MmioReadBuffer32 (
   Copies data from MMIO region to system memory by using 64-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copies data from MMIO region to system memory by using 64-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 64-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 64-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r


@@ -2555,11 +2555,11 @@ S3MmioReadBuffer64 (
   Copies data from system memory to MMIO region by using 8-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copies data from system memory to MMIO region by using 8-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 8-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 8-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -2582,13 +2582,13 @@ S3MmioWriteBuffer8 (
   Copies data from system memory to MMIO region by using 16-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copies data from system memory to MMIO region by using 16-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 16-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 16-bit access. The total number\r

   of bytes to be copied is specified by Length. Buffer is returned.\r
   of bytes to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -2614,13 +2614,13 @@ S3MmioWriteBuffer16 (
   Copies data from system memory to MMIO region by using 32-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copies data from system memory to MMIO region by using 32-bit access,\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 32-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 32-bit access. The total number\r

   of bytes to be copied is specified by Length. Buffer is returned.\r
   of bytes to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -2643,16 +2643,16 @@ S3MmioWriteBuffer32 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Copies data from system memory to MMIO region by using 64-bit access, \r
+  Copies data from system memory to MMIO region by using 64-bit access,\r

   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 64-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 64-bit access. The total number\r

   of bytes to be copied is specified by Length. Buffer is returned.\r
   of bytes to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Include/Library/S3PciLib.h b/MdePkg/Include/Library/S3PciLib.h
index bae12aba1eb802b0f8ff792f05bf22fb5bdd43df..fb20d8221927adf6a2dd512a2df9576fb8527e1d 100644 (file)
--- a/MdePkg/Include/Library/S3PciLib.h
+++ b/MdePkg/Include/Library/S3PciLib.h
@@ -1,9 +1,9 @@
 /** @file\r
   The PCI configuration Library Services that carry out PCI configuration and enable\r
   the PCI operations to be replayed during an S3 resume. This library class\r
 /** @file\r
   The PCI configuration Library Services that carry out PCI configuration and enable\r
   the PCI operations to be replayed during an S3 resume. This library class\r

-  maps directly on top of the PciLib class. \r
+  maps directly on top of the PciLib class.\r

 \r
 \r

-  Copyright (c) 2006 - 2012, 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


@@ -36,8 +36,8 @@
   (((Register) & 0xfff) | (((Function) & 0x07) << 12) | (((Device) & 0x1f) << 15) | (((Bus) & 0xff) << 20))\r
 \r
 /**\r
   (((Register) & 0xfff) | (((Function) & 0x07) << 12) | (((Device) & 0x1f) << 15) | (((Bus) & 0xff) << 20))\r
 \r
 /**\r

- \r
-  Reads and returns the 8-bit PCI configuration register specified by Address, \r
+\r
+  Reads and returns the 8-bit PCI configuration register specified by Address,\r

   and saves the value in the S3 script to be replayed on S3 resume.\r
   This function must guarantee that all PCI read and write operations are\r
   serialized.\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
   This function must guarantee that all PCI read and write operations are\r
   serialized.\r


@@ -813,7 +813,7 @@ S3PciAndThenOr32 (
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

- \r
+\r

   @param[in] Address    The PCI configuration register to read.\r
   @param[in] StartBit   The ordinal of the least significant bit in the bit field.\r
                         Range 0..31.\r
   @param[in] Address    The PCI configuration register to read.\r
   @param[in] StartBit   The ordinal of the least significant bit in the bit field.\r
                         Range 0..31.\r

diff --git a/MdePkg/Include/Library/S3SmbusLib.h b/MdePkg/Include/Library/S3SmbusLib.h
index f7a1e248f798c1b32409d75b85b861926871a3b8..fdb67241f9c9fad791b594883cc8f7feac757511 100644 (file)
--- a/MdePkg/Include/Library/S3SmbusLib.h
+++ b/MdePkg/Include/Library/S3SmbusLib.h
@@ -3,7 +3,7 @@
   to be replayed during an S3 resume. This library class maps directly on top\r
   of the SmbusLib class.\r
 \r
   to be replayed during an S3 resume. This library class maps directly on top\r
   of the SmbusLib class.\r
 \r

-  Copyright (c) 2007 - 2010, 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\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r


@@ -35,13 +35,13 @@
                              SMBUS Command, SMBUS Data Length, and PEC.\r
   @param[out] Status         The return status for the executed command.\r
                              This is an optional parameter and may be NULL.\r
                              SMBUS Command, SMBUS Data Length, and PEC.\r
   @param[out] Status         The return status for the executed command.\r
                              This is an optional parameter and may be NULL.\r

-                             RETURN_SUCCESS             The SMBUS command was executed.\r
-                             RETURN_TIMEOUT             A timeout occurred while executing the SMBUS command.\r
+                             RETURN_SUCCESS       The SMBUS command was executed.\r
+                             RETURN_TIMEOUT       A timeout occurred while executing the SMBUS command.\r

                              RETURN_DEVICE_ERROR The request was not completed because a failure\r
                               was recorded in the Host Status Register bit.  Device errors are a result\r
                               of a transaction collision, illegal command field, unclaimed cycle\r
                               (host initiated), or bus error (collision).\r
                              RETURN_DEVICE_ERROR The request was not completed because a failure\r
                               was recorded in the Host Status Register bit.  Device errors are a result\r
                               of a transaction collision, illegal command field, unclaimed cycle\r
                               (host initiated), or bus error (collision).\r

-                             RETURN_UNSUPPORTED        The SMBus operation is not supported.\r
+                             RETURN_UNSUPPORTED    The SMBus operation is not supported.\r

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


@@ -67,13 +67,13 @@ S3SmBusQuickRead (
                              SMBUS Command, SMBUS Data Length, and PEC.\r
   @param[out] Status         The return status for the executed command.\r
                              This is an optional parameter and may be NULL.\r
                              SMBUS Command, SMBUS Data Length, and PEC.\r
   @param[out] Status         The return status for the executed command.\r
                              This is an optional parameter and may be NULL.\r

-                             RETURN_SUCCESS            The SMBUS command was executed.\r
-                             RETURN_TIMEOUT            A timeout occurred while executing the SMBUS command.\r
+                             RETURN_SUCCESS      The SMBUS command was executed.\r
+                             RETURN_TIMEOUT      A timeout occurred while executing the SMBUS command.\r

                              RETURN_DEVICE_ERROR The request was not completed because a failure\r
                              was recorded in the Host Status Register bit.  Device errors are a result\r
                              of a transaction collision, illegal command field, unclaimed cycle\r
                              (host initiated), or bus error (collision).\r
                              RETURN_DEVICE_ERROR The request was not completed because a failure\r
                              was recorded in the Host Status Register bit.  Device errors are a result\r
                              of a transaction collision, illegal command field, unclaimed cycle\r
                              (host initiated), or bus error (collision).\r

-                             RETURN_UNSUPPORTED        The SMBus operation is not supported.\r
+                             RETURN_UNSUPPORTED    The SMBus operation is not supported.\r

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


@@ -99,14 +99,14 @@ S3SmBusQuickWrite (
                              SMBUS Command, SMBUS Data Length, and PEC.\r
   @param[out] Status         The return status for the executed command.\r
                              This is an optional parameter and may be NULL.\r
                              SMBUS Command, SMBUS Data Length, and PEC.\r
   @param[out] Status         The return status for the executed command.\r
                              This is an optional parameter and may be NULL.\r

-                             RETURN_SUCCESS            The SMBUS command was executed.\r
-                             RETURN_TIMEOUT            A timeout occurred while executing the SMBUS command.\r
+                             RETURN_SUCCESS      The SMBUS command was executed.\r
+                             RETURN_TIMEOUT      A timeout occurred while executing the SMBUS command.\r

                              RETURN_DEVICE_ERROR The request was not completed because a failure\r
                              was recorded in the Host Status Register bit.  Device errors are a result\r
                              of a transaction collision, illegal command field, unclaimed cycle\r
                              (host initiated), or bus error (collision).\r
                              RETURN_CRC_ERROR  The checksum is not correct (PEC is incorrect).\r
                              RETURN_DEVICE_ERROR The request was not completed because a failure\r
                              was recorded in the Host Status Register bit.  Device errors are a result\r
                              of a transaction collision, illegal command field, unclaimed cycle\r
                              (host initiated), or bus error (collision).\r
                              RETURN_CRC_ERROR  The checksum is not correct (PEC is incorrect).\r

-                             RETURN_UNSUPPORTED        The SMBus operation is not supported.\r
+                             RETURN_UNSUPPORTED    The SMBus operation is not supported.\r

 \r
   @return   The byte received from the SMBUS.\r
 \r
 \r
   @return   The byte received from the SMBUS.\r
 \r

diff --git a/MdePkg/Include/Library/S3StallLib.h b/MdePkg/Include/Library/S3StallLib.h
index 5fd55e16fe4b8aceb278fd12f74fb6ac385e1e62..61b0d9403554f6f758dff27ef4d05a8b209b1e90 100644 (file)
--- a/MdePkg/Include/Library/S3StallLib.h
+++ b/MdePkg/Include/Library/S3StallLib.h
@@ -1,9 +1,9 @@
 /** @file\r
   Stall Services that perform stalls and also enable the Stall operatation\r
   to be replayed during an S3 resume. This library class maps directly on top\r
 /** @file\r
   Stall Services that perform stalls and also enable the Stall operatation\r
   to be replayed during an S3 resume. This library class maps directly on top\r

-  of the Timer class. \r
+  of the Timer class.\r

 \r
 \r

-  Copyright (c) 2007 - 2010, 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\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r

diff --git a/MdePkg/Include/Library/SalLib.h b/MdePkg/Include/Library/SalLib.h
index 412763fb3121df181911c67cee69ca57ba2eb741..7f95ae8d4fbd80ef5e87e0b8c9c2dde7e1cf7979 100644 (file)
--- a/MdePkg/Include/Library/SalLib.h
+++ b/MdePkg/Include/Library/SalLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Provides library services to make SAL Calls.\r
 \r
 /** @file\r
   Provides library services to make SAL Calls.\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


@@ -19,8 +19,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Makes a SAL procedure call.\r
 \r
 /**\r
   Makes a SAL procedure call.\r

-  \r
-  This is a wrapper function to make a SAL procedure call.  \r
+\r
+  This is a wrapper function to make a SAL procedure call.\r

   No parameter checking is performed on the 8 input parameters,\r
   but there are some common rules that the caller should follow\r
   when making a SAL call.  Any address passed to SAL as buffers\r
   No parameter checking is performed on the 8 input parameters,\r
   but there are some common rules that the caller should follow\r
   when making a SAL call.  Any address passed to SAL as buffers\r

diff --git a/MdePkg/Include/Library/SerialPortLib.h b/MdePkg/Include/Library/SerialPortLib.h
index 965a2d964b02ffea5df0412c02db3c0b4bb8cc45..0c4ef58dd8e0e4defa137544f436a9f9f0f6b3d8 100644 (file)
--- a/MdePkg/Include/Library/SerialPortLib.h
+++ b/MdePkg/Include/Library/SerialPortLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   This library class provides common serial I/O port functions.\r
 \r
 /** @file\r
   This library class provides common serial I/O port functions.\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) 2012 - 2014, ARM Ltd. All rights reserved.\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) 2012 - 2014, ARM Ltd. All rights reserved.\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -21,11 +21,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \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


@@ -37,19 +37,19 @@ SerialPortInitialize (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Write data from buffer to serial device. \r
- \r
-  Writes NumberOfBytes data bytes from Buffer to the serial device.  \r
+  Write data from buffer to serial device.\r
+\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
   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

-  If Buffer is NULL, then ASSERT(). \r
+  If Buffer is NULL, then ASSERT().\r

   If NumberOfBytes is zero, then return 0.\r
 \r
   @param  Buffer           Pointer to the data buffer to be written.\r
   @param  NumberOfBytes    Number of bytes to written to the serial device.\r
 \r
   @retval 0                NumberOfBytes is 0.\r
   If NumberOfBytes is zero, then return 0.\r
 \r
   @param  Buffer           Pointer to the data buffer to be written.\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


@@ -63,11 +63,11 @@ SerialPortWrite (
 \r
 /**\r
   Read data from serial device and save the datas in buffer.\r
 \r
 /**\r
   Read data from serial device and save the datas in buffer.\r

- \r
+\r

   Reads NumberOfBytes data bytes from a serial device into the buffer\r
   Reads NumberOfBytes data bytes from a serial device into the buffer\r

-  specified by Buffer. The number of bytes actually read is returned. \r
+  specified by Buffer. The number of bytes actually read is returned.\r

   If the return value is less than NumberOfBytes, then the rest operation failed.\r
   If the return value is less than NumberOfBytes, then the rest operation failed.\r

-  If Buffer is NULL, then ASSERT(). \r
+  If Buffer is NULL, then ASSERT().\r

   If NumberOfBytes is zero, then return 0.\r
 \r
   @param  Buffer           Pointer to the data buffer to store the data read from the serial device.\r
   If NumberOfBytes is zero, then return 0.\r
 \r
   @param  Buffer           Pointer to the data buffer to store the data read from the serial device.\r

diff --git a/MdePkg/Include/Library/SmbusLib.h b/MdePkg/Include/Library/SmbusLib.h
index 8136fc522e7b7208b994e2ee425b7b63d75ed621..13a0908f37d965db1a5dd95b37118708a56d5629 100644 (file)
--- a/MdePkg/Include/Library/SmbusLib.h
+++ b/MdePkg/Include/Library/SmbusLib.h
@@ -2,7 +2,7 @@
   Provides library functions to access SMBUS devices. Libraries of this class\r
   must be ported to a specific SMBUS controller.\r
 \r
   Provides library functions to access SMBUS devices. Libraries of this class\r
   must be ported to a specific SMBUS controller.\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


@@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Computes an address that is compatible with the SMBUS Library functions.\r
   The unused upper bits of SlaveAddress, Command, and Length are stripped\r
   prior to the generation of the address.\r
   Computes an address that is compatible with the SMBUS Library functions.\r
   The unused upper bits of SlaveAddress, Command, and Length are stripped\r
   prior to the generation of the address.\r

-  \r
+\r

   @param  SlaveAddress    SMBUS Slave Address.  Range 0..127.\r
   @param  Command         SMBUS Command.  Range 0..255.\r
   @param  Length          SMBUS Data Length.  Range 0..32.\r
   @param  SlaveAddress    SMBUS Slave Address.  Range 0..127.\r
   @param  Command         SMBUS Command.  Range 0..255.\r
   @param  Length          SMBUS Data Length.  Range 0..32.\r


@@ -39,36 +39,36 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Macro that returns the SMBUS Slave Address value from an SmBusAddress Parameter value.\r
 \r
 /**\r
   Macro that returns the SMBUS Slave Address value from an SmBusAddress Parameter value.\r

-  \r
-  @param SmBusAddress   Address that encodes the SMBUS Slave Address, SMBUS Command, SMBUS Data Length, and PEC \r
+\r
+  @param SmBusAddress   Address that encodes the SMBUS Slave Address, SMBUS Command, SMBUS Data Length, and PEC\r

 **/\r
 #define SMBUS_LIB_SLAVE_ADDRESS(SmBusAddress)      (((SmBusAddress) >> 1)  & 0x7f)\r
 \r
 /**\r
   Macro that returns the SMBUS Command value from an SmBusAddress Parameter value.\r
 **/\r
 #define SMBUS_LIB_SLAVE_ADDRESS(SmBusAddress)      (((SmBusAddress) >> 1)  & 0x7f)\r
 \r
 /**\r
   Macro that returns the SMBUS Command value from an SmBusAddress Parameter value.\r

-  \r
+\r

   @param SmBusAddress   Address that encodes the SMBUS Slave Address, SMBUS Command, SMBUS Data Length, and PEC\r
 **/\r
 #define SMBUS_LIB_COMMAND(SmBusAddress)            (((SmBusAddress) >> 8)  & 0xff)\r
 \r
 /**\r
   Macro that returns the SMBUS Data Length value from an SmBusAddress Parameter value.\r
   @param SmBusAddress   Address that encodes the SMBUS Slave Address, SMBUS Command, SMBUS Data Length, and PEC\r
 **/\r
 #define SMBUS_LIB_COMMAND(SmBusAddress)            (((SmBusAddress) >> 8)  & 0xff)\r
 \r
 /**\r
   Macro that returns the SMBUS Data Length value from an SmBusAddress Parameter value.\r

-  \r
-  @param SmBusAddress Address that encodes the SMBUS Slave Address, SMBUS Command, SMBUS Data Length, and PEC \r
+\r
+  @param SmBusAddress Address that encodes the SMBUS Slave Address, SMBUS Command, SMBUS Data Length, and PEC\r

 **/\r
 #define SMBUS_LIB_LENGTH(SmBusAddress)             (((SmBusAddress) >> 16) & 0x3f)\r
 \r
 /**\r
   Macro that returns the SMBUS PEC value from an SmBusAddress Parameter value.\r
 **/\r
 #define SMBUS_LIB_LENGTH(SmBusAddress)             (((SmBusAddress) >> 16) & 0x3f)\r
 \r
 /**\r
   Macro that returns the SMBUS PEC value from an SmBusAddress Parameter value.\r

-  \r
-  @param SmBusAddress Address that encodes the SMBUS Slave Address, SMBUS Command, SMBUS Data Length, and PEC   \r
+\r
+  @param SmBusAddress Address that encodes the SMBUS Slave Address, SMBUS Command, SMBUS Data Length, and PEC\r

 **/\r
 #define SMBUS_LIB_PEC(SmBusAddress)                ((BOOLEAN) (((SmBusAddress) & BIT22) != 0))\r
 \r
 /**\r
   Macro that returns the set of reserved bits from an SmBusAddress Parameter value.\r
 **/\r
 #define SMBUS_LIB_PEC(SmBusAddress)                ((BOOLEAN) (((SmBusAddress) & BIT22) != 0))\r
 \r
 /**\r
   Macro that returns the set of reserved bits from an SmBusAddress Parameter value.\r

-  \r
-  @param SmBusAddress Address that encodes the SMBUS Slave Address, SMBUS Command, SMBUS Data Length, and PEC   \r
+\r
+  @param SmBusAddress Address that encodes the SMBUS Slave Address, SMBUS Command, SMBUS Data Length, and PEC\r

 **/\r
 #define SMBUS_LIB_RESERVED(SmBusAddress)           ((SmBusAddress) & ~(BIT23 - 2))\r
 \r
 **/\r
 #define SMBUS_LIB_RESERVED(SmBusAddress)           ((SmBusAddress) & ~(BIT23 - 2))\r
 \r


@@ -282,7 +282,7 @@ SmBusWriteDataByte (
   If Status is not NULL, then the status of the executed command is returned in Status.\r
   If Length in SmBusAddress is not zero, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r
   If Status is not NULL, then the status of the executed command is returned in Status.\r
   If Length in SmBusAddress is not zero, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r

-  \r
+\r

   @param  SmBusAddress  Address that encodes the SMBUS Slave Address,\r
                         SMBUS Command, SMBUS Data Length, and PEC.\r
   @param  Status        Return status for the executed command.\r
   @param  SmBusAddress  Address that encodes the SMBUS Slave Address,\r
                         SMBUS Command, SMBUS Data Length, and PEC.\r
   @param  Status        Return status for the executed command.\r


@@ -424,7 +424,7 @@ SmBusReadBlock (
   The SMBUS slave address, SMBUS command, and SMBUS length fields of SmBusAddress are required.\r
   Bytes are written to the SMBUS from Buffer.\r
   The number of bytes written is returned, and will never return a value larger than 32-bytes.\r
   The SMBUS slave address, SMBUS command, and SMBUS length fields of SmBusAddress are required.\r
   Bytes are written to the SMBUS from Buffer.\r
   The number of bytes written is returned, and will never return a value larger than 32-bytes.\r

-  If Status is not NULL, then the status of the executed command is returned in Status.  \r
+  If Status is not NULL, then the status of the executed command is returned in Status.\r

   If Length in SmBusAddress is zero or greater than 32, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r
   If Length in SmBusAddress is zero or greater than 32, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r

diff --git a/MdePkg/Include/Library/SmmLib.h b/MdePkg/Include/Library/SmmLib.h
index d1241c1967644844aca3155011d77d1eef3bdd9b..3b85355b7b41050fad4b2aec7acd452d1cc37db6 100644 (file)
--- a/MdePkg/Include/Library/SmmLib.h
+++ b/MdePkg/Include/Library/SmmLib.h
@@ -1,16 +1,16 @@
 /** @file\r
   Library class name: SmmLib\r
 /** @file\r
   Library class name: SmmLib\r

-  \r
-  SMM Library Services that abstracts both S/W SMI generation and detection. \r

 \r
 \r

-  Copyright (c) 2007 - 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
+  SMM Library Services that abstracts both S/W SMI generation and detection.\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) 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


@@ -19,7 +19,7 @@
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Triggers an SMI at boot time.  \r
+  Triggers an SMI at boot time.\r

 \r
   This function triggers a software SMM interrupt at boot time.\r
 \r
 \r
   This function triggers a software SMM interrupt at boot time.\r
 \r


@@ -32,7 +32,7 @@ TriggerBootServiceSoftwareSmi (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Triggers an SMI at run time.  \r
+  Triggers an SMI at run time.\r

 \r
   This function triggers a software SMM interrupt at run time.\r
 \r
 \r
   This function triggers a software SMM interrupt at run time.\r
 \r


@@ -45,7 +45,7 @@ TriggerRuntimeSoftwareSmi (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Test if a boot time software SMI happened.  \r
+  Test if a boot time software SMI happened.\r

 \r
   This function tests if a software SMM interrupt happened. If a software SMM interrupt happened and\r
   it was triggered at boot time, it returns TRUE. Otherwise, it returns FALSE.\r
 \r
   This function tests if a software SMM interrupt happened. If a software SMM interrupt happened and\r
   it was triggered at boot time, it returns TRUE. Otherwise, it returns FALSE.\r


@@ -62,7 +62,7 @@ IsBootServiceSoftwareSmi (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Test if a run time software SMI happened.  \r
+  Test if a run time software SMI happened.\r

 \r
   This function tests if a software SMM interrupt happened. If a software SMM interrupt happened and\r
   it was triggered at run time, it returns TRUE. Otherwise, it returns FALSE.\r
 \r
   This function tests if a software SMM interrupt happened. If a software SMM interrupt happened and\r
   it was triggered at run time, it returns TRUE. Otherwise, it returns FALSE.\r


@@ -78,8 +78,8 @@ IsRuntimeSoftwareSmi (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Clear APM SMI Status Bit; Set the EOS bit. \r
-  \r
+  Clear APM SMI Status Bit; Set the EOS bit.\r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Include/Library/SmmMemLib.h b/MdePkg/Include/Library/SmmMemLib.h
index 5186fd5d441cbb3a9f8dd937638efa3eb8be159a..e7848b2bce73d2c9ed7480a66901f9d6cb521ecf 100644 (file)
--- a/MdePkg/Include/Library/SmmMemLib.h
+++ b/MdePkg/Include/Library/SmmMemLib.h
@@ -4,8 +4,8 @@
   The SMM Mem Library provides function for checking if buffer is outside SMRAM and valid.\r
   It also provides functions for copy data from SMRAM to non-SMRAM, from non-SMRAM to SMRAM,\r
   from non-SMRAM to non-SMRAM, or set data in non-SMRAM.\r
   The SMM Mem Library provides function for checking if buffer is outside SMRAM and valid.\r
   It also provides functions for copy data from SMRAM to non-SMRAM, from non-SMRAM to SMRAM,\r
   from non-SMRAM to non-SMRAM, or set data in non-SMRAM.\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


@@ -68,7 +68,7 @@ SmmCopyMemToSmram (
   If the check passes, it copies memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r
   The implementation must be reentrant.\r
   If the check passes, it copies memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r
   The implementation must be reentrant.\r

-  \r
+\r

   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r
   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r


@@ -93,7 +93,7 @@ SmmCopyMemFromSmram (
   If the check passes, it copies memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r
   The implementation must be reentrant, and it must handle the case where source buffer overlaps destination buffer.\r
   If the check passes, it copies memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r
   The implementation must be reentrant, and it must handle the case where source buffer overlaps destination buffer.\r

-  \r
+\r

   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r
   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r


@@ -118,11 +118,11 @@ SmmCopyMem (
   It checks if target buffer is valid per processor architecture and not overlap with SMRAM.\r
   If the check passes, it fills memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r
   It checks if target buffer is valid per processor architecture and not overlap with SMRAM.\r
   If the check passes, it fills memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r

-  \r
+\r

   @param  Buffer    The memory to set.\r
   @param  Length    The number of bytes to set.\r
   @param  Value     The value with which to fill Length bytes of Buffer.\r
   @param  Buffer    The memory to set.\r
   @param  Length    The number of bytes to set.\r
   @param  Value     The value with which to fill Length bytes of Buffer.\r

-  \r
+\r

   @retval EFI_SECURITY_VIOLATION The Buffer is invalid per processor architecture or overlap with SMRAM.\r
   @retval EFI_SUCCESS            Memory is set.\r
 \r
   @retval EFI_SECURITY_VIOLATION The Buffer is invalid per processor architecture or overlap with SMRAM.\r
   @retval EFI_SUCCESS            Memory is set.\r
 \r


@@ -135,4 +135,4 @@ SmmSetMem (
   IN UINT8  Value\r
   );\r
 \r
   IN UINT8  Value\r
   );\r
 \r

-#endif
\ No newline at end of file
+#endif\r

diff --git a/MdePkg/Include/Library/SmmPeriodicSmiLib.h b/MdePkg/Include/Library/SmmPeriodicSmiLib.h
index 2bad2b7af7920e413d27a227b98e77a146b7a1e1..d0c1f4cda7d81f1666a84fb3975b009748cb1143 100644 (file)
--- a/MdePkg/Include/Library/SmmPeriodicSmiLib.h
+++ b/MdePkg/Include/Library/SmmPeriodicSmiLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Provides services to enable and disable periodic SMI handlers.\r
 \r
 /** @file\r
   Provides services to enable and disable periodic SMI handlers.\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,15 +19,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   This function returns a pointer to a table of supported periodic\r
 \r
 /**\r
   This function returns a pointer to a table of supported periodic\r

-  SMI tick periods in 100 ns units sorted from largest to smallest.  \r
-  The table contains a array of UINT64 values terminated by a tick \r
+  SMI tick periods in 100 ns units sorted from largest to smallest.\r
+  The table contains a array of UINT64 values terminated by a tick\r

   period value of 0.  The returned table must be treated as read-only\r
   data and must not be freed.\r
   period value of 0.  The returned table must be treated as read-only\r
   data and must not be freed.\r

-  \r
-  @return  A pointer to a table of UINT64 tick period values in \r
-           100ns units sorted from largest to smallest terminated \r
+\r
+  @return  A pointer to a table of UINT64 tick period values in\r
+           100ns units sorted from largest to smallest terminated\r

            by a tick period of 0.\r
            by a tick period of 0.\r

-  \r
+\r

 **/\r
 UINT64 *\r
 EFIAPI\r
 **/\r
 UINT64 *\r
 EFIAPI\r


@@ -53,30 +53,30 @@ PeriodicSmiExecutionTime (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function returns control back to the SMM Foundation.  When the next \r
+  This function returns control back to the SMM Foundation.  When the next\r

   periodic SMI for the currently executing handler is triggered, the periodic\r
   SMI handler will restarted from its registered DispatchFunction entry point.\r
   periodic SMI for the currently executing handler is triggered, the periodic\r
   SMI handler will restarted from its registered DispatchFunction entry point.\r

-  If this function is not called from within an enabled periodic SMI handler, \r
+  If this function is not called from within an enabled periodic SMI handler,\r

   then control is returned to the calling function.\r
 \r
 **/\r
 VOID\r
   then control is returned to the calling function.\r
 \r
 **/\r
 VOID\r

-EFIAPI  \r
+EFIAPI\r

 PeriodicSmiExit (\r
   VOID\r
   );\r
 \r
 /**\r
 PeriodicSmiExit (\r
   VOID\r
   );\r
 \r
 /**\r

-  This function yields control back to the SMM Foundation.  When the next \r
+  This function yields control back to the SMM Foundation.  When the next\r

   periodic SMI for the currently executing handler is triggered, the periodic\r
   periodic SMI for the currently executing handler is triggered, the periodic\r

-  SMI handler will be resumed and this function will return.  Use of this \r
+  SMI handler will be resumed and this function will return.  Use of this\r

   function requires a seperate stack for the periodic SMI handler.  A non zero\r
   function requires a seperate stack for the periodic SMI handler.  A non zero\r

-  stack size must be specified in PeriodicSmiEnable() for this function to be \r
-  used.  \r
-  \r
+  stack size must be specified in PeriodicSmiEnable() for this function to be\r
+  used.\r
+\r

   If the stack size passed into PeriodicSmiEnable() was zero, the 0 is returned.\r
   If the stack size passed into PeriodicSmiEnable() was zero, the 0 is returned.\r

-  \r
-  If this function is not called from within an enabled periodic SMI handler, \r
+\r
+  If this function is not called from within an enabled periodic SMI handler,\r

   then 0 is returned.\r
 \r
   @return  The actual time in 100ns units elapsed since this function was\r
   then 0 is returned.\r
 \r
   @return  The actual time in 100ns units elapsed since this function was\r


@@ -84,21 +84,21 @@ PeriodicSmiExit (
 \r
 **/\r
 UINT64\r
 \r
 **/\r
 UINT64\r

-EFIAPI  \r
+EFIAPI\r

 PeriodicSmiYield (\r
   VOID\r
   );\r
 \r
 /**\r
 PeriodicSmiYield (\r
   VOID\r
   );\r
 \r
 /**\r

-  This function is a prototype for a periodic SMI handler function \r
+  This function is a prototype for a periodic SMI handler function\r

   that may be enabled with PeriodicSmiEnable() and disabled with\r
   PeriodicSmiDisable().\r
 \r
   @param[in] Context      Content registered with PeriodicSmiEnable().\r
   @param[in] ElapsedTime  The actual time in 100ns units elapsed since\r
   that may be enabled with PeriodicSmiEnable() and disabled with\r
   PeriodicSmiDisable().\r
 \r
   @param[in] Context      Content registered with PeriodicSmiEnable().\r
   @param[in] ElapsedTime  The actual time in 100ns units elapsed since\r

-                          this function was called.  A value of 0 indicates \r
+                          this function was called.  A value of 0 indicates\r

                           an unknown amount of time.\r
                           an unknown amount of time.\r

-                            \r
+\r

 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r


@@ -106,48 +106,48 @@ VOID
   IN CONST VOID  *Context OPTIONAL,\r
   IN UINT64      ElapsedTime\r
   );\r
   IN CONST VOID  *Context OPTIONAL,\r
   IN UINT64      ElapsedTime\r
   );\r

-  \r
+\r

 /**\r
   This function enables a periodic SMI handler.\r
 /**\r
   This function enables a periodic SMI handler.\r

-  \r
-  @param[in, out] DispatchHandle   A pointer to the handle associated with the \r
-                                   enabled periodic SMI handler.  This is an \r
-                                   optional parameter that may be NULL.  If it is \r
-                                   NULL, then the handle will not be returned, \r
-                                   which means that the periodic SMI handler can \r
+\r
+  @param[in, out] DispatchHandle   A pointer to the handle associated with the\r
+                                   enabled periodic SMI handler.  This is an\r
+                                   optional parameter that may be NULL.  If it is\r
+                                   NULL, then the handle will not be returned,\r
+                                   which means that the periodic SMI handler can\r

                                    never be disabled.\r
   @param[in]     DispatchFunction  A pointer to a periodic SMI handler function.\r
   @param[in]     Context           Optional content to pass into DispatchFunction.\r
                                    never be disabled.\r
   @param[in]     DispatchFunction  A pointer to a periodic SMI handler function.\r
   @param[in]     Context           Optional content to pass into DispatchFunction.\r

-  @param[in]     TickPeriod        The requested tick period in 100ns units that \r
+  @param[in]     TickPeriod        The requested tick period in 100ns units that\r

                                    control should be givien to the periodic SMI\r
                                    handler.  Must be one of the supported values\r
                                    returned by PeriodicSmiSupportedPickPeriod().\r
   @param[in]     Cpu               Specifies the CPU that is required to execute\r
                                    control should be givien to the periodic SMI\r
                                    handler.  Must be one of the supported values\r
                                    returned by PeriodicSmiSupportedPickPeriod().\r
   @param[in]     Cpu               Specifies the CPU that is required to execute\r

-                                   the periodic SMI handler.  If Cpu is \r
-                                   PERIODIC_SMI_LIBRARY_ANY_CPU, then the periodic \r
-                                   SMI handler will always be executed on the SMST \r
-                                   CurrentlyExecutingCpu, which may vary across \r
-                                   periodic SMIs.  If Cpu is between 0 and the SMST \r
+                                   the periodic SMI handler.  If Cpu is\r
+                                   PERIODIC_SMI_LIBRARY_ANY_CPU, then the periodic\r
+                                   SMI handler will always be executed on the SMST\r
+                                   CurrentlyExecutingCpu, which may vary across\r
+                                   periodic SMIs.  If Cpu is between 0 and the SMST\r

                                    NumberOfCpus, then the periodic SMI will always\r
                                    be executed on the requested CPU.\r
   @param[in]     StackSize         The size, in bytes, of the stack to allocate for\r
                                    use by the periodic SMI handler.  If 0, then the\r
                                    default stack will be used.\r
                                    NumberOfCpus, then the periodic SMI will always\r
                                    be executed on the requested CPU.\r
   @param[in]     StackSize         The size, in bytes, of the stack to allocate for\r
                                    use by the periodic SMI handler.  If 0, then the\r
                                    default stack will be used.\r

-                            \r
+\r

   @retval EFI_INVALID_PARAMETER  DispatchFunction is NULL.\r
   @retval EFI_INVALID_PARAMETER  DispatchFunction is NULL.\r

-  @retval EFI_UNSUPPORTED        TickPeriod is not a supported tick period.  The \r
-                                 supported tick periods can be retrieved using \r
+  @retval EFI_UNSUPPORTED        TickPeriod is not a supported tick period.  The\r
+                                 supported tick periods can be retrieved using\r

                                  PeriodicSmiSupportedTickPeriod().\r
                                  PeriodicSmiSupportedTickPeriod().\r

-  @retval EFI_INVALID_PARAMETER  Cpu is not PERIODIC_SMI_LIBRARY_ANY_CPU or in \r
+  @retval EFI_INVALID_PARAMETER  Cpu is not PERIODIC_SMI_LIBRARY_ANY_CPU or in\r

                                  the range 0 to SMST NumberOfCpus.\r
                                  the range 0 to SMST NumberOfCpus.\r

-  @retval EFI_OUT_OF_RESOURCES   There are not enough resources to enable the \r
+  @retval EFI_OUT_OF_RESOURCES   There are not enough resources to enable the\r

                                  periodic SMI handler.\r
                                  periodic SMI handler.\r

-  @retval EFI_OUT_OF_RESOURCES   There are not enough resources to allocate the \r
+  @retval EFI_OUT_OF_RESOURCES   There are not enough resources to allocate the\r

                                  stack speficied by StackSize.\r
   @retval EFI_SUCCESS            The periodic SMI handler was enabled.\r
                                  stack speficied by StackSize.\r
   @retval EFI_SUCCESS            The periodic SMI handler was enabled.\r

-  \r
+\r

 **/\r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 EFIAPI\r
 PeriodicSmiEnable (\r
   IN OUT EFI_HANDLE                    *DispatchHandle,    OPTIONAL\r
 EFIAPI\r
 PeriodicSmiEnable (\r
   IN OUT EFI_HANDLE                    *DispatchHandle,    OPTIONAL\r


@@ -161,24 +161,24 @@ PeriodicSmiEnable (
 /**\r
   This function disables a periodic SMI handler that has been previously\r
   enabled with PeriodicSmiEnable().\r
 /**\r
   This function disables a periodic SMI handler that has been previously\r
   enabled with PeriodicSmiEnable().\r

-  \r
-  @param[in] DispatchHandle  A handle associated with a previously enabled periodic \r
+\r
+  @param[in] DispatchHandle  A handle associated with a previously enabled periodic\r

                              SMI handler.  This is an optional parameter that may\r
                              be NULL.  If it is NULL, then the active periodic SMI\r
                              handlers is disabled.\r
 \r
   @retval FALSE  DispatchHandle is NULL and there is no active periodic SMI handler.\r
                              SMI handler.  This is an optional parameter that may\r
                              be NULL.  If it is NULL, then the active periodic SMI\r
                              handlers is disabled.\r
 \r
   @retval FALSE  DispatchHandle is NULL and there is no active periodic SMI handler.\r

-  @retval FALSE  The periodic SMI handler specified by DispatchHandle has \r
+  @retval FALSE  The periodic SMI handler specified by DispatchHandle has\r

                  not been enabled with PeriodicSmiEnable().\r
                  not been enabled with PeriodicSmiEnable().\r

-  @retval TRUE   The periodic SMI handler specified by DispatchHandle has \r
+  @retval TRUE   The periodic SMI handler specified by DispatchHandle has\r

                  been disabled.  If DispatchHandle is NULL, then the active\r
                  periodic SMI handler has been disabled.\r
                  been disabled.  If DispatchHandle is NULL, then the active\r
                  periodic SMI handler has been disabled.\r

-  \r
+\r

 **/\r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 PeriodicSmiDisable (\r
   IN EFI_HANDLE  DispatchHandle    OPTIONAL\r
   );\r
 EFIAPI\r
 PeriodicSmiDisable (\r
   IN EFI_HANDLE  DispatchHandle    OPTIONAL\r
   );\r

-  \r
+\r

 #endif\r
 #endif\r

diff --git a/MdePkg/Include/Library/SmmServicesTableLib.h b/MdePkg/Include/Library/SmmServicesTableLib.h
index de2f57b78979d6e814bd400e6ee3a69258b5aa16..01e999d234e71acffe9659502fead4348f4ec9a6 100644 (file)
--- a/MdePkg/Include/Library/SmmServicesTableLib.h
+++ b/MdePkg/Include/Library/SmmServicesTableLib.h
@@ -2,7 +2,7 @@
   Provides a service to retrieve a pointer to the SMM Services Table.\r
   Only available to SMM module types.\r
 \r
   Provides a service to retrieve a pointer to the SMM Services Table.\r
   Only available to SMM module types.\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


@@ -24,14 +24,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 extern EFI_SMM_SYSTEM_TABLE2   *gSmst;\r
 \r
 /**\r
 extern EFI_SMM_SYSTEM_TABLE2   *gSmst;\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/MdePkg/Include/Library/SynchronizationLib.h b/MdePkg/Include/Library/SynchronizationLib.h
index 6cf3d71770e7e6fcd4f027ed4fb49a2f0ef6c2a4..da69f6ff5e0e19aecaed4bfc8dc9562b4b471f42 100644 (file)
--- a/MdePkg/Include/Library/SynchronizationLib.h
+++ b/MdePkg/Include/Library/SynchronizationLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Provides synchronization functions.\r
 \r
 /** @file\r
   Provides synchronization functions.\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


@@ -26,7 +26,7 @@ typedef volatile UINTN              SPIN_LOCK;
   optimal spin lock performance.\r
 \r
   This function retrieves the spin lock alignment requirements for optimal\r
   optimal spin lock performance.\r
 \r
   This function retrieves the spin lock alignment requirements for optimal\r

-  performance on a given CPU architecture. The spin lock alignment is byte alignment. \r
+  performance on a given CPU architecture. The spin lock alignment is byte alignment.\r

   It must be a power of two and is returned by this function. If there are no alignment\r
   requirements, then 1 must be returned. The spin lock synchronization\r
   functions must function correctly if the spin lock size and alignment values\r
   It must be a power of two and is returned by this function. If there are no alignment\r
   requirements, then 1 must be returned. The spin lock synchronization\r
   functions must function correctly if the spin lock size and alignment values\r

diff --git a/MdePkg/Include/Library/UefiApplicationEntryPoint.h b/MdePkg/Include/Library/UefiApplicationEntryPoint.h
index ec568ab6c5ad93da8bcfed030e0f92dd9d14ea6a..89725a74bbc76b65389d03cc40ff7da7f6834335 100644 (file)
--- a/MdePkg/Include/Library/UefiApplicationEntryPoint.h
+++ b/MdePkg/Include/Library/UefiApplicationEntryPoint.h
@@ -1,7 +1,7 @@
 /** @file\r
   Module entry point library for UEFI Applications.\r
 \r
 /** @file\r
   Module entry point library for UEFI Applications.\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


@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __UEFI_APPLICATION_ENTRY_POINT_H__\r
 \r
 ///\r
 #define __UEFI_APPLICATION_ENTRY_POINT_H__\r
 \r
 ///\r

-/// Declare the EFI/UEFI Specification Revision to which this driver is implemented \r
+/// Declare the EFI/UEFI Specification Revision to which this driver is implemented\r

 ///\r
 extern CONST UINT32        _gUefiDriverRevision;\r
 \r
 ///\r
 extern CONST UINT32        _gUefiDriverRevision;\r
 \r


@@ -47,7 +47,7 @@ _ModuleEntryPoint (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Required by the EBC compiler and identical in functionality to _ModuleEntryPoint(). \r
+  Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().\r

 \r
   @param  ImageHandle  The image handle of the UEFI Application.\r
   @param  SystemTable  A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle  The image handle of the UEFI Application.\r
   @param  SystemTable  A pointer to the EFI System Table.\r


@@ -67,13 +67,13 @@ EfiMain (
 \r
 /**\r
   Invokes the library destructors for all dependent libraries and terminates\r
 \r
 /**\r
   Invokes the library destructors for all dependent libraries and terminates\r

-  the UEFI Application. \r
+  the UEFI Application.\r

 \r
   This function calls ProcessLibraryDestructorList() and the EFI Boot Service Exit()\r
   with a status specified by Status.\r
 \r
   @param  Status  Status returned by the application that is exiting.\r
 \r
   This function calls ProcessLibraryDestructorList() and the EFI Boot Service Exit()\r
   with a status specified by Status.\r
 \r
   @param  Status  Status returned by the application that is exiting.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -89,7 +89,7 @@ Exit (
   This function must be called by _ModuleEntryPoint().\r
   This function calls the set of library constructors for the set of library instances\r
   that a module depends on. This includes library instances that a module depends on\r
   This function must be called by _ModuleEntryPoint().\r
   This function calls the set of library constructors for the set of library instances\r
   that a module depends on. This includes library instances that a module depends on\r

-  directly and library instances that a module depends on indirectly through other libraries.  \r
+  directly and library instances that a module depends on indirectly through other libraries.\r

   This function is autogenerated by build tools and those build tools are responsible for\r
   collecting the set of library instances, determine which ones have constructors, and\r
   calling the library constructors in the proper order based upon each of the library\r
   This function is autogenerated by build tools and those build tools are responsible for\r
   collecting the set of library instances, determine which ones have constructors, and\r
   calling the library constructors in the proper order based upon each of the library\r


@@ -97,7 +97,7 @@ Exit (
 \r
   @param  ImageHandle  The image handle of the UEFI Application.\r
   @param  SystemTable  A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle  The image handle of the UEFI Application.\r
   @param  SystemTable  A pointer to the EFI System Table.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -114,7 +114,7 @@ ProcessLibraryConstructorList (
   This function may be called by _ModuleEntryPoint()or Exit().\r
   This function calls the set of library destructors for the set of library instances\r
   that a module depends on.  This includes library instances that a module depends on\r
   This function may be called by _ModuleEntryPoint()or Exit().\r
   This function calls the set of library destructors for the set of library instances\r
   that a module depends on.  This includes library instances that a module depends on\r

-  directly and library instances that a module depends on indirectly through other libraries.  \r
+  directly and library instances that a module depends on indirectly through other libraries.\r

   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the set of library instances, determine which ones have destructors,\r
   and calling the library destructors in the proper order based upon each of the library\r
   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the set of library instances, determine which ones have destructors,\r
   and calling the library destructors in the proper order based upon each of the library\r


@@ -134,7 +134,7 @@ ProcessLibraryDestructorList (
 /**\r
   This function calls the set of module entry points. It must be called by _ModuleEntryPoint().\r
 \r
 /**\r
   This function calls the set of module entry points. It must be called by _ModuleEntryPoint().\r
 \r

-  This function is autogenerated by build tools and those build tools are \r
+  This function is autogenerated by build tools and those build tools are\r

   responsible for collecting the module entry points and calling them in a specified order.\r
 \r
   @param  ImageHandle    The image handle of the UEFI Application.\r
   responsible for collecting the module entry points and calling them in a specified order.\r
 \r
   @param  ImageHandle    The image handle of the UEFI Application.\r

diff --git a/MdePkg/Include/Library/UefiDecompressLib.h b/MdePkg/Include/Library/UefiDecompressLib.h
index de4e88864400e9841f6c2aa01e9a580ded83883d..f6675ffcba1e2ab7d274eb587aa0e8c69a6bcc92 100644 (file)
--- a/MdePkg/Include/Library/UefiDecompressLib.h
+++ b/MdePkg/Include/Library/UefiDecompressLib.h
@@ -1,12 +1,12 @@
 /** @file\r
   Provides services to decompress a buffer using the UEFI Decompress algorithm.\r
 \r
 /** @file\r
   Provides services to decompress a buffer using the UEFI Decompress algorithm.\r
 \r

-  The UEFI Decompress Library enables the decompression of objects that \r
-  were compressed using the UEFI compression scheme. The UEFI Decompress \r
-  Library is independent of environment and requires the caller to allocate \r
+  The UEFI Decompress Library enables the decompression of objects that\r
+  were compressed using the UEFI compression scheme. The UEFI Decompress\r
+  Library is independent of environment and requires the caller to allocate\r

   all required memory buffers.\r
 \r
   all required memory buffers.\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


@@ -21,18 +21,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __UEFI_DECPOMPRESS_LIB_H__\r
 \r
 /**\r
 #define __UEFI_DECPOMPRESS_LIB_H__\r
 \r
 /**\r

-  Given a compressed source buffer, this function retrieves the size of \r
-  the uncompressed buffer and the size of the scratch buffer required \r
+  Given a 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
   If the size of the uncompressed buffer or the size of the scratch buffer cannot\r
   required to decompress the buffer specified by Source and SourceSize.\r
   If the size of the uncompressed buffer or the size of the scratch buffer cannot\r

-  be determined from the compressed data specified by Source and SourceData, \r
+  be determined from the compressed data specified by Source and SourceData,\r

   then RETURN_INVALID_PARAMETER is returned.  Otherwise, the size of the uncompressed\r
   buffer is returned in DestinationSize, the size of the scratch buffer is returned\r
   in ScratchSize, and RETURN_SUCCESS is returned.\r
   then RETURN_INVALID_PARAMETER is returned.  Otherwise, the size of the uncompressed\r
   buffer is returned in DestinationSize, the size of the scratch buffer is returned\r
   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 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 beginning bytes of the source data and output it as DestinationSize.\r
   And ScratchSize is specific to the decompression implementation.\r


@@ -47,16 +47,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                           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
                           buffer was returned in ScratchSize.\r

-  @retval  RETURN_INVALID_PARAMETER \r
-                          The size of the uncompressed data or the size of \r
-                          the scratch buffer cannot be determined from \r
-                          the compressed data specified by Source \r
+  @retval  RETURN_INVALID_PARAMETER\r
+                          The size of the uncompressed data or the size of\r
+                          the scratch buffer cannot be determined from\r
+                          the compressed data specified by Source\r

                           and SourceSize.\r
 **/\r
 RETURN_STATUS\r
                           and SourceSize.\r
 **/\r
 RETURN_STATUS\r


@@ -74,10 +74,10 @@ UefiDecompressGetInfo (
   Extracts decompressed data to its original form.\r
   This function is designed so that the decompression algorithm can be implemented\r
   without using any memory services.  As a result, this function is not allowed to\r
   Extracts decompressed data to its original form.\r
   This function is designed so that the decompression algorithm can be implemented\r
   without using any memory services.  As a result, this function is not allowed to\r

-  call any memory allocation services in its implementation.  It is the caller's \r
+  call any memory allocation services in its implementation.  It is the caller's\r

   responsibility to allocate and free the Destination and Scratch buffers.\r
   responsibility to allocate and free the Destination and Scratch buffers.\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


@@ -88,13 +88,13 @@ UefiDecompressGetInfo (
   @param  Source      The source buffer containing the compressed data.\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  Source      The source buffer containing the compressed data.\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/MdePkg/Include/Library/UefiDriverEntryPoint.h b/MdePkg/Include/Library/UefiDriverEntryPoint.h
index f9d9befb9c126cca777f484837e5ab8153623c4c..4608c46b5ff3861d027f0f0066772131a4a853a7 100644 (file)
--- a/MdePkg/Include/Library/UefiDriverEntryPoint.h
+++ b/MdePkg/Include/Library/UefiDriverEntryPoint.h
@@ -2,7 +2,7 @@
   Module entry point library for UEFI drivers, DXE Drivers, DXE Runtime Drivers,\r
   and DXE SMM Drivers.\r
 \r
   Module entry point library for UEFI drivers, DXE Drivers, DXE Runtime Drivers,\r
   and DXE SMM Drivers.\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


@@ -22,18 +22,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 extern CONST UINT32                   _gDxeRevision;\r
 \r
 ///\r
 extern CONST UINT32                   _gDxeRevision;\r
 \r
 ///\r

-/// Declare the EFI/UEFI Specification Revision to which this driver is implemented \r
+/// Declare the EFI/UEFI Specification Revision to which this driver is implemented\r

 ///\r
 extern CONST UINT32                   _gUefiDriverRevision;\r
 \r
 ///\r
 ///\r
 extern CONST UINT32                   _gUefiDriverRevision;\r
 \r
 ///\r

-/// Declare the number of unload handler in the image. \r
+/// Declare the number of unload handler in the image.\r

 ///\r
 extern CONST UINT8                    _gDriverUnloadImageCount;\r
 \r
 \r
 /**\r
 ///\r
 extern CONST UINT8                    _gDriverUnloadImageCount;\r
 \r
 \r
 /**\r

-  The entry point of PE/COFF Image for a DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver. \r
+  The entry point of PE/COFF Image for a DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver.\r

 \r
   This function is the entry point for a DXE Driver, DXE Runtime Driver, DXE SMM Driver,\r
   or UEFI Driver.  This function must call ProcessLibraryConstructorList() and\r
 \r
   This function is the entry point for a DXE Driver, DXE Runtime Driver, DXE SMM Driver,\r
   or UEFI Driver.  This function must call ProcessLibraryConstructorList() and\r


@@ -64,7 +64,7 @@ _ModuleEntryPoint (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Required by the EBC compiler and identical in functionality to _ModuleEntryPoint(). \r
+  Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().\r

 \r
   This function is required to call _ModuleEntryPoint() passing in ImageHandle, and SystemTable.\r
 \r
 \r
   This function is required to call _ModuleEntryPoint() passing in ImageHandle, and SystemTable.\r
 \r


@@ -86,7 +86,7 @@ EfiMain (
 \r
 /**\r
   Invokes the library destructors for all dependent libraries and terminates the\r
 \r
 /**\r
   Invokes the library destructors for all dependent libraries and terminates the\r

-  DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver. \r
+  DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver.\r

 \r
   This function calls ProcessLibraryDestructorList() and the EFI Boot Service Exit()\r
   with a status specified by Status.\r
 \r
   This function calls ProcessLibraryDestructorList() and the EFI Boot Service Exit()\r
   with a status specified by Status.\r


@@ -108,7 +108,7 @@ ExitDriver (
   This function must be called by _ModuleEntryPoint().\r
   This function calls the set of library constructors for the set of library instances\r
   that a module depends on.  This includes library instances that a module depends on\r
   This function must be called by _ModuleEntryPoint().\r
   This function calls the set of library constructors for the set of library instances\r
   that a module depends on.  This includes library instances that a module depends on\r

-  directly and library instances that a module depends on indirectly through other libraries.  \r
+  directly and library instances that a module depends on indirectly through other libraries.\r

   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the set of library instances, determine which ones have constructors,\r
   and calling the library constructors in the proper order based upon each of the library\r
   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the set of library instances, determine which ones have constructors,\r
   and calling the library constructors in the proper order based upon each of the library\r


@@ -133,7 +133,7 @@ ProcessLibraryConstructorList (
   This function may be called by _ModuleEntryPoint() or ExitDriver().\r
   This function calls the set of library destructors for the set of library instances\r
   that a module depends on. This includes library instances that a module depends on\r
   This function may be called by _ModuleEntryPoint() or ExitDriver().\r
   This function calls the set of library destructors for the set of library instances\r
   that a module depends on. This includes library instances that a module depends on\r

-  directly and library instances that a module depends on indirectly through other libraries.  \r
+  directly and library instances that a module depends on indirectly through other libraries.\r

   This function is autogenerated by build tools and those build tools are responsible for\r
   collecting the set of library instances, determine which ones have destructors, and calling\r
   the library destructors in the proper order based upon each of the library instances own dependencies.\r
   This function is autogenerated by build tools and those build tools are responsible for\r
   collecting the set of library instances, determine which ones have destructors, and calling\r
   the library destructors in the proper order based upon each of the library instances own dependencies.\r


@@ -154,7 +154,7 @@ ProcessLibraryDestructorList (
   Autogenerated function that calls a set of module entry points.\r
 \r
   This function must be called by _ModuleEntryPoint().\r
   Autogenerated function that calls a set of module entry points.\r
 \r
   This function must be called by _ModuleEntryPoint().\r

-  This function calls the set of module entry points.  \r
+  This function calls the set of module entry points.\r

   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the module entry points and calling them in a specified order.\r
 \r
   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the module entry points and calling them in a specified order.\r
 \r


@@ -176,7 +176,7 @@ ProcessModuleEntryPointList (
   Autogenerated function that calls a set of module unload handlers.\r
 \r
   This function must be called from the unload handler registered by _ModuleEntryPoint().\r
   Autogenerated function that calls a set of module unload handlers.\r
 \r
   This function must be called from the unload handler registered by _ModuleEntryPoint().\r

-  This function calls the set of module unload handlers.  \r
+  This function calls the set of module unload handlers.\r

   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the module unload handlers and calling them in a specified order.\r
 \r
   This function is autogenerated by build tools and those build tools are responsible\r
   for collecting the module unload handlers and calling them in a specified order.\r
 \r

diff --git a/MdePkg/Include/Library/UefiLib.h b/MdePkg/Include/Library/UefiLib.h
index 617420ee0556bfc084571b50266b95ba70c117c1..7c6fde620c742b178fa5bb89147baf49a5e7356b 100644 (file)
--- a/MdePkg/Include/Library/UefiLib.h
+++ b/MdePkg/Include/Library/UefiLib.h
@@ -2,10 +2,10 @@
   Provides library functions for common UEFI operations. Only available to DXE\r
   and UEFI module types.\r
 \r
   Provides library functions for common UEFI operations. Only available to DXE\r
   and UEFI module types.\r
 \r

-  The UEFI Library provides functions and macros that simplify the development of \r
-  UEFI Drivers and UEFI Applications.  These functions and macros help manage EFI \r
-  events, build simple locks utilizing EFI Task Priority Levels (TPLs), install \r
-  EFI Driver Model related protocols, manage Unicode string tables for UEFI Drivers, \r
+  The UEFI Library provides functions and macros that simplify the development of\r
+  UEFI Drivers and UEFI Applications.  These functions and macros help manage EFI\r
+  events, build simple locks utilizing EFI Task Priority Levels (TPLs), install\r
+  EFI Driver Model related protocols, manage Unicode string tables for UEFI Drivers,\r

   and print messages on the console output and standard error devices.\r
 \r
   Note that a reserved macro named MDEPKG_NDEBUG is introduced for the intention\r
   and print messages on the console output and standard error devices.\r
 \r
   Note that a reserved macro named MDEPKG_NDEBUG is introduced for the intention\r


@@ -13,8 +13,8 @@
   defined, then debug and assert related macros wrapped by it are the NULL implementations.\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
   defined, then debug and assert related macros wrapped by it are the NULL implementations.\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
+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


@@ -54,7 +54,7 @@ typedef enum {
 } EFI_LOCK_STATE;\r
 \r
 ///\r
 } EFI_LOCK_STATE;\r
 \r
 ///\r

-/// EFI Lock \r
+/// EFI Lock\r

 ///\r
 typedef struct {\r
   EFI_TPL         Tpl;\r
 ///\r
 typedef struct {\r
   EFI_TPL         Tpl;\r


@@ -99,8 +99,8 @@ typedef struct {
 #define EFI_TIMER_PERIOD_SECONDS(Seconds)           MultU64x32((UINT64)(Seconds), 10000000)\r
 \r
 /**\r
 #define EFI_TIMER_PERIOD_SECONDS(Seconds)           MultU64x32((UINT64)(Seconds), 10000000)\r
 \r
 /**\r

-  Macro that returns the a pointer to the next EFI_MEMORY_DESCRIPTOR in an array \r
-  returned from GetMemoryMap().  \r
+  Macro that returns the a pointer to the next EFI_MEMORY_DESCRIPTOR in an array\r
+  returned from GetMemoryMap().\r

 \r
   @param  MemoryDescriptor  A pointer to an EFI_MEMORY_DESCRIPTOR.\r
 \r
 \r
   @param  MemoryDescriptor  A pointer to an EFI_MEMORY_DESCRIPTOR.\r
 \r


@@ -115,7 +115,7 @@ typedef struct {
 /**\r
   Retrieves a pointer to the system configuration table from the EFI System Table\r
   based on a specified GUID.\r
 /**\r
   Retrieves a pointer to the system configuration table from the EFI System Table\r
   based on a specified GUID.\r

-  \r
+\r

   This function searches the list of configuration tables stored in the EFI System Table\r
   for a table with a GUID that matches TableGuid. If a match is found, then a pointer to\r
   the configuration table is returned in Table, and EFI_SUCCESS is returned. If a matching GUID\r
   This function searches the list of configuration tables stored in the EFI System Table\r
   for a table with a GUID that matches TableGuid. If a match is found, then a pointer to\r
   the configuration table is returned in Table, and EFI_SUCCESS is returned. If a matching GUID\r


@@ -132,7 +132,7 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

-EfiGetSystemConfigurationTable (  \r
+EfiGetSystemConfigurationTable (\r

   IN  EFI_GUID  *TableGuid,\r
   OUT VOID      **Table\r
   );\r
   IN  EFI_GUID  *TableGuid,\r
   OUT VOID      **Table\r
   );\r


@@ -146,7 +146,7 @@ EfiGetSystemConfigurationTable (
   no instances of ProtocolGuid in the handle database at the time this function is invoked,\r
   then the notification function is still executed one time. In addition, every time a protocol\r
   of type ProtocolGuid instance is installed or reinstalled, the notification function is also\r
   no instances of ProtocolGuid in the handle database at the time this function is invoked,\r
   then the notification function is still executed one time. In addition, every time a protocol\r
   of type ProtocolGuid instance is installed or reinstalled, the notification function is also\r

-  executed. This function returns the notification event that was created. \r
+  executed. This function returns the notification event that was created.\r

   If ProtocolGuid is NULL, then ASSERT().\r
   If NotifyTpl is not a legal TPL value, then ASSERT().\r
   If NotifyFunction is NULL, then ASSERT().\r
   If ProtocolGuid is NULL, then ASSERT().\r
   If NotifyTpl is not a legal TPL value, then ASSERT().\r
   If NotifyFunction is NULL, then ASSERT().\r


@@ -159,7 +159,7 @@ EfiGetSystemConfigurationTable (
   @param  NotifyContext   The context parameter to pass to NotifyFunction.\r
   @param  Registration    A pointer to a memory location to receive the registration value.\r
                           This value is passed to LocateHandle() to obtain new handles that\r
   @param  NotifyContext   The context parameter to pass to NotifyFunction.\r
   @param  Registration    A pointer to a memory location to receive the registration value.\r
                           This value is passed to LocateHandle() to obtain new handles that\r

-                          have been added that support the ProtocolGuid-specified protocol. \r
+                          have been added that support the ProtocolGuid-specified protocol.\r

 \r
   @return The notification event that was created.\r
 \r
 \r
   @return The notification event that was created.\r
 \r


@@ -179,7 +179,7 @@ EfiCreateProtocolNotifyEvent(
 \r
   This function creates an event using NotifyTpl, NoifyFunction, and NotifyContext.\r
   This event is signaled with EfiNamedEventSignal(). This provides the ability for one or more\r
 \r
   This function creates an event using NotifyTpl, NoifyFunction, and NotifyContext.\r
   This event is signaled with EfiNamedEventSignal(). This provides the ability for one or more\r

-  listeners on the same event named by the GUID specified by Name. \r
+  listeners on the same event named by the GUID specified by Name.\r

   If Name is NULL, then ASSERT().\r
   If NotifyTpl is not a legal TPL value, then ASSERT().\r
   If NotifyFunction is NULL, then ASSERT().\r
   If Name is NULL, then ASSERT().\r
   If NotifyTpl is not a legal TPL value, then ASSERT().\r
   If NotifyFunction is NULL, then ASSERT().\r


@@ -187,7 +187,7 @@ EfiCreateProtocolNotifyEvent(
   @param  Name                  Supplies GUID name of the event.\r
   @param  NotifyTpl             Supplies the task priority level of the event notifications.\r
   @param  NotifyFunction        Supplies the function to notify when the event is signaled.\r
   @param  Name                  Supplies GUID name of the event.\r
   @param  NotifyTpl             Supplies the task priority level of the event notifications.\r
   @param  NotifyFunction        Supplies the function to notify when the event is signaled.\r

-  @param  NotifyContext         The context parameter to pass to NotifyFunction. \r
+  @param  NotifyContext         The context parameter to pass to NotifyFunction.\r

   @param  Registration          A pointer to a memory location to receive the registration value.\r
 \r
   @retval EFI_SUCCESS           A named event was created.\r
   @param  Registration          A pointer to a memory location to receive the registration value.\r
 \r
   @retval EFI_SUCCESS           A named event was created.\r


@@ -257,13 +257,13 @@ EfiEventEmptyFunction (
   IN VOID                   *Context\r
   );\r
 \r
   IN VOID                   *Context\r
   );\r
 \r

-/** \r
+/**\r

   Returns the current TPL.\r
 \r
   Returns the current TPL.\r
 \r

-  This function returns the current TPL.  There is no EFI service to directly \r
-  retrieve the current TPL. Instead, the RaiseTPL() function is used to raise \r
-  the TPL to TPL_HIGH_LEVEL.  This will return the current TPL.  The TPL level \r
-  can then immediately be restored back to the current TPL level with a call \r
+  This function returns the current TPL.  There is no EFI service to directly\r
+  retrieve the current TPL. Instead, the RaiseTPL() function is used to raise\r
+  the TPL to TPL_HIGH_LEVEL.  This will return the current TPL.  The TPL level\r
+  can then immediately be restored back to the current TPL level with a call\r

   to RestoreTPL().\r
 \r
   @return The current TPL.\r
   to RestoreTPL().\r
 \r
   @return The current TPL.\r


@@ -278,8 +278,8 @@ EfiGetCurrentTpl (
 /**\r
   Initializes a basic mutual exclusion lock.\r
 \r
 /**\r
   Initializes a basic mutual exclusion lock.\r
 \r

-  This function initializes a basic mutual exclusion lock to the released state \r
-  and returns the lock.  Each lock provides mutual exclusion access at its task \r
+  This function initializes a basic mutual exclusion lock to the released state\r
+  and returns the lock.  Each lock provides mutual exclusion access at its task\r

   priority level.  Since there is no preemption or multiprocessor support in EFI,\r
   acquiring the lock only consists of raising to the locks TPL.\r
   If Lock is NULL, then ASSERT().\r
   priority level.  Since there is no preemption or multiprocessor support in EFI,\r
   acquiring the lock only consists of raising to the locks TPL.\r
   If Lock is NULL, then ASSERT().\r


@@ -301,8 +301,8 @@ EfiInitializeLock (
 /**\r
   Initializes a basic mutual exclusion lock.\r
 \r
 /**\r
   Initializes a basic mutual exclusion lock.\r
 \r

-  This macro initializes the contents of a basic mutual exclusion lock to the \r
-  released state.  Each lock provides mutual exclusion access at its task \r
+  This macro initializes the contents of a basic mutual exclusion lock to the\r
+  released state.  Each lock provides mutual exclusion access at its task\r

   priority level.  Since there is no preemption or multiprocessor support in EFI,\r
   acquiring the lock only consists of raising to the locks TPL.\r
 \r
   priority level.  Since there is no preemption or multiprocessor support in EFI,\r
   acquiring the lock only consists of raising to the locks TPL.\r
 \r


@@ -318,10 +318,10 @@ EfiInitializeLock (
 /**\r
   Macro that calls DebugAssert() if an EFI_LOCK structure is not in the locked state.\r
 \r
 /**\r
   Macro that calls DebugAssert() if an EFI_LOCK structure is not in the locked state.\r
 \r

-  If MDEPKG_NDEBUG is not defined and the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED \r
-  bit of PcdDebugProperyMask is set, then this macro evaluates the EFI_LOCK \r
+  If MDEPKG_NDEBUG is not defined and the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED\r
+  bit of PcdDebugProperyMask is set, then this macro evaluates the EFI_LOCK\r

   structure specified by Lock.  If Lock is not in the locked state, then\r
   structure specified by Lock.  If Lock is not in the locked state, then\r

-  DebugAssert() is called passing in the source filename, source line number, \r
+  DebugAssert() is called passing in the source filename, source line number,\r

   and Lock.\r
 \r
   If Lock is NULL, then ASSERT().\r
   and Lock.\r
 \r
   If Lock is NULL, then ASSERT().\r


@@ -329,7 +329,7 @@ EfiInitializeLock (
   @param  LockParameter  A pointer to the lock to acquire.\r
 \r
 **/\r
   @param  LockParameter  A pointer to the lock to acquire.\r
 \r
 **/\r

-#if !defined(MDEPKG_NDEBUG)       \r
+#if !defined(MDEPKG_NDEBUG)\r

   #define ASSERT_LOCKED(LockParameter)                  \\r
     do {                                                \\r
       if (DebugAssertEnabled ()) {                      \\r
   #define ASSERT_LOCKED(LockParameter)                  \\r
     do {                                                \\r
       if (DebugAssertEnabled ()) {                      \\r


@@ -347,8 +347,8 @@ EfiInitializeLock (
 /**\r
   Acquires ownership of a lock.\r
 \r
 /**\r
   Acquires ownership of a lock.\r
 \r

-  This function raises the system's current task priority level to the task \r
-  priority level of the mutual exclusion lock.  Then, it places the lock in the \r
+  This function raises the system's current task priority level to the task\r
+  priority level of the mutual exclusion lock.  Then, it places the lock in the\r

   acquired state.\r
   If Lock is NULL, then ASSERT().\r
   If Lock is not initialized, then ASSERT().\r
   acquired state.\r
   If Lock is NULL, then ASSERT().\r
   If Lock is not initialized, then ASSERT().\r


@@ -388,8 +388,8 @@ EfiAcquireLockOrFail (
 /**\r
   Releases ownership of a lock.\r
 \r
 /**\r
   Releases ownership of a lock.\r
 \r

-  This function transitions a mutual exclusion lock from the acquired state to \r
-  the released state, and restores the system's task priority level to its \r
+  This function transitions a mutual exclusion lock from the acquired state to\r
+  the released state, and restores the system's task priority level to its\r

   previous level.\r
   If Lock is NULL, then ASSERT().\r
   If Lock is not initialized, then ASSERT().\r
   previous level.\r
   If Lock is NULL, then ASSERT().\r
   If Lock is not initialized, then ASSERT().\r


@@ -411,7 +411,7 @@ EfiReleaseLock (
   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 with an\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 with an\r

-  attribute of EFI_OPEN_PROTOCOL_BY_DRIVER. \r
+  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


@@ -444,10 +444,10 @@ EfiTestManagedDevice (
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
   If ProtocolGuid is NULL, then ASSERT().\r
 \r
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
   If ProtocolGuid is NULL, then ASSERT().\r
 \r

-  @param  ControllerHandle     A handle for a (parent) controller to test. \r
+  @param  ControllerHandle     A handle for a (parent) controller to test.\r

   @param  ChildHandle          A child handle to test.\r
   @param  ProtocolGuid         Supplies the protocol that the child controller\r
   @param  ChildHandle          A child handle to test.\r
   @param  ProtocolGuid         Supplies the protocol that the child controller\r

-                               opens on its parent controller. \r
+                               opens on its parent controller.\r

 \r
   @retval EFI_SUCCESS          ChildHandle is a child of the ControllerHandle.\r
   @retval EFI_UNSUPPORTED      ChildHandle is not a child of the\r
 \r
   @retval EFI_SUCCESS          ChildHandle is a child of the ControllerHandle.\r
   @retval EFI_UNSUPPORTED      ChildHandle is not a child of the\r


@@ -469,26 +469,26 @@ EfiTestChildHandle (
   UnicodeStringTable that matches the language code specified by Language, then it\r
   is returned in UnicodeString.\r
 \r
   UnicodeStringTable that matches the language code specified by Language, then it\r
   is returned in UnicodeString.\r
 \r

-  @param  Language                A pointer to the ISO 639-2 language code for the \r
+  @param  Language                A pointer to the ISO 639-2 language code for the\r

                                   Unicode string to look up and return.\r
                                   Unicode string to look up and return.\r

-  @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes \r
-                                  that the Unicode string table supports.  Language \r
+  @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes\r
+                                  that the Unicode string table supports.  Language\r

                                   must be a member of this set.\r
   @param  UnicodeStringTable      A pointer to the table of Unicode strings.\r
   @param  UnicodeString           A pointer to the Unicode string from UnicodeStringTable\r
                                   that matches the language specified by Language.\r
 \r
                                   must be a member of this set.\r
   @param  UnicodeStringTable      A pointer to the table of Unicode strings.\r
   @param  UnicodeString           A pointer to the Unicode string from UnicodeStringTable\r
                                   that matches the language specified by Language.\r
 \r

-  @retval EFI_SUCCESS             The Unicode string that matches the language \r
+  @retval EFI_SUCCESS             The Unicode string that matches the language\r

                                   specified by Language was found\r
                                   specified by Language was found\r

-                                  in the table of Unicode strings UnicodeStringTable, \r
+                                  in the table of Unicode strings UnicodeStringTable,\r

                                   and it was returned in UnicodeString.\r
   @retval EFI_INVALID_PARAMETER   Language is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is NULL.\r
   @retval EFI_UNSUPPORTED         SupportedLanguages is NULL.\r
   @retval EFI_UNSUPPORTED         UnicodeStringTable is NULL.\r
                                   and it was returned in UnicodeString.\r
   @retval EFI_INVALID_PARAMETER   Language is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is NULL.\r
   @retval EFI_UNSUPPORTED         SupportedLanguages is NULL.\r
   @retval EFI_UNSUPPORTED         UnicodeStringTable is NULL.\r

-  @retval EFI_UNSUPPORTED         The language specified by Language is not a \r
+  @retval EFI_UNSUPPORTED         The language specified by Language is not a\r

                                   member of SupportedLanguages.\r
                                   member of SupportedLanguages.\r

-  @retval EFI_UNSUPPORTED         The language specified by Language is not \r
+  @retval EFI_UNSUPPORTED         The language specified by Language is not\r

                                   supported by UnicodeStringTable.\r
 \r
 **/\r
                                   supported by UnicodeStringTable.\r
 \r
 **/\r


@@ -513,7 +513,7 @@ LookupUnicodeString (
                                return. If Iso639Language is TRUE, then this ASCII string is\r
                                not assumed to be Null-terminated, and only the first three\r
                                characters are used. If Iso639Language is FALSE, then this ASCII\r
                                return. If Iso639Language is TRUE, then this ASCII string is\r
                                not assumed to be Null-terminated, and only the first three\r
                                characters are used. If Iso639Language is FALSE, then this ASCII\r

-                               string must be Null-terminated. \r
+                               string must be Null-terminated.\r

   @param  SupportedLanguages   A pointer to a Null-terminated ASCII string that contains a\r
                                set of ISO 639-2 or RFC 4646 language codes that the Unicode\r
                                string table supports.  Language must be a member of this set.\r
   @param  SupportedLanguages   A pointer to a Null-terminated ASCII string that contains a\r
                                set of ISO 639-2 or RFC 4646 language codes that the Unicode\r
                                string table supports.  Language must be a member of this set.\r


@@ -533,11 +533,11 @@ LookupUnicodeString (
   @retval  EFI_SUCCESS            The Unicode string that matches the language specified by Language\r
                                   was found in the table of Unicode strings UnicodeStringTable, and\r
                                   it was returned in UnicodeString.\r
   @retval  EFI_SUCCESS            The Unicode string that matches the language specified by Language\r
                                   was found in the table of Unicode strings UnicodeStringTable, and\r
                                   it was returned in UnicodeString.\r

-  @retval  EFI_INVALID_PARAMETER  Language is NULL.  \r
-  @retval  EFI_INVALID_PARAMETER  UnicodeString is NULL.  \r
-  @retval  EFI_UNSUPPORTED        SupportedLanguages is NULL.  \r
-  @retval  EFI_UNSUPPORTED        UnicodeStringTable is NULL.  \r
-  @retval  EFI_UNSUPPORTED        The language specified by Language is not a member of SupportedLanguages.  \r
+  @retval  EFI_INVALID_PARAMETER  Language is NULL.\r
+  @retval  EFI_INVALID_PARAMETER  UnicodeString is NULL.\r
+  @retval  EFI_UNSUPPORTED        SupportedLanguages is NULL.\r
+  @retval  EFI_UNSUPPORTED        UnicodeStringTable is NULL.\r
+  @retval  EFI_UNSUPPORTED        The language specified by Language is not a member of SupportedLanguages.\r

   @retval  EFI_UNSUPPORTED        The language specified by Language is not supported by UnicodeStringTable.\r
 \r
 **/\r
   @retval  EFI_UNSUPPORTED        The language specified by Language is not supported by UnicodeStringTable.\r
 \r
 **/\r


@@ -554,13 +554,13 @@ LookupUnicodeString2 (
 /**\r
   This function adds a Unicode string to UnicodeStringTable.\r
 \r
 /**\r
   This function adds a Unicode string to UnicodeStringTable.\r
 \r

-  If Language is a member of SupportedLanguages then UnicodeString is added to \r
-  UnicodeStringTable.  New buffers are allocated for both Language and \r
-  UnicodeString.  The contents of Language and UnicodeString are copied into \r
-  these new buffers.  These buffers are automatically freed when \r
+  If Language is a member of SupportedLanguages then UnicodeString is added to\r
+  UnicodeStringTable.  New buffers are allocated for both Language and\r
+  UnicodeString.  The contents of Language and UnicodeString are copied into\r
+  these new buffers.  These buffers are automatically freed when\r

   FreeUnicodeStringTable() is called.\r
 \r
   FreeUnicodeStringTable() is called.\r
 \r

-  @param  Language                A pointer to the ISO 639-2 language code for the Unicode \r
+  @param  Language                A pointer to the ISO 639-2 language code for the Unicode\r

                                   string to add.\r
   @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes\r
                                   that the Unicode string table supports.\r
                                   string to add.\r
   @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes\r
                                   that the Unicode string table supports.\r


@@ -568,19 +568,19 @@ LookupUnicodeString2 (
   @param  UnicodeStringTable      A pointer to the table of Unicode strings.\r
   @param  UnicodeString           A pointer to the Unicode string to add.\r
 \r
   @param  UnicodeStringTable      A pointer to the table of Unicode strings.\r
   @param  UnicodeString           A pointer to the Unicode string to add.\r
 \r

-  @retval EFI_SUCCESS             The Unicode string that matches the language \r
-                                  specified by Language was found in the table of \r
-                                  Unicode strings UnicodeStringTable, and it was \r
+  @retval EFI_SUCCESS             The Unicode string that matches the language\r
+                                  specified by Language was found in the table of\r
+                                  Unicode strings UnicodeStringTable, and it was\r

                                   returned in UnicodeString.\r
   @retval EFI_INVALID_PARAMETER   Language is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is an empty string.\r
   @retval EFI_UNSUPPORTED         SupportedLanguages is NULL.\r
                                   returned in UnicodeString.\r
   @retval EFI_INVALID_PARAMETER   Language is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is an empty string.\r
   @retval EFI_UNSUPPORTED         SupportedLanguages is NULL.\r

-  @retval EFI_ALREADY_STARTED     A Unicode string with language Language is \r
+  @retval EFI_ALREADY_STARTED     A Unicode string with language Language is\r

                                   already present in UnicodeStringTable.\r
                                   already present in UnicodeStringTable.\r

-  @retval EFI_OUT_OF_RESOURCES    There is not enough memory to add another \r
+  @retval EFI_OUT_OF_RESOURCES    There is not enough memory to add another\r

                                   Unicode string to UnicodeStringTable.\r
                                   Unicode string to UnicodeStringTable.\r

-  @retval EFI_UNSUPPORTED         The language specified by Language is not a \r
+  @retval EFI_UNSUPPORTED         The language specified by Language is not a\r

                                   member of SupportedLanguages.\r
 \r
 **/\r
                                   member of SupportedLanguages.\r
 \r
 **/\r


@@ -617,21 +617,21 @@ AddUnicodeString (
                               RFC 4646 language codes separated by ';'.\r
   @param  UnicodeStringTable  A pointer to the table of Unicode strings. Type EFI_UNICODE_STRING_TABLE\r
                               is defined in "Related Definitions".\r
                               RFC 4646 language codes separated by ';'.\r
   @param  UnicodeStringTable  A pointer to the table of Unicode strings. Type EFI_UNICODE_STRING_TABLE\r
                               is defined in "Related Definitions".\r

-  @param  UnicodeString       A pointer to the Unicode string to add.  \r
+  @param  UnicodeString       A pointer to the Unicode string to add.\r

   @param  Iso639Language      Specifies the supported language code format. If it is TRUE,\r
                               then Language and SupportedLanguages follow ISO 639-2 language code format.\r
                               Otherwise, they follow RFC 4646 language code format.\r
 \r
   @retval EFI_SUCCESS            The Unicode string that matches the language specified by\r
                                  Language was found in the table of Unicode strings UnicodeStringTable,\r
   @param  Iso639Language      Specifies the supported language code format. If it is TRUE,\r
                               then Language and SupportedLanguages follow ISO 639-2 language code format.\r
                               Otherwise, they follow RFC 4646 language code format.\r
 \r
   @retval EFI_SUCCESS            The Unicode string that matches the language specified by\r
                                  Language was found in the table of Unicode strings UnicodeStringTable,\r

-                                 and it was returned in UnicodeString.  \r
-  @retval EFI_INVALID_PARAMETER  Language is NULL.  \r
-  @retval EFI_INVALID_PARAMETER  UnicodeString is NULL.  \r
-  @retval EFI_INVALID_PARAMETER  UnicodeString is an empty string.  \r
-  @retval EFI_UNSUPPORTED        SupportedLanguages is NULL.  \r
+                                 and it was returned in UnicodeString.\r
+  @retval EFI_INVALID_PARAMETER  Language is NULL.\r
+  @retval EFI_INVALID_PARAMETER  UnicodeString is NULL.\r
+  @retval EFI_INVALID_PARAMETER  UnicodeString is an empty string.\r
+  @retval EFI_UNSUPPORTED        SupportedLanguages is NULL.\r

   @retval EFI_ALREADY_STARTED    A Unicode string with language Language is already present in\r
   @retval EFI_ALREADY_STARTED    A Unicode string with language Language is already present in\r

-                                 UnicodeStringTable.  \r
-  @retval EFI_OUT_OF_RESOURCES   There is not enough memory to add another Unicode string UnicodeStringTable.  \r
+                                 UnicodeStringTable.\r
+  @retval EFI_OUT_OF_RESOURCES   There is not enough memory to add another Unicode string UnicodeStringTable.\r

   @retval EFI_UNSUPPORTED        The language specified by Language is not a member of SupportedLanguages.\r
 \r
 **/\r
   @retval EFI_UNSUPPORTED        The language specified by Language is not a member of SupportedLanguages.\r
 \r
 **/\r


@@ -649,7 +649,7 @@ AddUnicodeString2 (
   This function frees the table of Unicode strings in UnicodeStringTable.\r
 \r
   If UnicodeStringTable is NULL, then EFI_SUCCESS is returned.\r
   This function frees the table of Unicode strings in UnicodeStringTable.\r
 \r
   If UnicodeStringTable is NULL, then EFI_SUCCESS is returned.\r

-  Otherwise, each language code, and each Unicode string in the Unicode string \r
+  Otherwise, each language code, and each Unicode string in the Unicode string\r

   table are freed, and EFI_SUCCESS is returned.\r
 \r
   @param  UnicodeStringTable  A pointer to the table of Unicode strings.\r
   table are freed, and EFI_SUCCESS is returned.\r
 \r
   @param  UnicodeStringTable  A pointer to the table of Unicode strings.\r


@@ -668,8 +668,8 @@ FreeUnicodeStringTable (
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r

-  Returns a pointer to an allocated buffer that contains the contents of a \r
-  variable retrieved through the UEFI Runtime Service GetVariable().  The \r
+  Returns a pointer to an allocated buffer that contains the contents of a\r
+  variable retrieved through the UEFI Runtime Service GetVariable().  The\r

   returned buffer is allocated using AllocatePool().  The caller is responsible\r
   for freeing this buffer with FreePool().\r
 \r
   returned buffer is allocated using AllocatePool().  The caller is responsible\r
   for freeing this buffer with FreePool().\r
 \r


@@ -694,10 +694,10 @@ GetVariable (
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r

-  Returns a pointer to an allocated buffer that contains the contents of a \r
-  variable retrieved through the UEFI Runtime Service GetVariable().  This \r
+  Returns a pointer to an allocated buffer that contains the contents of a\r
+  variable retrieved through the UEFI Runtime Service GetVariable().  This\r

   function always uses the EFI_GLOBAL_VARIABLE GUID to retrieve variables.\r
   function always uses the EFI_GLOBAL_VARIABLE GUID to retrieve variables.\r

-  The returned buffer is allocated using AllocatePool().  The caller is \r
+  The returned buffer is allocated using AllocatePool().  The caller is\r

   responsible for freeing this buffer with FreePool().\r
 \r
   If Name is NULL, then ASSERT().\r
   responsible for freeing this buffer with FreePool().\r
 \r
   If Name is NULL, then ASSERT().\r


@@ -718,8 +718,8 @@ GetEfiGlobalVariable (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Returns the status whether get the variable success. The function retrieves \r
-  variable  through the UEFI Runtime Service GetVariable().  The \r
+  Returns the status whether get the variable success. The function retrieves\r
+  variable  through the UEFI Runtime Service GetVariable().  The\r

   returned buffer is allocated using AllocatePool().  The caller is responsible\r
   for freeing this buffer with FreePool().\r
 \r
   returned buffer is allocated using AllocatePool().  The caller is responsible\r
   for freeing this buffer with FreePool().\r
 \r


@@ -747,10 +747,10 @@ GetVariable2 (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Returns a pointer to an allocated buffer that contains the contents of a \r
-  variable retrieved through the UEFI Runtime Service GetVariable().  This \r
+  Returns a pointer to an allocated buffer that contains the contents of a\r
+  variable retrieved through the UEFI Runtime Service GetVariable().  This\r

   function always uses the EFI_GLOBAL_VARIABLE GUID to retrieve variables.\r
   function always uses the EFI_GLOBAL_VARIABLE GUID to retrieve variables.\r

-  The returned buffer is allocated using AllocatePool().  The caller is \r
+  The returned buffer is allocated using AllocatePool().  The caller is\r

   responsible for freeing this buffer with FreePool().\r
 \r
   If Name  is NULL, then ASSERT().\r
   responsible for freeing this buffer with FreePool().\r
 \r
   If Name  is NULL, then ASSERT().\r


@@ -774,76 +774,76 @@ GetEfiGlobalVariable2 (
   );\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
-  code types may not be mixed in a single call to this function.  The language \r
-  code returned is allocated using AllocatePool().  The caller is responsible for \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.  The language\r
+  code returned is allocated using AllocatePool().  The caller is responsible for\r

   freeing the allocated buffer using FreePool().  This function supports a variable\r
   freeing the allocated buffer using FreePool().  This function supports a variable\r

-  argument list that allows the caller to pass in a prioritized list of language \r
-  codes to test against all the language codes in SupportedLanguages. \r
+  argument list that allows the caller to pass in a prioritized list of language\r
+  codes to test against all the language codes in SupportedLanguages.\r

 \r
   If SupportedLanguages is NULL, then ASSERT().\r
 \r
   @param[in]  SupportedLanguages  A pointer to a Null-terminated ASCII string that\r
 \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
 GetBestLanguage (\r
                  language in SupportedLanguages.\r
 \r
 **/\r
 CHAR8 *\r
 EFIAPI\r
 GetBestLanguage (\r

-  IN CONST CHAR8  *SupportedLanguages, \r
+  IN CONST CHAR8  *SupportedLanguages,\r

   IN UINTN        Iso639Language,\r
   ...\r
   );\r
 \r
 /**\r
   IN UINTN        Iso639Language,\r
   ...\r
   );\r
 \r
 /**\r

-  Draws a dialog box to the console output device specified by \r
+  Draws a dialog box to the console output device specified by\r

   ConOut defined in the EFI_SYSTEM_TABLE and waits for a keystroke\r
   ConOut defined in the EFI_SYSTEM_TABLE and waits for a keystroke\r

-  from the console input device specified by ConIn defined in the \r
+  from the console input device specified by ConIn defined in the\r

   EFI_SYSTEM_TABLE.\r
 \r
   If there are no strings in the variable argument list, then ASSERT().\r
   If all the strings in the variable argument list are empty, then ASSERT().\r
 \r
   @param[in]   Attribute  Specifies the foreground and background color of the popup.\r
   EFI_SYSTEM_TABLE.\r
 \r
   If there are no strings in the variable argument list, then ASSERT().\r
   If all the strings in the variable argument list are empty, then ASSERT().\r
 \r
   @param[in]   Attribute  Specifies the foreground and background color of the popup.\r

-  @param[out]  Key        A pointer to the EFI_KEY value of the key that was \r
+  @param[out]  Key        A pointer to the EFI_KEY value of the key that was\r

                           pressed.  This is an optional parameter that may be NULL.\r
                           If it is NULL then no wait for a keypress will be performed.\r
   @param[in]  ...         The variable argument list that contains pointers to Null-\r
                           pressed.  This is an optional parameter that may be NULL.\r
                           If it is NULL then no wait for a keypress will be performed.\r
   @param[in]  ...         The variable argument list that contains pointers to Null-\r

-                          terminated Unicode strings to display in the dialog box.  \r
+                          terminated Unicode strings to display in the dialog box.\r

                           The variable argument list is terminated by a NULL.\r
 \r
 **/\r
 VOID\r
 EFIAPI\r
 CreatePopUp (\r
                           The variable argument list is terminated by a NULL.\r
 \r
 **/\r
 VOID\r
 EFIAPI\r
 CreatePopUp (\r

-  IN  UINTN          Attribute,                \r
+  IN  UINTN          Attribute,\r

   OUT EFI_INPUT_KEY  *Key,      OPTIONAL\r
   ...\r
   );\r
   OUT EFI_INPUT_KEY  *Key,      OPTIONAL\r
   ...\r
   );\r


@@ -875,13 +875,13 @@ GetGlyphWidth (
   of the Unicode characters in String can not be determined, then 0 is returned. The display\r
   width of String can be computed by summing the display widths of each Unicode character\r
   in String.  Unicode characters that are narrow glyphs have a width of 1, and Unicode\r
   of the Unicode characters in String can not be determined, then 0 is returned. The display\r
   width of String can be computed by summing the display widths of each Unicode character\r
   in String.  Unicode characters that are narrow glyphs have a width of 1, and Unicode\r

-  characters that are width glyphs have a width of 2. \r
+  characters that are width glyphs have a width of 2.\r

   If String is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   @param  String      A pointer to a Null-terminated Unicode string.\r
 \r
   @return The display length of the Null-terminated Unicode string specified by String.\r
   If String is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   @param  String      A pointer to a Null-terminated Unicode string.\r
 \r
   @return The display length of the Null-terminated Unicode string specified by String.\r

-  \r
+\r

 **/\r
 UINTN\r
 EFIAPI\r
 **/\r
 UINTN\r
 EFIAPI\r


@@ -894,7 +894,7 @@ UnicodeStringDisplayLength (
 //\r
 /**\r
   Create, Signal, and Close the Ready to Boot event using EfiSignalEventReadyToBoot().\r
 //\r
 /**\r
   Create, Signal, and Close the Ready to Boot event using EfiSignalEventReadyToBoot().\r

-  \r
+\r

   This function abstracts the signaling of the Ready to Boot Event. The Framework moved\r
   from a proprietary to UEFI 2.0 based mechanism. This library abstracts the caller\r
   from how this event is created to prevent to code form having to change with the\r
   This function abstracts the signaling of the Ready to Boot Event. The Framework moved\r
   from a proprietary to UEFI 2.0 based mechanism. This library abstracts the caller\r
   from how this event is created to prevent to code form having to change with the\r


@@ -947,8 +947,8 @@ EfiCreateEventLegacyBoot (
 \r
 /**\r
   Create an EFI event in the Legacy Boot Event Group and allows\r
 \r
 /**\r
   Create an EFI event in the Legacy Boot Event Group and allows\r

-  the caller to specify a notification function.  \r
-  \r
+  the caller to specify a notification function.\r
+\r

   This function abstracts the creation of the Legacy Boot Event.\r
   The Framework moved from a proprietary to UEFI 2.0 based mechanism.\r
   This library abstracts the caller from how this event is created to prevent\r
   This function abstracts the creation of the Legacy Boot Event.\r
   The Framework moved from a proprietary to UEFI 2.0 based mechanism.\r
   This library abstracts the caller from how this event is created to prevent\r


@@ -977,10 +977,10 @@ EfiCreateEventLegacyBootEx (
   Create an EFI event in the Ready To Boot Event Group.\r
 \r
   Prior to UEFI 2.0 this was done via a non-standard UEFI extension, and this library\r
   Create an EFI event in the Ready To Boot Event Group.\r
 \r
   Prior to UEFI 2.0 this was done via a non-standard UEFI extension, and this library\r

-  abstracts the implementation mechanism of this event from the caller.   \r
-  This function abstracts the creation of the Ready to Boot Event.  The Framework \r
-  moved from a proprietary to UEFI 2.0-based mechanism.  This library abstracts \r
-  the caller from how this event is created to prevent the code form having to \r
+  abstracts the implementation mechanism of this event from the caller.\r
+  This function abstracts the creation of the Ready to Boot Event.  The Framework\r
+  moved from a proprietary to UEFI 2.0-based mechanism.  This library abstracts\r
+  the caller from how this event is created to prevent the code form having to\r

   change with the version of the specification supported.\r
   If ReadyToBootEvent is NULL, then ASSERT().\r
 \r
   change with the version of the specification supported.\r
   If ReadyToBootEvent is NULL, then ASSERT().\r
 \r


@@ -998,8 +998,8 @@ EfiCreateEventReadyToBoot (
 \r
 /**\r
   Create an EFI event in the Ready To Boot Event Group and allows\r
 \r
 /**\r
   Create an EFI event in the Ready To Boot Event Group and allows\r

-  the caller to specify a notification function.  \r
-  \r
+  the caller to specify a notification function.\r
+\r

   This function abstracts the creation of the Ready to Boot Event.\r
   The Framework moved from a proprietary to UEFI 2.0 based mechanism.\r
   This library abstracts the caller from how this event is created to prevent\r
   This function abstracts the creation of the Ready to Boot Event.\r
   The Framework moved from a proprietary to UEFI 2.0 based mechanism.\r
   This library abstracts the caller from how this event is created to prevent\r


@@ -1026,16 +1026,16 @@ EfiCreateEventReadyToBootEx (
 \r
 /**\r
   Initialize a Firmware Volume (FV) Media Device Path node.\r
 \r
 /**\r
   Initialize a Firmware Volume (FV) Media Device Path node.\r

-  \r
-  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.  \r
-  This library function abstracts initializing a device path node.  \r
-  Initialize the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure.  This device \r
-  path changed in the DXE CIS version 0.92 in a non back ward compatible way to \r
-  not conflict with the UEFI 2.0 specification.  This function abstracts the \r
+\r
+  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.\r
+  This library function abstracts initializing a device path node.\r
+  Initialize the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure.  This device\r
+  path changed in the DXE CIS version 0.92 in a non back ward compatible way to\r
+  not conflict with the UEFI 2.0 specification.  This function abstracts the\r

   differences from the caller.\r
   If FvDevicePathNode is NULL, then ASSERT().\r
   If NameGuid is NULL, then ASSERT().\r
   differences from the caller.\r
   If FvDevicePathNode is NULL, then ASSERT().\r
   If NameGuid is NULL, then ASSERT().\r

-  \r
+\r

   @param  FvDevicePathNode  The pointer to a FV device path node to initialize\r
   @param  NameGuid          FV file name to use in FvDevicePathNode\r
 \r
   @param  FvDevicePathNode  The pointer to a FV device path node to initialize\r
   @param  NameGuid          FV file name to use in FvDevicePathNode\r
 \r


@@ -1048,14 +1048,14 @@ EfiInitializeFwVolDevicepathNode (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Check to see if the Firmware Volume (FV) Media Device Path is valid \r
-  \r
-  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.  \r
+  Check to see if the Firmware Volume (FV) Media Device Path is valid\r
+\r
+  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.\r

   This library function abstracts validating a device path node.\r
   This library function abstracts validating a device path node.\r

-  Check the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure to see if it's valid.  \r
-  If it is valid, then return the GUID file name from the device path node.  Otherwise, \r
-  return NULL.  This device path changed in the DXE CIS version 0.92 in a non backward \r
-  compatible way to not conflict with the UEFI 2.0 specification.  This function abstracts \r
+  Check the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure to see if it's valid.\r
+  If it is valid, then return the GUID file name from the device path node.  Otherwise,\r
+  return NULL.  This device path changed in the DXE CIS version 0.92 in a non backward\r
+  compatible way to not conflict with the UEFI 2.0 specification.  This function abstracts\r

   the differences from the caller.\r
   If FvDevicePathNode is NULL, then ASSERT().\r
 \r
   the differences from the caller.\r
   If FvDevicePathNode is NULL, then ASSERT().\r
 \r


@@ -1071,23 +1071,23 @@ EfiGetNameGuidFromFwVolDevicePathNode (
   IN CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvDevicePathNode\r
   );\r
 \r
   IN CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvDevicePathNode\r
   );\r
 \r

-/** \r
-  Prints a formatted Unicode string to the console output device specified by \r
+/**\r
+  Prints a formatted Unicode string to the console output device specified by\r

   ConOut defined in the EFI_SYSTEM_TABLE.\r
 \r
   ConOut defined in the EFI_SYSTEM_TABLE.\r
 \r

-  This function prints a formatted Unicode string to the console output device \r
-  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of Unicode \r
-  characters that printed to ConOut.  If the length of the formatted Unicode \r
-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first \r
+  This function prints a formatted Unicode string to the console output device\r
+  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of Unicode\r
+  characters that printed to ConOut.  If the length of the formatted Unicode\r
+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first\r

   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r
   If gST->ConOut is NULL, then ASSERT().\r
 \r
   @param Format   A null-terminated Unicode format string.\r
   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r
   If gST->ConOut is NULL, then ASSERT().\r
 \r
   @param Format   A null-terminated Unicode format string.\r

-  @param ...      The variable argument list whose contents are accessed based \r
+  @param ...      The variable argument list whose contents are accessed based\r

                   on the format string specified by Format.\r
                   on the format string specified by Format.\r

-  \r
+\r

   @return Number of Unicode characters printed to ConOut.\r
 \r
 **/\r
   @return Number of Unicode characters printed to ConOut.\r
 \r
 **/\r


@@ -1098,23 +1098,23 @@ Print (
   ...\r
   );\r
 \r
   ...\r
   );\r
 \r

-/** \r
-  Prints a formatted Unicode string to the console output device specified by \r
+/**\r
+  Prints a formatted Unicode string to the console output device specified by\r

   StdErr defined in the EFI_SYSTEM_TABLE.\r
 \r
   StdErr defined in the EFI_SYSTEM_TABLE.\r
 \r

-  This function prints a formatted Unicode string to the console output device \r
-  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of Unicode \r
-  characters that printed to StdErr.  If the length of the formatted Unicode \r
-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first \r
+  This function prints a formatted Unicode string to the console output device\r
+  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of Unicode\r
+  characters that printed to StdErr.  If the length of the formatted Unicode\r
+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first\r

   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r
   If gST->StdErr is NULL, then ASSERT().\r
 \r
   @param Format   A null-terminated Unicode format string.\r
   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r
   If gST->StdErr is NULL, then ASSERT().\r
 \r
   @param Format   A null-terminated Unicode format string.\r

-  @param ...      The variable argument list whose contents are accessed based \r
+  @param ...      The variable argument list whose contents are accessed based\r

                   on the format string specified by Format.\r
                   on the format string specified by Format.\r

-  \r
+\r

   @return Number of Unicode characters printed to StdErr.\r
 \r
 **/\r
   @return Number of Unicode characters printed to StdErr.\r
 \r
 **/\r


@@ -1125,22 +1125,22 @@ ErrorPrint (
   ...\r
   );\r
 \r
   ...\r
   );\r
 \r

-/** \r
-  Prints a formatted ASCII string to the console output device specified by \r
+/**\r
+  Prints a formatted ASCII string to the console output device specified by\r

   ConOut defined in the EFI_SYSTEM_TABLE.\r
 \r
   ConOut defined in the EFI_SYSTEM_TABLE.\r
 \r

-  This function prints a formatted ASCII string to the console output device \r
-  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of ASCII \r
-  characters that printed to ConOut.  If the length of the formatted ASCII \r
-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first \r
+  This function prints a formatted ASCII string to the console output device\r
+  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of ASCII\r
+  characters that printed to ConOut.  If the length of the formatted ASCII\r
+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first\r

   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.\r
   If Format is NULL, then ASSERT().\r
   If gST->ConOut is NULL, then ASSERT().\r
 \r
   @param Format   A null-terminated ASCII format string.\r
   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.\r
   If Format is NULL, then ASSERT().\r
   If gST->ConOut is NULL, then ASSERT().\r
 \r
   @param Format   A null-terminated ASCII format string.\r

-  @param ...      The variable argument list whose contents are accessed based \r
+  @param ...      The variable argument list whose contents are accessed based\r

                   on the format string specified by Format.\r
                   on the format string specified by Format.\r

-  \r
+\r

   @return Number of ASCII characters printed to ConOut.\r
 \r
 **/\r
   @return Number of ASCII characters printed to ConOut.\r
 \r
 **/\r


@@ -1151,22 +1151,22 @@ AsciiPrint (
   ...\r
   );\r
 \r
   ...\r
   );\r
 \r

-/** \r
-  Prints a formatted ASCII string to the console output device specified by \r
+/**\r
+  Prints a formatted ASCII string to the console output device specified by\r

   StdErr defined in the EFI_SYSTEM_TABLE.\r
 \r
   StdErr defined in the EFI_SYSTEM_TABLE.\r
 \r

-  This function prints a formatted ASCII string to the console output device \r
-  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of ASCII \r
-  characters that printed to StdErr.  If the length of the formatted ASCII \r
-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first \r
+  This function prints a formatted ASCII string to the console output device\r
+  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of ASCII\r
+  characters that printed to StdErr.  If the length of the formatted ASCII\r
+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first\r

   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.\r
   If Format is NULL, then ASSERT().\r
   If gST->StdErr is NULL, then ASSERT().\r
 \r
   @param Format   A null-terminated ASCII format string.\r
   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.\r
   If Format is NULL, then ASSERT().\r
   If gST->StdErr is NULL, then ASSERT().\r
 \r
   @param Format   A null-terminated ASCII format string.\r

-  @param ...      The variable argument list whose contents are accessed based \r
+  @param ...      The variable argument list whose contents are accessed based\r

                   on the format string specified by Format.\r
                   on the format string specified by Format.\r

-  \r
+\r

   @return Number of ASCII characters printed to ConErr.\r
 \r
 **/\r
   @return Number of ASCII characters printed to ConErr.\r
 \r
 **/\r


@@ -1179,22 +1179,22 @@ AsciiErrorPrint (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Prints a formatted Unicode string to a graphics console device specified by \r
+  Prints a formatted Unicode string to a graphics console device specified by\r

   ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.\r
 \r
   ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.\r
 \r

-  This function prints a formatted Unicode string to the graphics console device \r
-  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of \r
-  Unicode characters displayed, not including partial characters that may be clipped \r
+  This function prints a formatted Unicode string to the graphics console device\r
+  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of\r
+  Unicode characters displayed, not including partial characters that may be clipped\r

   by the right edge of the display.  If the length of the formatted Unicode string is\r
   by the right edge of the display.  If the length of the formatted Unicode string is\r

-  greater than PcdUefiLibMaxPrintBufferSize, then at most the first \r
+  greater than PcdUefiLibMaxPrintBufferSize, then at most the first\r

   PcdUefiLibMaxPrintBufferSize characters are printed.  The EFI_HII_FONT_PROTOCOL\r
   PcdUefiLibMaxPrintBufferSize characters are printed.  The EFI_HII_FONT_PROTOCOL\r

-  is used to convert the string to a bitmap using the glyphs registered with the \r
+  is used to convert the string to a bitmap using the glyphs registered with the\r

   HII database.  No wrapping is performed, so any portions of the string the fall\r
   outside the active display region will not be displayed.\r
 \r
   HII database.  No wrapping is performed, so any portions of the string the fall\r
   outside the active display region will not be displayed.\r
 \r

-  If a graphics console device is not associated with the ConsoleOutputHandle \r
+  If a graphics console device is not associated with the ConsoleOutputHandle\r

   defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.\r
   defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.\r

-  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no \r
+  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no\r

   string is printed, and 0 is returned.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r
   string is printed, and 0 is returned.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -1207,13 +1207,13 @@ AsciiErrorPrint (
                        then the foreground color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
   @param  BackGround   The background color of the string being printed.  This is\r
                        then the foreground color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
   @param  BackGround   The background color of the string being printed.  This is\r

-                       an optional parameter that may be NULL.  If it is NULL, \r
+                       an optional parameter that may be NULL.  If it is NULL,\r

                        then the background color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
                        then the background color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r

-  @param  Format       A null-terminated Unicode format string.  See Print Library \r
+  @param  Format       A null-terminated Unicode format string.  See Print Library\r

                        for the supported format string syntax.\r
                        for the supported format string syntax.\r

-  @param  ...          Variable argument list whose contents are accessed based on \r
-                       the format string specified by Format.         \r
+  @param  ...          Variable argument list whose contents are accessed based on\r
+                       the format string specified by Format.\r

 \r
   @return  The number of Unicode characters printed.\r
 \r
 \r
   @return  The number of Unicode characters printed.\r
 \r


@@ -1230,22 +1230,22 @@ PrintXY (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Prints a formatted ASCII string to a graphics console device specified by \r
+  Prints a formatted ASCII string to a graphics console device specified by\r

   ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.\r
 \r
   ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.\r
 \r

-  This function prints a formatted ASCII string to the graphics console device \r
-  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of \r
-  ASCII characters displayed, not including partial characters that may be clipped \r
+  This function prints a formatted ASCII string to the graphics console device\r
+  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of\r
+  ASCII characters displayed, not including partial characters that may be clipped\r

   by the right edge of the display.  If the length of the formatted ASCII string is\r
   by the right edge of the display.  If the length of the formatted ASCII string is\r

-  greater than PcdUefiLibMaxPrintBufferSize, then at most the first \r
+  greater than PcdUefiLibMaxPrintBufferSize, then at most the first\r

   PcdUefiLibMaxPrintBufferSize characters are printed.  The EFI_HII_FONT_PROTOCOL\r
   PcdUefiLibMaxPrintBufferSize characters are printed.  The EFI_HII_FONT_PROTOCOL\r

-  is used to convert the string to a bitmap using the glyphs registered with the \r
+  is used to convert the string to a bitmap using the glyphs registered with the\r

   HII database.  No wrapping is performed, so any portions of the string the fall\r
   outside the active display region will not be displayed.\r
 \r
   HII database.  No wrapping is performed, so any portions of the string the fall\r
   outside the active display region will not be displayed.\r
 \r

-  If a graphics console device is not associated with the ConsoleOutputHandle \r
+  If a graphics console device is not associated with the ConsoleOutputHandle\r

   defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.\r
   defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.\r

-  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no \r
+  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no\r

   string is printed, and 0 is returned.\r
   If Format is NULL, then ASSERT().\r
   If gST->ConsoleOutputHandle is NULL, then ASSERT().\r
   string is printed, and 0 is returned.\r
   If Format is NULL, then ASSERT().\r
   If gST->ConsoleOutputHandle is NULL, then ASSERT().\r


@@ -1257,13 +1257,13 @@ PrintXY (
                        then the foreground color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
   @param  BackGround   The background color of the string being printed.  This is\r
                        then the foreground color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
   @param  BackGround   The background color of the string being printed.  This is\r

-                       an optional parameter that may be NULL.  If it is NULL, \r
+                       an optional parameter that may be NULL.  If it is NULL,\r

                        then the background color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
                        then the background color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r

-  @param  Format       A null-terminated ASCII format string.  See Print Library \r
+  @param  Format       A null-terminated ASCII format string.  See Print Library\r

                        for the supported format string syntax.\r
                        for the supported format string syntax.\r

-  @param  ...          The variable argument list whose contents are accessed based on \r
-                       the format string specified by Format.         \r
+  @param  ...          The variable argument list whose contents are accessed based on\r
+                       the format string specified by Format.\r

 \r
   @return  The number of ASCII characters printed.\r
 \r
 \r
   @return  The number of ASCII characters printed.\r
 \r


@@ -1281,13 +1281,13 @@ AsciiPrintXY (
 \r
 /**\r
   Installs and completes the initialization of a Driver Binding Protocol instance.\r
 \r
 /**\r
   Installs and completes the initialization of a Driver Binding Protocol instance.\r

-  \r
+\r

   Installs the Driver Binding Protocol specified by DriverBinding onto the handle\r
   specified by DriverBindingHandle. If DriverBindingHandle is NULL, then DriverBinding\r
   is installed onto a newly created handle. DriverBindingHandle is typically the same\r
   as the driver's ImageHandle, but it can be different if the driver produces multiple\r
   Installs the Driver Binding Protocol specified by DriverBinding onto the handle\r
   specified by DriverBindingHandle. If DriverBindingHandle is NULL, then DriverBinding\r
   is installed onto a newly created handle. DriverBindingHandle is typically the same\r
   as the driver's ImageHandle, but it can be different if the driver produces multiple\r

-  Driver Binding Protocols. \r
-  If DriverBinding is NULL, then ASSERT(). \r
+  Driver Binding Protocols.\r
+  If DriverBinding is NULL, then ASSERT().\r

   If DriverBinding can not be installed onto a handle, then ASSERT().\r
 \r
   @param  ImageHandle          The image handle of the driver.\r
   If DriverBinding can not be installed onto a handle, then ASSERT().\r
 \r
   @param  ImageHandle          The image handle of the driver.\r


@@ -1320,10 +1320,10 @@ EfiLibInstallDriverBinding (
   Protocols onto the driver's DriverBindingHandle. If DriverBindingHandle is NULL,\r
   then the protocols are installed onto a newly created handle. DriverBindingHandle\r
   is typically the same as the driver's ImageHandle, but it can be different if the\r
   Protocols onto the driver's DriverBindingHandle. If DriverBindingHandle is NULL,\r
   then the protocols are installed onto a newly created handle. DriverBindingHandle\r
   is typically the same as the driver's ImageHandle, but it can be different if the\r

-  driver produces multiple Driver Binding Protocols. \r
-  If DriverBinding is NULL, then ASSERT(). \r
+  driver produces multiple Driver Binding Protocols.\r
+  If DriverBinding is NULL, then ASSERT().\r

   If the installation fails, then ASSERT().\r
   If the installation fails, then ASSERT().\r

-  \r
+\r

   @param  ImageHandle          The image handle of the driver.\r
   @param  SystemTable          The EFI System Table that was passed to the driver's entry point.\r
   @param  DriverBinding        A Driver Binding Protocol instance that this driver is producing.\r
   @param  ImageHandle          The image handle of the driver.\r
   @param  SystemTable          The EFI System Table that was passed to the driver's entry point.\r
   @param  DriverBinding        A Driver Binding Protocol instance that this driver is producing.\r


@@ -1358,8 +1358,8 @@ EfiLibInstallAllDriverProtocols (
   optional Component Name and optional Component Name 2 protocols onto the driver's\r
   DriverBindingHandle.  If DriverBindingHandle is NULL, then the protocols are installed\r
   onto a newly created handle.  DriverBindingHandle is typically the same as the driver's\r
   optional Component Name and optional Component Name 2 protocols onto the driver's\r
   DriverBindingHandle.  If DriverBindingHandle is NULL, then the protocols are installed\r
   onto a newly created handle.  DriverBindingHandle is typically the same as the driver's\r

-  ImageHandle, but it can be different if the driver produces multiple Driver Binding Protocols. \r
-  If DriverBinding is NULL, then ASSERT(). \r
+  ImageHandle, but it can be different if the driver produces multiple Driver Binding Protocols.\r
+  If DriverBinding is NULL, then ASSERT().\r

   If the installation fails, then ASSERT().\r
 \r
   @param  ImageHandle          The image handle of the driver.\r
   If the installation fails, then ASSERT().\r
 \r
   @param  ImageHandle          The image handle of the driver.\r


@@ -1394,8 +1394,8 @@ EfiLibInstallDriverBindingComponentName2 (
   Component Name, optional Component Name 2, optional Driver Configuration, optional Driver Configuration 2,\r
   optional Driver Diagnostic, and optional Driver Diagnostic 2 Protocols onto the driver's DriverBindingHandle.\r
   DriverBindingHandle is typically the same as the driver's ImageHandle, but it can be different if the driver\r
   Component Name, optional Component Name 2, optional Driver Configuration, optional Driver Configuration 2,\r
   optional Driver Diagnostic, and optional Driver Diagnostic 2 Protocols onto the driver's DriverBindingHandle.\r
   DriverBindingHandle is typically the same as the driver's ImageHandle, but it can be different if the driver\r

-  produces multiple Driver Binding Protocols. \r
-  If DriverBinding is NULL, then ASSERT(). \r
+  produces multiple Driver Binding Protocols.\r
+  If DriverBinding is NULL, then ASSERT().\r

   If the installation fails, then ASSERT().\r
 \r
 \r
   If the installation fails, then ASSERT().\r
 \r
 \r


@@ -1430,25 +1430,25 @@ EfiLibInstallAllDriverProtocols2 (
   IN CONST EFI_DRIVER_DIAGNOSTICS2_PROTOCOL   *DriverDiagnostics2    OPTIONAL\r
   );\r
 \r
   IN CONST EFI_DRIVER_DIAGNOSTICS2_PROTOCOL   *DriverDiagnostics2    OPTIONAL\r
   );\r
 \r

-/** \r
+/**\r

   Appends a formatted Unicode string to a Null-terminated Unicode string\r
   Appends a formatted Unicode string to a Null-terminated Unicode string\r

- \r
-  This function appends a formatted Unicode string to the Null-terminated \r
+\r
+  This function appends a formatted Unicode string to the Null-terminated\r

   Unicode string specified by String.   String is optional and may be NULL.\r
   Unicode string specified by String.   String is optional and may be NULL.\r

-  Storage for the formatted Unicode string returned is allocated using \r
+  Storage for the formatted Unicode string returned is allocated using\r

   AllocatePool().  The pointer to the appended string is returned.  The caller\r
   is responsible for freeing the returned string.\r
   AllocatePool().  The pointer to the appended string is returned.  The caller\r
   is responsible for freeing the returned string.\r

- \r
+\r

   If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().\r
   If FormatString is NULL, then ASSERT().\r
   If FormatString is not aligned on a 16-bit boundary, then ASSERT().\r
   If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().\r
   If FormatString is NULL, then ASSERT().\r
   If FormatString is not aligned on a 16-bit boundary, then ASSERT().\r

- \r
+\r

   @param[in] String         A Null-terminated Unicode string.\r
   @param[in] FormatString   A Null-terminated Unicode format string.\r
   @param[in]  Marker        VA_LIST marker for the variable argument list.\r
 \r
   @retval NULL    There was not enough available memory.\r
   @param[in] String         A Null-terminated Unicode string.\r
   @param[in] FormatString   A Null-terminated Unicode format string.\r
   @param[in]  Marker        VA_LIST marker for the variable argument list.\r
 \r
   @retval NULL    There was not enough available memory.\r

-  @return         Null-terminated Unicode string is that is the formatted \r
+  @return         Null-terminated Unicode string is that is the formatted\r

                   string appended to String.\r
 **/\r
 CHAR16*\r
                   string appended to String.\r
 **/\r
 CHAR16*\r


@@ -1459,27 +1459,27 @@ CatVSPrint (
   IN  VA_LIST       Marker\r
   );\r
 \r
   IN  VA_LIST       Marker\r
   );\r
 \r

-/** \r
+/**\r

   Appends a formatted Unicode string to a Null-terminated Unicode string\r
   Appends a formatted Unicode string to a Null-terminated Unicode string\r

- \r
-  This function appends a formatted Unicode string to the Null-terminated \r
+\r
+  This function appends a formatted Unicode string to the Null-terminated\r

   Unicode string specified by String.   String is optional and may be NULL.\r
   Unicode string specified by String.   String is optional and may be NULL.\r

-  Storage for the formatted Unicode string returned is allocated using \r
+  Storage for the formatted Unicode string returned is allocated using\r

   AllocatePool().  The pointer to the appended string is returned.  The caller\r
   is responsible for freeing the returned string.\r
   AllocatePool().  The pointer to the appended string is returned.  The caller\r
   is responsible for freeing the returned string.\r

- \r
+\r

   If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().\r
   If FormatString is NULL, then ASSERT().\r
   If FormatString is not aligned on a 16-bit boundary, then ASSERT().\r
   If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().\r
   If FormatString is NULL, then ASSERT().\r
   If FormatString is not aligned on a 16-bit boundary, then ASSERT().\r

- \r
+\r

   @param[in] String         A Null-terminated Unicode string.\r
   @param[in] FormatString   A Null-terminated Unicode format string.\r
   @param[in] String         A Null-terminated Unicode string.\r
   @param[in] FormatString   A Null-terminated Unicode format string.\r

-  @param[in] ...            The variable argument list whose contents are \r
-                            accessed based on the format string specified by \r
+  @param[in] ...            The variable argument list whose contents are\r
+                            accessed based on the format string specified by\r

                             FormatString.\r
 \r
   @retval NULL    There was not enough available memory.\r
                             FormatString.\r
 \r
   @retval NULL    There was not enough available memory.\r

-  @return         Null-terminated Unicode string is that is the formatted \r
+  @return         Null-terminated Unicode string is that is the formatted\r

                   string appended to String.\r
 **/\r
 CHAR16 *\r
                   string appended to String.\r
 **/\r
 CHAR16 *\r

diff --git a/MdePkg/Include/Library/UefiRuntimeLib.h b/MdePkg/Include/Library/UefiRuntimeLib.h
index 0bca416a4bebf974210cbf616658843f0a42d985..888410921bc88f3747d4dfb5e771e3938030ff11 100644 (file)
--- a/MdePkg/Include/Library/UefiRuntimeLib.h
+++ b/MdePkg/Include/Library/UefiRuntimeLib.h
@@ -2,9 +2,9 @@
   Provides library functions for each of the UEFI Runtime Services.\r
   Only available to DXE and UEFI module types.\r
 \r
   Provides library functions for each of the UEFI Runtime Services.\r
   Only available to DXE and UEFI module types.\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
 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


@@ -34,7 +34,7 @@ EfiAtRuntime (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function allows the caller to determine if UEFI SetVirtualAddressMap() has been called. \r
+  This function allows the caller to determine if UEFI SetVirtualAddressMap() has been called.\r

 \r
   This function returns TRUE after all the EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE functions have\r
   executed as a result of the OS calling SetVirtualAddressMap(). Prior to this time FALSE\r
 \r
   This function returns TRUE after all the EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE functions have\r
   executed as a result of the OS calling SetVirtualAddressMap(). Prior to this time FALSE\r


@@ -342,7 +342,7 @@ EfiResetSystem (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This service is a wrapper for the UEFI Runtime Service ConvertPointer().  \r
+  This service is a wrapper for the UEFI Runtime Service ConvertPointer().\r

 \r
   The ConvertPointer() function is used by an EFI component during the SetVirtualAddressMap() operation.\r
   ConvertPointer()must be called using physical address pointers during the execution of SetVirtualAddressMap().\r
 \r
   The ConvertPointer() function is used by an EFI component during the SetVirtualAddressMap() operation.\r
   ConvertPointer()must be called using physical address pointers during the execution of SetVirtualAddressMap().\r


@@ -370,7 +370,7 @@ EfiConvertPointer (
   Determines the new virtual address that is to be used on subsequent memory accesses.\r
 \r
   For IA32, x64, and EBC, this service is a wrapper for the UEFI Runtime Service\r
   Determines the new virtual address that is to be used on subsequent memory accesses.\r
 \r
   For IA32, x64, and EBC, this service is a wrapper for the UEFI Runtime Service\r

-  ConvertPointer().  See the UEFI Specification for details. \r
+  ConvertPointer().  See the UEFI Specification for details.\r

   For IPF, this function interprets Address as a pointer to an EFI_PLABEL structure\r
   and both the EntryPoint and GP fields of an EFI_PLABEL are converted from physical\r
   to virtiual addressing.  Since IPF allows the GP to point to an address outside\r
   For IPF, this function interprets Address as a pointer to an EFI_PLABEL structure\r
   and both the EntryPoint and GP fields of an EFI_PLABEL are converted from physical\r
   to virtiual addressing.  Since IPF allows the GP to point to an address outside\r

diff --git a/MdePkg/Include/Library/UefiScsiLib.h b/MdePkg/Include/Library/UefiScsiLib.h
index 067acfdb43478898dbd1c6c833093157c2c7dc7e..dbb248972ba0e46a73a2daa37d9d0f73d29e7c75 100644 (file)
--- a/MdePkg/Include/Library/UefiScsiLib.h
+++ b/MdePkg/Include/Library/UefiScsiLib.h
@@ -5,14 +5,14 @@
   for hard drive, CD and DVD devices that are the most common SCSI boot targets used by UEFI platforms.\r
   This library class depends on SCSI I/O Protocol defined in UEFI Specification and SCSI-2 industry standard.\r
 \r
   for hard drive, CD and DVD devices that are the most common SCSI boot targets used by UEFI platforms.\r
   This library class depends on SCSI I/O Protocol defined in UEFI Specification and SCSI-2 industry standard.\r
 \r

-Copyright (c) 2006 - 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) 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 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                                     optional and may be NULL.\r
   @param[in, out] SenseDataLength   On input, a pointer to the length in bytes of\r
                                     the SenseData buffer. On output, a pointer to\r
                                     optional and may be NULL.\r
   @param[in, out] SenseDataLength   On input, a pointer to the length in bytes of\r
                                     the SenseData buffer. On output, a pointer to\r

-                                    the number of bytes written to the SenseData buffer. \r
+                                    the number of bytes written to the SenseData buffer.\r

   @param[out]     HostAdapterStatus The status of the SCSI Host Controller that produces\r
                                     the SCSI bus containing the SCSI target specified by\r
                                     ScsiIo when the SCSI Request Packet was executed.\r
   @param[out]     HostAdapterStatus The status of the SCSI Host Controller that produces\r
                                     the SCSI bus containing the SCSI target specified by\r
                                     ScsiIo when the SCSI Request Packet was executed.\r


@@ -62,7 +62,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                                     by ScsiIo when the SCSI Request Packet was executed\r
                                     on the SCSI Host Controller. See the EFI SCSI I/O\r
                                     Protocol in the UEFI Specification for details on\r
                                     by ScsiIo when the SCSI Request Packet was executed\r
                                     on the SCSI Host Controller. See the EFI SCSI I/O\r
                                     Protocol in the UEFI Specification for details on\r

-                                    the possible return values. \r
+                                    the possible return values.\r

 \r
   @retval EFI_SUCCESS               The command was executed successfully.\r
                                     See HostAdapterStatus, TargetStatus, SenseDataLength,\r
 \r
   @retval EFI_SUCCESS               The command was executed successfully.\r
                                     See HostAdapterStatus, TargetStatus, SenseDataLength,\r


@@ -135,7 +135,7 @@ ScsiTestUnitReadyCommand (
                                          If SenseDataLength is 0, then this parameter\r
                                          is optional and may be NULL.\r
   @param[in, out] SenseDataLength        On input, the length in bytes of the SenseData buffer.\r
                                          If SenseDataLength is 0, then this parameter\r
                                          is optional and may be NULL.\r
   @param[in, out] SenseDataLength        On input, the length in bytes of the SenseData buffer.\r

-                                         On output, the number of bytes written to the SenseData buffer. \r
+                                         On output, the number of bytes written to the SenseData buffer.\r

   @param[out]     HostAdapterStatus      The status of the SCSI Host Controller that\r
                                          produces the SCSI bus containing the SCSI\r
                                          target specified by ScsiIo when the SCSI\r
   @param[out]     HostAdapterStatus      The status of the SCSI Host Controller that\r
                                          produces the SCSI bus containing the SCSI\r
                                          target specified by ScsiIo when the SCSI\r


@@ -147,12 +147,12 @@ ScsiTestUnitReadyCommand (
                                          executed on the SCSI Host Controller.\r
                                          See the EFI SCSI I/O Protocol in the UEFI\r
                                          Specification for details on the possible\r
                                          executed on the SCSI Host Controller.\r
                                          See the EFI SCSI I/O Protocol in the UEFI\r
                                          Specification for details on the possible\r

-                                         return values. \r
+                                         return values.\r

   @param[in, out] InquiryDataBuffer      A pointer to inquiry data that was generated\r
                                          by the execution of the SCSI Request Packet.\r
                                          This buffer must be allocated by the caller.\r
                                          If InquiryDataLength is 0, then this parameter\r
   @param[in, out] InquiryDataBuffer      A pointer to inquiry data that was generated\r
                                          by the execution of the SCSI Request Packet.\r
                                          This buffer must be allocated by the caller.\r
                                          If InquiryDataLength is 0, then this parameter\r

-                                         is optional and may be NULL. \r
+                                         is optional and may be NULL.\r

   @param[in, out] InquiryDataLength      On input, a pointer to the length in bytes\r
                                          of the InquiryDataBuffer buffer.\r
                                          On output, a pointer to the number of bytes\r
   @param[in, out] InquiryDataLength      On input, a pointer to the length in bytes\r
                                          of the InquiryDataBuffer buffer.\r
                                          On output, a pointer to the number of bytes\r


@@ -160,7 +160,7 @@ ScsiTestUnitReadyCommand (
   @param[in]      EnableVitalProductData If TRUE, then the supported vital product\r
                                          data is returned in InquiryDataBuffer.\r
                                          If FALSE, then the standard inquiry data is\r
   @param[in]      EnableVitalProductData If TRUE, then the supported vital product\r
                                          data is returned in InquiryDataBuffer.\r
                                          If FALSE, then the standard inquiry data is\r

-                                         returned in InquiryDataBuffer. \r
+                                         returned in InquiryDataBuffer.\r

 \r
   @retval EFI_SUCCESS                    The command was executed successfully. See HostAdapterStatus,\r
                                          TargetStatus, SenseDataLength, and SenseData in that order\r
 \r
   @retval EFI_SUCCESS                    The command was executed successfully. See HostAdapterStatus,\r
                                          TargetStatus, SenseDataLength, and SenseData in that order\r


@@ -237,7 +237,7 @@ ScsiInquiryCommand (
                                          If SenseDataLength is 0, then this parameter\r
                                          is optional and may be NULL.\r
   @param[in, out] SenseDataLength        On input, the length in bytes of the SenseData buffer.\r
                                          If SenseDataLength is 0, then this parameter\r
                                          is optional and may be NULL.\r
   @param[in, out] SenseDataLength        On input, the length in bytes of the SenseData buffer.\r

-                                         On output, the number of bytes written to the SenseData buffer. \r
+                                         On output, the number of bytes written to the SenseData buffer.\r

   @param[out]     HostAdapterStatus      The status of the SCSI Host Controller that\r
                                          produces the SCSI bus containing the SCSI\r
                                          target specified by ScsiIo when the SCSI\r
   @param[out]     HostAdapterStatus      The status of the SCSI Host Controller that\r
                                          produces the SCSI bus containing the SCSI\r
                                          target specified by ScsiIo when the SCSI\r


@@ -249,12 +249,12 @@ ScsiInquiryCommand (
                                          executed on the SCSI Host Controller.\r
                                          See the EFI SCSI I/O Protocol in the UEFI\r
                                          Specification for details on the possible\r
                                          executed on the SCSI Host Controller.\r
                                          See the EFI SCSI I/O Protocol in the UEFI\r
                                          Specification for details on the possible\r

-                                         return values. \r
+                                         return values.\r

   @param[in, out] InquiryDataBuffer      A pointer to inquiry data that was generated\r
                                          by the execution of the SCSI Request Packet.\r
                                          This buffer must be allocated by the caller.\r
                                          If InquiryDataLength is 0, then this parameter\r
   @param[in, out] InquiryDataBuffer      A pointer to inquiry data that was generated\r
                                          by the execution of the SCSI Request Packet.\r
                                          This buffer must be allocated by the caller.\r
                                          If InquiryDataLength is 0, then this parameter\r

-                                         is optional and may be NULL. \r
+                                         is optional and may be NULL.\r

   @param[in, out] InquiryDataLength      On input, a pointer to the length in bytes\r
                                          of the InquiryDataBuffer buffer.\r
                                          On output, a pointer to the number of bytes\r
   @param[in, out] InquiryDataLength      On input, a pointer to the length in bytes\r
                                          of the InquiryDataBuffer buffer.\r
                                          On output, a pointer to the number of bytes\r


@@ -344,7 +344,7 @@ ScsiInquiryCommandEx (
                                      If SenseDataLength is 0, then this parameter\r
                                      is optional and may be NULL.\r
   @param[in, out]  SenseDataLength   On input, the length in bytes of the SenseData buffer.\r
                                      If SenseDataLength is 0, then this parameter\r
                                      is optional and may be NULL.\r
   @param[in, out]  SenseDataLength   On input, the length in bytes of the SenseData buffer.\r

-                                     On output, the number of bytes written to the SenseData buffer. \r
+                                     On output, the number of bytes written to the SenseData buffer.\r

   @param[out]     HostAdapterStatus  The status of the SCSI Host Controller that\r
                                      produces the SCSI bus containing the SCSI target\r
                                      specified by ScsiIo when the SCSI Request Packet\r
   @param[out]     HostAdapterStatus  The status of the SCSI Host Controller that\r
                                      produces the SCSI bus containing the SCSI target\r
                                      specified by ScsiIo when the SCSI Request Packet\r


@@ -360,14 +360,14 @@ ScsiInquiryCommandEx (
                                      execution of the SCSI Request Packet.  This\r
                                      buffer must be allocated by the caller. If\r
                                      DataLength is 0, then this parameter is optional\r
                                      execution of the SCSI Request Packet.  This\r
                                      buffer must be allocated by the caller. If\r
                                      DataLength is 0, then this parameter is optional\r

-                                     and may be NULL. \r
+                                     and may be NULL.\r

   @param[in, out]  DataLength        On input, a pointer to the length in bytes of\r
                                      the DataBuffer buffer.  On output, a pointer\r
                                      to the number of bytes written to the DataBuffer\r
   @param[in, out]  DataLength        On input, a pointer to the length in bytes of\r
                                      the DataBuffer buffer.  On output, a pointer\r
                                      to the number of bytes written to the DataBuffer\r

-                                     buffer. \r
+                                     buffer.\r

   @param[in]      DBDField           Specifies the DBD field of the CDB for this SCSI Command.\r
   @param[in]      DBDField           Specifies the DBD field of the CDB for this SCSI Command.\r

-  @param[in]      PageControl        Specifies the PC field of the CDB for this SCSI Command. \r
-  @param[in]      PageCode           Specifies the Page Control field of the CDB for this SCSI Command. \r
+  @param[in]      PageControl        Specifies the PC field of the CDB for this SCSI Command.\r
+  @param[in]      PageCode           Specifies the Page Control field of the CDB for this SCSI Command.\r

 \r
   @retval EFI_SUCCESS                The command was executed successfully.\r
                                      See HostAdapterStatus, TargetStatus, SenseDataLength,\r
 \r
   @retval EFI_SUCCESS                The command was executed successfully.\r
                                      See HostAdapterStatus, TargetStatus, SenseDataLength,\r

diff --git a/MdePkg/Include/Pi/PiDependency.h b/MdePkg/Include/Pi/PiDependency.h
index 1db03af8fcd54b0fa7ae94de8e29b73dcdf6d88b..37719321065f2343296fb377d32f120938e2812a 100644 (file)
--- a/MdePkg/Include/Pi/PiDependency.h
+++ b/MdePkg/Include/Pi/PiDependency.h
@@ -1,14 +1,14 @@
 /** @file\r
   Present the dependency expression values in PI.\r
 \r
 /** @file\r
   Present the dependency expression values in PI.\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
+  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
   @par Revision Reference:\r
   PI Version 1.0\r
 \r
   @par Revision Reference:\r
   PI Version 1.0\r


@@ -17,16 +17,16 @@
 #ifndef __PI_DEPENDENCY_H__\r
 #define __PI_DEPENDENCY_H__\r
 \r
 #ifndef __PI_DEPENDENCY_H__\r
 #define __PI_DEPENDENCY_H__\r
 \r

-/// \r
+///\r

 /// If present, this must be the first and only opcode,\r
 /// EFI_DEP_BEFORE may be used by DXE and SMM drivers.\r
 /// If present, this must be the first and only opcode,\r
 /// EFI_DEP_BEFORE may be used by DXE and SMM drivers.\r

-/// \r
+///\r

 #define EFI_DEP_BEFORE        0x00\r
 \r
 #define EFI_DEP_BEFORE        0x00\r
 \r

-/// \r
+///\r

 /// If present, this must be the first and only opcode,\r
 /// EFI_DEP_AFTER may be used by DXE and SMM drivers.\r
 /// If present, this must be the first and only opcode,\r
 /// EFI_DEP_AFTER may be used by DXE and SMM drivers.\r

-/// \r
+///\r

 #define EFI_DEP_AFTER         0x01\r
 \r
 #define EFI_DEP_PUSH          0x02\r
 #define EFI_DEP_AFTER         0x01\r
 \r
 #define EFI_DEP_PUSH          0x02\r


@@ -38,10 +38,10 @@
 #define EFI_DEP_END           0x08\r
 \r
 \r
 #define EFI_DEP_END           0x08\r
 \r
 \r

-/// \r
+///\r

 /// If present, this must be the first opcode,\r
 /// EFI_DEP_SOR is only used by DXE driver.\r
 /// If present, this must be the first opcode,\r
 /// EFI_DEP_SOR is only used by DXE driver.\r

-/// \r
+///\r

 #define EFI_DEP_SOR           0x09\r
 \r
 #define EFI_DEP_SOR           0x09\r
 \r

-#endif \r
+#endif\r

diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
index c081d047b35fe9ae6e21fb8b382206d356ba02b2..b779e33289f6518c3502453f7f01d23c8700c004 100644 (file)
--- a/MdePkg/Include/Pi/PiDxeCis.h
+++ b/MdePkg/Include/Pi/PiDxeCis.h
@@ -1,14 +1,14 @@
 /** @file\r
   Include file matches things in PI.\r
 \r
 /** @file\r
   Include file matches things in PI.\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
-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
   @par Revision Reference:\r
   PI Version 1.6\r
 \r
   @par Revision Reference:\r
   PI Version 1.6\r


@@ -49,8 +49,8 @@ typedef enum {
   ///\r
   EfiGcdMemoryTypeMemoryMappedIo,\r
   ///\r
   ///\r
   EfiGcdMemoryTypeMemoryMappedIo,\r
   ///\r

-  /// A memory region that is visible to the boot processor. \r
-  /// This memory supports byte-addressable non-volatility. \r
+  /// A memory region that is visible to the boot processor.\r
+  /// This memory supports byte-addressable non-volatility.\r

   ///\r
   EfiGcdMemoryTypePersistent,\r
   //\r
   ///\r
   EfiGcdMemoryTypePersistent,\r
   //\r


@@ -89,7 +89,7 @@ typedef enum {
 \r
 ///\r
 /// The type of allocation to perform.\r
 \r
 ///\r
 /// The type of allocation to perform.\r

-/// \r
+///\r

 typedef enum {\r
   ///\r
   /// The GCD memory space map is searched from the lowest address up to the highest address\r
 typedef enum {\r
   ///\r
   /// The GCD memory space map is searched from the lowest address up to the highest address\r


@@ -97,22 +97,22 @@ typedef enum {
   ///\r
   EfiGcdAllocateAnySearchBottomUp,\r
   ///\r
   ///\r
   EfiGcdAllocateAnySearchBottomUp,\r
   ///\r

-  /// The GCD memory space map is searched from the lowest address up \r
+  /// The GCD memory space map is searched from the lowest address up\r

   /// to the specified MaxAddress looking for unallocated memory ranges.\r
   ///\r
   EfiGcdAllocateMaxAddressSearchBottomUp,\r
   ///\r
   /// to the specified MaxAddress looking for unallocated memory ranges.\r
   ///\r
   EfiGcdAllocateMaxAddressSearchBottomUp,\r
   ///\r

-  /// The GCD memory space map is checked to see if the memory range starting \r
+  /// The GCD memory space map is checked to see if the memory range starting\r

   /// at the specified Address is available.\r
   ///\r
   EfiGcdAllocateAddress,\r
   ///\r
   /// at the specified Address is available.\r
   ///\r
   EfiGcdAllocateAddress,\r
   ///\r

-  /// The GCD memory space map is searched from the highest address down to the lowest address \r
+  /// The GCD memory space map is searched from the highest address down to the lowest address\r

   /// looking for unallocated memory ranges.\r
   ///\r
   EfiGcdAllocateAnySearchTopDown,\r
   ///\r
   /// looking for unallocated memory ranges.\r
   ///\r
   EfiGcdAllocateAnySearchTopDown,\r
   ///\r

-  /// The GCD memory space map is searched from the specified MaxAddress \r
+  /// The GCD memory space map is searched from the specified MaxAddress\r

   /// down to the lowest address looking for unallocated memory ranges.\r
   ///\r
   EfiGcdAllocateMaxAddressSearchTopDown,\r
   /// down to the lowest address looking for unallocated memory ranges.\r
   ///\r
   EfiGcdAllocateMaxAddressSearchTopDown,\r


@@ -121,35 +121,35 @@ typedef enum {
 \r
 ///\r
 /// EFI_GCD_MEMORY_SPACE_DESCRIPTOR.\r
 \r
 ///\r
 /// EFI_GCD_MEMORY_SPACE_DESCRIPTOR.\r

-/// \r
+///\r

 typedef struct {\r
   ///\r
   /// The physical address of the first byte in the memory region. Type\r
   /// EFI_PHYSICAL_ADDRESS is defined in the AllocatePages() function\r
   /// description in the UEFI 2.0 specification.\r
 typedef struct {\r
   ///\r
   /// The physical address of the first byte in the memory region. Type\r
   /// EFI_PHYSICAL_ADDRESS is defined in the AllocatePages() function\r
   /// description in the UEFI 2.0 specification.\r

-  /// \r
+  ///\r

   EFI_PHYSICAL_ADDRESS  BaseAddress;\r
 \r
   ///\r
   /// The number of bytes in the memory region.\r
   EFI_PHYSICAL_ADDRESS  BaseAddress;\r
 \r
   ///\r
   /// The number of bytes in the memory region.\r

-  /// \r
+  ///\r

   UINT64                Length;\r
 \r
   ///\r
   /// The bit mask of attributes that the memory region is capable of supporting. The bit\r
   /// mask of available attributes is defined in the GetMemoryMap() function description\r
   /// in the UEFI 2.0 specification.\r
   UINT64                Length;\r
 \r
   ///\r
   /// The bit mask of attributes that the memory region is capable of supporting. The bit\r
   /// mask of available attributes is defined in the GetMemoryMap() function description\r
   /// in the UEFI 2.0 specification.\r

-  /// \r
+  ///\r

   UINT64                Capabilities;\r
   ///\r
   /// The bit mask of attributes that the memory region is currently using. The bit mask of\r
   /// available attributes is defined in GetMemoryMap().\r
   UINT64                Capabilities;\r
   ///\r
   /// The bit mask of attributes that the memory region is currently using. The bit mask of\r
   /// available attributes is defined in GetMemoryMap().\r

-  /// \r
+  ///\r

   UINT64                Attributes;\r
   ///\r
   /// Type of the memory region. Type EFI_GCD_MEMORY_TYPE is defined in the\r
   /// AddMemorySpace() function description.\r
   UINT64                Attributes;\r
   ///\r
   /// Type of the memory region. Type EFI_GCD_MEMORY_TYPE is defined in the\r
   /// AddMemorySpace() function description.\r

-  /// \r
+  ///\r

   EFI_GCD_MEMORY_TYPE   GcdMemoryType;\r
 \r
   ///\r
   EFI_GCD_MEMORY_TYPE   GcdMemoryType;\r
 \r
   ///\r


@@ -157,7 +157,7 @@ typedef struct {
   /// PhysicalStart and NumberOfBytes. If this field is NULL, then the memory\r
   /// resource is not currently allocated. Type EFI_HANDLE is defined in\r
   /// InstallProtocolInterface() in the UEFI 2.0 specification.\r
   /// PhysicalStart and NumberOfBytes. If this field is NULL, then the memory\r
   /// resource is not currently allocated. Type EFI_HANDLE is defined in\r
   /// InstallProtocolInterface() in the UEFI 2.0 specification.\r

-  /// \r
+  ///\r

   EFI_HANDLE            ImageHandle;\r
 \r
   ///\r
   EFI_HANDLE            ImageHandle;\r
 \r
   ///\r


@@ -166,19 +166,19 @@ typedef struct {
   /// field is NULL, then the memory resource is not associated with a device that is\r
   /// described by a device handle. Type EFI_HANDLE is defined in\r
   /// InstallProtocolInterface() in the UEFI 2.0 specification.\r
   /// field is NULL, then the memory resource is not associated with a device that is\r
   /// described by a device handle. Type EFI_HANDLE is defined in\r
   /// InstallProtocolInterface() in the UEFI 2.0 specification.\r

-  /// \r
+  ///\r

   EFI_HANDLE            DeviceHandle;\r
 } EFI_GCD_MEMORY_SPACE_DESCRIPTOR;\r
 \r
 ///\r
 /// EFI_GCD_IO_SPACE_DESCRIPTOR.\r
   EFI_HANDLE            DeviceHandle;\r
 } EFI_GCD_MEMORY_SPACE_DESCRIPTOR;\r
 \r
 ///\r
 /// EFI_GCD_IO_SPACE_DESCRIPTOR.\r

-/// \r
+///\r

 typedef struct {\r
   ///\r
   /// Physical address of the first byte in the I/O region. Type\r
   /// EFI_PHYSICAL_ADDRESS is defined in the AllocatePages() function\r
   /// description in the UEFI 2.0 specification.\r
 typedef struct {\r
   ///\r
   /// Physical address of the first byte in the I/O region. Type\r
   /// EFI_PHYSICAL_ADDRESS is defined in the AllocatePages() function\r
   /// description in the UEFI 2.0 specification.\r

-  /// \r
+  ///\r

   EFI_PHYSICAL_ADDRESS  BaseAddress;\r
 \r
   ///\r
   EFI_PHYSICAL_ADDRESS  BaseAddress;\r
 \r
   ///\r


@@ -186,18 +186,18 @@ typedef struct {
   ///\r
   UINT64                Length;\r
 \r
   ///\r
   UINT64                Length;\r
 \r

-  /// \r
+  ///\r

   /// Type of the I/O region. Type EFI_GCD_IO_TYPE is defined in the\r
   /// AddIoSpace() function description.\r
   /// Type of the I/O region. Type EFI_GCD_IO_TYPE is defined in the\r
   /// AddIoSpace() function description.\r

-  /// \r
+  ///\r

   EFI_GCD_IO_TYPE       GcdIoType;\r
 \r
   EFI_GCD_IO_TYPE       GcdIoType;\r
 \r

-  /// \r
+  ///\r

   /// The image handle of the agent that allocated the I/O resource described by\r
   /// PhysicalStart and NumberOfBytes. If this field is NULL, then the I/O\r
   /// resource is not currently allocated. Type EFI_HANDLE is defined in\r
   /// InstallProtocolInterface() in the UEFI 2.0 specification.\r
   /// The image handle of the agent that allocated the I/O resource described by\r
   /// PhysicalStart and NumberOfBytes. If this field is NULL, then the I/O\r
   /// resource is not currently allocated. Type EFI_HANDLE is defined in\r
   /// InstallProtocolInterface() in the UEFI 2.0 specification.\r

-  /// \r
+  ///\r

   EFI_HANDLE            ImageHandle;\r
 \r
   ///\r
   EFI_HANDLE            ImageHandle;\r
 \r
   ///\r


@@ -206,7 +206,7 @@ typedef struct {
   /// the I/O resource is not associated with a device that is described by a device handle.\r
   /// Type EFI_HANDLE is defined in InstallProtocolInterface() in the UEFI\r
   /// 2.0 specification.\r
   /// the I/O resource is not associated with a device that is described by a device handle.\r
   /// Type EFI_HANDLE is defined in InstallProtocolInterface() in the UEFI\r
   /// 2.0 specification.\r

-  /// \r
+  ///\r

   EFI_HANDLE            DeviceHandle;\r
 } EFI_GCD_IO_SPACE_DESCRIPTOR;\r
 \r
   EFI_HANDLE            DeviceHandle;\r
 } EFI_GCD_IO_SPACE_DESCRIPTOR;\r
 \r


@@ -220,7 +220,7 @@ typedef struct {
                            of the memory resource being added.\r
   @param  Length           The size, in bytes, of the memory resource that\r
                            is being added.\r
                            of the memory resource being added.\r
   @param  Length           The size, in bytes, of the memory resource that\r
                            is being added.\r

-  @param  Capabilities     The bit mask of attributes that the memory \r
+  @param  Capabilities     The bit mask of attributes that the memory\r

                            resource region supports.\r
 \r
   @retval EFI_SUCCESS            The memory resource was added to the global\r
                            resource region supports.\r
 \r
   @retval EFI_SUCCESS            The memory resource was added to the global\r


@@ -228,13 +228,13 @@ typedef struct {
   @retval EFI_INVALID_PARAMETER  GcdMemoryType is invalid.\r
   @retval EFI_INVALID_PARAMETER  Length is zero.\r
   @retval EFI_OUT_OF_RESOURCES   There are not enough system resources to add\r
   @retval EFI_INVALID_PARAMETER  GcdMemoryType is invalid.\r
   @retval EFI_INVALID_PARAMETER  Length is zero.\r
   @retval EFI_OUT_OF_RESOURCES   There are not enough system resources to add\r

-                                 the memory resource to the global coherency \r
+                                 the memory resource to the global coherency\r

                                  domain of the processor.\r
   @retval EFI_UNSUPPORTED        The processor does not support one or more bytes\r
                                  domain of the processor.\r
   @retval EFI_UNSUPPORTED        The processor does not support one or more bytes\r

-                                 of the memory resource range specified by \r
+                                 of the memory resource range specified by\r

                                  BaseAddress and Length.\r
   @retval EFI_ACCESS_DENIED      One or more bytes of the memory resource range\r
                                  BaseAddress and Length.\r
   @retval EFI_ACCESS_DENIED      One or more bytes of the memory resource range\r

-                                 specified by BaseAddress and Length conflicts \r
+                                 specified by BaseAddress and Length conflicts\r

                                  with a memory resource range that was previously\r
                                  added to the global coherency domain of the processor.\r
   @retval EFI_ACCESS_DENIED      One or more bytes of the memory resource range\r
                                  with a memory resource range that was previously\r
                                  added to the global coherency domain of the processor.\r
   @retval EFI_ACCESS_DENIED      One or more bytes of the memory resource range\r


@@ -262,7 +262,7 @@ EFI_STATUS
   @param  Length           The size in bytes of the memory resource range that\r
                            is being allocated.\r
   @param  BaseAddress      A pointer to a physical address to allocate.\r
   @param  Length           The size in bytes of the memory resource range that\r
                            is being allocated.\r
   @param  BaseAddress      A pointer to a physical address to allocate.\r

-  @param  Imagehandle      The image handle of the agent that is allocating \r
+  @param  Imagehandle      The image handle of the agent that is allocating\r

                            the memory resource.\r
   @param  DeviceHandle     The device handle for which the memory resource\r
                            is being allocated.\r
                            the memory resource.\r
   @param  DeviceHandle     The device handle for which the memory resource\r
                            is being allocated.\r


@@ -302,7 +302,7 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS           The memory resource was freed from the global coherency domain of\r
                                 the processor.\r
 \r
   @retval EFI_SUCCESS           The memory resource was freed from the global coherency domain of\r
                                 the processor.\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_NOT_FOUND         The memory resource range specified by BaseAddress and\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_NOT_FOUND         The memory resource range specified by BaseAddress and\r


@@ -327,7 +327,7 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS           The memory resource was removed from the global coherency\r
                                 domain of the processor.\r
 \r
   @retval EFI_SUCCESS           The memory resource was removed from the global coherency\r
                                 domain of the processor.\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_NOT_FOUND         One or more bytes of the memory resource range specified by\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_NOT_FOUND         One or more bytes of the memory resource range specified by\r


@@ -374,7 +374,7 @@ EFI_STATUS
   @param  Attributes       The bit mask of attributes to set for the memory region.\r
 \r
   @retval EFI_SUCCESS           The attributes were set for the memory region.\r
   @param  Attributes       The bit mask of attributes to set for the memory region.\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


@@ -610,8 +610,8 @@ EFI_STATUS
 /**\r
   Loads and executed DXE drivers from firmware volumes.\r
 \r
 /**\r
   Loads and executed DXE drivers from firmware volumes.\r
 \r

-  The Dispatch() function searches for DXE drivers in firmware volumes that have been \r
-  installed since the last time the Dispatch() service was called. It then evaluates \r
+  The Dispatch() function searches for DXE drivers in firmware volumes that have been\r
+  installed since the last time the Dispatch() service was called. It then evaluates\r

   the dependency expressions of all the DXE drivers and loads and executes those DXE\r
   drivers whose dependency expression evaluate to TRUE. This service must interact with\r
   the Security Architectural Protocol to authenticate DXE drivers before they are executed.\r
   the dependency expressions of all the DXE drivers and loads and executes those DXE\r
   drivers whose dependency expression evaluate to TRUE. This service must interact with\r
   the Security Architectural Protocol to authenticate DXE drivers before they are executed.\r


@@ -679,7 +679,7 @@ EFI_STATUS
   @retval EFI_VOLUME_CORRUPTED The firmware volume described by FirmwareVolumeHeader\r
                                and Size is corrupted.\r
   @retval EFI_OUT_OF_RESOURCES There are not enough system resources available to produce the\r
   @retval EFI_VOLUME_CORRUPTED The firmware volume described by FirmwareVolumeHeader\r
                                and Size is corrupted.\r
   @retval EFI_OUT_OF_RESOURCES There are not enough system resources available to produce the\r

-                               EFI_FIRMWARE_VOLUME_PROTOCOL and EFI_DEVICE_PATH_PROTOCOL \r
+                               EFI_FIRMWARE_VOLUME_PROTOCOL and EFI_DEVICE_PATH_PROTOCOL\r

                                for the firmware volume described by FirmwareVolumeHeader and Size.\r
 \r
 **/\r
                                for the firmware volume described by FirmwareVolumeHeader and Size.\r
 \r
 **/\r

diff --git a/MdePkg/Include/Pi/PiI2c.h b/MdePkg/Include/Pi/PiI2c.h
index d7e0e2de45083bd3c5351aadc9e7397a45e92a02..812406cbeb329031851c52f531fdd7c7ae37761c 100644 (file)
--- a/MdePkg/Include/Pi/PiI2c.h
+++ b/MdePkg/Include/Pi/PiI2c.h
@@ -1,14 +1,14 @@
 /** @file\r
   Include file matches things in PI.\r
 \r
 /** @file\r
   Include file matches things in PI.\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
   @par Revision Reference:\r
   PI Version 1.3\r
 \r
   @par Revision Reference:\r
   PI Version 1.3\r

diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h
index 68390385805e4f0eb5f597b715976637ae159ca4..4baa21f748e6a56ad0e2653061de1fadba04825f 100644 (file)
--- a/MdePkg/Include/Pi/PiMultiPhase.h
+++ b/MdePkg/Include/Pi/PiMultiPhase.h
@@ -1,14 +1,14 @@
 /** @file\r
   Include file matches things in PI for multiple module types.\r
 \r
 /** @file\r
   Include file matches things in PI for multiple module types.\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
   @par Revision Reference:\r
   These elements are defined in UEFI Platform Initialization Specification 1.2.\r
 \r
   @par Revision Reference:\r
   These elements are defined in UEFI Platform Initialization Specification 1.2.\r


@@ -30,10 +30,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Produces an error code in the range reserved for use by the Platform Initialization\r
   Architecture Specification.\r
 \r
   Produces an error code in the range reserved for use by the Platform Initialization\r
   Architecture Specification.\r
 \r

-  The supported 32-bit range is 0xA0000000-0xBFFFFFFF \r
-  The supported 64-bit range is 0xA000000000000000-0xBFFFFFFFFFFFFFFF \r
+  The supported 32-bit range is 0xA0000000-0xBFFFFFFF\r
+  The supported 64-bit range is 0xA000000000000000-0xBFFFFFFFFFFFFFFF\r

 \r
 \r

-  @param  StatusCode    The status code value to convert into a warning code.  \r
+  @param  StatusCode    The status code value to convert into a warning code.\r

                         StatusCode must be in the range 0x00000000..0x1FFFFFFF.\r
 \r
   @return The value specified by StatusCode in the PI reserved range.\r
                         StatusCode must be in the range 0x00000000..0x1FFFFFFF.\r
 \r
   @return The value specified by StatusCode in the PI reserved range.\r


@@ -47,7 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define EFI_REQUEST_UNLOAD_IMAGE  DXE_ERROR (1)\r
 \r
 ///\r
 #define EFI_REQUEST_UNLOAD_IMAGE  DXE_ERROR (1)\r
 \r
 ///\r

-/// If this value is returned by an API, it means the capability is not yet \r
+/// If this value is returned by an API, it means the capability is not yet\r

 /// installed/available/ready to use.\r
 ///\r
 #define EFI_NOT_AVAILABLE_YET     DXE_ERROR (2)\r
 /// installed/available/ready to use.\r
 ///\r
 #define EFI_NOT_AVAILABLE_YET     DXE_ERROR (2)\r


@@ -66,9 +66,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///\r
 #define PI_ENCODE_ERROR(a)                  (MAX_BIT | (MAX_BIT >> 2) | (a))\r
 \r
 ///\r
 #define PI_ENCODE_ERROR(a)                  (MAX_BIT | (MAX_BIT >> 2) | (a))\r
 \r

-/// \r
+///\r

 /// Return status codes defined in SMM CIS.\r
 /// Return status codes defined in SMM CIS.\r

-/// \r
+///\r

 #define EFI_INTERRUPT_PENDING               PI_ENCODE_ERROR (0)\r
 \r
 #define EFI_WARN_INTERRUPT_SOURCE_PENDING   PI_ENCODE_WARNING (0)\r
 #define EFI_INTERRUPT_PENDING               PI_ENCODE_ERROR (0)\r
 \r
 #define EFI_WARN_INTERRUPT_SOURCE_PENDING   PI_ENCODE_WARNING (0)\r


@@ -76,7 +76,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 ///\r
 /// Bitmask of values for Authentication Status.\r
 \r
 ///\r
 /// Bitmask of values for Authentication Status.\r

-/// Authentication Status is returned from EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL \r
+/// Authentication Status is returned from EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL\r

 /// and the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI\r
 ///\r
 /// xx00 Image was not signed.\r
 /// and the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI\r
 ///\r
 /// xx00 Image was not signed.\r


@@ -123,7 +123,7 @@ typedef struct {
   /// Designates the address of the MMRAM, as seen by software executing on the\r
   /// processors. This address may or may not match PhysicalStart.\r
   ///\r
   /// Designates the address of the MMRAM, as seen by software executing on the\r
   /// processors. This address may or may not match PhysicalStart.\r
   ///\r

-  EFI_PHYSICAL_ADDRESS  CpuStart;       \r
+  EFI_PHYSICAL_ADDRESS  CpuStart;\r

   ///\r
   /// Describes the number of bytes in the MMRAM region.\r
   ///\r
   ///\r
   /// Describes the number of bytes in the MMRAM region.\r
   ///\r

diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index eace494ecf509bd2e20ea81a56ee095a7db20def..27e0ba348907470f3b583a09a91d158fbab39456 100644 (file)
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -1,15 +1,15 @@
 /** @file\r
   PI PEI master include file. This file should match the PI spec.\r
 \r
 /** @file\r
   PI PEI master include file. This file should match the PI spec.\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
-                                           \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
   @par Revision Reference:\r
   PI Version 1.6.\r
 \r
   @par Revision Reference:\r
   PI Version 1.6.\r


@@ -24,22 +24,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 ///\r
 /// The handles of EFI FV.\r
 \r
 ///\r
 /// The handles of EFI FV.\r

-/// \r
+///\r

 typedef VOID    *EFI_PEI_FV_HANDLE;\r
 \r
 ///\r
 /// The handles of EFI FFS.\r
 typedef VOID    *EFI_PEI_FV_HANDLE;\r
 \r
 ///\r
 /// The handles of EFI FFS.\r

-/// \r
+///\r

 typedef VOID    *EFI_PEI_FILE_HANDLE;\r
 \r
 ///\r
 /// Declare the forward reference data structure for EFI_PEI_SERVICE.\r
 typedef VOID    *EFI_PEI_FILE_HANDLE;\r
 \r
 ///\r
 /// Declare the forward reference data structure for EFI_PEI_SERVICE.\r

-/// \r
+///\r

 typedef struct _EFI_PEI_SERVICES          EFI_PEI_SERVICES;\r
 \r
 ///\r
 /// Declare the forward reference data structure for EFI_PEI_NOTIFY_DESCRIPTOR.\r
 typedef struct _EFI_PEI_SERVICES          EFI_PEI_SERVICES;\r
 \r
 ///\r
 /// Declare the forward reference data structure for EFI_PEI_NOTIFY_DESCRIPTOR.\r

-/// \r
+///\r

 typedef struct _EFI_PEI_NOTIFY_DESCRIPTOR EFI_PEI_NOTIFY_DESCRIPTOR;\r
 \r
 \r
 typedef struct _EFI_PEI_NOTIFY_DESCRIPTOR EFI_PEI_NOTIFY_DESCRIPTOR;\r
 \r
 \r


@@ -48,8 +48,8 @@ typedef struct _EFI_PEI_NOTIFY_DESCRIPTOR EFI_PEI_NOTIFY_DESCRIPTOR;
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  The PEI Dispatcher will invoke each PEIM one time.  During this pass, the PEI \r
-  Dispatcher will pass control to the PEIM at the AddressOfEntryPoint in the PE Header. \r
+  The PEI Dispatcher will invoke each PEIM one time.  During this pass, the PEI\r
+  Dispatcher will pass control to the PEIM at the AddressOfEntryPoint in the PE Header.\r

 \r
   @param  FileHandle       Pointer to the FFS file header.\r
   @param  PeiServices      Describes the list of possible PEI Services.\r
 \r
   @param  FileHandle       Pointer to the FFS file header.\r
   @param  PeiServices      Describes the list of possible PEI Services.\r


@@ -95,7 +95,7 @@ EFI_STATUS
 \r
 ///\r
 /// The data structure through which a PEIM describes available services to the PEI Foundation.\r
 \r
 ///\r
 /// The data structure through which a PEIM describes available services to the PEI Foundation.\r

-/// \r
+///\r

 typedef struct {\r
   ///\r
   /// This field is a set of flags describing the characteristics of this imported table entry.\r
 typedef struct {\r
   ///\r
   /// This field is a set of flags describing the characteristics of this imported table entry.\r


@@ -112,10 +112,10 @@ typedef struct {
   VOID      *Ppi;\r
 } EFI_PEI_PPI_DESCRIPTOR;\r
 \r
   VOID      *Ppi;\r
 } EFI_PEI_PPI_DESCRIPTOR;\r
 \r

-/// \r
-/// The data structure in a given PEIM that tells the PEI \r
+///\r
+/// The data structure in a given PEIM that tells the PEI\r

 /// Foundation where to invoke the notification service.\r
 /// Foundation where to invoke the notification service.\r

-/// \r
+///\r

 struct _EFI_PEI_NOTIFY_DESCRIPTOR {\r
   ///\r
   /// Details if the type of notification are callback or dispatch.\r
 struct _EFI_PEI_NOTIFY_DESCRIPTOR {\r
   ///\r
   /// Details if the type of notification are callback or dispatch.\r


@@ -147,9 +147,9 @@ typedef union {
 } EFI_PEI_DESCRIPTOR;\r
 \r
 /**\r
 } EFI_PEI_DESCRIPTOR;\r
 \r
 /**\r

-  This service is the first one provided by the PEI Foundation.  This function \r
-  installs an interface in the PEI PPI database by GUID.  The purpose of the \r
-  service is to publish an interface that other parties can use to call \r
+  This service is the first one provided by the PEI Foundation.  This function\r
+  installs an interface in the PEI PPI database by GUID.  The purpose of the\r
+  service is to publish an interface that other parties can use to call\r

   additional PEIMs.\r
 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table\r
   additional PEIMs.\r
 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table\r


@@ -157,8 +157,8 @@ typedef union {
   @param  PpiList          A pointer to the list of interfaces that the caller shall install.\r
 \r
   @retval EFI_SUCCESS           The interface was successfully installed.\r
   @param  PpiList          A pointer to the list of interfaces that the caller shall install.\r
 \r
   @retval EFI_SUCCESS           The interface was successfully installed.\r

-  @retval EFI_INVALID_PARAMETER The PpiList pointer is NULL or Any of the PEI PPI \r
-                                descriptors in the list do not have the \r
+  @retval EFI_INVALID_PARAMETER The PpiList pointer is NULL or Any of the PEI PPI\r
+                                descriptors in the list do not have the\r

                                 EFI_PEI_PPI_DESCRIPTOR_PPI bit set in the Flags field.\r
   @retval EFI_OUT_OF_RESOURCES  There is no additional space in the PPI database.\r
 \r
                                 EFI_PEI_PPI_DESCRIPTOR_PPI bit set in the Flags field.\r
   @retval EFI_OUT_OF_RESOURCES  There is no additional space in the PPI database.\r
 \r


@@ -171,10 +171,10 @@ EFI_STATUS
   );\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 \r
-  can use to replace a same-named interface in the protocol database \r
-  with a different interface. \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\r
+  can use to replace a same-named interface in the protocol database\r
+  with a different interface.\r

 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table\r
                            published by the PEI Foundation.\r
 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table\r
                            published by the PEI Foundation.\r


@@ -182,7 +182,7 @@ EFI_STATUS
   @param  NewPpi           A pointer to the new interfaces that the caller shall install.\r
 \r
   @retval EFI_SUCCESS           The interface was successfully installed.\r
   @param  NewPpi           A pointer to the new interfaces that the caller shall install.\r
 \r
   @retval EFI_SUCCESS           The interface was successfully installed.\r

-  @retval EFI_INVALID_PARAMETER The PpiList pointer is NULL or Any of the PEI PPI descriptors in the \r
+  @retval EFI_INVALID_PARAMETER The PpiList pointer is NULL or Any of the PEI PPI descriptors in the\r

                                 list do not have the EFI_PEI_PPI_DESCRIPTOR_PPI bit set in the Flags field.\r
   @retval EFI_OUT_OF_RESOURCES  There is no additional space in the PPI database.\r
   @retval EFI_NOT_FOUND         The PPI for which the reinstallation was requested has not been installed.\r
                                 list do not have the EFI_PEI_PPI_DESCRIPTOR_PPI bit set in the Flags field.\r
   @retval EFI_OUT_OF_RESOURCES  There is no additional space in the PPI database.\r
   @retval EFI_NOT_FOUND         The PPI for which the reinstallation was requested has not been installed.\r


@@ -197,7 +197,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function locates an interface in the PEI PPI database by GUID. \r
+  This function locates an interface in the PEI PPI database by GUID.\r

 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES published by the PEI Foundation.\r
   @param  Guid             A pointer to the GUID whose corresponding interface needs to be found.\r
 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES published by the PEI Foundation.\r
   @param  Guid             A pointer to the GUID whose corresponding interface needs to be found.\r


@@ -220,16 +220,16 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function installs a notification service to be called back when a \r
-  given interface is installed or reinstalled.  The purpose of the service \r
-  is to publish an interface that other parties can use to call additional PPIs \r
+  This function installs a notification service to be called back when a\r
+  given interface is installed or reinstalled.  The purpose of the service\r
+  is to publish an interface that other parties can use to call additional PPIs\r

   that may materialize later.\r
 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation\r
   @param  NotifyList       A pointer to the list of notification interfaces that the caller shall install.\r
 \r
   @retval EFI_SUCCESS           The interface was successfully installed.\r
   that may materialize later.\r
 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation\r
   @param  NotifyList       A pointer to the list of notification interfaces that the caller shall install.\r
 \r
   @retval EFI_SUCCESS           The interface was successfully installed.\r

-  @retval EFI_INVALID_PARAMETER The PpiList pointer is NULL, or any of the PEI PPI descriptors in the \r
+  @retval EFI_INVALID_PARAMETER The PpiList pointer is NULL, or any of the PEI PPI descriptors in the\r

                                 list do not have the EFI_PEI_PPI_DESCRIPTOR_NOTIFY_TYPES bit set in the Flags field.\r
   @retval EFI_OUT_OF_RESOURCES  There is no additional space in the PPI database.\r
 \r
                                 list do not have the EFI_PEI_PPI_DESCRIPTOR_NOTIFY_TYPES bit set in the Flags field.\r
   @retval EFI_OUT_OF_RESOURCES  There is no additional space in the PPI database.\r
 \r


@@ -274,7 +274,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function returns the pointer to the list of Hand-Off Blocks (HOBs) in memory. \r
+  This function returns the pointer to the list of Hand-Off Blocks (HOBs) in memory.\r

 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation\r
   @param  HobList          A pointer to the list of HOBs that the PEI Foundation will initialize\r
 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation\r
   @param  HobList          A pointer to the list of HOBs that the PEI Foundation will initialize\r


@@ -312,8 +312,8 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  The purpose of the service is to abstract the capability of the PEI \r
-  Foundation to discover instances of firmware volumes in the system. \r
+  The purpose of the service is to abstract the capability of the PEI\r
+  Foundation to discover instances of firmware volumes in the system.\r

 \r
   This service enables PEIMs to discover additional firmware volumes. The PEI Foundation uses this\r
   service to abstract the locations and formats of various firmware volumes. These volumes include\r
 \r
   This service enables PEIMs to discover additional firmware volumes. The PEI Foundation uses this\r
   service to abstract the locations and formats of various firmware volumes. These volumes include\r


@@ -449,7 +449,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  The purpose of the service is to publish an interface that allows \r
+  The purpose of the service is to publish an interface that allows\r

   PEIMs to allocate memory ranges that are managed by the PEI Foundation.\r
 \r
   Prior to InstallPeiMemory() being called, PEI will allocate pages from the heap.\r
   PEIMs to allocate memory ranges that are managed by the PEI Foundation.\r
 \r
   Prior to InstallPeiMemory() being called, PEI will allocate pages from the heap.\r


@@ -460,12 +460,12 @@ EFI_STATUS
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param  MemoryType       The type of memory to allocate.\r
   @param  Pages            The number of contiguous 4 KB pages to allocate.\r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param  MemoryType       The type of memory to allocate.\r
   @param  Pages            The number of contiguous 4 KB pages to allocate.\r

-  @param  Memory           A pointer to a physical address. On output, the address is set to the base \r
+  @param  Memory           A pointer to a physical address. On output, the address is set to the base\r

                            of the page range that was allocated.\r
 \r
   @retval EFI_SUCCESS           The memory range was successfully allocated.\r
   @retval EFI_OUT_OF_RESOURCES  The pages could not be allocated.\r
                            of the page range that was allocated.\r
 \r
   @retval EFI_SUCCESS           The memory range was successfully allocated.\r
   @retval EFI_OUT_OF_RESOURCES  The pages could not be allocated.\r

-  @retval EFI_INVALID_PARAMETER The type is not equal to EfiLoaderCode, EfiLoaderData, EfiRuntimeServicesCode, \r
+  @retval EFI_INVALID_PARAMETER The type is not equal to EfiLoaderCode, EfiLoaderData, EfiRuntimeServicesCode,\r

                                 EfiRuntimeServicesData, EfiBootServicesCode, EfiBootServicesData,\r
                                 EfiACPIReclaimMemory, EfiReservedMemoryType, or EfiACPIMemoryNVS.\r
 \r
                                 EfiRuntimeServicesData, EfiBootServicesCode, EfiBootServicesData,\r
                                 EfiACPIReclaimMemory, EfiReservedMemoryType, or EfiACPIMemoryNVS.\r
 \r


@@ -501,7 +501,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  The purpose of this service is to publish an interface that \r
+  The purpose of this service is to publish an interface that\r

   allows PEIMs to allocate memory ranges that are managed by the PEI Foundation.\r
 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   allows PEIMs to allocate memory ranges that are managed by the PEI Foundation.\r
 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r


@@ -597,7 +597,7 @@ EFI_STATUS
 \r
   This service resets the entire platform, including all processors\r
   and devices, and reboots the system.\r
 \r
   This service resets the entire platform, including all processors\r
   and devices, and reboots the system.\r

-  This service will never return EFI_SUCCESS.  \r
+  This service will never return EFI_SUCCESS.\r

 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES\r
                            table published by the PEI Foundation.\r
 \r
   @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES\r
                            table published by the PEI Foundation.\r


@@ -739,7 +739,7 @@ typedef struct {
   @retval EFI_INVALID_PARAMETER   FileHandle does not\r
                                   represent a valid file.\r
   @retval EFI_INVALID_PARAMETER   FileInfo is NULL.\r
   @retval EFI_INVALID_PARAMETER   FileHandle does not\r
                                   represent a valid file.\r
   @retval EFI_INVALID_PARAMETER   FileInfo is NULL.\r

-  \r
+\r

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


@@ -839,7 +839,7 @@ EFI_STATUS
 \r
   @param  FileHandle            PEIM's file handle. Must be the currently\r
                                 executing PEIM.\r
 \r
   @param  FileHandle            PEIM's file handle. Must be the currently\r
                                 executing PEIM.\r

-  \r
+\r

   @retval EFI_SUCCESS           The PEIM was successfully registered for\r
                                 shadowing.\r
   @retval EFI_ALREADY_STARTED   The PEIM was previously\r
   @retval EFI_SUCCESS           The PEIM was successfully registered for\r
                                 shadowing.\r
   @retval EFI_ALREADY_STARTED   The PEIM was previously\r


@@ -861,8 +861,8 @@ EFI_STATUS
 #define PEI_SPECIFICATION_MAJOR_REVISION  1\r
 #define PEI_SPECIFICATION_MINOR_REVISION  60\r
 ///\r
 #define PEI_SPECIFICATION_MAJOR_REVISION  1\r
 #define PEI_SPECIFICATION_MINOR_REVISION  60\r
 ///\r

-/// Specification inconsistency here: \r
-/// In the PI1.0 spec, PEI_SERVICES_SIGNATURE is defined as 0x5652455320494550. But \r
+/// Specification inconsistency here:\r
+/// In the PI1.0 spec, PEI_SERVICES_SIGNATURE is defined as 0x5652455320494550. But\r

 /// to pass a multiple tool chain, it appends an ULL.\r
 ///\r
 //\r
 /// to pass a multiple tool chain, it appends an ULL.\r
 ///\r
 //\r


@@ -870,14 +870,14 @@ EFI_STATUS
 //\r
 #define PEI_SERVICES_SIGNATURE  0x5652455320494550ULL\r
 ///\r
 //\r
 #define PEI_SERVICES_SIGNATURE  0x5652455320494550ULL\r
 ///\r

-/// Specification inconsistency here: \r
-/// In the PI1.0 specification, there is a typo error in PEI_SERVICES_REVISION. In the specification the defintion is \r
+/// Specification inconsistency here:\r
+/// In the PI1.0 specification, there is a typo error in PEI_SERVICES_REVISION. In the specification the defintion is\r

 /// #define ((PEI_SPECIFICATION_MAJOR_REVISION<<16) |(PEI_SPECIFICATION_MINOR_REVISION))\r
 /// and it should be as follows:\r
 ///\r
 #define PEI_SERVICES_REVISION   ((PEI_SPECIFICATION_MAJOR_REVISION<<16) | (PEI_SPECIFICATION_MINOR_REVISION))\r
 \r
 /// #define ((PEI_SPECIFICATION_MAJOR_REVISION<<16) |(PEI_SPECIFICATION_MINOR_REVISION))\r
 /// and it should be as follows:\r
 ///\r
 #define PEI_SERVICES_REVISION   ((PEI_SPECIFICATION_MAJOR_REVISION<<16) | (PEI_SPECIFICATION_MINOR_REVISION))\r
 \r

-/// \r
+///\r

 /// EFI_PEI_SERVICES is a collection of functions whose implementation is provided by the PEI\r
 /// Foundation. These services fall into various classes, including the following:\r
 /// - Managing the boot mode\r
 /// EFI_PEI_SERVICES is a collection of functions whose implementation is provided by the PEI\r
 /// Foundation. These services fall into various classes, including the following:\r
 /// - Managing the boot mode\r


@@ -963,63 +963,63 @@ struct _EFI_PEI_SERVICES {
 /// EFI_SEC_PEI_HAND_OFF structure holds information about\r
 /// PEI core's operating environment, such as the size of location of\r
 /// temporary RAM, the stack location and BFV location.\r
 /// EFI_SEC_PEI_HAND_OFF structure holds information about\r
 /// PEI core's operating environment, such as the size of location of\r
 /// temporary RAM, the stack location and BFV location.\r

-/// \r
+///\r

 typedef struct _EFI_SEC_PEI_HAND_OFF {\r
   ///\r
   /// Size of the data structure.\r
 typedef struct _EFI_SEC_PEI_HAND_OFF {\r
   ///\r
   /// Size of the data structure.\r

-  /// \r
+  ///\r

   UINT16  DataSize;\r
 \r
   ///\r
   UINT16  DataSize;\r
 \r
   ///\r

-  /// Points to the first byte of the boot firmware volume, \r
-  /// which the PEI Dispatcher should search for \r
+  /// Points to the first byte of the boot firmware volume,\r
+  /// which the PEI Dispatcher should search for\r

   /// PEI modules.\r
   /// PEI modules.\r

-  /// \r
+  ///\r

   VOID    *BootFirmwareVolumeBase;\r
 \r
   ///\r
   /// Size of the boot firmware volume, in bytes.\r
   VOID    *BootFirmwareVolumeBase;\r
 \r
   ///\r
   /// Size of the boot firmware volume, in bytes.\r

-  /// \r
+  ///\r

   UINTN   BootFirmwareVolumeSize;\r
 \r
   ///\r
   /// Points to the first byte of the temporary RAM.\r
   UINTN   BootFirmwareVolumeSize;\r
 \r
   ///\r
   /// Points to the first byte of the temporary RAM.\r

-  /// \r
+  ///\r

   VOID    *TemporaryRamBase;\r
 \r
   ///\r
   /// Size of the temporary RAM, in bytes.\r
   VOID    *TemporaryRamBase;\r
 \r
   ///\r
   /// Size of the temporary RAM, in bytes.\r

-  /// \r
+  ///\r

   UINTN   TemporaryRamSize;\r
 \r
   ///\r
   UINTN   TemporaryRamSize;\r
 \r
   ///\r

-  /// Points to the first byte of the temporary RAM \r
-  /// available for use by the PEI Foundation. The area \r
-  /// described by PeiTemporaryRamBase and PeiTemporaryRamSize \r
+  /// Points to the first byte of the temporary RAM\r
+  /// available for use by the PEI Foundation. The area\r
+  /// described by PeiTemporaryRamBase and PeiTemporaryRamSize\r

   /// must not extend outside beyond the area described by\r
   /// TemporaryRamBase & TemporaryRamSize. This area should not\r
   /// must not extend outside beyond the area described by\r
   /// TemporaryRamBase & TemporaryRamSize. This area should not\r

-  /// overlap with the area reported by StackBase and \r
+  /// overlap with the area reported by StackBase and\r

   /// StackSize.\r
   ///\r
   VOID    *PeiTemporaryRamBase;\r
 \r
   ///\r
   /// StackSize.\r
   ///\r
   VOID    *PeiTemporaryRamBase;\r
 \r
   ///\r

-  /// The size of the available temporary RAM available for \r
+  /// The size of the available temporary RAM available for\r

   /// use by the PEI Foundation, in bytes.\r
   /// use by the PEI Foundation, in bytes.\r

-  /// \r
+  ///\r

   UINTN   PeiTemporaryRamSize;\r
 \r
   ///\r
   UINTN   PeiTemporaryRamSize;\r
 \r
   ///\r

-  /// Points to the first byte of the stack. \r
-  /// This are may be part of the memory described by \r
-  /// TemporaryRamBase and TemporaryRamSize \r
+  /// Points to the first byte of the stack.\r
+  /// This are may be part of the memory described by\r
+  /// TemporaryRamBase and TemporaryRamSize\r

   /// or may be an entirely separate area.\r
   /// or may be an entirely separate area.\r

-  /// \r
+  ///\r

   VOID    *StackBase;\r
 \r
   ///\r
   /// Size of the stack, in bytes.\r
   VOID    *StackBase;\r
 \r
   ///\r
   /// Size of the stack, in bytes.\r

-  /// \r
+  ///\r

   UINTN   StackSize;\r
 } EFI_SEC_PEI_HAND_OFF;\r
 \r
   UINTN   StackSize;\r
 } EFI_SEC_PEI_HAND_OFF;\r
 \r

diff --git a/MdePkg/Include/Pi/PiS3BootScript.h b/MdePkg/Include/Pi/PiS3BootScript.h
index 413f69c18c1af4683c6a9bc99763d36090652ab7..d88de16ae5a331501779e186c4b87976016ed96d 100644 (file)
--- a/MdePkg/Include/Pi/PiS3BootScript.h
+++ b/MdePkg/Include/Pi/PiS3BootScript.h
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  This file contains the boot script defintions that are shared between the \r
+  This file contains the boot script defintions that are shared between the\r

   Boot Script Executor PPI and the Boot Script Save Protocol.\r
 \r
   Boot Script Executor PPI and the Boot Script Save Protocol.\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

diff --git a/MdePkg/Include/Pi/PiSmmCis.h b/MdePkg/Include/Pi/PiSmmCis.h
index 4f8d5d0fdfaef9bd04a7399876141da6b5213118..7692800e34e75ffdcf047143794467b2f9c13b73 100644 (file)
--- a/MdePkg/Include/Pi/PiSmmCis.h
+++ b/MdePkg/Include/Pi/PiSmmCis.h
@@ -2,7 +2,7 @@
   Common definitions in the Platform Initialization Specification version 1.4a\r
   VOLUME 4 System Management Mode Core Interface version.\r
 \r
   Common definitions in the Platform Initialization Specification version 1.4a\r
   VOLUME 4 System Management Mode Core Interface version.\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


@@ -69,24 +69,24 @@ typedef  EFI_MM_INTERRUPT_UNREGISTER           EFI_SMM_INTERRUPT_UNREGISTER;
 typedef struct _EFI_SMM_ENTRY_CONTEXT {\r
   EFI_SMM_STARTUP_THIS_AP  SmmStartupThisAp;\r
   ///\r
 typedef struct _EFI_SMM_ENTRY_CONTEXT {\r
   EFI_SMM_STARTUP_THIS_AP  SmmStartupThisAp;\r
   ///\r

-  /// A number between zero and the NumberOfCpus field. This field designates which \r
+  /// A number between zero and the NumberOfCpus field. This field designates which\r

   /// processor is executing the SMM Foundation.\r
   ///\r
   UINTN                    CurrentlyExecutingCpu;\r
   ///\r
   /// processor is executing the SMM Foundation.\r
   ///\r
   UINTN                    CurrentlyExecutingCpu;\r
   ///\r

-  /// The number of possible processors in the platform.  This is a 1 based \r
+  /// The number of possible processors in the platform.  This is a 1 based\r

   /// counter.  This does not indicate the number of processors that entered SMM.\r
   ///\r
   UINTN                    NumberOfCpus;\r
   ///\r
   /// counter.  This does not indicate the number of processors that entered SMM.\r
   ///\r
   UINTN                    NumberOfCpus;\r
   ///\r

-  /// Points to an array, where each element describes the number of bytes in the \r
-  /// corresponding save state specified by CpuSaveState. There are always \r
-  /// NumberOfCpus entries in the array. \r
+  /// Points to an array, where each element describes the number of bytes in the\r
+  /// corresponding save state specified by CpuSaveState. There are always\r
+  /// NumberOfCpus entries in the array.\r

   ///\r
   UINTN                    *CpuSaveStateSize;\r
   ///\r
   ///\r
   UINTN                    *CpuSaveStateSize;\r
   ///\r

-  /// Points to an array, where each element is a pointer to a CPU save state. The \r
-  /// corresponding element in CpuSaveStateSize specifies the number of bytes in the \r
+  /// Points to an array, where each element is a pointer to a CPU save state. The\r
+  /// corresponding element in CpuSaveStateSize specifies the number of bytes in the\r

   /// save state area. There are always NumberOfCpus entries in the array.\r
   ///\r
   VOID                     **CpuSaveState;\r
   /// save state area. There are always NumberOfCpus entries in the array.\r
   ///\r
   VOID                     **CpuSaveState;\r


@@ -106,8 +106,8 @@ VOID
 ///\r
 /// System Management System Table (SMST)\r
 ///\r
 ///\r
 /// System Management System Table (SMST)\r
 ///\r

-/// The System Management System Table (SMST) is a table that contains a collection of common \r
-/// services for managing SMRAM allocation and providing basic I/O services. These services are \r
+/// The System Management System Table (SMST) is a table that contains a collection of common\r
+/// services for managing SMRAM allocation and providing basic I/O services. These services are\r

 /// intended for both preboot and runtime usage.\r
 ///\r
 struct _EFI_SMM_SYSTEM_TABLE2 {\r
 /// intended for both preboot and runtime usage.\r
 ///\r
 struct _EFI_SMM_SYSTEM_TABLE2 {\r


@@ -150,7 +150,7 @@ struct _EFI_SMM_SYSTEM_TABLE2 {
   ///\r
 \r
   ///\r
   ///\r
 \r
   ///\r

-  /// A number between zero and and the NumberOfCpus field. This field designates \r
+  /// A number between zero and and the NumberOfCpus field. This field designates\r

   /// which processor is executing the SMM infrastructure.\r
   ///\r
   UINTN                                CurrentlyExecutingCpu;\r
   /// which processor is executing the SMM infrastructure.\r
   ///\r
   UINTN                                CurrentlyExecutingCpu;\r


@@ -159,14 +159,14 @@ struct _EFI_SMM_SYSTEM_TABLE2 {
   ///\r
   UINTN                                NumberOfCpus;\r
   ///\r
   ///\r
   UINTN                                NumberOfCpus;\r
   ///\r

-  /// Points to an array, where each element describes the number of bytes in the \r
-  /// corresponding save state specified by CpuSaveState. There are always \r
-  /// NumberOfCpus entries in the array. \r
+  /// Points to an array, where each element describes the number of bytes in the\r
+  /// corresponding save state specified by CpuSaveState. There are always\r
+  /// NumberOfCpus entries in the array.\r

   ///\r
   UINTN                                *CpuSaveStateSize;\r
   ///\r
   ///\r
   UINTN                                *CpuSaveStateSize;\r
   ///\r

-  /// Points to an array, where each element is a pointer to a CPU save state. The \r
-  /// corresponding element in CpuSaveStateSize specifies the number of bytes in the \r
+  /// Points to an array, where each element is a pointer to a CPU save state. The\r
+  /// corresponding element in CpuSaveStateSize specifies the number of bytes in the\r

   /// save state area. There are always NumberOfCpus entries in the array.\r
   ///\r
   VOID                                 **CpuSaveState;\r
   /// save state area. There are always NumberOfCpus entries in the array.\r
   ///\r
   VOID                                 **CpuSaveState;\r


@@ -180,8 +180,8 @@ struct _EFI_SMM_SYSTEM_TABLE2 {
   ///\r
   UINTN                                NumberOfTableEntries;\r
   ///\r
   ///\r
   UINTN                                NumberOfTableEntries;\r
   ///\r

-  /// A pointer to the UEFI Configuration Tables. The number of entries in the table is \r
-  /// NumberOfTableEntries. \r
+  /// A pointer to the UEFI Configuration Tables. The number of entries in the table is\r
+  /// NumberOfTableEntries.\r

   ///\r
   EFI_CONFIGURATION_TABLE              *SmmConfigurationTable;\r
 \r
   ///\r
   EFI_CONFIGURATION_TABLE              *SmmConfigurationTable;\r
 \r

diff --git a/MdePkg/Include/Pi/PiStatusCode.h b/MdePkg/Include/Pi/PiStatusCode.h
index 953585ce20df0d3bcdaeaed590f2a0f0dfe6d2fc..996e3ee19104ca8cc1647d74e0727e2ac2f7cd09 100644 (file)
--- a/MdePkg/Include/Pi/PiStatusCode.h
+++ b/MdePkg/Include/Pi/PiStatusCode.h
@@ -1,17 +1,17 @@
 /** @file\r
   StatusCode related definitions in PI.\r
 \r
 /** @file\r
   StatusCode related definitions in PI.\r
 \r

-Copyright (c) 2009 - 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) 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
   @par Revision Reference:\r
 \r
   @par Revision Reference:\r

-  These status codes are defined in UEFI Platform Initialization Specification 1.2, \r
+  These status codes are defined in UEFI Platform Initialization Specification 1.2,\r

   Volume 3: Shared Architectural Elements.\r
 \r
 **/\r
   Volume 3: Shared Architectural Elements.\r
 \r
 **/\r


@@ -133,7 +133,7 @@ typedef struct {
 #define EFI_SOFTWARE        0x03000000\r
 ///@}\r
 \r
 #define EFI_SOFTWARE        0x03000000\r
 ///@}\r
 \r

-/// \r
+///\r

 /// Computing Unit Subclass definitions.\r
 /// Values of 8-127 are reserved for future use by this specification.\r
 /// Values of 128-255 are reserved for OEM use.\r
 /// Computing Unit Subclass definitions.\r
 /// Values of 8-127 are reserved for future use by this specification.\r
 /// Values of 128-255 are reserved for OEM use.\r


@@ -1187,9 +1187,9 @@ typedef struct {
 /// definitions in the EFI specification.\r
 ///\r
 ///@{\r
 /// definitions in the EFI specification.\r
 ///\r
 ///@{\r

-#define EFI_SW_EC_ARM_RESET                          EXCEPT_ARM_RESET \r
-#define EFI_SW_EC_ARM_UNDEFINED_INSTRUCTION          EXCEPT_ARM_UNDEFINED_INSTRUCTION \r
-#define EFI_SW_EC_ARM_SOFTWARE_INTERRUPT             EXCEPT_ARM_SOFTWARE_INTERRUPT \r
+#define EFI_SW_EC_ARM_RESET                          EXCEPT_ARM_RESET\r
+#define EFI_SW_EC_ARM_UNDEFINED_INSTRUCTION          EXCEPT_ARM_UNDEFINED_INSTRUCTION\r
+#define EFI_SW_EC_ARM_SOFTWARE_INTERRUPT             EXCEPT_ARM_SOFTWARE_INTERRUPT\r

 #define EFI_SW_EC_ARM_PREFETCH_ABORT                 EXCEPT_ARM_PREFETCH_ABORT\r
 #define EFI_SW_EC_ARM_DATA_ABORT                     EXCEPT_ARM_DATA_ABORT\r
 #define EFI_SW_EC_ARM_RESERVED                       EXCEPT_ARM_RESERVED\r
 #define EFI_SW_EC_ARM_PREFETCH_ABORT                 EXCEPT_ARM_PREFETCH_ABORT\r
 #define EFI_SW_EC_ARM_DATA_ABORT                     EXCEPT_ARM_DATA_ABORT\r
 #define EFI_SW_EC_ARM_RESERVED                       EXCEPT_ARM_RESERVED\r

diff --git a/MdePkg/Include/PiDxe.h b/MdePkg/Include/PiDxe.h
index 4910dc832ccb71be8b230a3c3dda6d2ff1a76af8..aa484cb9991319afdbf49a72273f5a69848224b7 100644 (file)
--- a/MdePkg/Include/PiDxe.h
+++ b/MdePkg/Include/PiDxe.h
@@ -2,13 +2,13 @@
 \r
   Root include file for Mde Package DXE_CORE, DXE, RUNTIME, SMM, SAL type modules.\r
 \r
 \r
   Root include file for Mde Package DXE_CORE, DXE, RUNTIME, SMM, SAL type modules.\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
-    \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/MdePkg/Include/PiPei.h b/MdePkg/Include/PiPei.h
index cb0996183b0b9a9211524146898ce7498757832d..28a10de43887331f09c3a7e6351ec90bcfb29b07 100644 (file)
--- a/MdePkg/Include/PiPei.h
+++ b/MdePkg/Include/PiPei.h
@@ -4,15 +4,15 @@
 \r
   This is the include file for any module of type PEIM. PEIM\r
   modules only use types defined via this include file and can\r
 \r
   This is the include file for any module of type PEIM. PEIM\r
   modules only use types defined via this include file and can\r

-  be ported easily to any environment. \r
+  be ported easily to any environment.\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
-    \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/MdePkg/Include/PiSmm.h b/MdePkg/Include/PiSmm.h
index e94a5d21b8bf82b26f2743f903aa095e7ce80dd9..13c7aa9524a0df8a8411bf0514cbd5cf62e1a512 100644 (file)
--- a/MdePkg/Include/PiSmm.h
+++ b/MdePkg/Include/PiSmm.h
@@ -2,13 +2,13 @@
 \r
   Root include file for Mde Package SMM modules.\r
 \r
 \r
   Root include file for Mde Package SMM modules.\r
 \r

-Copyright (c) 2009 - 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) 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

diff --git a/MdePkg/Include/Ppi/BlockIo.h b/MdePkg/Include/Ppi/BlockIo.h
index a69419e284708c802fb0f9b7180656573f59a143..b65c464545e75c6b62994cea234038434efcda70 100644 (file)
--- a/MdePkg/Include/Ppi/BlockIo.h
+++ b/MdePkg/Include/Ppi/BlockIo.h
@@ -1,26 +1,26 @@
 /** @file\r
 /** @file\r

-  Provides the services required to access a block I/O device during PEI recovery \r
+  Provides the services required to access a block I/O device during PEI recovery\r

   boot mode.\r
 \r
   boot mode.\r
 \r

-  The Recovery Module PPI and the Device Recovery Module PPI are device neutral. \r
-  This PPI is device specific and addresses the most common form of recovery \r
+  The Recovery Module PPI and the Device Recovery Module PPI are device neutral.\r
+  This PPI is device specific and addresses the most common form of recovery\r

   media-block I/O devices such as legacy floppy, CD-ROM, or IDE devices.\r
 \r
   media-block I/O devices such as legacy floppy, CD-ROM, or IDE devices.\r
 \r

-  The Recovery Block I/O PPI is used to access block devices. Because the Recovery \r
-  Block I/O PPIs that are provided by the PEI ATAPI driver and PEI legacy floppy \r
+  The Recovery Block I/O PPI is used to access block devices. Because the Recovery\r
+  Block I/O PPIs that are provided by the PEI ATAPI driver and PEI legacy floppy\r

   driver are the same, here we define a set of general PPIs for both drivers to use.\r
   driver are the same, here we define a set of general PPIs for both drivers to use.\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
+\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
   @par Revision Reference:\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  This PPI is defined in UEFI Platform Initialization Specification 1.2 Volume 1: \r
+  This PPI is defined in UEFI Platform Initialization Specification 1.2 Volume 1:\r

   Pre-EFI Initalization Core Interface.\r
 \r
 **/\r
   Pre-EFI Initalization Core Interface.\r
 \r
 **/\r


@@ -50,7 +50,7 @@ typedef UINT64  EFI_PEI_LBA;
 /// EFI_PEI_BLOCK_DEVICE_TYPE\r
 ///\r
 typedef enum {\r
 /// EFI_PEI_BLOCK_DEVICE_TYPE\r
 ///\r
 typedef enum {\r

-  LegacyFloppy  = 0,   ///< The recovery device is a floppy. \r
+  LegacyFloppy  = 0,   ///< The recovery device is a floppy.\r

   IdeCDROM      = 1,   ///< The recovery device is an IDE CD-ROM\r
   IdeLS120      = 2,   ///< The recovery device is an IDE LS-120\r
   UsbMassStorage= 3,   ///< The recovery device is a USB Mass Storage device\r
   IdeCDROM      = 1,   ///< The recovery device is an IDE CD-ROM\r
   IdeLS120      = 2,   ///< The recovery device is an IDE LS-120\r
   UsbMassStorage= 3,   ///< The recovery device is a USB Mass Storage device\r


@@ -61,22 +61,22 @@ typedef enum {
 } EFI_PEI_BLOCK_DEVICE_TYPE;\r
 \r
 ///\r
 } EFI_PEI_BLOCK_DEVICE_TYPE;\r
 \r
 ///\r

-/// Specification inconsistency here: \r
+/// Specification inconsistency here:\r

 /// PEI_BLOCK_IO_MEDIA has been changed to EFI_PEI_BLOCK_IO_MEDIA.\r
 /// PEI_BLOCK_IO_MEDIA has been changed to EFI_PEI_BLOCK_IO_MEDIA.\r

-/// Inconsistency exists in UEFI Platform Initialization Specification 1.2 \r
-/// Volume 1: Pre-EFI Initalization Core Interface, where all referrences to \r
-/// this structure name are with the "EFI_" prefix, except for the definition \r
-/// which is without "EFI_".  So the name of PEI_BLOCK_IO_MEDIA is taken as the \r
-/// exception, and EFI_PEI_BLOCK_IO_MEDIA is used to comply with most of \r
+/// Inconsistency exists in UEFI Platform Initialization Specification 1.2\r
+/// Volume 1: Pre-EFI Initalization Core Interface, where all referrences to\r
+/// this structure name are with the "EFI_" prefix, except for the definition\r
+/// which is without "EFI_".  So the name of PEI_BLOCK_IO_MEDIA is taken as the\r
+/// exception, and EFI_PEI_BLOCK_IO_MEDIA is used to comply with most of\r

 /// the specification.\r
 ///\r
 typedef struct {\r
   ///\r
 /// the specification.\r
 ///\r
 typedef struct {\r
   ///\r

-  /// The type of media device being referenced by DeviceIndex. \r
+  /// The type of media device being referenced by DeviceIndex.\r

   ///\r
   EFI_PEI_BLOCK_DEVICE_TYPE  DeviceType;\r
   ///\r
   ///\r
   EFI_PEI_BLOCK_DEVICE_TYPE  DeviceType;\r
   ///\r

-  /// A flag that indicates if media is present. This flag is always set for \r
+  /// A flag that indicates if media is present. This flag is always set for\r

   /// nonremovable media devices.\r
   ///\r
   BOOLEAN                    MediaPresent;\r
   /// nonremovable media devices.\r
   ///\r
   BOOLEAN                    MediaPresent;\r


@@ -93,16 +93,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


@@ -120,41 +120,41 @@ EFI_STATUS
 /**\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


@@ -170,31 +170,31 @@ EFI_STATUS
 /**\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


@@ -221,12 +221,12 @@ struct _EFI_PEI_RECOVERY_BLOCK_IO_PPI {
   /// Gets the number of block I/O devices that the specific block driver manages.\r
   ///\r
   EFI_PEI_GET_NUMBER_BLOCK_DEVICES      GetNumberOfBlockDevices;\r
   /// Gets the number of block I/O devices that the specific block driver manages.\r
   ///\r
   EFI_PEI_GET_NUMBER_BLOCK_DEVICES      GetNumberOfBlockDevices;\r

-  \r
+\r

   ///\r
   /// Gets the specified media information.\r
   ///\r
   EFI_PEI_GET_DEVICE_MEDIA_INFORMATION  GetBlockDeviceMediaInfo;\r
   ///\r
   /// Gets the specified media information.\r
   ///\r
   EFI_PEI_GET_DEVICE_MEDIA_INFORMATION  GetBlockDeviceMediaInfo;\r

-  \r
+\r

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

diff --git a/MdePkg/Include/Ppi/BootInRecoveryMode.h b/MdePkg/Include/Ppi/BootInRecoveryMode.h
index 37c00d0f9babde46f1f73ea4fa941d0b98e35bea..688c6f83e0927bade676d518a3a29dcf470ccca2 100644 (file)
--- a/MdePkg/Include/Ppi/BootInRecoveryMode.h
+++ b/MdePkg/Include/Ppi/BootInRecoveryMode.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  This PPI is installed by the platform PEIM to designate that a recovery boot \r
+  This PPI is installed by the platform PEIM to designate that a recovery boot\r

   is in progress.\r
 \r
   is in progress.\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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r

diff --git a/MdePkg/Include/Ppi/Capsule.h b/MdePkg/Include/Ppi/Capsule.h
index c8fd72fcd8172aa00c970b8c4cb34dad89cd1b6a..cddc12ae4f43aec644c22ee68ed9a4009674e578 100644 (file)
--- a/MdePkg/Include/Ppi/Capsule.h
+++ b/MdePkg/Include/Ppi/Capsule.h
@@ -1,12 +1,12 @@
 /** @file\r
 /** @file\r

-  Defines the APIs that enable PEI services to work with \r
+  Defines the APIs that enable PEI services to work with\r

   the underlying capsule capabilities of the platform.\r
 \r
   the underlying capsule capabilities of the platform.\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
 THE PROGRAM IS 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


@@ -38,23 +38,23 @@ typedef struct _EFI_PEI_CAPSULE_PPI EFI_PEI_CAPSULE_PPI;
 typedef struct _EFI_PEI_CAPSULE_PPI PEI_CAPSULE_PPI;\r
 \r
 /**\r
 typedef struct _EFI_PEI_CAPSULE_PPI PEI_CAPSULE_PPI;\r
 \r
 /**\r

-  Upon determining that there is a capsule to operate on, this service \r
-  will use a series of EFI_CAPSULE_BLOCK_DESCRIPTOR entries to determine \r
-  the current location of the various capsule fragments and coalesce them \r
-  into a contiguous region of system memory.   \r
+  Upon determining that there is a capsule to operate on, this service\r
+  will use a series of EFI_CAPSULE_BLOCK_DESCRIPTOR entries to determine\r
+  the current location of the various capsule fragments and coalesce them\r
+  into a contiguous region of system memory.\r

 \r
   @param[in]  PeiServices   Pointer to the PEI Services Table.\r
   @param[out] MemoryBase    Pointer to the base of a block of memory into which the buffers will be coalesced.\r
 \r
   @param[in]  PeiServices   Pointer to the PEI Services Table.\r
   @param[out] MemoryBase    Pointer to the base of a block of memory into which the buffers will be coalesced.\r

-                            On output, this variable will hold the base address \r
+                            On output, this variable will hold the base address\r

                             of a coalesced capsule.\r
   @param[out] MemorySize    Size of the memory region pointed to by MemoryBase.\r
                             On output, this variable will contain the size of the\r
                             coalesced capsule.\r
 \r
                             of a coalesced capsule.\r
   @param[out] MemorySize    Size of the memory region pointed to by MemoryBase.\r
                             On output, this variable will contain the size of the\r
                             coalesced capsule.\r
 \r

-  @retval EFI_NOT_FOUND          If: boot modecould not be determined, or the \r
-                                 boot mode is not flash-update, or the capsule descriptors were not found. \r
-  @retval EFI_BUFFER_TOO_SMALL   The capsule could not be coalesced in the provided memory region. \r
-  @retval EFI_SUCCESS            There was no capsule, or the capsule was processed successfully. \r
+  @retval EFI_NOT_FOUND          If: boot modecould not be determined, or the\r
+                                 boot mode is not flash-update, or the capsule descriptors were not found.\r
+  @retval EFI_BUFFER_TOO_SMALL   The capsule could not be coalesced in the provided memory region.\r
+  @retval EFI_SUCCESS            There was no capsule, or the capsule was processed successfully.\r

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


@@ -66,12 +66,12 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Determine if a capsule needs to be processed. \r
+  Determine if a capsule needs to be processed.\r

   The means by which the presence of a capsule is determined is platform\r
   The means by which the presence of a capsule is determined is platform\r

-  specific. For example, an implementation could be driven by the presence \r
-  of a Capsule EFI Variable containing a list of EFI_CAPSULE_BLOCK_DESCRIPTOR \r
+  specific. For example, an implementation could be driven by the presence\r
+  of a Capsule EFI Variable containing a list of EFI_CAPSULE_BLOCK_DESCRIPTOR\r

   entries. If present, return EFI_SUCCESS, otherwise return EFI_NOT_FOUND.\r
   entries. If present, return EFI_SUCCESS, otherwise return EFI_NOT_FOUND.\r

-    \r
+\r

   @param[in] PeiServices   Pointer to the PEI Services Table.\r
 \r
   @retval EFI_SUCCESS     If a capsule is available.\r
   @param[in] PeiServices   Pointer to the PEI Services Table.\r
 \r
   @retval EFI_SUCCESS     If a capsule is available.\r


@@ -87,9 +87,9 @@ EFI_STATUS
 /**\r
   The Capsule PPI service that gets called after memory is available. The\r
   capsule coalesce function, which must be called first, returns a base\r
 /**\r
   The Capsule PPI service that gets called after memory is available. The\r
   capsule coalesce function, which must be called first, returns a base\r

-  address and size. Once the memory init PEIM has discovered memory, \r
-  it should call this function and pass in the base address and size \r
-  returned by the Coalesce() function. Then this function can create a \r
+  address and size. Once the memory init PEIM has discovered memory,\r
+  it should call this function and pass in the base address and size\r
+  returned by the Coalesce() function. Then this function can create a\r

   capsule HOB and return.\r
 \r
   @par Notes:\r
   capsule HOB and return.\r
 \r
   @par Notes:\r


@@ -97,7 +97,7 @@ EFI_STATUS
     actual capsule update.\r
 \r
   @param[in] PeiServices   Pointer to the PEI Services Table.\r
     actual capsule update.\r
 \r
   @param[in] PeiServices   Pointer to the PEI Services Table.\r

-  @param[in] CapsuleBase   Address returned by the capsule coalesce function. \r
+  @param[in] CapsuleBase   Address returned by the capsule coalesce function.\r

   @param[in] CapsuleSize   Value returned by the capsule coalesce function.\r
 \r
   @retval EFI_VOLUME_CORRUPTED   CapsuleBase does not appear to point to a\r
   @param[in] CapsuleSize   Value returned by the capsule coalesce function.\r
 \r
   @retval EFI_VOLUME_CORRUPTED   CapsuleBase does not appear to point to a\r


@@ -110,13 +110,13 @@ EFI_STATUS
 (EFIAPI *EFI_PEI_CAPSULE_CREATE_STATE)(\r
   IN EFI_PEI_SERVICES  **PeiServices,\r
   IN VOID              *CapsuleBase,\r
 (EFIAPI *EFI_PEI_CAPSULE_CREATE_STATE)(\r
   IN EFI_PEI_SERVICES  **PeiServices,\r
   IN VOID              *CapsuleBase,\r

-  IN UINTN             CapsuleSize  \r
+  IN UINTN             CapsuleSize\r

   );\r
 \r
 ///\r
 /// This PPI provides several services in PEI to work with the underlying\r
   );\r
 \r
 ///\r
 /// This PPI provides several services in PEI to work with the underlying\r

-/// capsule capabilities of the platform.  These services include the ability \r
-/// for PEI to coalesce a capsule from a scattered set of memory locations \r
+/// capsule capabilities of the platform.  These services include the ability\r
+/// for PEI to coalesce a capsule from a scattered set of memory locations\r

 /// into a contiguous space in memory, detect if a capsule is present for\r
 /// processing, and once memory is available, create a HOB for the capsule.\r
 ///\r
 /// into a contiguous space in memory, detect if a capsule is present for\r
 /// processing, and once memory is available, create a HOB for the capsule.\r
 ///\r

diff --git a/MdePkg/Include/Ppi/CpuIo.h b/MdePkg/Include/Ppi/CpuIo.h
index 809a18cb163419c53345d40ecc09c684daa4827f..3e35c63d90519f05e8ad044cf4598f670c405881 100644 (file)
--- a/MdePkg/Include/Ppi/CpuIo.h
+++ b/MdePkg/Include/Ppi/CpuIo.h
@@ -1,19 +1,19 @@
 /** @file\r
 /** @file\r

-  This PPI provides a set of memory and I/O-based services. \r
+  This PPI provides a set of memory and I/O-based services.\r

   The perspective of the services is that of the processor, not the bus or system.\r
 \r
   The perspective of the services is that of the processor, not the bus or system.\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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r

-  \r
+\r

 **/\r
 \r
 #ifndef __PEI_CPUIO_PPI_H__\r
 **/\r
 \r
 #ifndef __PEI_CPUIO_PPI_H__\r


@@ -86,7 +86,7 @@ typedef struct {
 /**\r
   8-bit I/O read operations.\r
 \r
 /**\r
   8-bit I/O read operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -105,7 +105,7 @@ UINT8
 /**\r
   16-bit I/O read operations.\r
 \r
 /**\r
   16-bit I/O read operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -124,7 +124,7 @@ UINT16
 /**\r
   32-bit I/O read operations.\r
 \r
 /**\r
   32-bit I/O read operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -143,7 +143,7 @@ UINT32
 /**\r
   64-bit I/O read operations.\r
 \r
 /**\r
   64-bit I/O read operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -162,7 +162,7 @@ UINT64
 /**\r
   8-bit I/O write operations.\r
 \r
 /**\r
   8-bit I/O write operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -181,7 +181,7 @@ VOID
 /**\r
   16-bit I/O write operations.\r
 \r
 /**\r
   16-bit I/O write operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -200,7 +200,7 @@ VOID
 /**\r
   32-bit I/O write operations.\r
 \r
 /**\r
   32-bit I/O write operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -219,7 +219,7 @@ VOID
 /**\r
   64-bit I/O write operations.\r
 \r
 /**\r
   64-bit I/O write operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -238,7 +238,7 @@ VOID
 /**\r
   8-bit memory read operations.\r
 \r
 /**\r
   8-bit memory read operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -257,7 +257,7 @@ UINT8
 /**\r
   16-bit memory read operations.\r
 \r
 /**\r
   16-bit memory read operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -276,7 +276,7 @@ UINT16
 /**\r
   32-bit memory read operations.\r
 \r
 /**\r
   32-bit memory read operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -295,7 +295,7 @@ UINT32
 /**\r
   64-bit memory read operations.\r
 \r
 /**\r
   64-bit memory read operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -314,7 +314,7 @@ UINT64
 /**\r
   8-bit memory write operations.\r
 \r
 /**\r
   8-bit memory write operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -333,7 +333,7 @@ VOID
 /**\r
   16-bit memory write operations.\r
 \r
 /**\r
   16-bit memory write operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -352,7 +352,7 @@ VOID
 /**\r
   32-bit memory write operations.\r
 \r
 /**\r
   32-bit memory write operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -371,7 +371,7 @@ VOID
 /**\r
   64-bit memory write operations.\r
 \r
 /**\r
   64-bit memory write operations.\r
 \r

-  @param[in] PeiServices  An indirect pointer to the PEI Services Table published \r
+  @param[in] PeiServices  An indirect pointer to the PEI Services Table published\r

                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r
                           by the PEI Foundation.\r
   @param[in] This         The pointer to local data for the interface.\r
   @param[in] Address      The physical address of the access.\r


@@ -389,7 +389,7 @@ VOID
 \r
 ///\r
 /// EFI_PEI_CPU_IO_PPI provides a set of memory and I/O-based services.\r
 \r
 ///\r
 /// EFI_PEI_CPU_IO_PPI provides a set of memory and I/O-based services.\r

-/// The perspective of the services is that of the processor, not that of the \r
+/// The perspective of the services is that of the processor, not that of the\r

 /// bus or system.\r
 ///\r
 struct _EFI_PEI_CPU_IO_PPI {\r
 /// bus or system.\r
 ///\r
 struct _EFI_PEI_CPU_IO_PPI {\r

diff --git a/MdePkg/Include/Ppi/Decompress.h b/MdePkg/Include/Ppi/Decompress.h
index 5dea8e79071c73528b00dbef6eeef8ba873304d7..f6abca7b835d47d334adfbcba3319b6de3ab002f 100644 (file)
--- a/MdePkg/Include/Ppi/Decompress.h
+++ b/MdePkg/Include/Ppi/Decompress.h
@@ -1,14 +1,14 @@
 /** @file\r
   Provides decompression services to the PEI Foundatoin.\r
 \r
 /** @file\r
   Provides decompression services to the PEI Foundatoin.\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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -23,9 +23,9 @@
 \r
 typedef struct _EFI_PEI_DECOMPRESS_PPI  EFI_PEI_DECOMPRESS_PPI;\r
 \r
 \r
 typedef struct _EFI_PEI_DECOMPRESS_PPI  EFI_PEI_DECOMPRESS_PPI;\r
 \r

-/** \r
+/**\r

   Decompress a single compression section in a firmware file.\r
   Decompress a single compression section in a firmware file.\r

-                                                               \r
+\r

   Decompresses the data in a compressed section and returns it\r
   as a series of standard PI Firmware File Sections. The\r
   required memory is allocated from permanent memory.\r
   Decompresses the data in a compressed section and returns it\r
   as a series of standard PI Firmware File Sections. The\r
   required memory is allocated from permanent memory.\r

diff --git a/MdePkg/Include/Ppi/DeviceRecoveryModule.h b/MdePkg/Include/Ppi/DeviceRecoveryModule.h
index 83e03a4fa690b1d7b8e85d94318206f7efcbb30c..3ae2b88e08ac955bf8df4641b4257dd4070afe82 100644 (file)
--- a/MdePkg/Include/Ppi/DeviceRecoveryModule.h
+++ b/MdePkg/Include/Ppi/DeviceRecoveryModule.h
@@ -10,7 +10,7 @@
   The module determines the internal search order, with capsule number 1 as the highest load\r
   priority and number N as the lowest priority.\r
 \r
   The module determines the internal search order, with capsule number 1 as the highest load\r
   priority and number N as the lowest priority.\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


@@ -20,7 +20,7 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  This PPI is defined in UEFI Platform Initialization Specification 1.2 Volume 1: \r
+  This PPI is defined in UEFI Platform Initialization Specification 1.2 Volume 1:\r

   Pre-EFI Initalization Core Interface\r
 \r
 **/\r
   Pre-EFI Initalization Core Interface\r
 \r
 **/\r


@@ -39,18 +39,18 @@ typedef struct _EFI_PEI_DEVICE_RECOVERY_MODULE_PPI EFI_PEI_DEVICE_RECOVERY_MODUL
   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


@@ -72,18 +72,18 @@ EFI_STATUS
   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


@@ -107,12 +107,12 @@ EFI_STATUS
   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/MdePkg/Include/Ppi/DxeIpl.h b/MdePkg/Include/Ppi/DxeIpl.h
index b8f8cc38a9583291cabe2e8d4ebbf6b61c679af9..b647c3ca06ce16be01e8b655031517211407bbef 100644 (file)
--- a/MdePkg/Include/Ppi/DxeIpl.h
+++ b/MdePkg/Include/Ppi/DxeIpl.h
@@ -2,14 +2,14 @@
   This file declares DXE Initial Program Load PPI.\r
   When the PEI core is done it calls the DXE IPL PPI to load the DXE Foundation.\r
 \r
   This file declares DXE Initial Program Load PPI.\r
   When the PEI core is done it calls the DXE IPL PPI to load the DXE Foundation.\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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -27,7 +27,7 @@
 typedef struct _EFI_DXE_IPL_PPI EFI_DXE_IPL_PPI;\r
 \r
 /**\r
 typedef struct _EFI_DXE_IPL_PPI EFI_DXE_IPL_PPI;\r
 \r
 /**\r

-  The architectural PPI that the PEI Foundation invokes when \r
+  The architectural PPI that the PEI Foundation invokes when\r

   there are no additional PEIMs to invoke.\r
 \r
   This function is invoked by the PEI Foundation.\r
   there are no additional PEIMs to invoke.\r
 \r
   This function is invoked by the PEI Foundation.\r


@@ -46,7 +46,7 @@ typedef struct _EFI_DXE_IPL_PPI EFI_DXE_IPL_PPI;
   @param  HobList        Pointer to the list of Hand-Off Block (HOB) entries.\r
 \r
   @retval EFI_SUCCESS    Upon this return code, the PEI Foundation should enter\r
   @param  HobList        Pointer to the list of Hand-Off Block (HOB) entries.\r
 \r
   @retval EFI_SUCCESS    Upon this return code, the PEI Foundation should enter\r

-                         some exception handling.Under normal circumstances, \r
+                         some exception handling.Under normal circumstances,\r

                          the DXE IPL PPI should not return.\r
 \r
 **/\r
                          the DXE IPL PPI should not return.\r
 \r
 **/\r

diff --git a/MdePkg/Include/Ppi/EndOfPeiPhase.h b/MdePkg/Include/Ppi/EndOfPeiPhase.h
index a8da2fc11ce9c14f170f01fd8f94c40f9dd7374a..3ef55fd19a5bf337251d77c0a0c715f2f22f27df 100644 (file)
--- a/MdePkg/Include/Ppi/EndOfPeiPhase.h
+++ b/MdePkg/Include/Ppi/EndOfPeiPhase.h
@@ -1,17 +1,17 @@
 /** @file\r
 /** @file\r

-  This PPI will be installed at the end of PEI for all boot paths, including \r
-  normal, recovery, and S3. It allows for PEIMs to possibly quiesce hardware, \r
-  build handoff information for the next phase of execution, \r
+  This PPI will be installed at the end of PEI for all boot paths, including\r
+  normal, recovery, and S3. It allows for PEIMs to possibly quiesce hardware,\r
+  build handoff information for the next phase of execution,\r

   or provide some terminal processing behavior.\r
 \r
   or provide some terminal processing behavior.\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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r

diff --git a/MdePkg/Include/Ppi/FirmwareVolume.h b/MdePkg/Include/Ppi/FirmwareVolume.h
index d8998fad17fe502f5d97624133dbc7fbc63d2baf..e38480701c2c53cbb16bf65de917be0c8695db5d 100644 (file)
--- a/MdePkg/Include/Ppi/FirmwareVolume.h
+++ b/MdePkg/Include/Ppi/FirmwareVolume.h
@@ -1,14 +1,14 @@
 /** @file\r
   This file provides functions for accessing a memory-mapped firmware volume of a specific format.\r
 \r
 /** @file\r
   This file provides functions for accessing a memory-mapped firmware volume of a specific format.\r
 \r

-  Copyright (c) 2006 - 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) 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
   @par Revision Reference:\r
   This PPI is from PI Version 1.0 errata.\r
 \r
   @par Revision Reference:\r
   This PPI is from PI Version 1.0 errata.\r


@@ -22,7 +22,7 @@
 /// The GUID for this PPI is the same as the firmware volume format GUID.\r
 /// The FV format can be EFI_FIRMWARE_FILE_SYSTEM2_GUID or the GUID for a user-defined\r
 /// format. The EFI_FIRMWARE_FILE_SYSTEM2_GUID is the PI Firmware Volume format.\r
 /// The GUID for this PPI is the same as the firmware volume format GUID.\r
 /// The FV format can be EFI_FIRMWARE_FILE_SYSTEM2_GUID or the GUID for a user-defined\r
 /// format. The EFI_FIRMWARE_FILE_SYSTEM2_GUID is the PI Firmware Volume format.\r

-/// \r
+///\r

 typedef struct _EFI_PEI_FIRMWARE_VOLUME_PPI   EFI_PEI_FIRMWARE_VOLUME_PPI;\r
 \r
 \r
 typedef struct _EFI_PEI_FIRMWARE_VOLUME_PPI   EFI_PEI_FIRMWARE_VOLUME_PPI;\r
 \r
 \r


@@ -36,15 +36,15 @@ typedef struct _EFI_PEI_FIRMWARE_VOLUME_PPI   EFI_PEI_FIRMWARE_VOLUME_PPI;
   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


@@ -62,7 +62,7 @@ EFI_STATUS
 /**\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


@@ -80,20 +80,20 @@ EFI_STATUS
   @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

 typedef\r
 EFI_STATUS\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EFI_PEI_FV_FIND_FILE_TYPE)( \r
-  IN     CONST EFI_PEI_FIRMWARE_VOLUME_PPI   *This, \r
-  IN     EFI_FV_FILETYPE                     SearchType, \r
+(EFIAPI *EFI_PEI_FV_FIND_FILE_TYPE)(\r
+  IN     CONST EFI_PEI_FIRMWARE_VOLUME_PPI   *This,\r
+  IN     EFI_FV_FILETYPE                     SearchType,\r

   IN     EFI_PEI_FV_HANDLE                   FvHandle,\r
   IN     EFI_PEI_FV_HANDLE                   FvHandle,\r

-  IN OUT EFI_PEI_FILE_HANDLE                 *FileHandle \r
+  IN OUT EFI_PEI_FILE_HANDLE                 *FileHandle\r

 );\r
 \r
 \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


@@ -131,8 +131,8 @@ EFI_STATUS
 \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


@@ -143,13 +143,13 @@ EFI_STATUS
   @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

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_GET_FILE_INFO)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_GET_FILE_INFO)(\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


@@ -158,7 +158,7 @@ EFI_STATUS
 \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, size and authentication status. \r
+  address, size and authentication status.\r

 \r
   @param This                     Points to this instance of the\r
                                   EFI_PEI_FIRMWARE_VOLUME_PPI.\r
 \r
   @param This                     Points to this instance of the\r
                                   EFI_PEI_FIRMWARE_VOLUME_PPI.\r


@@ -175,14 +175,14 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_GET_FILE_INFO2)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_GET_FILE_INFO2)(\r

-  IN  CONST EFI_PEI_FIRMWARE_VOLUME_PPI   *This, \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
 /**\r
   This function returns information about the firmware volume.\r
   IN  EFI_PEI_FILE_HANDLE                 FileHandle,\r
   OUT EFI_FV_FILE_INFO2                   *FileInfo\r
 );\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


@@ -193,21 +193,21 @@ EFI_STATUS
   @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

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_GET_INFO)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_GET_INFO)(\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
   Find the next matching section in the firmware file.\r
   OUT EFI_FV_INFO                          *VolumeInfo\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


@@ -216,7 +216,7 @@ EFI_STATUS
                           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


@@ -291,4 +291,4 @@ struct _EFI_PEI_FIRMWARE_VOLUME_PPI {
 \r
 extern EFI_GUID gEfiPeiFirmwareVolumePpiGuid;\r
 \r
 \r
 extern EFI_GUID gEfiPeiFirmwareVolumePpiGuid;\r
 \r

-#endif \r
+#endif\r

diff --git a/MdePkg/Include/Ppi/FirmwareVolumeInfo.h b/MdePkg/Include/Ppi/FirmwareVolumeInfo.h
index 23872aa2fd4056ba312c26b15413c06eeabc4b8f..054d937be6c16fad53f039a6c59ae12c5261bfac 100644 (file)
--- a/MdePkg/Include/Ppi/FirmwareVolumeInfo.h
+++ b/MdePkg/Include/Ppi/FirmwareVolumeInfo.h
@@ -1,14 +1,14 @@
 /** @file\r
   This file provides location and format of a firmware volume.\r
 \r
 /** @file\r
   This file provides location and format of a firmware volume.\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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -26,9 +26,9 @@
 typedef struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI  EFI_PEI_FIRMWARE_VOLUME_INFO_PPI;\r
 \r
 ///\r
 typedef struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI  EFI_PEI_FIRMWARE_VOLUME_INFO_PPI;\r
 \r
 ///\r

-///  This PPI describes the location and format of a firmware volume. \r
-///  The FvFormat can be EFI_FIRMWARE_FILE_SYSTEM2_GUID or the GUID for \r
-///  a user-defined format. The  EFI_FIRMWARE_FILE_SYSTEM2_GUID is \r
+///  This PPI describes the location and format of a firmware volume.\r
+///  The FvFormat can be EFI_FIRMWARE_FILE_SYSTEM2_GUID or the GUID for\r
+///  a user-defined format. The  EFI_FIRMWARE_FILE_SYSTEM2_GUID is\r

 ///  the PI Firmware Volume format.\r
 ///\r
 struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI {\r
 ///  the PI Firmware Volume format.\r
 ///\r
 struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI {\r

diff --git a/MdePkg/Include/Ppi/FirmwareVolumeInfo2.h b/MdePkg/Include/Ppi/FirmwareVolumeInfo2.h
index 6cb66b3c38865fa3a2ec3462175149b09c55e52f..94c102197d9bf181b197e5f9df34b522582175f8 100644 (file)
--- a/MdePkg/Include/Ppi/FirmwareVolumeInfo2.h
+++ b/MdePkg/Include/Ppi/FirmwareVolumeInfo2.h
@@ -1,14 +1,14 @@
 /** @file\r
   This file provides location, format and authentication status of a firmware volume.\r
 \r
 /** @file\r
   This file provides location, format and authentication status of a firmware volume.\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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.3 errata.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.3 errata.\r


@@ -26,9 +26,9 @@
 typedef struct _EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI  EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI;\r
 \r
 ///\r
 typedef struct _EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI  EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI;\r
 \r
 ///\r

-///  This PPI describes the location and format of a firmware volume. \r
-///  The FvFormat can be EFI_FIRMWARE_FILE_SYSTEM2_GUID or the GUID for \r
-///  a user-defined format. The  EFI_FIRMWARE_FILE_SYSTEM2_GUID is \r
+///  This PPI describes the location and format of a firmware volume.\r
+///  The FvFormat can be EFI_FIRMWARE_FILE_SYSTEM2_GUID or the GUID for\r
+///  a user-defined format. The  EFI_FIRMWARE_FILE_SYSTEM2_GUID is\r

 ///  the PI Firmware Volume format.\r
 ///\r
 struct _EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI {\r
 ///  the PI Firmware Volume format.\r
 ///\r
 struct _EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI {\r

diff --git a/MdePkg/Include/Ppi/GuidedSectionExtraction.h b/MdePkg/Include/Ppi/GuidedSectionExtraction.h
index 84c913f870debd5a557037ae53265223ecf61b63..5dbcbf56867fae2ae3377a34a5a4ada47d8913aa 100644 (file)
--- a/MdePkg/Include/Ppi/GuidedSectionExtraction.h
+++ b/MdePkg/Include/Ppi/GuidedSectionExtraction.h
@@ -1,17 +1,17 @@
 /** @file\r
 /** @file\r

-  If a GUID-defined section is encountered when doing section extraction, \r
-  the PEI Foundation or the EFI_PEI_FILE_LOADER_PPI instance \r
-  calls the appropriate instance of the GUIDed Section Extraction PPI \r
-  to extract the section stream contained therein. \r
+  If a GUID-defined section is encountered when doing section extraction,\r
+  the PEI Foundation or the EFI_PEI_FILE_LOADER_PPI instance\r
+  calls the appropriate instance of the GUIDed Section Extraction PPI\r
+  to extract the section stream contained therein.\r

 \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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -22,15 +22,15 @@
 #define __EFI_GUIDED_SECTION_EXTRACTION_PPI_H__\r
 \r
 //\r
 #define __EFI_GUIDED_SECTION_EXTRACTION_PPI_H__\r
 \r
 //\r

-// Typically, protocol interface structures are identified \r
-// by associating them with a GUID. Each instance of \r
-// a protocol with a given GUID must have \r
-// the same interface structure. While all instances of \r
-// the GUIDed Section Extraction PPI must have \r
-// the same interface structure, they do not all have \r
-// te same GUID. The GUID that is associated with \r
-// an instance of the GUIDed Section Extraction Protocol \r
-// is used to correlate it with the GUIDed section type \r
+// Typically, protocol interface structures are identified\r
+// by associating them with a GUID. Each instance of\r
+// a protocol with a given GUID must have\r
+// the same interface structure. While all instances of\r
+// the GUIDed Section Extraction PPI must have\r
+// the same interface structure, they do not all have\r
+// te same GUID. The GUID that is associated with\r
+// an instance of the GUIDed Section Extraction Protocol\r
+// is used to correlate it with the GUIDed section type\r

 // that it is intended to process.\r
 //\r
 \r
 // that it is intended to process.\r
 //\r
 \r


@@ -39,7 +39,7 @@ typedef struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI   EFI_PEI_GUIDED_SECTION_E
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Processes the input section and returns the data contained therein \r
+  Processes the input section and returns the data contained therein\r

   along with the authentication status.\r
 \r
   The ExtractSection() function processes the input section and\r
   along with the authentication status.\r
 \r
   The ExtractSection() function processes the input section and\r


@@ -70,7 +70,7 @@ typedef struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI   EFI_PEI_GUIDED_SECTION_E
                                 reflect the status of the extraction operation.\r
                                 If the function returns anything other than EFI_SUCCESS,\r
                                 the value of *AuthenticationStatus is undefined.\r
                                 reflect the status of the extraction operation.\r
                                 If the function returns anything other than EFI_SUCCESS,\r
                                 the value of *AuthenticationStatus is undefined.\r

-  \r
+\r

   @retval EFI_SUCCESS           The InputSection was successfully processed and the\r
                                 section contents were returned.\r
   @retval EFI_OUT_OF_RESOURCES  The system has insufficient resources to process the request.\r
   @retval EFI_SUCCESS           The InputSection was successfully processed and the\r
                                 section contents were returned.\r
   @retval EFI_OUT_OF_RESOURCES  The system has insufficient resources to process the request.\r


@@ -93,7 +93,7 @@ EFI_STATUS
 /// calls the appropriate instance of the GUIDed Section\r
 /// Extraction PPI to extract the section stream contained\r
 /// therein.\r
 /// calls the appropriate instance of the GUIDed Section\r
 /// Extraction PPI to extract the section stream contained\r
 /// therein.\r

-///  \r
+///\r

 struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI {\r
   EFI_PEI_EXTRACT_GUIDED_SECTION ExtractSection;\r
 };\r
 struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI {\r
   EFI_PEI_EXTRACT_GUIDED_SECTION ExtractSection;\r
 };\r

diff --git a/MdePkg/Include/Ppi/I2cMaster.h b/MdePkg/Include/Ppi/I2cMaster.h
index a46b055675b299f89549e6e07a5e5208d65217c2..274f3e79b7e88445df09c6a25441721887509225 100644 (file)
--- a/MdePkg/Include/Ppi/I2cMaster.h
+++ b/MdePkg/Include/Ppi/I2cMaster.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  This PPI manipulates the I2C host controller to perform transactions as a master \r
+  This PPI manipulates the I2C host controller to perform transactions as a master\r

   on the I2C bus using the current state of any switches or multiplexers in the I2C bus.\r
 \r
   on the I2C bus using the current state of any switches or multiplexers in the I2C bus.\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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.3.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.3.\r


@@ -28,16 +28,16 @@ typedef struct _EFI_PEI_I2C_MASTER_PPI EFI_PEI_I2C_MASTER_PPI;
 \r
 /**\r
   Set the frequency for the I2C clock line.\r
 \r
 /**\r
   Set the frequency for the I2C clock line.\r

-  \r
+\r

   @param This                   Pointer to an EFI_PEI_I2C_MASTER_PPI structure.\r
   @param BusClockHertz          Pointer to the requested I2C bus clock frequency in Hertz.\r
   @param This                   Pointer to an EFI_PEI_I2C_MASTER_PPI structure.\r
   @param BusClockHertz          Pointer to the requested I2C bus clock frequency in Hertz.\r

-                                Upon return this value contains the actual frequency \r
+                                Upon return this value contains the actual frequency\r

                                 in use by the I2C controller.\r
 \r
   @retval EFI_SUCCESS           The bus frequency was set successfully.\r
   @retval EFI_INVALID_PARAMETER BusClockHertz is NULL\r
   @retval EFI_UNSUPPORTED       The controller does not support this frequency.\r
                                 in use by the I2C controller.\r
 \r
   @retval EFI_SUCCESS           The bus frequency was set successfully.\r
   @retval EFI_INVALID_PARAMETER BusClockHertz is NULL\r
   @retval EFI_UNSUPPORTED       The controller does not support this frequency.\r

-   \r
+\r

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


@@ -48,12 +48,12 @@ EFI_STATUS
 \r
 /**\r
   Reset the I2C controller and configure it for use.\r
 \r
 /**\r
   Reset the I2C controller and configure it for use.\r

-  \r
+\r

   @param  This                  Pointer to an EFI_PEI_I2C_MASTER_PPI structure.\r
 \r
   @retval EFI_SUCCESS           The reset completed successfully.\r
   @retval EFI_DEVICE_ERROR      The reset operation failed.\r
   @param  This                  Pointer to an EFI_PEI_I2C_MASTER_PPI structure.\r
 \r
   @retval EFI_SUCCESS           The reset completed successfully.\r
   @retval EFI_DEVICE_ERROR      The reset operation failed.\r

-   \r
+\r

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


@@ -63,25 +63,25 @@ EFI_STATUS
 \r
 /**\r
   Start an I2C transaction on the host controller.\r
 \r
 /**\r
   Start an I2C transaction on the host controller.\r

-  \r
+\r

   @param  This                   Pointer to an EFI_PEI_I2C_MASTER_PPI structure.\r
   @param  SlaveAddress           Address of the device on the I2C bus.\r
   @param  This                   Pointer to an EFI_PEI_I2C_MASTER_PPI structure.\r
   @param  SlaveAddress           Address of the device on the I2C bus.\r

-                                 Set the I2C_ADDRESSING_10_BIT when using 10-bit addresses, \r
+                                 Set the I2C_ADDRESSING_10_BIT when using 10-bit addresses,\r

                                  clear this bit for 7-bit addressing.\r
                                  clear this bit for 7-bit addressing.\r

-                                 Bits 0-6 are used for 7-bit I2C slave addresses and \r
+                                 Bits 0-6 are used for 7-bit I2C slave addresses and\r

                                  bits 0-9 are used for 10-bit I2C slave addresses.\r
   @param  RequestPacket          Pointer to an EFI_I2C_REQUEST_PACKET structure describing the I2C transaction.\r
 \r
                                  bits 0-9 are used for 10-bit I2C slave addresses.\r
   @param  RequestPacket          Pointer to an EFI_I2C_REQUEST_PACKET structure describing the I2C transaction.\r
 \r

-  @retval EFI_SUCCESS             The transaction completed successfully.\r
-  @retval EFI_BAD_BUFFER_SIZE     The RequestPacket->LengthInBytes value is too large.\r
-  @retval EFI_DEVICE_ERROR          There was an I2C error (NACK) during the transaction.\r
-  @retval EFI_INVALID_PARAMETER         RequestPacket is NULL\r
-  @retval EFI_NO_RESPONSE             The I2C device is not responding to the slave address.\r
+  @retval EFI_SUCCESS             The transaction completed successfully.\r
+  @retval EFI_BAD_BUFFER_SIZE     The RequestPacket->LengthInBytes value is too large.\r
+  @retval EFI_DEVICE_ERROR       There was an I2C error (NACK) during the transaction.\r
+  @retval EFI_INVALID_PARAMETER   RequestPacket is NULL\r
+  @retval EFI_NO_RESPONSE         The I2C device is not responding to the slave address.\r

                                  EFI_DEVICE_ERROR will be returned if the controller cannot distinguish when the NACK occurred.\r
                                  EFI_DEVICE_ERROR will be returned if the controller cannot distinguish when the NACK occurred.\r

-  @retval EFI_NOT_FOUND                 Reserved bit set in the SlaveAddress parameter\r
-  @retval EFI_OUT_OF_RESOURCES  Insufficient memory for I2C transaction\r
-  @retval EFI_UNSUPPORTED             The controller does not support the requested transaction.\r
-   \r
+  @retval EFI_NOT_FOUND           Reserved bit set in the SlaveAddress parameter\r
+  @retval EFI_OUT_OF_RESOURCES   Insufficient memory for I2C transaction\r
+  @retval EFI_UNSUPPORTED         The controller does not support the requested transaction.\r
+\r

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

diff --git a/MdePkg/Include/Ppi/IsaHc.h b/MdePkg/Include/Ppi/IsaHc.h
index cdffc400a813464b418e7284b8d669780452507f..5ae6870b72953cf1d85defe5111691faf0a0e77a 100644 (file)
--- a/MdePkg/Include/Ppi/IsaHc.h
+++ b/MdePkg/Include/Ppi/IsaHc.h
@@ -1,14 +1,14 @@
 /** @file\r
   This PPI opens or closes an I/O aperture in a ISA HOST controller.\r
 \r
 /** @file\r
   This PPI opens or closes an I/O aperture in a ISA HOST controller.\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
+  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
 \r

-  THE PROGRAM 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
   @par Revision Reference:\r
   This PPI is from PI Version 1.2.1.\r
 \r
   @par Revision Reference:\r
   This PPI is from PI Version 1.2.1.\r


@@ -33,10 +33,10 @@ typedef struct _EFI_ISA_HC_PPI *PEFI_ISA_HC_PPI;
   addresses specified by IoAddress to IoAddress + IoLength - 1. It is possible\r
   that more than one caller may be assigned to the same aperture.\r
   It may be possible that a single hardware aperture may be used for more than\r
   addresses specified by IoAddress to IoAddress + IoLength - 1. It is possible\r
   that more than one caller may be assigned to the same aperture.\r
   It may be possible that a single hardware aperture may be used for more than\r

-  one device. This function tracks the number of times that each aperture is \r
+  one device. This function tracks the number of times that each aperture is\r

   referenced, and doesa not close the hardware aperture (via CloseIoAperture())\r
   until there are no more references to it.\r
   referenced, and doesa not close the hardware aperture (via CloseIoAperture())\r
   until there are no more references to it.\r

- \r
+\r

   @param This             A pointer to this instance of the EFI_ISA_HC_PPI.\r
   @param IoAddress        An unsigned integer that specifies the first byte of\r
                           the I/O space required.\r
   @param This             A pointer to this instance of the EFI_ISA_HC_PPI.\r
   @param IoAddress        An unsigned integer that specifies the first byte of\r
                           the I/O space required.\r


@@ -74,7 +74,7 @@ EFI_STATUS
                           call to OpenIoAperture().\r
 \r
   @retval EFI_SUCCESS   The I/O aperture was closed successfully.\r
                           call to OpenIoAperture().\r
 \r
   @retval EFI_SUCCESS   The I/O aperture was closed successfully.\r

-**/ \r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_ISA_HC_CLOSE_IO) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_ISA_HC_CLOSE_IO) (\r


@@ -116,4 +116,4 @@ struct _EFI_ISA_HC_PPI {
 \r
 extern EFI_GUID gEfiIsaHcPpiGuid;\r
 \r
 \r
 extern EFI_GUID gEfiIsaHcPpiGuid;\r
 \r

-#endif \r
+#endif\r

diff --git a/MdePkg/Include/Ppi/LoadFile.h b/MdePkg/Include/Ppi/LoadFile.h
index 03bfb32af00a6d9696e4df7ad5154072e28a4d1c..87dd78529a65869ebeb389122d63778c0c422f23 100644 (file)
--- a/MdePkg/Include/Ppi/LoadFile.h
+++ b/MdePkg/Include/Ppi/LoadFile.h
@@ -1,14 +1,14 @@
 /** @file\r
 /** @file\r

-  Load image file from fv to memory. \r
+  Load image file from fv to memory.\r

 \r
 \r

-  Copyright (c) 2006 - 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) 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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -29,7 +29,7 @@ typedef struct _EFI_PEI_LOAD_FILE_PPI EFI_PEI_LOAD_FILE_PPI;
 \r
   This service is the single member function of EFI_LOAD_FILE_PPI.\r
   This service separates image loading and relocating from the PEI Foundation.\r
 \r
   This service is the single member function of EFI_LOAD_FILE_PPI.\r
   This service separates image loading and relocating from the PEI Foundation.\r

-  \r
+\r

   @param This                   Interface pointer that implements\r
                                 the Load File PPI instance.\r
   @param FileHandle             File handle of the file to load.\r
   @param This                   Interface pointer that implements\r
                                 the Load File PPI instance.\r
   @param FileHandle             File handle of the file to load.\r


@@ -47,7 +47,7 @@ typedef struct _EFI_PEI_LOAD_FILE_PPI EFI_PEI_LOAD_FILE_PPI;
   @retval EFI_INVALID_PARAMETER EntryPoint was NULL.\r
   @retval EFI_UNSUPPORTED       An image requires relocations or is not\r
                                 memory mapped.\r
   @retval EFI_INVALID_PARAMETER EntryPoint was NULL.\r
   @retval EFI_UNSUPPORTED       An image requires relocations or is not\r
                                 memory mapped.\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/MdePkg/Include/Ppi/LoadImage.h b/MdePkg/Include/Ppi/LoadImage.h
index 75f743a58cad44e3b059f94c347c710aadd3876a..55b646109bfd1fe18f67635a2d06dfd5163cdbab 100644 (file)
--- a/MdePkg/Include/Ppi/LoadImage.h
+++ b/MdePkg/Include/Ppi/LoadImage.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  The file describes the PPI which notifies other drivers \r
+  The file describes the PPI which notifies other drivers\r

   of the PEIM being initialized by the PEI Dispatcher.\r
 \r
   of the PEIM being initialized by the PEI Dispatcher.\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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -27,7 +27,7 @@ typedef struct _EFI_PEI_LOADED_IMAGE_PPI  EFI_PEI_LOADED_IMAGE_PPI;
 \r
 ///\r
 /// This interface is installed by the PEI Dispatcher after the image has been\r
 \r
 ///\r
 /// This interface is installed by the PEI Dispatcher after the image has been\r

-/// loaded and after all security checks have been performed, \r
+/// loaded and after all security checks have been performed,\r

 /// to notify other PEIMs of the files which are being loaded.\r
 ///\r
 struct _EFI_PEI_LOADED_IMAGE_PPI {\r
 /// to notify other PEIMs of the files which are being loaded.\r
 ///\r
 struct _EFI_PEI_LOADED_IMAGE_PPI {\r

diff --git a/MdePkg/Include/Ppi/MasterBootMode.h b/MdePkg/Include/Ppi/MasterBootMode.h
index 1b4c787b5ed6c50b558a55ddcfc4a58b040baace..f1573a172b9f71cabf2f91212e03e423e3b83e5d 100644 (file)
--- a/MdePkg/Include/Ppi/MasterBootMode.h
+++ b/MdePkg/Include/Ppi/MasterBootMode.h
@@ -1,18 +1,18 @@
 /** @file\r
   This file declares Boot Mode PPI.\r
 \r
 /** @file\r
   This file declares Boot Mode PPI.\r
 \r

-  The Master Boot Mode PPI is installed by a PEIM to signal that a final \r
-  boot has been determined and set. This signal is useful in that PEIMs \r
+  The Master Boot Mode PPI is installed by a PEIM to signal that a final\r
+  boot has been determined and set. This signal is useful in that PEIMs\r

   with boot-mode-specific behavior can put this PPI in their dependency expression.\r
 \r
   with boot-mode-specific behavior can put this PPI in their dependency expression.\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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r

diff --git a/MdePkg/Include/Ppi/MemoryDiscovered.h b/MdePkg/Include/Ppi/MemoryDiscovered.h
index d6c4f065547c532c4d64ff5ba71bd26210306c89..9f8adb6e1694309dce99d4bd5c5609d1a8ad7356 100644 (file)
--- a/MdePkg/Include/Ppi/MemoryDiscovered.h
+++ b/MdePkg/Include/Ppi/MemoryDiscovered.h
@@ -1,18 +1,18 @@
 /** @file\r
   This file declares Memory Discovered PPI.\r
 \r
 /** @file\r
   This file declares Memory Discovered PPI.\r
 \r

-  This PPI is published by the PEI Foundation when the main memory is installed. \r
+  This PPI is published by the PEI Foundation when the main memory is installed.\r

   It is essentially a PPI with no associated interface. Its purpose is to be used\r
   It is essentially a PPI with no associated interface. Its purpose is to be used\r

-  as a signal for other PEIMs who can register for a notification on its installation. \r
+  as a signal for other PEIMs who can register for a notification on its installation.\r

 \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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r

diff --git a/MdePkg/Include/Ppi/Pcd.h b/MdePkg/Include/Ppi/Pcd.h
index 79e9c3e971ce4b2731030c5cd7ae89db8935783b..aac2be80bb34aa82f5b2d2d1eaa89f74d366ba40 100644 (file)
--- a/MdePkg/Include/Ppi/Pcd.h
+++ b/MdePkg/Include/Ppi/Pcd.h
@@ -1,19 +1,19 @@
 /** @file\r
   Native Platform Configuration Database (PCD) PPI\r
 /** @file\r
   Native Platform Configuration Database (PCD) PPI\r

-  \r
+\r

   Different with the EFI_PCD_PPI defined in PI 1.2 specification, the native\r
   Different with the EFI_PCD_PPI defined in PI 1.2 specification, the native\r

-  PCD PPI provide interfaces for dynamic and dynamic-ex type PCD. \r
+  PCD PPI provide interfaces for dynamic and dynamic-ex type PCD.\r

   The interfaces for dynamic type PCD do not require the token space guid as parameter,\r
   but interfaces for dynamic-ex type PCD require token space guid as parameter.\r
 \r
   The interfaces for dynamic type PCD do not require the token space guid as parameter,\r
   but interfaces for dynamic-ex type PCD require token space guid as parameter.\r
 \r

-Copyright (c) 2006 - 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) 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


@@ -29,27 +29,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\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
   @retval VOID\r
 \r
 **/\r
               set values associated with a PCD token.\r
 \r
   @retval VOID\r
 \r
 **/\r

-typedef \r
+typedef\r

 VOID\r
 (EFIAPI *PCD_PPI_SET_SKU)(\r
   IN  UINTN          SkuId\r
 VOID\r
 (EFIAPI *PCD_PPI_SET_SKU)(\r
   IN  UINTN          SkuId\r


@@ -60,13 +60,13 @@ VOID
 /**\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
 typedef\r
 UINT8\r
 **/\r
 typedef\r
 UINT8\r


@@ -79,13 +79,13 @@ UINT8
 /**\r
   Retrieves a 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves a 16-bit value for a given PCD token.\r
 \r

-  Retrieves the current 16-bit value for a PCD token number.  \r
+  Retrieves the current 16-bit 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
 typedef\r
 UINT16\r
 **/\r
 typedef\r
 UINT16\r


@@ -98,13 +98,13 @@ UINT16
 /**\r
   Retrieves a 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves a 32-bit value for a given PCD token.\r
 \r

-  Retrieves the current 32-bit value for a PCD token number.  \r
+  Retrieves the current 32-bit 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
 typedef\r
 UINT32\r
 **/\r
 typedef\r
 UINT32\r


@@ -117,13 +117,13 @@ UINT32
 /**\r
   Retrieves a 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves a 64-bit value for a given PCD token.\r
 \r

-  Retrieves the current 64-bit value for a PCD token number.  \r
+  Retrieves the current 64-bit 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
 typedef\r
 UINT64\r
 **/\r
 typedef\r
 UINT64\r


@@ -136,15 +136,15 @@ UINT64
 /**\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
 typedef\r
 VOID *\r
 **/\r
 typedef\r
 VOID *\r


@@ -157,15 +157,15 @@ VOID *
 /**\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
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r


@@ -178,13 +178,13 @@ BOOLEAN
 /**\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
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r


@@ -197,16 +197,16 @@ UINTN
 /**\r
   Retrieves an 8-bit value for a given PCD token and token space.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token and token space.\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
 typedef\r
 UINT8\r
 **/\r
 typedef\r
 UINT8\r


@@ -220,16 +220,16 @@ UINT8
 /**\r
   Retrieves a 16-bit value for a given PCD token and token space.\r
 \r
 /**\r
   Retrieves a 16-bit value for a given PCD token and token space.\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
 typedef\r
 UINT16\r
 **/\r
 typedef\r
 UINT16\r


@@ -243,16 +243,16 @@ UINT16
 /**\r
   Retrieves a 32-bit value for a given PCD token and token space.\r
 \r
 /**\r
   Retrieves a 32-bit value for a given PCD token and token space.\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
 typedef\r
 UINT32\r
 **/\r
 typedef\r
 UINT32\r


@@ -266,16 +266,16 @@ UINT32
 /**\r
   Retrieves a 64-bit value for a given PCD token and token space.\r
 \r
 /**\r
   Retrieves a 64-bit value for a given PCD token and token space.\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
 typedef\r
 UINT64\r
 **/\r
 typedef\r
 UINT64\r


@@ -289,16 +289,16 @@ UINT64
 /**\r
   Retrieves a pointer to a value for a given PCD token and token space.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token and token space.\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
 typedef\r
 VOID *\r
 **/\r
 typedef\r
 VOID *\r


@@ -312,16 +312,16 @@ VOID *
 /**\r
   Retrieves an Boolean value for a given PCD token and token space.\r
 \r
 /**\r
   Retrieves an Boolean value for a given PCD token and token space.\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
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r


@@ -335,14 +335,14 @@ BOOLEAN
 /**\r
   Retrieves the size of the value for a given PCD token and token space.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token and token space.\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
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r


@@ -356,19 +356,19 @@ UINTN
 /**\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           The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -382,19 +382,19 @@ EFI_STATUS
 /**\r
   Sets a 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets a 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           The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -408,19 +408,19 @@ EFI_STATUS
 /**\r
   Sets a 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets a 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           The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -434,19 +434,19 @@ EFI_STATUS
 /**\r
   Sets a 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets a 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           The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -458,23 +458,23 @@ EFI_STATUS
 /**\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] SizeOfValue  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] SizeOfValue  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           The 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           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -487,19 +487,19 @@ EFI_STATUS
 /**\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           The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -513,20 +513,20 @@ EFI_STATUS
 /**\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           The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -541,20 +541,20 @@ EFI_STATUS
 /**\r
   Sets a 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets a 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           The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -569,20 +569,20 @@ EFI_STATUS
 /**\r
   Sets a 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets a 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           The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -597,20 +597,20 @@ EFI_STATUS
 /**\r
   Sets a 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets a 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           The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -625,24 +625,24 @@ EFI_STATUS
 /**\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] SizeOfValue  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] SizeOfValue  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           The 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           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -656,20 +656,20 @@ EFI_STATUS
 /**\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           The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS           The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -684,11 +684,11 @@ EFI_STATUS
 /**\r
   Callback on SET function prototype definition.\r
 \r
 /**\r
   Callback on SET function prototype definition.\r
 \r

-  This notification function serves two purposes. Firstly, it notifies the module \r
-  which did the registration that the value of this PCD token has been set. Secondly, \r
-  it provides a mechanism for the module which did the registration to intercept the set \r
-  operation and override the value been set if necessary. After the invocation of the \r
-  callback function, TokenData will be used by PCD service PEIM to modify the internal data \r
+  This notification function serves two purposes. Firstly, it notifies the module\r
+  which did the registration that the value of this PCD token has been set. Secondly,\r
+  it provides a mechanism for the module which did the registration to intercept the set\r
+  operation and override the value been set if necessary. After the invocation of the\r
+  callback function, TokenData will be used by PCD service PEIM to modify the internal data\r

   in PCD database.\r
 \r
   @param[in]      CallBackGuid  The PCD token GUID being set.\r
   in PCD database.\r
 \r
   @param[in]      CallBackGuid  The PCD token GUID being set.\r


@@ -713,11 +713,11 @@ VOID
 /**\r
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
 /**\r
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.  \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


@@ -735,11 +735,11 @@ EFI_STATUS
 /**\r
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
 /**\r
   Cancels a previously set callback function for a particular PCD token number.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.  \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


@@ -755,31 +755,31 @@ EFI_STATUS
 \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
 **/\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
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *PCD_PPI_GET_NEXT_TOKEN)(\r
   IN CONST EFI_GUID           *Guid, OPTIONAL\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_GET_NEXT_TOKEN)(\r
   IN CONST EFI_GUID           *Guid, OPTIONAL\r


@@ -799,7 +799,7 @@ EFI_STATUS
                             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

diff --git a/MdePkg/Include/Ppi/PcdInfo.h b/MdePkg/Include/Ppi/PcdInfo.h
index 731f873ed196153d81810650855ca8bb107c62ff..8bf6cfb5d52b6630fdd9c605236f33be15f1d71c 100644 (file)
--- a/MdePkg/Include/Ppi/PcdInfo.h
+++ b/MdePkg/Include/Ppi/PcdInfo.h
@@ -2,13 +2,13 @@
   Native Platform Configuration Database (PCD) INFO PPI\r
 \r
   The PPI that provides additional information about items that reside in the PCD database.\r
   Native Platform Configuration Database (PCD) INFO PPI\r
 \r
   The PPI that provides additional information about items that reside in the PCD database.\r

-  \r
+\r

   Different with the EFI_GET_PCD_INFO_PPI defined in PI 1.2.1 specification,\r
   Different with the EFI_GET_PCD_INFO_PPI defined in PI 1.2.1 specification,\r

-  the native PCD INFO PPI provide interfaces for dynamic and dynamic-ex type PCD. \r
+  the native PCD INFO PPI provide interfaces for dynamic and dynamic-ex type PCD.\r

   The interfaces for dynamic type PCD do not require the token space guid as parameter,\r
   but interfaces for dynamic-ex type PCD require token space guid as parameter.\r
 \r
   The interfaces for dynamic type PCD do not require the token space guid as parameter,\r
   but interfaces for dynamic-ex type PCD require token space guid as parameter.\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

diff --git a/MdePkg/Include/Ppi/PciCfg2.h b/MdePkg/Include/Ppi/PciCfg2.h
index 5df2e673156c39a52b111972ff07e6a070aafa3e..5fa87ceb8046ca84625befd672f6ce606be8f766 100644 (file)
--- a/MdePkg/Include/Ppi/PciCfg2.h
+++ b/MdePkg/Include/Ppi/PciCfg2.h
@@ -1,10 +1,10 @@
 /** @file\r
   This file declares PciCfg2 PPI.\r
 \r
 /** @file\r
   This file declares PciCfg2 PPI.\r
 \r

-  This ppi Provides platform or chipset-specific access to \r
+  This ppi Provides platform or chipset-specific access to\r

   the PCI configuration space for a specific PCI segment.\r
 \r
   the PCI configuration space for a specific PCI segment.\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


@@ -124,7 +124,7 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Performs a read-modify-write operation on the contents \r
+  Performs a read-modify-write operation on the contents\r

   from a given location in the PCI configuration space.\r
 \r
   @param  PeiServices     An indirect pointer to the PEI Services Table\r
   from a given location in the PCI configuration space.\r
 \r
   @param  PeiServices     An indirect pointer to the PEI Services Table\r

diff --git a/MdePkg/Include/Ppi/ReadOnlyVariable2.h b/MdePkg/Include/Ppi/ReadOnlyVariable2.h
index 6d8ea603811fbdf810915f0505ee7eff0e8991ee..ebf0bb5a9b3fc8811ce0b5741c35eae3370f4cd0 100644 (file)
--- a/MdePkg/Include/Ppi/ReadOnlyVariable2.h
+++ b/MdePkg/Include/Ppi/ReadOnlyVariable2.h
@@ -2,14 +2,14 @@
   This file declares Read-only Variable Service2 PPI.\r
   This ppi permits read-only access to the UEFI variable store during the PEI phase.\r
 \r
   This file declares Read-only Variable Service2 PPI.\r
   This ppi permits read-only access to the UEFI variable store during the PEI phase.\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
-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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -28,8 +28,8 @@ typedef struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI  EFI_PEI_READ_ONLY_VARIABLE2_PPI
 /**\r
   This service retrieves a variable's value using its name and GUID.\r
 \r
 /**\r
   This service retrieves a variable's value using its name and GUID.\r
 \r

-  Read the specified variable from the UEFI variable store. If the Data \r
-  buffer is too small to hold the contents of the variable, \r
+  Read the specified variable from the UEFI variable store. If the Data\r
+  buffer is too small to hold the contents of the variable,\r

   the error EFI_BUFFER_TOO_SMALL is returned and DataSize is set to the\r
   required buffer size to obtain the data.\r
 \r
   the error EFI_BUFFER_TOO_SMALL is returned and DataSize is set to the\r
   required buffer size to obtain the data.\r
 \r


@@ -45,8 +45,8 @@ typedef struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI  EFI_PEI_READ_ONLY_VARIABLE2_PPI
 \r
   @retval EFI_SUCCESS           The variable was read successfully.\r
   @retval EFI_NOT_FOUND         The variable was not found.\r
 \r
   @retval EFI_SUCCESS           The variable was read successfully.\r
   @retval EFI_NOT_FOUND         The variable was not found.\r

-  @retval EFI_BUFFER_TOO_SMALL  The DataSize is too small for the resulting data. \r
-                                DataSize is updated with the size required for \r
+  @retval EFI_BUFFER_TOO_SMALL  The DataSize is too small for the resulting data.\r
+                                DataSize is updated with the size required for\r

                                 the specified variable.\r
   @retval EFI_INVALID_PARAMETER VariableName, VariableGuid, DataSize or Data is NULL.\r
   @retval EFI_DEVICE_ERROR      The variable could not be retrieved because of a device error.\r
                                 the specified variable.\r
   @retval EFI_INVALID_PARAMETER VariableName, VariableGuid, DataSize or Data is NULL.\r
   @retval EFI_DEVICE_ERROR      The variable could not be retrieved because of a device error.\r


@@ -67,11 +67,11 @@ EFI_STATUS
 /**\r
   Return the next variable name and GUID.\r
 \r
 /**\r
   Return the next variable name and GUID.\r
 \r

-  This function is called multiple times to retrieve the VariableName \r
-  and VariableGuid of all variables currently available in the system. \r
-  On each call, the previous results are passed into the interface, \r
-  and, on return, the interface returns the data for the next \r
-  interface. When the entire variable list has been returned, \r
+  This function is called multiple times to retrieve the VariableName\r
+  and VariableGuid of all variables currently available in the system.\r
+  On each call, the previous results are passed into the interface,\r
+  and, on return, the interface returns the data for the next\r
+  interface. When the entire variable list has been returned,\r

   EFI_NOT_FOUND is returned.\r
 \r
   @param  This              A pointer to this instance of the EFI_PEI_READ_ONLY_VARIABLE2_PPI.\r
   EFI_NOT_FOUND is returned.\r
 \r
   @param  This              A pointer to this instance of the EFI_PEI_READ_ONLY_VARIABLE2_PPI.\r


@@ -81,7 +81,7 @@ EFI_STATUS
   @param  VariableName      On entry, a pointer to a null-terminated string that is the variable's name.\r
                             On return, points to the next variable's null-terminated name string.\r
 \r
   @param  VariableName      On entry, a pointer to a null-terminated string that is the variable's name.\r
                             On return, points to the next variable's null-terminated name string.\r
 \r

-  @param  VariableGuid      On entry, a pointer to an EFI_GUID that is the variable's GUID. \r
+  @param  VariableGuid      On entry, a pointer to an EFI_GUID that is the variable's GUID.\r

                             On return, a pointer to the next variable's GUID.\r
 \r
   @retval EFI_SUCCESS           The variable was read successfully.\r
                             On return, a pointer to the next variable's GUID.\r
 \r
   @retval EFI_SUCCESS           The variable was read successfully.\r


@@ -104,8 +104,8 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// This PPI provides a lightweight, read-only variant of the full EFI \r
-/// variable services. \r
+/// This PPI provides a lightweight, read-only variant of the full EFI\r
+/// variable services.\r

 ///\r
 struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI {\r
   EFI_PEI_GET_VARIABLE2           GetVariable;\r
 ///\r
 struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI {\r
   EFI_PEI_GET_VARIABLE2           GetVariable;\r

diff --git a/MdePkg/Include/Ppi/RecoveryModule.h b/MdePkg/Include/Ppi/RecoveryModule.h
index d359a1bc9e0063c953720dbdad19d9af6c3c2834..58512d6d2c7e69b191f278cf020ab0592de593c7 100644 (file)
--- a/MdePkg/Include/Ppi/RecoveryModule.h
+++ b/MdePkg/Include/Ppi/RecoveryModule.h
@@ -4,7 +4,7 @@
 \r
   A module that produces this PPI has many roles and is responsible for the following:\r
     -# Calling the driver recovery PPI EFI_PEI_DEVICE_RECOVERY_MODULE_PPI.\r
 \r
   A module that produces this PPI has many roles and is responsible for the following:\r
     -# Calling the driver recovery PPI EFI_PEI_DEVICE_RECOVERY_MODULE_PPI.\r

-       GetNumberRecoveryCapsules() to determine if one or more DXE recovery \r
+       GetNumberRecoveryCapsules() to determine if one or more DXE recovery\r

        entities exist.\r
     -# If no capsules exist, then performing appropriate error handling.\r
     -# Allocating a buffer of MaxRecoveryCapsuleSize as determined by\r
        entities exist.\r
     -# If no capsules exist, then performing appropriate error handling.\r
     -# Allocating a buffer of MaxRecoveryCapsuleSize as determined by\r


@@ -16,22 +16,22 @@
     -# If the load failed, performing appropriate error handling.\r
     -# Performing security checks for a loaded DXE recovery capsule.\r
     -# If the security checks failed, then logging the failure in a data HOB.\r
     -# If the load failed, performing appropriate error handling.\r
     -# Performing security checks for a loaded DXE recovery capsule.\r
     -# If the security checks failed, then logging the failure in a data HOB.\r

-    -# If the security checks failed, then determining the next \r
-       EFI_PEI_DEVICE_RECOVERY_MODULE_PPI.LoadRecoveryCapsule()capsule number; \r
+    -# If the security checks failed, then determining the next\r
+       EFI_PEI_DEVICE_RECOVERY_MODULE_PPI.LoadRecoveryCapsule()capsule number;\r

        otherwise, go to step 11.\r
        otherwise, go to step 11.\r

-    -# If more DXE recovery capsules exist, then go to step 5; otherwise, perform \r
+    -# If more DXE recovery capsules exist, then go to step 5; otherwise, perform\r

        error handling.\r
     -# Decomposing the capsule loaded by EFI_PEI_DEVICE_RECOVERY_MODULE_PPI.\r
        error handling.\r
     -# Decomposing the capsule loaded by EFI_PEI_DEVICE_RECOVERY_MODULE_PPI.\r

-       LoadRecoveryCapsule() into its components. It is assumed that the path \r
-       parameters are redundant for recovery and Setup parameters are either \r
+       LoadRecoveryCapsule() into its components. It is assumed that the path\r
+       parameters are redundant for recovery and Setup parameters are either\r

        redundant or canned.\r
        redundant or canned.\r

-    -# Invalidating all HOB entries for updateable firmware volume entries. \r
+    -# Invalidating all HOB entries for updateable firmware volume entries.\r

        This invalidation prevents possible errant drivers from being executed.\r
        This invalidation prevents possible errant drivers from being executed.\r

-    -# Updating the HOB table with the recovery DXE firmware volume information \r
+    -# Updating the HOB table with the recovery DXE firmware volume information\r

        generated from the capsule decomposition.\r
        generated from the capsule decomposition.\r

-    -# Returning to the PEI Dispatcher.  \r
-  \r
-  Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
+    -# Returning to the PEI Dispatcher.\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


@@ -41,7 +41,7 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  This PPI is defined in UEFI Platform Initialization Specification 1.2 Errata B Volume 1: \r
+  This PPI is defined in UEFI Platform Initialization Specification 1.2 Errata B Volume 1:\r

   Pre-EFI Initalization Core Interface\r
 \r
 **/\r
   Pre-EFI Initalization Core Interface\r
 \r
 **/\r

diff --git a/MdePkg/Include/Ppi/ReportStatusCodeHandler.h b/MdePkg/Include/Ppi/ReportStatusCodeHandler.h
index aedeeb8d07ca73ab4239985d64b849e56e52587e..48966329dc54fbc07680fd37aeacad928f66ec6f 100644 (file)
--- a/MdePkg/Include/Ppi/ReportStatusCodeHandler.h
+++ b/MdePkg/Include/Ppi/ReportStatusCodeHandler.h
@@ -1,7 +1,7 @@
 /** @file\r
   This PPI provides registering and unregistering services to status code consumers.\r
 /** @file\r
   This PPI provides registering and unregistering services to status code consumers.\r

-  \r
-  Copyright (c) 2007 - 2009, 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


@@ -33,19 +33,19 @@ EFI_STATUS
 \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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -55,16 +55,16 @@ EFI_STATUS
 \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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

diff --git a/MdePkg/Include/Ppi/Reset.h b/MdePkg/Include/Ppi/Reset.h
index bbd5ceee07664fd6006c79af778f0fa9cb2be76d..6f9d77edd7293502f948303790d03b288fc2990d 100644 (file)
--- a/MdePkg/Include/Ppi/Reset.h
+++ b/MdePkg/Include/Ppi/Reset.h
@@ -1,17 +1,17 @@
 /** @file\r
   This file declares Reset PPI used to reset the platform.\r
 /** @file\r
   This file declares Reset PPI used to reset the platform.\r

-  \r
-  This PPI is installed by some platform- or chipset-specific PEIM that \r
+\r
+  This PPI is installed by some platform- or chipset-specific PEIM that\r

   abstracts the Reset Service to other agents.\r
 \r
   abstracts the Reset Service to other agents.\r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -29,11 +29,11 @@
 //\r
 // EFI_PEI_RESET_PPI.ResetSystem() is equivalent to the\r
 // PEI Service ResetSystem().\r
 //\r
 // EFI_PEI_RESET_PPI.ResetSystem() is equivalent to the\r
 // PEI Service ResetSystem().\r

-// It is introduced in PIPeiCis.h. \r
+// It is introduced in PIPeiCis.h.\r

 //\r
 \r
 ///\r
 //\r
 \r
 ///\r

-/// This PPI provides provide a simple reset service. \r
+/// This PPI provides provide a simple reset service.\r

 ///\r
 typedef struct {\r
   EFI_PEI_RESET_SYSTEM  ResetSystem;\r
 ///\r
 typedef struct {\r
   EFI_PEI_RESET_SYSTEM  ResetSystem;\r

diff --git a/MdePkg/Include/Ppi/S3Resume2.h b/MdePkg/Include/Ppi/S3Resume2.h
index 69d71fa765526b4c1ec5a12482041cf1dbd7cc05..936a5220e0b97cb290f99e948b026c4bc1eef04d 100644 (file)
--- a/MdePkg/Include/Ppi/S3Resume2.h
+++ b/MdePkg/Include/Ppi/S3Resume2.h
@@ -1,13 +1,13 @@
 /** @file\r
   This PPI produces functions to interpret and execute the PI boot script table.\r
 /** @file\r
   This PPI produces functions to interpret and execute the PI boot script table.\r

-  \r
+\r

   This PPI is published by a PEIM and provides for the restoration of the platform's\r
   This PPI is published by a PEIM and provides for the restoration of the platform's\r

-  configuration when resuming from the ACPI S3 power state. The ability to execute \r
-  the boot script may depend on the availability of other PPIs. For example, if \r
-  the boot script includes an SMBus command, this PEIM looks for the relevant PPI \r
-  that is able to execute that command.  \r
-  \r
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+  configuration when resuming from the ACPI S3 power state. The ability to execute\r
+  the boot script may depend on the availability of other PPIs. For example, if\r
+  the boot script includes an SMBus command, this PEIM looks for the relevant PPI\r
+  that is able to execute that command.\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


@@ -17,7 +17,7 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  This PPI is defined in UEFI Platform Initialization Specification 1.2 Volume 5: \r
+  This PPI is defined in UEFI Platform Initialization Specification 1.2 Volume 5:\r

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


@@ -42,30 +42,30 @@ typedef struct _EFI_PEI_S3_RESUME2_PPI  EFI_PEI_S3_RESUME2_PPI;
   Restores the platform to its preboot configuration for an S3 resume and\r
   jumps to the OS waking vector.\r
 \r
   Restores the platform to its preboot configuration for an S3 resume and\r
   jumps to the OS waking vector.\r
 \r

-  This function will restore the platform to its pre-boot configuration that was \r
+  This function will restore the platform to its pre-boot configuration that was\r

   pre-stored in the boot script table and transfer control to OS waking vector.\r
   pre-stored in the boot script table and transfer control to OS waking vector.\r

-  Upon invocation, this function is responsible for locating the following \r
+  Upon invocation, this function is responsible for locating the following\r

   information before jumping to OS waking vector:\r
     - ACPI tables\r
     - boot script table\r
     - any other information that it needs\r
   information before jumping to OS waking vector:\r
     - ACPI tables\r
     - boot script table\r
     - any other information that it needs\r

-    \r
-  The S3RestoreConfig() function then executes the pre-stored boot script table \r
-  and transitions the platform to the pre-boot state. The boot script is recorded \r
+\r
+  The S3RestoreConfig() function then executes the pre-stored boot script table\r
+  and transitions the platform to the pre-boot state. The boot script is recorded\r

   during regular boot using the EFI_S3_SAVE_STATE_PROTOCOL.Write() and\r
   during regular boot using the EFI_S3_SAVE_STATE_PROTOCOL.Write() and\r

-  EFI_S3_SMM_SAVE_STATE_PROTOCOL.Write() functions.  Finally, this function \r
-  transfers control to the OS waking vector. If the OS supports only a real-mode \r
-  waking vector, this function will switch from flat mode to real mode before \r
-  jumping to the waking vector.  If all platform pre-boot configurations are \r
-  successfully restored and all other necessary information is ready, this \r
-  function will never return and instead will directly jump to the OS waking \r
-  vector. If this function returns, it indicates that the attempt to resume \r
-  from the ACPI S3 sleep state failed.  \r
-  \r
+  EFI_S3_SMM_SAVE_STATE_PROTOCOL.Write() functions.  Finally, this function\r
+  transfers control to the OS waking vector. If the OS supports only a real-mode\r
+  waking vector, this function will switch from flat mode to real mode before\r
+  jumping to the waking vector.  If all platform pre-boot configurations are\r
+  successfully restored and all other necessary information is ready, this\r
+  function will never return and instead will directly jump to the OS waking\r
+  vector. If this function returns, it indicates that the attempt to resume\r
+  from the ACPI S3 sleep state failed.\r
+\r

   @param[in] This   Pointer to this instance of the PEI_S3_RESUME_PPI\r
 \r
   @retval EFI_ABORTED     Execution of the S3 resume boot script table failed.\r
   @param[in] This   Pointer to this instance of the PEI_S3_RESUME_PPI\r
 \r
   @retval EFI_ABORTED     Execution of the S3 resume boot script table failed.\r

-  @retval EFI_NOT_FOUND   Some necessary information that is used for the S3 \r
+  @retval EFI_NOT_FOUND   Some necessary information that is used for the S3\r

                           resume boot path could not be located.\r
 \r
 **/\r
                           resume boot path could not be located.\r
 \r
 **/\r

diff --git a/MdePkg/Include/Ppi/SecHobData.h b/MdePkg/Include/Ppi/SecHobData.h
index 0efe1a2d0b7756018138e57dce2645123f17d4ed..11289db5266e9008ab7991a882644c3401896ac6 100644 (file)
--- a/MdePkg/Include/Ppi/SecHobData.h
+++ b/MdePkg/Include/Ppi/SecHobData.h
@@ -1,9 +1,9 @@
 /** @file\r
   This file declares Sec Hob Data PPI.\r
 \r
 /** @file\r
   This file declares Sec Hob Data PPI.\r
 \r

-  This PPI provides a way for the SEC code to pass zero or more HOBs in a HOB list. \r
+  This PPI provides a way for the SEC code to pass zero or more HOBs in a HOB list.\r

 \r
 \r

-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2017 - 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

diff --git a/MdePkg/Include/Ppi/Security2.h b/MdePkg/Include/Ppi/Security2.h
index f7aabfca3791cc985676139b71f477bef0ea0aa1..1cd59b2f4245b39c6f6b2d3b6992d58160a33554 100644 (file)
--- a/MdePkg/Include/Ppi/Security2.h
+++ b/MdePkg/Include/Ppi/Security2.h
@@ -1,18 +1,18 @@
 /** @file\r
   This file declares Pei Security2 PPI.\r
 \r
 /** @file\r
   This file declares Pei Security2 PPI.\r
 \r

-  This PPI is installed by some platform PEIM that abstracts the security \r
-  policy to the PEI Foundation, namely the case of a PEIM's authentication \r
+  This PPI is installed by some platform PEIM that abstracts the security\r
+  policy to the PEI Foundation, namely the case of a PEIM's authentication\r

   state being returned during the PEI section extraction process.\r
 \r
   state being returned during the PEI section extraction process.\r
 \r

-  Copyright (c) 2006 - 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) 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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -29,7 +29,7 @@
 typedef struct _EFI_PEI_SECURITY2_PPI  EFI_PEI_SECURITY2_PPI;\r
 \r
 /**\r
 typedef struct _EFI_PEI_SECURITY2_PPI  EFI_PEI_SECURITY2_PPI;\r
 \r
 /**\r

-  Allows the platform builder to implement a security policy \r
+  Allows the platform builder to implement a security policy\r

   in response to varying file authentication states.\r
 \r
   This service is published by some platform PEIM. The purpose of\r
   in response to varying file authentication states.\r
 \r
   This service is published by some platform PEIM. The purpose of\r


@@ -48,13 +48,13 @@ typedef struct _EFI_PEI_SECURITY2_PPI  EFI_PEI_SECURITY2_PPI;
                                  particular EFI_PEI_SECURITY2_PPI instance.\r
   @param AuthenticationStatus    Authentication status of the file.\r
                                  xx00 Image was not signed.\r
                                  particular EFI_PEI_SECURITY2_PPI instance.\r
   @param AuthenticationStatus    Authentication status of the file.\r
                                  xx00 Image was not signed.\r

-                                 xxx1 Platform security policy override. \r
+                                 xxx1 Platform security policy override.\r

                                       Assumes same meaning as 0010 (the image was signed, the\r
                                       signature was tested, and the signature passed authentication test).\r
                                       Assumes same meaning as 0010 (the image was signed, the\r
                                       signature was tested, and the signature passed authentication test).\r

-                                 0010 Image was signed, the signature was tested, \r
+                                 0010 Image was signed, the signature was tested,\r

                                       and the signature passed authentication test.\r
                                  0110 Image was signed and the signature was not tested.\r
                                       and the signature passed authentication test.\r
                                  0110 Image was signed and the signature was not tested.\r

-                                 1010 Image was signed, the signature was tested, \r
+                                 1010 Image was signed, the signature was tested,\r

                                       and the signature failed the authentication test.\r
   @param FvHandle                Handle of the volume in which the file\r
                                  resides. This allows different policies\r
                                       and the signature failed the authentication test.\r
   @param FvHandle                Handle of the volume in which the file\r
                                  resides. This allows different policies\r

diff --git a/MdePkg/Include/Ppi/Smbus2.h b/MdePkg/Include/Ppi/Smbus2.h
index a0aac6d8eb584febf99f928070cd415177214fe1..508267ee4cc71fa508f7495b5fa259c43ef0b8f0 100644 (file)
--- a/MdePkg/Include/Ppi/Smbus2.h
+++ b/MdePkg/Include/Ppi/Smbus2.h
@@ -1,16 +1,16 @@
 /** @file\r
   This file declares Smbus2 PPI.\r
 /** @file\r
   This file declares Smbus2 PPI.\r

-  This PPI provides the basic I/O interfaces that a PEIM uses to access its \r
+  This PPI provides the basic I/O interfaces that a PEIM uses to access its\r

   SMBus controller and the slave devices attached to it.\r
 \r
   SMBus controller and the slave devices attached to it.\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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -29,28 +29,28 @@
 typedef struct _EFI_PEI_SMBUS2_PPI EFI_PEI_SMBUS2_PPI;\r
 \r
 /**\r
 typedef struct _EFI_PEI_SMBUS2_PPI EFI_PEI_SMBUS2_PPI;\r
 \r
 /**\r

-  Executes an SMBus operation to an SMBus controller. Returns when either \r
+  Executes an SMBus operation to an SMBus controller. Returns when either\r

   the command has been executed or an error is encountered in doing the operation.\r
 \r
   @param  This            A pointer to the EFI_PEI_SMBUS2_PPI instance.\r
   @param  SlaveAddress    The SMBUS hardware address to which the SMBUS device is preassigned or\r
                           allocated.\r
   the command has been executed or an error is encountered in doing the operation.\r
 \r
   @param  This            A pointer to the EFI_PEI_SMBUS2_PPI instance.\r
   @param  SlaveAddress    The SMBUS hardware address to which the SMBUS device is preassigned or\r
                           allocated.\r

-  @param  Command         This command is transmitted by the SMBus host controller to the SMBus slave \r
-                          device and the interpretation is SMBus slave device specific. \r
-                          It can mean the offset to a list of functions inside \r
+  @param  Command         This command is transmitted by the SMBus host controller to the SMBus slave\r
+                          device and the interpretation is SMBus slave device specific.\r
+                          It can mean the offset to a list of functions inside\r

                           an SMBus slave device. Not all operations or slave devices support\r
                           this command's registers.\r
                           an SMBus slave device. Not all operations or slave devices support\r
                           this command's registers.\r

-  @param  Operation       Signifies which particular SMBus hardware protocol instance that it \r
-                          will use to execute the SMBus transactions. \r
-                          This SMBus hardware protocol is defined by the System Management Bus (SMBus) \r
+  @param  Operation       Signifies which particular SMBus hardware protocol instance that it\r
+                          will use to execute the SMBus transactions.\r
+                          This SMBus hardware protocol is defined by the System Management Bus (SMBus)\r

                           Specification and is not related to UEFI.\r
   @param  PecCheck        Defines if Packet Error Code (PEC) checking is required for this operation.\r
                           Specification and is not related to UEFI.\r
   @param  PecCheck        Defines if Packet Error Code (PEC) checking is required for this operation.\r

-  @param  Length          Signifies the number of bytes that this operation will do. \r
+  @param  Length          Signifies the number of bytes that this operation will do.\r

                           The maximum number of bytes can be revision specific and operation specific.\r
                           This parameter will contain the actual number of bytes that are executed\r
                           for this operation. Not all operations require this argument.\r
                           The maximum number of bytes can be revision specific and operation specific.\r
                           This parameter will contain the actual number of bytes that are executed\r
                           for this operation. Not all operations require this argument.\r

-  @param  Buffer          Contains the value of data to execute to the SMBus slave device. \r
-                          Not all operations require this argument. \r
+  @param  Buffer          Contains the value of data to execute to the SMBus slave device.\r
+                          Not all operations require this argument.\r

                           The length of this buffer is identified by Length.\r
 \r
 \r
                           The length of this buffer is identified by Length.\r
 \r
 \r


@@ -83,8 +83,8 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-  The ArpDevice() function enumerates the entire bus or enumerates a specific \r
-  device that is identified by SmbusUdid. \r
+  The ArpDevice() function enumerates the entire bus or enumerates a specific\r
+  device that is identified by SmbusUdid.\r

 \r
   @param  This           A pointer to the EFI_PEI_SMBUS2_PPI instance.\r
   @param  ArpAll         A Boolean expression that indicates if the host drivers need\r
 \r
   @param  This           A pointer to the EFI_PEI_SMBUS2_PPI instance.\r
   @param  ArpAll         A Boolean expression that indicates if the host drivers need\r


@@ -116,8 +116,8 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-  The GetArpMap() function returns the mapping of all the SMBus devices \r
-  that are enumerated by the SMBus host driver. \r
+  The GetArpMap() function returns the mapping of all the SMBus devices\r
+  that are enumerated by the SMBus host driver.\r

 \r
   @param  This           A pointer to the EFI_PEI_SMBUS2_PPI instance.\r
   @param  Length         Size of the buffer that contains the SMBus device map.\r
 \r
   @param  This           A pointer to the EFI_PEI_SMBUS2_PPI instance.\r
   @param  Length         Size of the buffer that contains the SMBus device map.\r


@@ -159,7 +159,7 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-  The Notify() function registers all the callback functions to allow the \r
+  The Notify() function registers all the callback functions to allow the\r

   bus driver to call these functions when the SlaveAddress/Data pair happens.\r
 \r
   @param  This           A pointer to the EFI_PEI_SMBUS2_PPI instance.\r
   bus driver to call these functions when the SlaveAddress/Data pair happens.\r
 \r
   @param  This           A pointer to the EFI_PEI_SMBUS2_PPI instance.\r


@@ -184,7 +184,7 @@ EFI_STATUS
 );\r
 \r
 ///\r
 );\r
 \r
 ///\r

-///  Provides the basic I/O interfaces that a PEIM uses to access \r
+///  Provides the basic I/O interfaces that a PEIM uses to access\r

 ///  its SMBus controller and the slave devices attached to it.\r
 ///\r
 struct _EFI_PEI_SMBUS2_PPI {\r
 ///  its SMBus controller and the slave devices attached to it.\r
 ///\r
 struct _EFI_PEI_SMBUS2_PPI {\r

diff --git a/MdePkg/Include/Ppi/Stall.h b/MdePkg/Include/Ppi/Stall.h
index ebd93d6e078b6d96983bb681b2074f2eb438ddfe..7139bbba6cff8d302e3d2153e9879008bf188f26 100644 (file)
--- a/MdePkg/Include/Ppi/Stall.h
+++ b/MdePkg/Include/Ppi/Stall.h
@@ -3,14 +3,14 @@
 \r
   This ppi abstracts the blocking stall service to other agents.\r
 \r
 \r
   This ppi abstracts the blocking stall service to other agents.\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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -26,7 +26,7 @@
 typedef struct _EFI_PEI_STALL_PPI EFI_PEI_STALL_PPI;\r
 \r
 /**\r
 typedef struct _EFI_PEI_STALL_PPI EFI_PEI_STALL_PPI;\r
 \r
 /**\r

-  The Stall() function provides a blocking stall for at least the number \r
+  The Stall() function provides a blocking stall for at least the number\r

   of microseconds stipulated in the final argument of the API.\r
 \r
   @param  PeiServices    An indirect pointer to the PEI Services Table\r
   of microseconds stipulated in the final argument of the API.\r
 \r
   @param  PeiServices    An indirect pointer to the PEI Services Table\r


@@ -46,7 +46,7 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// This service provides a simple, blocking stall with platform-specific resolution. \r
+/// This service provides a simple, blocking stall with platform-specific resolution.\r

 ///\r
 struct _EFI_PEI_STALL_PPI {\r
   ///\r
 ///\r
 struct _EFI_PEI_STALL_PPI {\r
   ///\r

diff --git a/MdePkg/Include/Ppi/StatusCode.h b/MdePkg/Include/Ppi/StatusCode.h
index e28d8a12bd4c74283a155740a0d4f8404b7e7cbc..989b24815115e61a97e2abe861f34be7c32974f2 100644 (file)
--- a/MdePkg/Include/Ppi/StatusCode.h
+++ b/MdePkg/Include/Ppi/StatusCode.h
@@ -2,14 +2,14 @@
   This file declares Status Code PPI.\r
   This ppi provides a service that allows PEIMs to report status codes.\r
 \r
   This file declares Status Code PPI.\r
   This ppi provides a service that allows PEIMs to report status codes.\r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r


@@ -25,7 +25,7 @@
 //\r
 // EFI_PEI_PROGRESS_CODE_PPI.ReportStatusCode() is equivalent to the\r
 // PEI Service ReportStatusCode().\r
 //\r
 // EFI_PEI_PROGRESS_CODE_PPI.ReportStatusCode() is equivalent to the\r
 // PEI Service ReportStatusCode().\r

-// It is introduced in PIPeiCis.h. \r
+// It is introduced in PIPeiCis.h.\r

 //\r
 \r
 ///\r
 //\r
 \r
 ///\r

diff --git a/MdePkg/Include/Ppi/SuperIo.h b/MdePkg/Include/Ppi/SuperIo.h
index 81c9180945031f967ca31115e00e353a0da7a637..725b71a0828b4717c849faa22ca9c5048d2acfce 100644 (file)
--- a/MdePkg/Include/Ppi/SuperIo.h
+++ b/MdePkg/Include/Ppi/SuperIo.h
@@ -1,14 +1,14 @@
 /** @file\r
   This PPI provides the super I/O register access functionality.\r
 \r
 /** @file\r
   This PPI provides the super I/O register access functionality.\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
+  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
 \r

-  THE PROGRAM 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
   @par Revision Reference:\r
   This PPI is from PI Version 1.2.1.\r
 \r
   @par Revision Reference:\r
   This PPI is from PI Version 1.2.1.\r


@@ -34,7 +34,7 @@ typedef UINT16 EFI_SIO_REGISTER;
 \r
 /**\r
   Read a Super I/O register.\r
 \r
 /**\r
   Read a Super I/O register.\r

- \r
+\r

   The register is specified as an 8-bit logical device number and an 8-bit\r
   register value. The logical device numbers for specific SIO devices can be\r
   determined using the Info member of the PPI structure.\r
   The register is specified as an 8-bit logical device number and an 8-bit\r
   register value. The logical device numbers for specific SIO devices can be\r
   determined using the Info member of the PPI structure.\r


@@ -47,8 +47,8 @@ typedef UINT16 EFI_SIO_REGISTER;
                       track the current state of the configuration mode (if any)\r
                       and turn on configuration mode (if necessary) prior to\r
                       register access.\r
                       track the current state of the configuration mode (if any)\r
                       and turn on configuration mode (if necessary) prior to\r
                       register access.\r

-  @param Register     A value specifying the logical device number (bits 15:8) \r
-                      and the register to read (bits 7:0). The logical device \r
+  @param Register     A value specifying the logical device number (bits 15:8)\r
+                      and the register to read (bits 7:0). The logical device\r

                       number of EFI_SIO_LDN_GLOBAL indicates that global\r
                       registers will be used.\r
   @param IoData       A pointer to the returned register value.\r
                       number of EFI_SIO_LDN_GLOBAL indicates that global\r
                       registers will be used.\r
   @param IoData       A pointer to the returned register value.\r


@@ -85,8 +85,8 @@ EFI_STATUS
                       track the current state of the configuration mode (if any)\r
                       and turn on configuration mode (if necessary) prior to\r
                       register access.\r
                       track the current state of the configuration mode (if any)\r
                       and turn on configuration mode (if necessary) prior to\r
                       register access.\r

-  @param Register     A value specifying the logical device number (bits 15:8) \r
-                      and the register to read (bits 7:0). The logical device \r
+  @param Register     A value specifying the logical device number (bits 15:8)\r
+                      and the register to read (bits 7:0). The logical device\r

                       number of EFI_SIO_LDN_GLOBAL indicates that global\r
                       registers will be used.\r
   @param IoData       A pointer to the returned register value.\r
                       number of EFI_SIO_LDN_GLOBAL indicates that global\r
                       registers will be used.\r
   @param IoData       A pointer to the returned register value.\r


@@ -97,7 +97,7 @@ EFI_STATUS
   @retval EFI_INVALID_PARAMETERS Register was out of range for this device.\r
   @retval EFI_INVALID_PARAMETERS IoData was NULL\r
   @retval EFI_DEVICE_ERROR       There was a device fault or the device was not present.\r
   @retval EFI_INVALID_PARAMETERS Register was out of range for this device.\r
   @retval EFI_INVALID_PARAMETERS IoData was NULL\r
   @retval EFI_DEVICE_ERROR       There was a device fault or the device was not present.\r

-**/ \r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SIO_REGISTER_WRITE)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SIO_REGISTER_WRITE)(\r


@@ -129,7 +129,7 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS             The operation completed successfully.\r
   @retval EFI_INVALID_PARAMETERS  Command is NULL.\r
 \r
   @retval EFI_SUCCESS             The operation completed successfully.\r
   @retval EFI_INVALID_PARAMETERS  Command is NULL.\r

-**/ \r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SIO_REGISTER_MODIFY)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SIO_REGISTER_MODIFY)(\r


@@ -186,4 +186,4 @@ struct _EFI_SIO_PPI {
 \r
 extern EFI_GUID gEfiSioPpiGuid;\r
 \r
 \r
 extern EFI_GUID gEfiSioPpiGuid;\r
 \r

-#endif \r
+#endif\r

diff --git a/MdePkg/Include/Ppi/TemporaryRamDone.h b/MdePkg/Include/Ppi/TemporaryRamDone.h
index c492a86fbdbc35df192c7e713342f7f1d8c5a580..a6dd7f57e648a9cc3d68a49f3ab1732da3c54b9b 100644 (file)
--- a/MdePkg/Include/Ppi/TemporaryRamDone.h
+++ b/MdePkg/Include/Ppi/TemporaryRamDone.h
@@ -2,14 +2,14 @@
   This file declares Temporary RAM Done PPI.\r
   The PPI that provides a service to disable the use of Temporary RAM.\r
 \r
   This file declares Temporary RAM Done PPI.\r
   The PPI that provides a service to disable the use of Temporary RAM.\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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.2.1.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.2.1.\r

diff --git a/MdePkg/Include/Ppi/TemporaryRamSupport.h b/MdePkg/Include/Ppi/TemporaryRamSupport.h
index ec6500ce39428a1efa8b31d2d452c8cbe76b59c3..aa697acf86c44c492a64922a5deb20ed8122010f 100644 (file)
--- a/MdePkg/Include/Ppi/TemporaryRamSupport.h
+++ b/MdePkg/Include/Ppi/TemporaryRamSupport.h
@@ -2,14 +2,14 @@
   This file declares Temporary RAM Support PPI.\r
   This Ppi provides the service that migrates temporary RAM into permanent memory.\r
 \r
   This file declares Temporary RAM Support PPI.\r
   This Ppi provides the service that migrates temporary RAM into permanent memory.\r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.0.\r

diff --git a/MdePkg/Include/Ppi/VectorHandoffInfo.h b/MdePkg/Include/Ppi/VectorHandoffInfo.h
index 84cad704636ac64e8716623e9e2042ff49ea2093..d194e56c6e8c64f33c04df130dc0e2fc12d0ec6b 100644 (file)
--- a/MdePkg/Include/Ppi/VectorHandoffInfo.h
+++ b/MdePkg/Include/Ppi/VectorHandoffInfo.h
@@ -4,16 +4,16 @@
 \r
   This is an optional PPI that may be produced by SEC. If present, it provides\r
   a description of the interrupt and/or exception vectors that were established\r
 \r
   This is an optional PPI that may be produced by SEC. If present, it provides\r
   a description of the interrupt and/or exception vectors that were established\r

-  in the SEC Phase and need to persist into PEI and DXE. \r
+  in the SEC Phase and need to persist into PEI and DXE.\r

 \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
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.2.1.\r
 \r
   @par Revision Reference:\r
   This PPI is introduced in PI Version 1.2.1.\r


@@ -53,7 +53,7 @@ typedef struct {
   //\r
   UINT32    Attribute;\r
   //\r
   //\r
   UINT32    Attribute;\r
   //\r

-  // The GUID identifies the party who created the entry. For the \r
+  // The GUID identifies the party who created the entry. For the\r

   // EFI_VECTOR_HANDOFF_DO_NOT_HOOK case, this establishes the single owner.\r
   //\r
   EFI_GUID  Owner;\r
   // EFI_VECTOR_HANDOFF_DO_NOT_HOOK case, this establishes the single owner.\r
   //\r
   EFI_GUID  Owner;\r


@@ -61,7 +61,7 @@ typedef struct {
 \r
 ///\r
 /// Provides a description of the interrupt and/or exception vectors that\r
 \r
 ///\r
 /// Provides a description of the interrupt and/or exception vectors that\r

-/// were established in the SEC Phase and need to persist into PEI and DXE.  \r
+/// were established in the SEC Phase and need to persist into PEI and DXE.\r

 ///\r
 typedef struct _EFI_PEI_VECTOR_HANDOFF_INFO_PPI {\r
   //\r
 ///\r
 typedef struct _EFI_PEI_VECTOR_HANDOFF_INFO_PPI {\r
   //\r

diff --git a/MdePkg/Include/Protocol/AbsolutePointer.h b/MdePkg/Include/Protocol/AbsolutePointer.h
index a4efea221fc5696f5911c619d5f9ddc3ba78ca4e..ecf476d7c0e2f0b96eda0b0a380ef65913fc69a0 100644 (file)
--- a/MdePkg/Include/Protocol/AbsolutePointer.h
+++ b/MdePkg/Include/Protocol/AbsolutePointer.h
@@ -1,15 +1,15 @@
 /** @file\r
   The file provides services that allow information about an\r
   absolute pointer device to be retrieved.\r
 /** @file\r
   The file provides services that allow information about an\r
   absolute pointer device to be retrieved.\r

-  \r
-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  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


@@ -38,25 +38,25 @@ typedef struct {
   UINT64 AbsoluteMinX; ///< The Absolute Minimum of the device on the x-axis\r
   UINT64 AbsoluteMinY; ///< The Absolute Minimum of the device on the y axis.\r
   UINT64 AbsoluteMinZ; ///< The Absolute Minimum of the device on the z-axis\r
   UINT64 AbsoluteMinX; ///< The Absolute Minimum of the device on the x-axis\r
   UINT64 AbsoluteMinY; ///< The Absolute Minimum of the device on the y axis.\r
   UINT64 AbsoluteMinZ; ///< The Absolute Minimum of the device on the z-axis\r

-  UINT64 AbsoluteMaxX; ///< The Absolute Maximum of the device on the x-axis. If 0, and the \r
+  UINT64 AbsoluteMaxX; ///< The Absolute Maximum of the device on the x-axis. If 0, and the\r

                        ///< AbsoluteMinX is 0, then the pointer device does not support a xaxis\r
                        ///< AbsoluteMinX is 0, then the pointer device does not support a xaxis\r

-  UINT64 AbsoluteMaxY; ///< The Absolute Maximum of the device on the y -axis. If 0, and the \r
+  UINT64 AbsoluteMaxY; ///< The Absolute Maximum of the device on the y -axis. If 0, and the\r

                        ///< AbsoluteMinX is 0, then the pointer device does not support a yaxis.\r
                        ///< AbsoluteMinX is 0, then the pointer device does not support a yaxis.\r

-  UINT64 AbsoluteMaxZ; ///< The Absolute Maximum of the device on the z-axis. If 0 , and the \r
+  UINT64 AbsoluteMaxZ; ///< The Absolute Maximum of the device on the z-axis. If 0 , and the\r

                        ///< AbsoluteMinX is 0, then the pointer device does not support a zaxis\r
                        ///< AbsoluteMinX is 0, then the pointer device does not support a zaxis\r

-  UINT32 Attributes;   ///< The following bits are set as needed (or'd together) to indicate the \r
-                       ///< capabilities of the device supported. The remaining bits are undefined \r
+  UINT32 Attributes;   ///< The following bits are set as needed (or'd together) to indicate the\r
+                       ///< capabilities of the device supported. The remaining bits are undefined\r

                        ///< and should be 0\r
 } EFI_ABSOLUTE_POINTER_MODE;\r
 \r
 ///\r
                        ///< and should be 0\r
 } EFI_ABSOLUTE_POINTER_MODE;\r
 \r
 ///\r

-/// If set, indicates this device supports an alternate button input. \r
-/// \r
+/// If set, indicates this device supports an alternate button input.\r
+///\r

 #define EFI_ABSP_SupportsAltActive    0x00000001\r
 \r
 ///\r
 /// If set, indicates this device returns pressure data in parameter CurrentZ.\r
 #define EFI_ABSP_SupportsAltActive    0x00000001\r
 \r
 ///\r
 /// If set, indicates this device returns pressure data in parameter CurrentZ.\r

-/// \r
+///\r

 #define EFI_ABSP_SupportsPressureAsZ  0x00000002\r
 \r
 \r
 #define EFI_ABSP_SupportsPressureAsZ  0x00000002\r
 \r
 \r


@@ -80,7 +80,7 @@ typedef struct {
                               device during reset.\r
 \r
   @retval EFI_SUCCESS       The device was reset.\r
                               device during reset.\r
 \r
   @retval EFI_SUCCESS       The device was reset.\r

-  \r
+\r

   @retval EFI_DEVICE_ERROR  The device is not functioning\r
                             correctly and could not be reset.\r
 \r
   @retval EFI_DEVICE_ERROR  The device is not functioning\r
                             correctly and could not be reset.\r
 \r


@@ -95,11 +95,11 @@ EFI_STATUS
 ///\r
 /// This bit is set if the touch sensor is active.\r
 ///\r
 ///\r
 /// This bit is set if the touch sensor is active.\r
 ///\r

-#define EFI_ABSP_TouchActive  0x00000001 \r
+#define EFI_ABSP_TouchActive  0x00000001\r

 \r
 ///\r
 /// This bit is set if the alt sensor, such as pen-side button, is active\r
 \r
 ///\r
 /// This bit is set if the alt sensor, such as pen-side button, is active\r

-/// \r
+///\r

 #define EFI_ABS_AltActive     0x00000002\r
 \r
 \r
 #define EFI_ABS_AltActive     0x00000002\r
 \r
 \r


@@ -108,29 +108,29 @@ EFI_STATUS
 **/\r
 typedef struct {\r
   ///\r
 **/\r
 typedef struct {\r
   ///\r

-  /// The unsigned position of the activation on the x axis. If the AboluteMinX \r
-  /// and the AboluteMaxX fields of the EFI_ABSOLUTE_POINTER_MODE structure are \r
+  /// The unsigned position of the activation on the x axis. If the AboluteMinX\r
+  /// and the AboluteMaxX fields of the EFI_ABSOLUTE_POINTER_MODE structure are\r

   /// both 0, then this pointer device does not support an x-axis, and this field\r
   /// must be ignored.\r
   ///\r
   UINT64 CurrentX;\r
   /// both 0, then this pointer device does not support an x-axis, and this field\r
   /// must be ignored.\r
   ///\r
   UINT64 CurrentX;\r

-  \r
+\r

   ///\r
   ///\r

-  /// The unsigned position of the activation on the y axis. If the AboluteMinY \r
-  /// and the AboluteMaxY fields of the EFI_ABSOLUTE_POINTER_MODE structure are \r
+  /// The unsigned position of the activation on the y axis. If the AboluteMinY\r
+  /// and the AboluteMaxY fields of the EFI_ABSOLUTE_POINTER_MODE structure are\r

   /// both 0, then this pointer device does not support an y-axis, and this field\r
   /// both 0, then this pointer device does not support an y-axis, and this field\r

-  /// must be ignored.  \r
+  /// must be ignored.\r

   ///\r
   UINT64 CurrentY;\r
   ///\r
   UINT64 CurrentY;\r

-  \r
+\r

   ///\r
   ///\r

-  /// The unsigned position of the activation on the z axis, or the pressure \r
-  /// measurement. If the AboluteMinZ and the AboluteMaxZ fields of the \r
-  /// EFI_ABSOLUTE_POINTER_MODE structure are both 0, then this pointer device \r
-  /// does not support an z-axis, and this field must be ignored.  \r
+  /// The unsigned position of the activation on the z axis, or the pressure\r
+  /// measurement. If the AboluteMinZ and the AboluteMaxZ fields of the\r
+  /// EFI_ABSOLUTE_POINTER_MODE structure are both 0, then this pointer device\r
+  /// does not support an z-axis, and this field must be ignored.\r

   ///\r
   UINT64 CurrentZ;\r
   ///\r
   UINT64 CurrentZ;\r

-  \r
+\r

   ///\r
   /// Bits are set to 1 in this structure item to indicate that device buttons are\r
   /// active.\r
   ///\r
   /// Bits are set to 1 in this structure item to indicate that device buttons are\r
   /// active.\r


@@ -188,7 +188,7 @@ struct _EFI_ABSOLUTE_POINTER_PROTOCOL {
   EFI_ABSOLUTE_POINTER_RESET      Reset;\r
   EFI_ABSOLUTE_POINTER_GET_STATE  GetState;\r
   ///\r
   EFI_ABSOLUTE_POINTER_RESET      Reset;\r
   EFI_ABSOLUTE_POINTER_GET_STATE  GetState;\r
   ///\r

-  /// Event to use with WaitForEvent() to wait for input from the pointer device.  \r
+  /// Event to use with WaitForEvent() to wait for input from the pointer device.\r

   ///\r
   EFI_EVENT                       WaitForInput;\r
   ///\r
   ///\r
   EFI_EVENT                       WaitForInput;\r
   ///\r

diff --git a/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h b/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h
index faacbfc46f6fd1def21a1b9bf1ec01b525cd9ad6..c8bd429f1fdda4571b276b8a4189a0a32c3bcb10 100644 (file)
--- a/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h
+++ b/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h
@@ -1,14 +1,14 @@
 /** @file\r
   This protocol provides services for creating ACPI system description tables.\r
 /** @file\r
   This protocol provides services for creating ACPI system description tables.\r

-  \r
-  Copyright (c) 2006 - 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) 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


@@ -17,7 +17,7 @@
 \r
 #define EFI_ACPI_SDT_PROTOCOL_GUID \\r
   { 0xeb97088e, 0xcfdf, 0x49c6, { 0xbe, 0x4b, 0xd9, 0x6, 0xa5, 0xb2, 0xe, 0x86 }}\r
 \r
 #define EFI_ACPI_SDT_PROTOCOL_GUID \\r
   { 0xeb97088e, 0xcfdf, 0x49c6, { 0xbe, 0x4b, 0xd9, 0x6, 0xa5, 0xb2, 0xe, 0x86 }}\r

-  \r
+\r

 typedef UINT32  EFI_ACPI_TABLE_VERSION;\r
 typedef VOID    *EFI_ACPI_HANDLE;\r
 \r
 typedef UINT32  EFI_ACPI_TABLE_VERSION;\r
 typedef VOID    *EFI_ACPI_HANDLE;\r
 \r


@@ -27,7 +27,7 @@ typedef VOID    *EFI_ACPI_HANDLE;
 #define EFI_ACPI_TABLE_VERSION_3_0  (1 << 3)\r
 #define EFI_ACPI_TABLE_VERSION_4_0  (1 << 4)\r
 #define EFI_ACPI_TABLE_VERSION_5_0  (1 << 5)\r
 #define EFI_ACPI_TABLE_VERSION_3_0  (1 << 3)\r
 #define EFI_ACPI_TABLE_VERSION_4_0  (1 << 4)\r
 #define EFI_ACPI_TABLE_VERSION_5_0  (1 << 5)\r

-  \r
+\r

 typedef UINT32 EFI_ACPI_DATA_TYPE;\r
 #define EFI_ACPI_DATA_TYPE_NONE         0\r
 #define EFI_ACPI_DATA_TYPE_OPCODE       1\r
 typedef UINT32 EFI_ACPI_DATA_TYPE;\r
 #define EFI_ACPI_DATA_TYPE_NONE         0\r
 #define EFI_ACPI_DATA_TYPE_OPCODE       1\r


@@ -36,7 +36,7 @@ typedef UINT32 EFI_ACPI_DATA_TYPE;
 #define EFI_ACPI_DATA_TYPE_UINT         4\r
 #define EFI_ACPI_DATA_TYPE_STRING       5\r
 #define EFI_ACPI_DATA_TYPE_CHILD        6\r
 #define EFI_ACPI_DATA_TYPE_UINT         4\r
 #define EFI_ACPI_DATA_TYPE_STRING       5\r
 #define EFI_ACPI_DATA_TYPE_CHILD        6\r

-  \r
+\r

 typedef struct {\r
   UINT32    Signature;\r
   UINT32    Length;\r
 typedef struct {\r
   UINT32    Signature;\r
   UINT32    Length;\r


@@ -48,7 +48,7 @@ typedef struct {
   UINT32    CreatorId;\r
   UINT32    CreatorRevision;\r
 } EFI_ACPI_SDT_HEADER;\r
   UINT32    CreatorId;\r
   UINT32    CreatorRevision;\r
 } EFI_ACPI_SDT_HEADER;\r

-  \r
+\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_ACPI_NOTIFICATION_FN)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_ACPI_NOTIFICATION_FN)(\r


@@ -56,10 +56,10 @@ EFI_STATUS
   IN EFI_ACPI_TABLE_VERSION Version,    ///< The ACPI table's version.\r
   IN UINTN                  TableKey    ///< The table key for this ACPI table.\r
 );\r
   IN EFI_ACPI_TABLE_VERSION Version,    ///< The ACPI table's version.\r
   IN UINTN                  TableKey    ///< The table key for this ACPI table.\r
 );\r

-  \r
+\r

 /**\r
   Returns a requested ACPI table.\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


@@ -69,20 +69,20 @@ EFI_STATUS
   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
 \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
 \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

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_ACPI_GET_ACPI_TABLE2)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_ACPI_GET_ACPI_TABLE2)(\r


@@ -94,17 +94,17 @@ EFI_STATUS
 \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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -115,30 +115,30 @@ EFI_STATUS
 \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
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_ACPI_OPEN)(\r
   IN    VOID            *Buffer,\r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_ACPI_OPEN)(\r
   IN    VOID            *Buffer,\r

-  OUT   EFI_ACPI_HANDLE *Handle \r
+  OUT   EFI_ACPI_HANDLE *Handle\r

 );\r
 \r
 /**\r
   Create a handle for the first ACPI opcode in an ACPI system description table.\r
 );\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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -149,11 +149,11 @@ EFI_STATUS
 \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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -163,14 +163,14 @@ EFI_STATUS
 \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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -181,7 +181,7 @@ EFI_STATUS
 \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


@@ -189,8 +189,8 @@ EFI_STATUS
                             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
-  @retval              \r
+\r
+  @retval\r

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


@@ -204,7 +204,7 @@ EFI_STATUS
 \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


@@ -228,14 +228,14 @@ EFI_STATUS
 \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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

diff --git a/MdePkg/Include/Protocol/AcpiTable.h b/MdePkg/Include/Protocol/AcpiTable.h
index 6149b7e4533584b7ee259001582db5eafe9b4169..753d79e6bb5b81d6300b3b73bdcfaf23973d4316 100644 (file)
--- a/MdePkg/Include/Protocol/AcpiTable.h
+++ b/MdePkg/Include/Protocol/AcpiTable.h
@@ -1,15 +1,15 @@
 /** @file\r
   The file provides the protocol to install or remove an ACPI\r
 /** @file\r
   The file provides the protocol to install or remove an ACPI\r

-  table from a platform. \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
+  table from a platform.\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


@@ -24,24 +24,24 @@ typedef struct _EFI_ACPI_TABLE_PROTOCOL EFI_ACPI_TABLE_PROTOCOL;
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  The InstallAcpiTable() function allows a caller to install an   \r
-  ACPI table. When successful, the table will be linked by the   \r
-  RSDT/XSDT. AcpiTableBuffer specifies the table to be installed.   \r
-  InstallAcpiTable() will make a copy of the table and insert the   \r
-  copy into the RSDT/XSDT. InstallAcpiTable() must insert the new   \r
-  table at the end of the RSDT/XSDT. To prevent namespace   \r
-  collision, ACPI tables may be created using UEFI ACPI table   \r
+  The InstallAcpiTable() function allows a caller to install an\r
+  ACPI table. When successful, the table will be linked by the\r
+  RSDT/XSDT. AcpiTableBuffer specifies the table to be installed.\r
+  InstallAcpiTable() will make a copy of the table and insert the\r
+  copy into the RSDT/XSDT. InstallAcpiTable() must insert the new\r
+  table at the end of the RSDT/XSDT. To prevent namespace\r
+  collision, ACPI tables may be created using UEFI ACPI table\r

   format. If this protocol is used to install a table with a\r
   signature already present in the system, the new table will not\r
   replace the existing table. It is a platform implementation\r
   decision to add a new table with a signature matching an\r
   existing table or disallow duplicate table signatures and\r
   format. If this protocol is used to install a table with a\r
   signature already present in the system, the new table will not\r
   replace the existing table. It is a platform implementation\r
   decision to add a new table with a signature matching an\r
   existing table or disallow duplicate table signatures and\r

-  return EFI_ACCESS_DENIED. On successful output, TableKey is   \r
-  initialized with a unique key. Its value may be used in a   \r
-  subsequent call to UninstallAcpiTable to remove an ACPI table.   \r
-  If an EFI application is running at the time of this call, the   \r
-  relevant EFI_CONFIGURATION_TABLE pointer to the RSDT is no   \r
-  longer considered valid.   \r
+  return EFI_ACCESS_DENIED. On successful output, TableKey is\r
+  initialized with a unique key. Its value may be used in a\r
+  subsequent call to UninstallAcpiTable to remove an ACPI table.\r
+  If an EFI application is running at the time of this call, the\r
+  relevant EFI_CONFIGURATION_TABLE pointer to the RSDT is no\r
+  longer considered valid.\r

 \r
 \r
   @param This                 A pointer to a EFI_ACPI_TABLE_PROTOCOL.\r
 \r
 \r
   @param This                 A pointer to a EFI_ACPI_TABLE_PROTOCOL.\r


@@ -54,16 +54,16 @@ typedef struct _EFI_ACPI_TABLE_PROTOCOL EFI_ACPI_TABLE_PROTOCOL;
 \r
 \r
   @param TableKey             Returns a key to refer to the ACPI table.\r
 \r
 \r
   @param TableKey             Returns a key to refer to the ACPI table.\r

-  \r
+\r

   @retval EFI_SUCCESS           The table was successfully inserted\r
   @retval EFI_SUCCESS           The table was successfully inserted\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER Either AcpiTableBuffer is NULL,\r
                                 TableKey is NULL, or\r
                                 AcpiTableBufferSize and the size\r
                                 field embedded in the ACPI table\r
                                 pointed to by AcpiTableBuffer\r
                                 are not in sync.\r
   @retval EFI_INVALID_PARAMETER Either AcpiTableBuffer is NULL,\r
                                 TableKey is NULL, or\r
                                 AcpiTableBufferSize and the size\r
                                 field embedded in the ACPI table\r
                                 pointed to by AcpiTableBuffer\r
                                 are not in sync.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES  Insufficient resources exist to\r
                                 complete the request.\r
   @retval EFI_ACCESS_DENIED     The table signature matches a table already\r
   @retval EFI_OUT_OF_RESOURCES  Insufficient resources exist to\r
                                 complete the request.\r
   @retval EFI_ACCESS_DENIED     The table signature matches a table already\r


@@ -82,7 +82,7 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  \r
+\r

   The UninstallAcpiTable() function allows a caller to remove an\r
   ACPI table. The routine will remove its reference from the\r
   RSDT/XSDT. A table is referenced by the TableKey parameter\r
   The UninstallAcpiTable() function allows a caller to remove an\r
   ACPI table. The routine will remove its reference from the\r
   RSDT/XSDT. A table is referenced by the TableKey parameter\r


@@ -103,7 +103,7 @@ EFI_STATUS
 \r
   @retval EFI_OUT_OF_RESOURCES  Insufficient resources exist to\r
                                 complete the request.\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Insufficient resources exist to\r
                                 complete the request.\r

-  \r
+\r

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

diff --git a/MdePkg/Include/Protocol/AdapterInformation.h b/MdePkg/Include/Protocol/AdapterInformation.h
index 6421e56d9aaba9903da36917d8447f1812e84f06..6331848e0d0079ff3ee1cce3f5947c27900dbc13 100644 (file)
--- a/MdePkg/Include/Protocol/AdapterInformation.h
+++ b/MdePkg/Include/Protocol/AdapterInformation.h
@@ -3,7 +3,7 @@
   The EFI Adapter Information Protocol is used to dynamically and quickly discover\r
   or set device information for an adapter.\r
 \r
   The EFI Adapter Information Protocol is used to dynamically and quickly discover\r
   or set device information for an adapter.\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


@@ -59,9 +59,9 @@ typedef struct _EFI_ADAPTER_INFORMATION_PROTOCOL EFI_ADAPTER_INFORMATION_PROTOCO
 ///\r
 typedef struct {\r
   ///\r
 ///\r
 typedef struct {\r
   ///\r

-  /// Returns the current media state status. MediaState can have any of the following values: \r
-  /// EFI_SUCCESS: There is media attached to the network adapter. EFI_NOT_READY: This detects a bounced state. \r
-  /// There was media attached to the network adapter, but it was removed and reattached. EFI_NO_MEDIA: There is \r
+  /// Returns the current media state status. MediaState can have any of the following values:\r
+  /// EFI_SUCCESS: There is media attached to the network adapter. EFI_NOT_READY: This detects a bounced state.\r
+  /// There was media attached to the network adapter, but it was removed and reattached. EFI_NO_MEDIA: There is\r

   /// not any media attached to the network.\r
   ///\r
   EFI_STATUS                    MediaState;\r
   /// not any media attached to the network.\r
   ///\r
   EFI_STATUS                    MediaState;\r


@@ -140,7 +140,7 @@ typedef struct {
   ///\r
   /// Returns capability of UNDI to support IPv6 traffic.\r
   ///\r
   ///\r
   /// Returns capability of UNDI to support IPv6 traffic.\r
   ///\r

-  BOOLEAN                            Ipv6Support; \r
+  BOOLEAN                            Ipv6Support;\r

 } EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT;\r
 \r
 /**\r
 } EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT;\r
 \r
 /**\r


@@ -148,7 +148,7 @@ typedef struct {
 \r
   This function returns information of type InformationType from the adapter.\r
   If an adapter does not support the requested informational type, then\r
 \r
   This function returns information of type InformationType from the adapter.\r
   If an adapter does not support the requested informational type, then\r

-  EFI_UNSUPPORTED is returned. \r
+  EFI_UNSUPPORTED is returned.\r

 \r
   @param[in]  This                   A pointer to the EFI_ADAPTER_INFORMATION_PROTOCOL instance.\r
   @param[in]  InformationType        A pointer to an EFI_GUID that defines the contents of InformationBlock.\r
 \r
   @param[in]  This                   A pointer to the EFI_ADAPTER_INFORMATION_PROTOCOL instance.\r
   @param[in]  InformationType        A pointer to an EFI_GUID that defines the contents of InformationBlock.\r


@@ -160,8 +160,8 @@ typedef struct {
   @retval EFI_UNSUPPORTED            The InformationType is not known.\r
   @retval EFI_DEVICE_ERROR           The device reported an error.\r
   @retval EFI_OUT_OF_RESOURCES       The request could not be completed due to a lack of resources.\r
   @retval EFI_UNSUPPORTED            The InformationType is not known.\r
   @retval EFI_DEVICE_ERROR           The device reported an error.\r
   @retval EFI_OUT_OF_RESOURCES       The request could not be completed due to a lack of resources.\r

-  @retval EFI_INVALID_PARAMETER      This is NULL. \r
-  @retval EFI_INVALID_PARAMETER      InformationBlock is NULL. \r
+  @retval EFI_INVALID_PARAMETER      This is NULL.\r
+  @retval EFI_INVALID_PARAMETER      InformationBlock is NULL.\r

   @retval EFI_INVALID_PARAMETER      InformationBlockSize is NULL.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER      InformationBlockSize is NULL.\r
 \r
 **/\r

diff --git a/MdePkg/Include/Protocol/Arp.h b/MdePkg/Include/Protocol/Arp.h
index 8bb6bc7bd2927f5f42aae193a3bfed573dc88005..1dc8a47fee2cd1808da864b1594c786cd3bde4ab 100644 (file)
--- a/MdePkg/Include/Protocol/Arp.h
+++ b/MdePkg/Include/Protocol/Arp.h
@@ -1,22 +1,22 @@
-/** @file  \r
+/** @file\r

   EFI ARP Protocol Definition\r
   EFI ARP Protocol Definition\r

-  \r
+\r

   The EFI ARP Service Binding Protocol is used to locate EFI\r
   ARP Protocol drivers to create and destroy child of the\r
   driver to communicate with other host using ARP protocol.\r
   The EFI ARP Protocol provides services to map IP network\r
   address to hardware address used by a data link protocol.\r
   The EFI ARP Service Binding Protocol is used to locate EFI\r
   ARP Protocol drivers to create and destroy child of the\r
   driver to communicate with other host using ARP protocol.\r
   The EFI ARP Protocol provides services to map IP network\r
   address to hardware address used by a data link protocol.\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
-    \r
-THE PROGRAM 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
 \r

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

   This Protocol was introduced in UEFI Specification 2.0.\r
 \r
 **/\r
   This Protocol was introduced in UEFI Specification 2.0.\r
 \r
 **/\r


@@ -119,13 +119,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                   The 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                   The pointer to the EFI_ARP_PROTOCOL instance.\r


@@ -134,8 +134,8 @@ typedef struct {
   @retval EFI_SUCCESS            The new station address was successfully\r
                                  registered.\r
   @retval EFI_INVALID_PARAMETER  One or more of the following conditions is TRUE:\r
   @retval EFI_SUCCESS            The new station address was successfully\r
                                  registered.\r
   @retval EFI_INVALID_PARAMETER  One or more of the following conditions is TRUE:\r

-                                 * This is NULL. \r
-                                 * SwAddressLength is zero when ConfigData is not NULL. \r
+                                 * This is NULL.\r
+                                 * SwAddressLength is zero when ConfigData is not NULL.\r

                                  * StationAddress is NULL when ConfigData is not NULL.\r
   @retval EFI_ACCESS_DENIED      The SwAddressType, SwAddressLength, or\r
                                  StationAddress is different from the one that is\r
                                  * StationAddress is NULL when ConfigData is not NULL.\r
   @retval EFI_ACCESS_DENIED      The SwAddressType, SwAddressLength, or\r
                                  StationAddress is different from the one that is\r


@@ -144,27 +144,27 @@ typedef struct {
                                  allocated.\r
 \r
 **/\r
                                  allocated.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_ARP_CONFIGURE)(\r
   IN EFI_ARP_PROTOCOL       *This,\r
   IN EFI_ARP_CONFIG_DATA    *ConfigData   OPTIONAL\r
 EFI_STATUS\r
 (EFIAPI *EFI_ARP_CONFIGURE)(\r
   IN EFI_ARP_PROTOCOL       *This,\r
   IN EFI_ARP_CONFIG_DATA    *ConfigData   OPTIONAL\r

-  );  \r
+  );\r

 \r
 /**\r
   This function is used to insert entries into the ARP cache.\r
 \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 terms 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 terms 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


@@ -184,10 +184,10 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS            The entry has been added or updated.\r
   @retval EFI_INVALID_PARAMETER  One or more of the following conditions is TRUE:\r
 \r
   @retval EFI_SUCCESS            The entry has been added or updated.\r
   @retval EFI_INVALID_PARAMETER  One or more of the following conditions is TRUE:\r

-                                 * This is NULL. \r
-                                 * DenyFlag is FALSE and TargetHwAddress is NULL. \r
-                                 * DenyFlag is FALSE and TargetSwAddress is NULL. \r
-                                 * TargetHwAddress is NULL and TargetSwAddress is NULL. \r
+                                 * This is NULL.\r
+                                 * DenyFlag is FALSE and TargetHwAddress is NULL.\r
+                                 * DenyFlag is FALSE and TargetSwAddress is NULL.\r
+                                 * TargetHwAddress is NULL and TargetSwAddress is NULL.\r

                                  * Neither TargetSwAddress nor TargetHwAddress are NULL when DenyFlag is\r
                                  TRUE.\r
   @retval EFI_OUT_OF_RESOURCES   The new ARP cache entry could not be allocated.\r
                                  * Neither TargetSwAddress nor TargetHwAddress are NULL when DenyFlag is\r
                                  TRUE.\r
   @retval EFI_OUT_OF_RESOURCES   The new ARP cache entry could not be allocated.\r


@@ -205,24 +205,24 @@ EFI_STATUS
   IN VOID                   *TargetHwAddress  OPTIONAL,\r
   IN UINT32                 TimeoutValue,\r
   IN BOOLEAN                Overwrite\r
   IN VOID                   *TargetHwAddress  OPTIONAL,\r
   IN UINT32                 TimeoutValue,\r
   IN BOOLEAN                Overwrite\r

-  );  \r
+  );\r

 \r
 /**\r
   This function searches the ARP cache for matching entries and allocates a buffer into\r
   which those entries are copied.\r
 \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                   The 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
                                  hardware protocol addresses.\r
   @param  This                   The 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
                                  hardware protocol addresses.\r

-  @param  AddressBuffer          The pointer to the address buffer. Set to NULL \r
+  @param  AddressBuffer          The pointer to the address buffer. Set to NULL\r

                                  to match all addresses.\r
   @param  EntryLength            The size of an entry in the entries buffer.\r
   @param  EntryCount             The number of ARP cache entries that are found by\r
                                  to match all addresses.\r
   @param  EntryLength            The size of an entry in the entries buffer.\r
   @param  EntryCount             The number of ARP cache entries that are found by\r


@@ -241,7 +241,7 @@ EFI_STATUS
   @retval EFI_NOT_STARTED        The ARP driver instance has not been configured.\r
 \r
 **/\r
   @retval EFI_NOT_STARTED        The ARP driver instance has not been configured.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_ARP_FIND)(\r
   IN EFI_ARP_PROTOCOL       *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_ARP_FIND)(\r
   IN EFI_ARP_PROTOCOL       *This,\r


@@ -251,7 +251,7 @@ EFI_STATUS
   OUT UINT32                *EntryCount       OPTIONAL,\r
   OUT EFI_ARP_FIND_DATA     **Entries         OPTIONAL,\r
   IN BOOLEAN                Refresh\r
   OUT UINT32                *EntryCount       OPTIONAL,\r
   OUT EFI_ARP_FIND_DATA     **Entries         OPTIONAL,\r
   IN BOOLEAN                Refresh\r

-  );  \r
+  );\r

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


@@ -277,7 +277,7 @@ EFI_STATUS
   IN EFI_ARP_PROTOCOL       *This,\r
   IN BOOLEAN                BySwAddress,\r
   IN VOID                   *AddressBuffer   OPTIONAL\r
   IN EFI_ARP_PROTOCOL       *This,\r
   IN BOOLEAN                BySwAddress,\r
   IN VOID                   *AddressBuffer   OPTIONAL\r

-  );  \r
+  );\r

 \r
 /**\r
   This function delete all dynamic entries from the ARP cache that match the specified\r
 \r
 /**\r
   This function delete all dynamic entries from the ARP cache that match the specified\r


@@ -295,7 +295,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_ARP_FLUSH)(\r
   IN EFI_ARP_PROTOCOL       *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_ARP_FLUSH)(\r
   IN EFI_ARP_PROTOCOL       *This\r

-  );  \r
+  );\r

 \r
 /**\r
   This function tries to resolve the TargetSwAddress and optionally returns a\r
 \r
 /**\r
   This function tries to resolve the TargetSwAddress and optionally returns a\r


@@ -322,22 +322,22 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_ARP_REQUEST)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_ARP_REQUEST)(\r

-  IN EFI_ARP_PROTOCOL       *This, \r
+  IN EFI_ARP_PROTOCOL       *This,\r

   IN VOID                   *TargetSwAddress  OPTIONAL,\r
   IN EFI_EVENT              ResolvedEvent     OPTIONAL,\r
   IN VOID                   *TargetSwAddress  OPTIONAL,\r
   IN EFI_EVENT              ResolvedEvent     OPTIONAL,\r

-  OUT VOID                  *TargetHwAddress  \r
-  );  \r
+  OUT VOID                  *TargetHwAddress\r
+  );\r

 \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
 /**\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                   The pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  TargetSwAddress        The pointer to the protocol address in previous\r
                                  request session.\r
   @param  This                   The pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  TargetSwAddress        The pointer to the protocol address in previous\r
                                  request session.\r


@@ -359,13 +359,13 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_ARP_CANCEL)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_ARP_CANCEL)(\r

-  IN EFI_ARP_PROTOCOL       *This, \r
+  IN EFI_ARP_PROTOCOL       *This,\r

   IN VOID                   *TargetSwAddress  OPTIONAL,\r
   IN EFI_EVENT              ResolvedEvent     OPTIONAL\r
   IN VOID                   *TargetSwAddress  OPTIONAL,\r
   IN EFI_EVENT              ResolvedEvent     OPTIONAL\r

-  );  \r
+  );\r

 \r
 ///\r
 \r
 ///\r

-/// ARP is used to resolve local network protocol addresses into \r
+/// ARP is used to resolve local network protocol addresses into\r

 /// network hardware addresses.\r
 ///\r
 struct _EFI_ARP_PROTOCOL {\r
 /// network hardware addresses.\r
 ///\r
 struct _EFI_ARP_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/AtaPassThru.h b/MdePkg/Include/Protocol/AtaPassThru.h
index c0545547bd004014d1cf69c4e2634d3d0437449d..6d9b9f10b421df5f8c0d7cb6768092136b70d860 100644 (file)
--- a/MdePkg/Include/Protocol/AtaPassThru.h
+++ b/MdePkg/Include/Protocol/AtaPassThru.h
@@ -3,14 +3,14 @@
   to send ATA Command Blocks to any ATA device attached to that ATA controller. The information\r
   includes the attributes of the ATA controller.\r
 \r
   to send ATA Command Blocks to any ATA device attached to that ATA controller. The information\r
   includes the attributes of the ATA controller.\r
 \r

-  Copyright (c) 2009 - 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) 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
 \r

-  THE PROGRAM 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


@@ -56,7 +56,7 @@ typedef struct _EFI_ATA_COMMAND_BLOCK {
   UINT8 AtaDeviceHead;\r
   UINT8 AtaSectorNumberExp;\r
   UINT8 AtaCylinderLowExp;\r
   UINT8 AtaDeviceHead;\r
   UINT8 AtaSectorNumberExp;\r
   UINT8 AtaCylinderLowExp;\r

-  UINT8 AtaCylinderHighExp; \r
+  UINT8 AtaCylinderHighExp;\r

   UINT8 AtaFeaturesExp;\r
   UINT8 AtaSectorCount;\r
   UINT8 AtaSectorCountExp;\r
   UINT8 AtaFeaturesExp;\r
   UINT8 AtaSectorCount;\r
   UINT8 AtaSectorCountExp;\r


@@ -73,7 +73,7 @@ typedef struct _EFI_ATA_STATUS_BLOCK {
   UINT8 AtaDeviceHead;\r
   UINT8 AtaSectorNumberExp;\r
   UINT8 AtaCylinderLowExp;\r
   UINT8 AtaDeviceHead;\r
   UINT8 AtaSectorNumberExp;\r
   UINT8 AtaCylinderLowExp;\r

-  UINT8 AtaCylinderHighExp; \r
+  UINT8 AtaCylinderHighExp;\r

   UINT8 Reserved2;\r
   UINT8 AtaSectorCount;\r
   UINT8 AtaSectorCountExp;\r
   UINT8 Reserved2;\r
   UINT8 AtaSectorCount;\r
   UINT8 AtaSectorCountExp;\r


@@ -156,7 +156,7 @@ typedef struct {
   ///\r
   /// On Input, the size, in bytes of OutDataBuffer. On Output, the Number of bytes\r
   /// transferred between ATA Controller and the ATA device. If OutTransferLength is\r
   ///\r
   /// On Input, the size, in bytes of OutDataBuffer. On Output, the Number of bytes\r
   /// transferred between ATA Controller and the ATA device. If OutTransferLength is\r

-  /// larger than the ATA controller can handle, no data will be transferred, \r
+  /// larger than the ATA controller can handle, no data will be transferred,\r

   /// OutTransferLength will be updated to contain the number of bytes that the ATA\r
   /// controller is able to transfer, and EFI_BAD_BUFFER_SIZE will be returned.\r
   ///\r
   /// OutTransferLength will be updated to contain the number of bytes that the ATA\r
   /// controller is able to transfer, and EFI_BAD_BUFFER_SIZE will be returned.\r
   ///\r


@@ -177,8 +177,8 @@ typedef struct {
   supports both blocking I/O and non-blocking I/O. The blocking I/O functionality is required,\r
   and the non-blocking I/O functionality is optional.\r
 \r
   supports both blocking I/O and non-blocking I/O. The blocking I/O functionality is required,\r
   and the non-blocking I/O functionality is optional.\r
 \r

-  @param[in]     This                A pointer to the EFI_ATA_PASS_THRU_PROTOCOL instance. \r
-  @param[in]     Port                The port number of the ATA device to send the command. \r
+  @param[in]     This                A pointer to the EFI_ATA_PASS_THRU_PROTOCOL instance.\r
+  @param[in]     Port                The port number of the ATA device to send the command.\r

   @param[in]     PortMultiplierPort  The port multiplier port number of the ATA device to send the command.\r
                                      If there is no port multiplier, then specify 0xFFFF.\r
   @param[in,out] Packet              A pointer to the ATA command to send to the ATA device specified by Port\r
   @param[in]     PortMultiplierPort  The port multiplier port number of the ATA device to send the command.\r
                                      If there is no port multiplier, then specify 0xFFFF.\r
   @param[in,out] Packet              A pointer to the ATA command to send to the ATA device specified by Port\r


@@ -188,11 +188,11 @@ typedef struct {
                                      Event is not NULL and non blocking I/O is supported, then non-blocking\r
                                      I/O is performed, and Event will be signaled when the ATA command completes.\r
 \r
                                      Event is not NULL and non blocking I/O is supported, then non-blocking\r
                                      I/O is performed, and Event will be signaled when the ATA command completes.\r
 \r

-  @retval EFI_SUCCESS                The ATA command was sent by the host. For bi-directional commands, \r
+  @retval EFI_SUCCESS                The ATA command was sent by the host. For bi-directional commands,\r

                                      InTransferLength bytes were transferred from InDataBuffer. For write and\r
                                      bi-directional commands, OutTransferLength bytes were transferred by OutDataBuffer.\r
   @retval EFI_BAD_BUFFER_SIZE        The ATA command was not executed. The number of bytes that could be transferred\r
                                      InTransferLength bytes were transferred from InDataBuffer. For write and\r
                                      bi-directional commands, OutTransferLength bytes were transferred by OutDataBuffer.\r
   @retval EFI_BAD_BUFFER_SIZE        The ATA command was not executed. The number of bytes that could be transferred\r

-                                     is returned in InTransferLength. For write and bi-directional commands, \r
+                                     is returned in InTransferLength. For write and bi-directional commands,\r

                                      OutTransferLength bytes were transferred by OutDataBuffer.\r
   @retval EFI_NOT_READY              The ATA command could not be sent because there are too many ATA commands\r
                                      already queued. The caller may retry again later.\r
                                      OutTransferLength bytes were transferred by OutDataBuffer.\r
   @retval EFI_NOT_READY              The ATA command could not be sent because there are too many ATA commands\r
                                      already queued. The caller may retry again later.\r


@@ -230,7 +230,7 @@ EFI_STATUS
   If Port is the port number of the last port on the ATA controller, then EFI_NOT_FOUND is\r
   returned.\r
 \r
   If Port is the port number of the last port on the ATA controller, then EFI_NOT_FOUND is\r
   returned.\r
 \r

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

   @param[in,out] Port           On input, a pointer to the port number on the ATA controller.\r
                                 On output, a pointer to the next port number on the ATA\r
                                 controller. An input value of 0xFFFF retrieves the first port\r
   @param[in,out] Port           On input, a pointer to the port number on the ATA controller.\r
                                 On output, a pointer to the next port number on the ATA\r
                                 controller. An input value of 0xFFFF retrieves the first port\r


@@ -250,36 +250,36 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Used to retrieve the list of legal port multiplier port numbers for ATA devices on a port of an ATA \r
-  controller. These can either be the list of port multiplier ports where ATA devices are actually \r
-  present on port or the list of legal port multiplier ports on that port. Regardless, the caller of this \r
-  function must probe the port number and port multiplier port number returned to see if an ATA \r
+  Used to retrieve the list of legal port multiplier port numbers for ATA devices on a port of an ATA\r
+  controller. These can either be the list of port multiplier ports where ATA devices are actually\r
+  present on port or the list of legal port multiplier ports on that port. Regardless, the caller of this\r
+  function must probe the port number and port multiplier port number returned to see if an ATA\r

   device is actually present.\r
 \r
   device is actually present.\r
 \r

-  The GetNextDevice() function retrieves the port multiplier port number of an ATA device \r
+  The GetNextDevice() function retrieves the port multiplier port number of an ATA device\r

   present on a port of an ATA controller.\r
   present on a port of an ATA controller.\r

-  \r
-  If PortMultiplierPort points to a port multiplier port number value that was returned on a \r
+\r
+  If PortMultiplierPort points to a port multiplier port number value that was returned on a\r

   previous call to GetNextDevice(), then the port multiplier port number of the next ATA device\r
   on the port of the ATA controller is returned in PortMultiplierPort, and EFI_SUCCESS is\r
   returned.\r
   previous call to GetNextDevice(), then the port multiplier port number of the next ATA device\r
   on the port of the ATA controller is returned in PortMultiplierPort, and EFI_SUCCESS is\r
   returned.\r

-  \r
-  If PortMultiplierPort points to 0xFFFF, then the port multiplier port number of the first \r
-  ATA device on port of the ATA controller is returned in PortMultiplierPort and \r
+\r
+  If PortMultiplierPort points to 0xFFFF, then the port multiplier port number of the first\r
+  ATA device on port of the ATA controller is returned in PortMultiplierPort and\r

   EFI_SUCCESS is returned.\r
   EFI_SUCCESS is returned.\r

-  \r
+\r

   If PortMultiplierPort is not 0xFFFF and the value pointed to by PortMultiplierPort\r
   was not returned on a previous call to GetNextDevice(), then EFI_INVALID_PARAMETER\r
   is returned.\r
   If PortMultiplierPort is not 0xFFFF and the value pointed to by PortMultiplierPort\r
   was not returned on a previous call to GetNextDevice(), then EFI_INVALID_PARAMETER\r
   is returned.\r

-  \r
-  If PortMultiplierPort is the port multiplier port number of the last ATA device on the port of \r
+\r
+  If PortMultiplierPort is the port multiplier port number of the last ATA device on the port of\r

   the ATA controller, then EFI_NOT_FOUND is returned.\r
 \r
   @param[in]     This                A pointer to the EFI_ATA_PASS_THRU_PROTOCOL instance.\r
   @param[in]     Port                The port number present on the ATA controller.\r
   @param[in,out] PortMultiplierPort  On input, a pointer to the port multiplier port number of an\r
   the ATA controller, then EFI_NOT_FOUND is returned.\r
 \r
   @param[in]     This                A pointer to the EFI_ATA_PASS_THRU_PROTOCOL instance.\r
   @param[in]     Port                The port number present on the ATA controller.\r
   @param[in,out] PortMultiplierPort  On input, a pointer to the port multiplier port number of an\r

-                                     ATA device present on the ATA controller. \r
-                                     If on input a PortMultiplierPort of 0xFFFF is specified, \r
+                                     ATA device present on the ATA controller.\r
+                                     If on input a PortMultiplierPort of 0xFFFF is specified,\r

                                      then the port multiplier port number of the first ATA device\r
                                      is returned. On output, a pointer to the port multiplier port\r
                                      number of the next ATA device present on an ATA controller.\r
                                      then the port multiplier port number of the first ATA device\r
                                      is returned. On output, a pointer to the port multiplier port\r
                                      number of the next ATA device present on an ATA controller.\r


@@ -345,7 +345,7 @@ EFI_STATUS
 \r
   The GetDevice() function determines the port and port multiplier port number associated with\r
   the ATA device described by DevicePath. If DevicePath is a device path node type that the\r
 \r
   The GetDevice() function determines the port and port multiplier port number associated with\r
   the ATA device described by DevicePath. If DevicePath is a device path node type that the\r

-  ATA Pass Thru driver supports, then the ATA Pass Thru driver will attempt to translate the contents \r
+  ATA Pass Thru driver supports, then the ATA Pass Thru driver will attempt to translate the contents\r

   DevicePath into a port number and port multiplier port number.\r
 \r
   If this translation is successful, then that port number and port multiplier port number are returned\r
   DevicePath into a port number and port multiplier port number.\r
 \r
   If this translation is successful, then that port number and port multiplier port number are returned\r


@@ -353,11 +353,11 @@ EFI_STATUS
 \r
   If DevicePath, Port, or PortMultiplierPort are NULL, then EFI_INVALID_PARAMETER is returned.\r
 \r
 \r
   If DevicePath, Port, or PortMultiplierPort are NULL, then EFI_INVALID_PARAMETER is returned.\r
 \r

-  If DevicePath is not a device path node type that the ATA Pass Thru driver supports, then \r
+  If DevicePath is not a device path node type that the ATA Pass Thru driver supports, then\r

   EFI_UNSUPPORTED is returned.\r
 \r
   EFI_UNSUPPORTED is returned.\r
 \r

-  If DevicePath is a device path node type that the ATA Pass Thru driver supports, but there is not \r
-  a valid translation from DevicePath to a port number and port multiplier port number, then \r
+  If DevicePath is a device path node type that the ATA Pass Thru driver supports, but there is not\r
+  a valid translation from DevicePath to a port number and port multiplier port number, then\r

   EFI_NOT_FOUND is returned.\r
 \r
   @param[in]  This                A pointer to the EFI_ATA_PASS_THRU_PROTOCOL instance.\r
   EFI_NOT_FOUND is returned.\r
 \r
   @param[in]  This                A pointer to the EFI_ATA_PASS_THRU_PROTOCOL instance.\r


@@ -423,7 +423,7 @@ EFI_STATUS
   If this ATA controller does not support a device reset operation, then EFI_UNSUPPORTED is\r
   returned.\r
 \r
   If this ATA controller does not support a device reset operation, then EFI_UNSUPPORTED is\r
   returned.\r
 \r

-  If Port or PortMultiplierPort are not in a valid range for this ATA controller, then \r
+  If Port or PortMultiplierPort are not in a valid range for this ATA controller, then\r

   EFI_INVALID_PARAMETER is returned.\r
 \r
   If a device error occurs while executing that device reset operation, then EFI_DEVICE_ERROR\r
   EFI_INVALID_PARAMETER is returned.\r
 \r
   If a device error occurs while executing that device reset operation, then EFI_DEVICE_ERROR\r

diff --git a/MdePkg/Include/Protocol/AuthenticationInfo.h b/MdePkg/Include/Protocol/AuthenticationInfo.h
index a69423fe5b266a80557a95ce0183fbed09153541..47b8105134714d900d55e61439c295d496666e23 100644 (file)
--- a/MdePkg/Include/Protocol/AuthenticationInfo.h
+++ b/MdePkg/Include/Protocol/AuthenticationInfo.h
@@ -1,16 +1,16 @@
 /** @file\r
   EFI_AUTHENTICATION_INFO_PROTOCOL as defined in UEFI 2.0.\r
 /** @file\r
   EFI_AUTHENTICATION_INFO_PROTOCOL as defined in UEFI 2.0.\r

-  This protocol is used on any device handle to obtain authentication information \r
+  This protocol is used on any device handle to obtain authentication information\r

   associated with the physical or logical device.\r
 \r
   associated with the physical or logical device.\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
-    \r
-THE PROGRAM 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


@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   { \\r
     0x7671d9d0, 0x53db, 0x4173, {0xaa, 0x69, 0x23, 0x27, 0xf2, 0x1f, 0x0b, 0xc7 } \\r
   }\r
   { \\r
     0x7671d9d0, 0x53db, 0x4173, {0xaa, 0x69, 0x23, 0x27, 0xf2, 0x1f, 0x0b, 0xc7 } \\r
   }\r

-  \r
+\r

 #define EFI_AUTHENTICATION_CHAP_RADIUS_GUID \\r
   { \\r
     0xd6062b50, 0x15ca, 0x11da, {0x92, 0x19, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d } \\r
 #define EFI_AUTHENTICATION_CHAP_RADIUS_GUID \\r
   { \\r
     0xd6062b50, 0x15ca, 0x11da, {0x92, 0x19, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d } \\r


@@ -75,7 +75,7 @@ typedef struct {
   ///\r
   UINT8            NasSecret[1];\r
 \r
   ///\r
   UINT8            NasSecret[1];\r
 \r

-  /// \r
+  ///\r

   /// CHAP Initiator Secret Length in bytes on offset NasSecret + NasSecretLength.\r
   ///\r
   /// UINT16           ChapSecretLength;\r
   /// CHAP Initiator Secret Length in bytes on offset NasSecret + NasSecretLength.\r
   ///\r
   /// UINT16           ChapSecretLength;\r


@@ -181,11 +181,11 @@ typedef struct {
                                     responsible for allocating the buffer and it is the caller's\r
                                     responsibility to free buffer when the caller is finished with buffer.\r
 \r
                                     responsible for allocating the buffer and it is the caller's\r
                                     responsibility to free buffer when the caller is finished with buffer.\r
 \r

-  @retval EFI_SUCCESS           Successfully retrieved authentication information \r
+  @retval EFI_SUCCESS           Successfully retrieved authentication information\r

                                 for the given ControllerHandle.\r
                                 for the given ControllerHandle.\r

-  @retval EFI_INVALID_PARAMETER No matching authentication information found for \r
+  @retval EFI_INVALID_PARAMETER No matching authentication information found for\r

                                 the given ControllerHandle.\r
                                 the given ControllerHandle.\r

-  @retval EFI_DEVICE_ERROR      The authentication information could not be retrieved \r
+  @retval EFI_DEVICE_ERROR      The authentication information could not be retrieved\r

                                 due to a hardware error.\r
 \r
 **/\r
                                 due to a hardware error.\r
 \r
 **/\r


@@ -203,12 +203,12 @@ EFI_STATUS
   @param[in]  This                 The pointer to the EFI_AUTHENTICATION_INFO_PROTOCOL.\r
   @param[in]  ControllerHandle     The handle to the Controller.\r
   @param[in]  Buffer               The pointer to the authentication information.\r
   @param[in]  This                 The pointer to the EFI_AUTHENTICATION_INFO_PROTOCOL.\r
   @param[in]  ControllerHandle     The handle to the Controller.\r
   @param[in]  Buffer               The pointer to the authentication information.\r

-                                \r
-  @retval EFI_SUCCESS          Successfully set authentication information for the \r
+\r
+  @retval EFI_SUCCESS          Successfully set authentication information for the\r

                                given ControllerHandle.\r
                                given ControllerHandle.\r

-  @retval EFI_UNSUPPORTED      If the platform policies do not allow setting of \r
+  @retval EFI_UNSUPPORTED      If the platform policies do not allow setting of\r

                                the authentication information.\r
                                the authentication information.\r

-  @retval EFI_DEVICE_ERROR     The authentication information could not be configured \r
+  @retval EFI_DEVICE_ERROR     The authentication information could not be configured\r

                                due to a hardware error.\r
   @retval EFI_OUT_OF_RESOURCES Not enough storage is available to hold the data.\r
 \r
                                due to a hardware error.\r
   @retval EFI_OUT_OF_RESOURCES Not enough storage is available to hold the data.\r
 \r


@@ -219,10 +219,10 @@ EFI_STATUS
   IN EFI_AUTHENTICATION_INFO_PROTOCOL  *This,\r
   IN EFI_HANDLE                        ControllerHandle,\r
   IN VOID                              *Buffer\r
   IN EFI_AUTHENTICATION_INFO_PROTOCOL  *This,\r
   IN EFI_HANDLE                        ControllerHandle,\r
   IN VOID                              *Buffer\r

-  );  \r
+  );\r

 \r
 ///\r
 \r
 ///\r

-/// This protocol is used on any device handle to obtain authentication \r
+/// This protocol is used on any device handle to obtain authentication\r

 /// information associated with the physical or logical device.\r
 ///\r
 struct _EFI_AUTHENTICATION_INFO_PROTOCOL {\r
 /// information associated with the physical or logical device.\r
 ///\r
 struct _EFI_AUTHENTICATION_INFO_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Bds.h b/MdePkg/Include/Protocol/Bds.h
index f6b3645524c02f99ec8b150e5b895c9698617ddb..a463a28ab1acb65a7e05b74b71af5384fd54aa28 100644 (file)
--- a/MdePkg/Include/Protocol/Bds.h
+++ b/MdePkg/Include/Protocol/Bds.h
@@ -3,14 +3,14 @@
 \r
   When the DXE core is done it calls the BDS via this protocol.\r
 \r
 \r
   When the DXE core is done it calls the BDS via this protocol.\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
+  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


@@ -29,19 +29,19 @@
 typedef struct _EFI_BDS_ARCH_PROTOCOL   EFI_BDS_ARCH_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_BDS_ARCH_PROTOCOL   EFI_BDS_ARCH_PROTOCOL;\r
 \r
 /**\r

-  This function uses policy data from the platform to determine what operating \r
-  system or system utility should be loaded and invoked.  This function call \r
-  also optionally make the use of user input to determine the operating system \r
-  or system utility to be loaded and invoked.  When the DXE Core has dispatched \r
-  all the drivers on the dispatch queue, this function is called.  This \r
-  function will attempt to connect the boot devices required to load and invoke \r
-  the selected operating system or system utility.  During this process, \r
-  additional firmware volumes may be discovered that may contain addition DXE \r
-  drivers that can be dispatched by the DXE Core.   If a boot device cannot be \r
-  fully connected, this function calls the DXE Service Dispatch() to allow the \r
-  DXE drivers from any newly discovered firmware volumes to be dispatched.  \r
-  Then the boot device connection can be attempted again.  If the same boot \r
-  device connection operation fails twice in a row, then that boot device has \r
+  This function uses policy data from the platform to determine what operating\r
+  system or system utility should be loaded and invoked.  This function call\r
+  also optionally make the use of user input to determine the operating system\r
+  or system utility to be loaded and invoked.  When the DXE Core has dispatched\r
+  all the drivers on the dispatch queue, this function is called.  This\r
+  function will attempt to connect the boot devices required to load and invoke\r
+  the selected operating system or system utility.  During this process,\r
+  additional firmware volumes may be discovered that may contain addition DXE\r
+  drivers that can be dispatched by the DXE Core.   If a boot device cannot be\r
+  fully connected, this function calls the DXE Service Dispatch() to allow the\r
+  DXE drivers from any newly discovered firmware volumes to be dispatched.\r
+  Then the boot device connection can be attempted again.  If the same boot\r
+  device connection operation fails twice in a row, then that boot device has\r

   failed, and should be skipped.  This function should never return.\r
 \r
   @param  This             The EFI_BDS_ARCH_PROTOCOL instance.\r
   failed, and should be skipped.  This function should never return.\r
 \r
   @param  This             The EFI_BDS_ARCH_PROTOCOL instance.\r


@@ -56,11 +56,11 @@ VOID
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The EFI_BDS_ARCH_PROTOCOL transfers control from DXE to an operating \r
-/// system or a system utility.  If there are not enough drivers initialized \r
-/// when this protocol is used to access the required boot device(s), then \r
-/// this protocol should add drivers to the dispatch queue and return control \r
-/// back to the dispatcher.  Once the required boot devices are available, then \r
+/// The EFI_BDS_ARCH_PROTOCOL transfers control from DXE to an operating\r
+/// system or a system utility.  If there are not enough drivers initialized\r
+/// when this protocol is used to access the required boot device(s), then\r
+/// this protocol should add drivers to the dispatch queue and return control\r
+/// back to the dispatcher.  Once the required boot devices are available, then\r

 /// the boot device can be used to load and invoke an OS or a system utility.\r
 ///\r
 struct _EFI_BDS_ARCH_PROTOCOL {\r
 /// the boot device can be used to load and invoke an OS or a system utility.\r
 ///\r
 struct _EFI_BDS_ARCH_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Bis.h b/MdePkg/Include/Protocol/Bis.h
index 03cae05907c2ceab265ad68d30a69e3c16f4fd33..f4376570ba10e1ed5e58e3fe0d390b456a4b7c32 100644 (file)
--- a/MdePkg/Include/Protocol/Bis.h
+++ b/MdePkg/Include/Protocol/Bis.h
@@ -1,18 +1,18 @@
 /** @file\r
 /** @file\r

-  The EFI_BIS_PROTOCOL is used to check a digital signature of a data block \r
+  The EFI_BIS_PROTOCOL is used to check a digital signature of a data block\r

   against a digital certificate for the purpose of an integrity and authorization check.\r
 \r
   against a digital certificate for the purpose of an integrity and authorization check.\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
-    \r
-THE PROGRAM 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
 \r

-  @par Revision Reference:          \r
-  This Protocol is introduced in EFI Specification 1.10.     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+  @par Revision Reference:\r
+  This Protocol is introduced in EFI Specification 1.10.\r

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


@@ -122,32 +122,32 @@ typedef struct {
 #define BOOT_OBJECT_AUTHORIZATION_PARMSET_GUIDVALUE \\r
         BOOT_OBJECT_AUTHORIZATION_PARMSET_GUID\r
 \r
 #define BOOT_OBJECT_AUTHORIZATION_PARMSET_GUIDVALUE \\r
         BOOT_OBJECT_AUTHORIZATION_PARMSET_GUID\r
 \r

-/**                                                                 \r
+/**\r

   Initializes the BIS service, checking that it is compatible with the version requested by the caller.\r
   Initializes the BIS service, checking that it is compatible with the version requested by the caller.\r

-  After this call, other BIS functions may be invoked.                                                 \r
-    \r
+  After this call, other BIS functions may be invoked.\r
+\r

   @param  This                     A pointer to the EFI_BIS_PROTOCOL object.\r
   @param  This                     A pointer to the EFI_BIS_PROTOCOL object.\r

-  @param  AppHandle                The function writes the new BIS_APPLICATION_HANDLE if           \r
+  @param  AppHandle                The function writes the new BIS_APPLICATION_HANDLE if\r

                                    successful, otherwise it writes NULL. The caller must eventually\r
                                    successful, otherwise it writes NULL. The caller must eventually\r

-                                   destroy this handle by calling Shutdown().                      \r
+                                   destroy this handle by calling Shutdown().\r

   @param  InterfaceVersion         On input, the caller supplies the major version number of the\r
   @param  InterfaceVersion         On input, the caller supplies the major version number of the\r

-                                   interface version desired.                                   \r
-                                   On output, both the major and minor                         \r
+                                   interface version desired.\r
+                                   On output, both the major and minor\r

                                    version numbers are updated with the major and minor version\r
                                    numbers of the interface. This update is done whether or not the\r
                                    version numbers are updated with the major and minor version\r
                                    numbers of the interface. This update is done whether or not the\r

-                                   initialization was successful.                                    \r
-  @param  TargetAddress            Indicates a network or device address of the BIS platform to connect to.                                                                 \r
+                                   initialization was successful.\r
+  @param  TargetAddress            Indicates a network or device address of the BIS platform to connect to.\r

 \r
   @retval EFI_SUCCESS              The function completed successfully.\r
 \r
   @retval EFI_SUCCESS              The function completed successfully.\r

-  @retval EFI_INCOMPATIBLE_VERSION The InterfaceVersion.Major requested by the                \r
+  @retval EFI_INCOMPATIBLE_VERSION The InterfaceVersion.Major requested by the\r

                                    caller was not compatible with the interface version of the\r
                                    implementation. The InterfaceVersion.Major has\r
                                    been updated with the current interface version.\r
                                    caller was not compatible with the interface version of the\r
                                    implementation. The InterfaceVersion.Major has\r
                                    been updated with the current interface version.\r

-  @retval EFI_UNSUPPORTED          This is a local-platform implementation and        \r
-                                   TargetAddress.Data was not NULL, or                \r
+  @retval EFI_UNSUPPORTED          This is a local-platform implementation and\r
+                                   TargetAddress.Data was not NULL, or\r

                                    TargetAddress.Data was any other value that was not\r
                                    TargetAddress.Data was any other value that was not\r

-                                   supported by the implementation.                   \r
-  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.                              \r
+                                   supported by the implementation.\r
+  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.\r

   @retval EFI_DEVICE_ERROR         One of the following device errors:\r
                                    * The function encountered an unexpected internal failure while initializing a cryptographic software module\r
                                    * No cryptographic software module with compatible version was found\r
   @retval EFI_DEVICE_ERROR         One of the following device errors:\r
                                    * The function encountered an unexpected internal failure while initializing a cryptographic software module\r
                                    * No cryptographic software module with compatible version was found\r


@@ -161,51 +161,51 @@ typedef struct {
                                    is NULL or an invalid memory reference. Or,\r
                                    the TargetAddress parameter supplied by the caller is\r
                                    NULL or an invalid memory reference.\r
                                    is NULL or an invalid memory reference. Or,\r
                                    the TargetAddress parameter supplied by the caller is\r
                                    NULL or an invalid memory reference.\r

-                                          \r
-**/                                       \r
+\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_INITIALIZE)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_INITIALIZE)(\r

-  IN     EFI_BIS_PROTOCOL        *This,              \r
-  OUT    BIS_APPLICATION_HANDLE  *AppHandle,         \r
-  IN OUT EFI_BIS_VERSION         *InterfaceVersion,  \r
-  IN     EFI_BIS_DATA            *TargetAddress      \r
+  IN     EFI_BIS_PROTOCOL        *This,\r
+  OUT    BIS_APPLICATION_HANDLE  *AppHandle,\r
+  IN OUT EFI_BIS_VERSION         *InterfaceVersion,\r
+  IN     EFI_BIS_DATA            *TargetAddress\r

   );\r
 \r
   );\r
 \r

-/**                                                                 \r
-  Frees memory structures allocated and returned by other functions in the EFI_BIS protocol.  \r
-      \r
+/**\r
+  Frees memory structures allocated and returned by other functions in the EFI_BIS protocol.\r
+\r

   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r
   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r

-                                   of the BIS service.                                                                                         \r
-  @param  ToFree                   An EFI_BIS_DATA* and associated memory block to be freed. \r
+                                   of the BIS service.\r
+  @param  ToFree                   An EFI_BIS_DATA* and associated memory block to be freed.\r

                                    This EFI_BIS_DATA* must have been allocated by one of the other BIS functions.\r
 \r
   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r
                                    This EFI_BIS_DATA* must have been allocated by one of the other BIS functions.\r
 \r
   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r

-                                   application instance handle associated with the EFI_BIS protocol.                                     \r
-  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.                                \r
+                                   application instance handle associated with the EFI_BIS protocol.\r
+  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.\r

   @retval EFI_INVALID_PARAMETER    The ToFree parameter is not or is no longer a memory resource\r
   @retval EFI_INVALID_PARAMETER    The ToFree parameter is not or is no longer a memory resource\r

-                                   associated with this AppHandle.                              \r
-                                           \r
-**/     \r
+                                   associated with this AppHandle.\r
+\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_FREE)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_FREE)(\r

-  IN BIS_APPLICATION_HANDLE  AppHandle,               \r
-  IN EFI_BIS_DATA            *ToFree                  \r
+  IN BIS_APPLICATION_HANDLE  AppHandle,\r
+  IN EFI_BIS_DATA            *ToFree\r

   );\r
 \r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Shuts down an application's instance of the BIS service, invalidating the application handle. After\r
   Shuts down an application's instance of the BIS service, invalidating the application handle. After\r

-  this call, other BIS functions may no longer be invoked using the application handle value.         \r
-      \r
+  this call, other BIS functions may no longer be invoked using the application handle value.\r
+\r

   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r
   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r

-                                   of the BIS service.                                                                                           \r
+                                   of the BIS service.\r

 \r
   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not, or is no longer, a valid\r
 \r
   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not, or is no longer, a valid\r

-                                   application instance handle associated with the EFI_BIS protocol.                                     \r
-  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.                                \r
+                                   application instance handle associated with the EFI_BIS protocol.\r
+  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.\r

   @retval EFI_DEVICE_ERROR         The function encountered an unexpected internal failure while\r
                                    returning resources associated with a cryptographic software module, or\r
                                    while trying to shut down a cryptographic software module.\r
   @retval EFI_DEVICE_ERROR         The function encountered an unexpected internal failure while\r
                                    returning resources associated with a cryptographic software module, or\r
                                    while trying to shut down a cryptographic software module.\r


@@ -213,206 +213,206 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_SHUTDOWN)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_SHUTDOWN)(\r

-  IN BIS_APPLICATION_HANDLE  AppHandle               \r
+  IN BIS_APPLICATION_HANDLE  AppHandle\r

   );\r
 \r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves the certificate that has been configured as the identity of the organization designated as\r
   the source of authorization for signatures of boot objects.\r
   Retrieves the certificate that has been configured as the identity of the organization designated as\r
   the source of authorization for signatures of boot objects.\r

-      \r
+\r

   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r
   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r

-                                   of the BIS service.                                                                                           \r
+                                   of the BIS service.\r

   @param  Certificate              The function writes an allocated EFI_BIS_DATA* containing the Boot\r
                                    Object Authorization Certificate object.  The caller must\r
                                    eventually free the memory allocated by this function using the function Free().\r
 \r
   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r
   @param  Certificate              The function writes an allocated EFI_BIS_DATA* containing the Boot\r
                                    Object Authorization Certificate object.  The caller must\r
                                    eventually free the memory allocated by this function using the function Free().\r
 \r
   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r

-                                   application instance handle associated with the EFI_BIS protocol.                                     \r
-  @retval EFI_NOT_FOUND            There is no Boot Object Authorization Certificate currently installed.                        \r
-  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.                                \r
+                                   application instance handle associated with the EFI_BIS protocol.\r
+  @retval EFI_NOT_FOUND            There is no Boot Object Authorization Certificate currently installed.\r
+  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.\r

   @retval EFI_INVALID_PARAMETER    The Certificate parameter supplied by the caller is NULL or\r
   @retval EFI_INVALID_PARAMETER    The Certificate parameter supplied by the caller is NULL or\r

-                                   an invalid memory reference.                                       \r
-                                   \r
-**/ \r
+                                   an invalid memory reference.\r
+\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_CERTIFICATE)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_CERTIFICATE)(\r

-  IN  BIS_APPLICATION_HANDLE  AppHandle,              \r
-  OUT EFI_BIS_DATA            **Certificate           \r
+  IN  BIS_APPLICATION_HANDLE  AppHandle,\r
+  OUT EFI_BIS_DATA            **Certificate\r

   );\r
 \r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Verifies the integrity and authorization of the indicated data object according to the\r
   Verifies the integrity and authorization of the indicated data object according to the\r

-  indicated credentials.                                                                \r
-      \r
+  indicated credentials.\r
+\r

   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r
   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r

-                                   of the BIS service.                                                                                           \r
+                                   of the BIS service.\r

   @param  Credentials              A Signed Manifest containing verification information for the indicated\r
   @param  Credentials              A Signed Manifest containing verification information for the indicated\r

-                                   data object.                                                            \r
+                                   data object.\r

   @param  DataObject               An in-memory copy of the raw data object to be verified.\r
   @param  IsVerified               The function writes TRUE if the verification succeeded, otherwise\r
   @param  DataObject               An in-memory copy of the raw data object to be verified.\r
   @param  IsVerified               The function writes TRUE if the verification succeeded, otherwise\r

-                                   FALSE.                                                           \r
-                                   \r
+                                   FALSE.\r
+\r

   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r
   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r

-                                   application instance handle associated with the EFI_BIS protocol.                                       \r
-  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.                                \r
+                                   application instance handle associated with the EFI_BIS protocol.\r
+  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.\r

   @retval EFI_INVALID_PARAMETER    One or more parameters are invalid.\r
   @retval EFI_SECURITY_VIOLATION   The signed manifest supplied as the Credentials parameter\r
                                    was invalid (could not be parsed) or Platform-specific authorization failed, etc.\r
   @retval EFI_INVALID_PARAMETER    One or more parameters are invalid.\r
   @retval EFI_SECURITY_VIOLATION   The signed manifest supplied as the Credentials parameter\r
                                    was invalid (could not be parsed) or Platform-specific authorization failed, etc.\r

-  @retval EFI_DEVICE_ERROR         An unexpected internal error occurred.                           \r
-                                   \r
-**/ \r
+  @retval EFI_DEVICE_ERROR         An unexpected internal error occurred.\r
+\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_VERIFY_BOOT_OBJECT)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_VERIFY_BOOT_OBJECT)(\r

-  IN  BIS_APPLICATION_HANDLE AppHandle,               \r
-  IN  EFI_BIS_DATA           *Credentials,            \r
-  IN  EFI_BIS_DATA           *DataObject,             \r
-  OUT BOOLEAN                *IsVerified              \r
+  IN  BIS_APPLICATION_HANDLE AppHandle,\r
+  IN  EFI_BIS_DATA           *Credentials,\r
+  IN  EFI_BIS_DATA           *DataObject,\r
+  OUT BOOLEAN                *IsVerified\r

   );\r
 \r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves the current status of the Boot Authorization Check Flag.\r
   Retrieves the current status of the Boot Authorization Check Flag.\r

-      \r
+\r

   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r
   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r

-                                   of the BIS service.                                                                                           \r
+                                   of the BIS service.\r

   @param  CheckIsRequired          The function writes the value TRUE if a Boot Authorization Check is\r
   @param  CheckIsRequired          The function writes the value TRUE if a Boot Authorization Check is\r

-                                   currently required on this platform, otherwise the function writes \r
-                                   FALSE.                                                             \r
-                                   \r
+                                   currently required on this platform, otherwise the function writes\r
+                                   FALSE.\r
+\r

   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r
   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r

-                                   application instance handle associated with the EFI_BIS protocol.                                       \r
-  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.                                \r
+                                   application instance handle associated with the EFI_BIS protocol.\r
+  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.\r

   @retval EFI_INVALID_PARAMETER    The CheckIsRequired parameter supplied by the caller is\r
   @retval EFI_INVALID_PARAMETER    The CheckIsRequired parameter supplied by the caller is\r

-                                   NULL or an invalid memory reference.                   \r
-                                   \r
-**/ \r
+                                   NULL or an invalid memory reference.\r
+\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_CHECKFLAG)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_CHECKFLAG)(\r

-  IN  BIS_APPLICATION_HANDLE  AppHandle,             \r
-  OUT BOOLEAN                 *CheckIsRequired       \r
+  IN  BIS_APPLICATION_HANDLE  AppHandle,\r
+  OUT BOOLEAN                 *CheckIsRequired\r

   );\r
 \r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves a unique token value to be included in the request credential for the next update of any\r
   Retrieves a unique token value to be included in the request credential for the next update of any\r

-  parameter in the Boot Object Authorization set                                                    \r
-      \r
-  @param  AppHandle                An opaque handle that identifies the caller's \r
-                                   instance of initialization of the BIS service.                                                                                           \r
-  @param  UpdateToken              The function writes an allocated EFI_BIS_DATA* \r
-                                   containing the newunique update token value.  \r
-                                   The caller musteventually free the memory allocated  \r
+  parameter in the Boot Object Authorization set\r
+\r
+  @param  AppHandle                An opaque handle that identifies the caller's\r
+                                   instance of initialization of the BIS service.\r
+  @param  UpdateToken              The function writes an allocated EFI_BIS_DATA*\r
+                                   containing the newunique update token value.\r
+                                   The caller musteventually free the memory allocated\r

                                    by this function using the function Free().\r
                                    by this function using the function Free().\r

-                                   \r
+\r

   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r
   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r

-                                   application instance handle associated with the EFI_BIS protocol.                                       \r
-  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.                                \r
+                                   application instance handle associated with the EFI_BIS protocol.\r
+  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.\r

   @retval EFI_INVALID_PARAMETER    The UpdateToken parameter supplied by the caller is NULL or\r
   @retval EFI_INVALID_PARAMETER    The UpdateToken parameter supplied by the caller is NULL or\r

-                                   an invalid memory reference.        \r
-  @retval EFI_DEVICE_ERROR         An unexpected internal error occurred.                                                            \r
-                                   \r
-**/ \r
+                                   an invalid memory reference.\r
+  @retval EFI_DEVICE_ERROR         An unexpected internal error occurred.\r
+\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_UPDATE_TOKEN)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_UPDATE_TOKEN)(\r

-  IN  BIS_APPLICATION_HANDLE  AppHandle,              \r
-  OUT EFI_BIS_DATA            **UpdateToken           \r
+  IN  BIS_APPLICATION_HANDLE  AppHandle,\r
+  OUT EFI_BIS_DATA            **UpdateToken\r

   );\r
 \r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Updates one of the configurable parameters of the Boot Object Authorization set.\r
   Updates one of the configurable parameters of the Boot Object Authorization set.\r

-      \r
-  @param  AppHandle                An opaque handle that identifies the caller's \r
-                                   instance of initialization of the BIS service.                                                                                           \r
-  @param  RequestCredential        This is a Signed Manifest with embedded attributes \r
-                                   that carry the details of the requested update.                                                 \r
-  @param  NewUpdateToken           The function writes an allocated EFI_BIS_DATA* \r
-                                   containing the new unique update token value. \r
-                                   The caller must eventually free the memory allocated  \r
+\r
+  @param  AppHandle                An opaque handle that identifies the caller's\r
+                                   instance of initialization of the BIS service.\r
+  @param  RequestCredential        This is a Signed Manifest with embedded attributes\r
+                                   that carry the details of the requested update.\r
+  @param  NewUpdateToken           The function writes an allocated EFI_BIS_DATA*\r
+                                   containing the new unique update token value.\r
+                                   The caller must eventually free the memory allocated\r

                                    by this function using the function Free().\r
                                    by this function using the function Free().\r

-                                   \r
-  @retval EFI_SUCCESS              The function completed successfully.                                                \r
-  @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid                              \r
-                                   application instance handle associated with the EFI_BIS protocol.                   \r
-  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.                       \r
-  @retval EFI_INVALID_PARAMETER    One or more parameters are invalid.                                                 \r
-  @retval EFI_SECURITY_VIOLATION   The signed manifest supplied as the RequestCredential parameter                           \r
-                                   was invalid (could not be parsed) or Platform-specific authorization failed, etc.   \r
+\r
+  @retval EFI_SUCCESS              The function completed successfully.\r
+  @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r
+                                   application instance handle associated with the EFI_BIS protocol.\r
+  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.\r
+  @retval EFI_INVALID_PARAMETER    One or more parameters are invalid.\r
+  @retval EFI_SECURITY_VIOLATION   The signed manifest supplied as the RequestCredential parameter\r
+                                   was invalid (could not be parsed) or Platform-specific authorization failed, etc.\r

   @retval EFI_DEVICE_ERROR         An unexpected internal error occurred while analyzing the new\r
                                    certificate's key algorithm, or while attempting to retrieve\r
                                    the public key algorithm of the manifest's signer's certificate,\r
   @retval EFI_DEVICE_ERROR         An unexpected internal error occurred while analyzing the new\r
                                    certificate's key algorithm, or while attempting to retrieve\r
                                    the public key algorithm of the manifest's signer's certificate,\r

-                                   or An unexpected internal error occurred in a cryptographic software module.                                                                                                                                                                  \r
-                                   \r
-**/ \r
+                                   or An unexpected internal error occurred in a cryptographic software module.\r
+\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_UPDATE_BOOT_OBJECT_AUTHORIZATION)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_UPDATE_BOOT_OBJECT_AUTHORIZATION)(\r

-  IN  BIS_APPLICATION_HANDLE AppHandle,               \r
-  IN  EFI_BIS_DATA           *RequestCredential,      \r
-  OUT EFI_BIS_DATA           **NewUpdateToken         \r
+  IN  BIS_APPLICATION_HANDLE AppHandle,\r
+  IN  EFI_BIS_DATA           *RequestCredential,\r
+  OUT EFI_BIS_DATA           **NewUpdateToken\r

   );\r
 \r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Verifies the integrity and authorization of the indicated data object according to the indicated\r
   Verifies the integrity and authorization of the indicated data object according to the indicated\r

-  credentials and authority certificate.                                                          \r
-      \r
+  credentials and authority certificate.\r
+\r

   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r
   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r

-                                   of the BIS service.                                                                                           \r
+                                   of the BIS service.\r

   @param  Credentials              A Signed Manifest containing verification information for the\r
   @param  Credentials              A Signed Manifest containing verification information for the\r

-                                   indicated data object.                                       \r
+                                   indicated data object.\r

   @param  DataObject               An in-memory copy of the raw data object to be verified.\r
   @param  DataObject               An in-memory copy of the raw data object to be verified.\r

-  @param  SectionName              An ASCII string giving the section name in the  \r
+  @param  SectionName              An ASCII string giving the section name in the\r

                                    manifest holding the verification information (in other words,\r
                                    manifest holding the verification information (in other words,\r

-                                   hash value) that corresponds to DataObject.                             \r
-  @param  AuthorityCertificate     A digital certificate whose public key must match the signer's                              \r
-                                   public key which is found in the credentials.                  \r
+                                   hash value) that corresponds to DataObject.\r
+  @param  AuthorityCertificate     A digital certificate whose public key must match the signer's\r
+                                   public key which is found in the credentials.\r

   @param  IsVerified               The function writes TRUE if the verification was successful.\r
   @param  IsVerified               The function writes TRUE if the verification was successful.\r

-                                   Otherwise, the function writes FALSE.                       \r
-                                   \r
-  @retval EFI_SUCCESS              The function completed successfully.                                                \r
-  @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid                              \r
-                                   application instance handle associated with the EFI_BIS protocol.                   \r
-  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.                       \r
-  @retval EFI_INVALID_PARAMETER    One or more parameters are invalid.                                                 \r
+                                   Otherwise, the function writes FALSE.\r
+\r
+  @retval EFI_SUCCESS              The function completed successfully.\r
+  @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r
+                                   application instance handle associated with the EFI_BIS protocol.\r
+  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.\r
+  @retval EFI_INVALID_PARAMETER    One or more parameters are invalid.\r

   @retval EFI_SECURITY_VIOLATION   The Credentials.Data supplied by the caller is NULL,\r
   @retval EFI_SECURITY_VIOLATION   The Credentials.Data supplied by the caller is NULL,\r

-                                   or the AuthorityCertificate supplied by the caller was \r
-                                   invalid (could not be parsed),                      \r
-                                   or Platform-specific authorization failed, etc.   \r
+                                   or the AuthorityCertificate supplied by the caller was\r
+                                   invalid (could not be parsed),\r
+                                   or Platform-specific authorization failed, etc.\r

   @retval EFI_DEVICE_ERROR         An unexpected internal error occurred while attempting to retrieve\r
                                    the public key algorithm of the manifest's signer's certificate,\r
   @retval EFI_DEVICE_ERROR         An unexpected internal error occurred while attempting to retrieve\r
                                    the public key algorithm of the manifest's signer's certificate,\r

-                                   or An unexpected internal error occurred in a cryptographic software module.                                                                                                                                                                  \r
-**/ \r
+                                   or An unexpected internal error occurred in a cryptographic software module.\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_VERIFY_OBJECT_WITH_CREDENTIAL)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_VERIFY_OBJECT_WITH_CREDENTIAL)(\r

-  IN  BIS_APPLICATION_HANDLE AppHandle,              \r
-  IN  EFI_BIS_DATA           *Credentials,           \r
-  IN  EFI_BIS_DATA           *DataObject,            \r
-  IN  EFI_BIS_DATA           *SectionName,           \r
-  IN  EFI_BIS_DATA           *AuthorityCertificate,  \r
-  OUT BOOLEAN                *IsVerified             \r
+  IN  BIS_APPLICATION_HANDLE AppHandle,\r
+  IN  EFI_BIS_DATA           *Credentials,\r
+  IN  EFI_BIS_DATA           *DataObject,\r
+  IN  EFI_BIS_DATA           *SectionName,\r
+  IN  EFI_BIS_DATA           *AuthorityCertificate,\r
+  OUT BOOLEAN                *IsVerified\r

   );\r
 \r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves a list of digital certificate identifier, digital signature algorithm, hash algorithm, and keylength\r
   Retrieves a list of digital certificate identifier, digital signature algorithm, hash algorithm, and keylength\r

-  combinations that the platform supports.                                                                      \r
+  combinations that the platform supports.\r

 \r
   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r
 \r
   @param  AppHandle                An opaque handle that identifies the caller's instance of initialization\r

-                                   of the BIS service.                                                                                           \r
+                                   of the BIS service.\r

   @param  SignatureInfo            The function writes an allocated EFI_BIS_DATA* containing the array\r
   @param  SignatureInfo            The function writes an allocated EFI_BIS_DATA* containing the array\r

-                                   of EFI_BIS_SIGNATURE_INFO structures representing the supported    \r
+                                   of EFI_BIS_SIGNATURE_INFO structures representing the supported\r

                                    digital certificate identifier, algorithm, and key length combinations.\r
                                    The caller must eventually free the memory allocated by this function using the function Free().\r
 \r
                                    digital certificate identifier, algorithm, and key length combinations.\r
                                    The caller must eventually free the memory allocated by this function using the function Free().\r
 \r

-  @retval EFI_SUCCESS              The function completed successfully.                                                \r
-  @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid                              \r
-                                   application instance handle associated with the EFI_BIS protocol.                   \r
-  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.                       \r
+  @retval EFI_SUCCESS              The function completed successfully.\r
+  @retval EFI_NO_MAPPING           The AppHandle parameter is not or is no longer a valid\r
+                                   application instance handle associated with the EFI_BIS protocol.\r
+  @retval EFI_OUT_OF_RESOURCES     The function failed due to lack of memory or other resources.\r

   @retval EFI_INVALID_PARAMETER    The SignatureInfo parameter supplied by the caller is NULL\r
                                    or an invalid memory reference.\r
   @retval EFI_DEVICE_ERROR         An unexpected internal error occurred in a\r
   @retval EFI_INVALID_PARAMETER    The SignatureInfo parameter supplied by the caller is NULL\r
                                    or an invalid memory reference.\r
   @retval EFI_DEVICE_ERROR         An unexpected internal error occurred in a\r


@@ -424,8 +424,8 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_GET_SIGNATURE_INFO)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BIS_GET_SIGNATURE_INFO)(\r

-  IN  BIS_APPLICATION_HANDLE  AppHandle,           \r
-  OUT EFI_BIS_DATA            **SignatureInfo      \r
+  IN  BIS_APPLICATION_HANDLE  AppHandle,\r
+  OUT EFI_BIS_DATA            **SignatureInfo\r

   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

diff --git a/MdePkg/Include/Protocol/BlockIo.h b/MdePkg/Include/Protocol/BlockIo.h
index 0bc2bcbd8e269c1da36c98a5d9ece9e686f4a116..213c897e7497330cf095f4a7c3092a063287f8e1 100644 (file)
--- a/MdePkg/Include/Protocol/BlockIo.h
+++ b/MdePkg/Include/Protocol/BlockIo.h
@@ -4,14 +4,14 @@
   The Block IO protocol is used to abstract block devices like hard drives,\r
   DVD-ROMs and floppy drives.\r
 \r
   The Block IO protocol is used to abstract block devices like hard drives,\r
   DVD-ROMs and floppy drives.\r
 \r

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


@@ -27,12 +27,12 @@ typedef struct _EFI_BLOCK_IO_PROTOCOL  EFI_BLOCK_IO_PROTOCOL;
 \r
 ///\r
 /// Protocol GUID name defined in EFI1.1.\r
 \r
 ///\r
 /// Protocol GUID name defined in EFI1.1.\r

-/// \r
+///\r

 #define BLOCK_IO_PROTOCOL       EFI_BLOCK_IO_PROTOCOL_GUID\r
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r
 #define BLOCK_IO_PROTOCOL       EFI_BLOCK_IO_PROTOCOL_GUID\r
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r

-/// \r
+///\r

 typedef EFI_BLOCK_IO_PROTOCOL   EFI_BLOCK_IO;\r
 \r
 /**\r
 typedef EFI_BLOCK_IO_PROTOCOL   EFI_BLOCK_IO;\r
 \r
 /**\r


@@ -68,7 +68,7 @@ EFI_STATUS
   @retval EFI_NO_MEDIA          There is no media in the device.\r
   @retval EFI_MEDIA_CHANGED     The MediaId does not matched the current device.\r
   @retval EFI_BAD_BUFFER_SIZE   The Buffer was not a multiple of the block size of the device.\r
   @retval EFI_NO_MEDIA          There is no media in the device.\r
   @retval EFI_MEDIA_CHANGED     The MediaId does not matched the current device.\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 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
 \r
 **/\r
                                 or the buffer is not on proper alignment.\r
 \r
 **/\r


@@ -98,7 +98,7 @@ EFI_STATUS
   @retval EFI_NO_MEDIA          There is no media in the device.\r
   @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.\r
   @retval EFI_BAD_BUFFER_SIZE   The Buffer was not a multiple of the block size of the device.\r
   @retval EFI_NO_MEDIA          There is no media in the device.\r
   @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.\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
 \r
 **/\r
                                 or the buffer is not on proper alignment.\r
 \r
 **/\r


@@ -135,17 +135,17 @@ typedef struct {
   ///\r
   /// The curent media Id. If the media changes, this value is changed.\r
   ///\r
   ///\r
   /// The curent media Id. If the media changes, this value is changed.\r
   ///\r

-  UINT32  MediaId;         \r
-   \r
+  UINT32  MediaId;\r
+\r

   ///\r
   /// TRUE if the media is removable; otherwise, FALSE.\r
   ///\r
   /// TRUE if the media is removable; otherwise, FALSE.\r

-  ///    \r
+  ///\r

   BOOLEAN RemovableMedia;\r
   BOOLEAN RemovableMedia;\r

-  \r
+\r

   ///\r
   /// TRUE if there is a media currently present in the device;\r
   /// othersise, FALSE. THis field shows the media present status\r
   ///\r
   /// TRUE if there is a media currently present in the device;\r
   /// othersise, FALSE. THis field shows the media present status\r

-  /// as of the most recent ReadBlocks() or WriteBlocks() call.  \r
+  /// as of the most recent ReadBlocks() or WriteBlocks() call.\r

   ///\r
   BOOLEAN MediaPresent;\r
 \r
   ///\r
   BOOLEAN MediaPresent;\r
 \r


@@ -154,45 +154,45 @@ typedef struct {
   /// FALSE. For media with only one partition this would be TRUE.\r
   ///\r
   BOOLEAN LogicalPartition;\r
   /// FALSE. For media with only one partition this would be TRUE.\r
   ///\r
   BOOLEAN LogicalPartition;\r

-  \r
+\r

   ///\r
   /// TRUE if the media is marked read-only otherwise, FALSE.\r
   /// This field shows the read-only status as of the most recent WriteBlocks () call.\r
   ///\r
   BOOLEAN ReadOnly;\r
   ///\r
   /// TRUE if the media is marked read-only otherwise, FALSE.\r
   /// This field shows the read-only status as of the most recent WriteBlocks () call.\r
   ///\r
   BOOLEAN ReadOnly;\r

-  \r
+\r

   ///\r
   /// TRUE if the WriteBlock () function caches write data.\r
   ///\r
   ///\r
   /// TRUE if the WriteBlock () function caches write data.\r
   ///\r

-  BOOLEAN WriteCaching; \r
-  \r
+  BOOLEAN WriteCaching;\r
+\r

   ///\r
   /// The intrinsic block size of the device. If the media changes, then\r
   ///\r
   /// The intrinsic block size of the device. If the media changes, then\r

-  /// this field is updated.  \r
+  /// this field is updated.\r

   ///\r
   ///\r

-  UINT32  BlockSize; \r
-  \r
+  UINT32  BlockSize;\r
+\r

   ///\r
   /// Supplies the alignment requirement for any buffer to read or write block(s).\r
   ///\r
   ///\r
   /// Supplies the alignment requirement for any buffer to read or write block(s).\r
   ///\r

-  UINT32  IoAlign; \r
-  \r
+  UINT32  IoAlign;\r
+\r

   ///\r
   /// The last logical block address on the device.\r
   ///\r
   /// The last logical block address on the device.\r

-  /// If the media changes, then this field is updated. \r
+  /// If the media changes, then this field is updated.\r

   ///\r
   ///\r

-  EFI_LBA LastBlock; \r
+  EFI_LBA LastBlock;\r

 \r
   ///\r
   /// Only present if EFI_BLOCK_IO_PROTOCOL.Revision is greater than or equal to\r
 \r
   ///\r
   /// Only present if EFI_BLOCK_IO_PROTOCOL.Revision is greater than or equal to\r

-  /// EFI_BLOCK_IO_PROTOCOL_REVISION2. Returns the first LBA is aligned to \r
-  /// a physical block boundary. \r
+  /// EFI_BLOCK_IO_PROTOCOL_REVISION2. Returns the first LBA is aligned to\r
+  /// a physical block boundary.\r

   ///\r
   EFI_LBA LowestAlignedLba;\r
 \r
   ///\r
   /// Only present if EFI_BLOCK_IO_PROTOCOL.Revision is greater than or equal to\r
   ///\r
   EFI_LBA LowestAlignedLba;\r
 \r
   ///\r
   /// Only present if EFI_BLOCK_IO_PROTOCOL.Revision is greater than or equal to\r

-  /// EFI_BLOCK_IO_PROTOCOL_REVISION2. Returns the number of logical blocks \r
+  /// EFI_BLOCK_IO_PROTOCOL_REVISION2. Returns the number of logical blocks\r

   /// per physical block.\r
   ///\r
   UINT32 LogicalBlocksPerPhysicalBlock;\r
   /// per physical block.\r
   ///\r
   UINT32 LogicalBlocksPerPhysicalBlock;\r


@@ -211,7 +211,7 @@ typedef struct {
 \r
 ///\r
 /// Revision defined in EFI1.1.\r
 \r
 ///\r
 /// Revision defined in EFI1.1.\r

-/// \r
+///\r

 #define EFI_BLOCK_IO_INTERFACE_REVISION   EFI_BLOCK_IO_PROTOCOL_REVISION\r
 \r
 ///\r
 #define EFI_BLOCK_IO_INTERFACE_REVISION   EFI_BLOCK_IO_PROTOCOL_REVISION\r
 \r
 ///\r

diff --git a/MdePkg/Include/Protocol/BlockIo2.h b/MdePkg/Include/Protocol/BlockIo2.h
index 5fad1078430c135c47b573001392b17ca6da91b0..1ffe322eee53e8019229316af794a8a5fa3343ad 100644 (file)
--- a/MdePkg/Include/Protocol/BlockIo2.h
+++ b/MdePkg/Include/Protocol/BlockIo2.h
@@ -5,14 +5,14 @@
   enables the ability to read and write data at a block level in a non-blocking\r
   manner.\r
 \r
   enables the ability to read and write data at a block level in a non-blocking\r
   manner.\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
+  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
 **/\r
 \r


@@ -69,7 +69,7 @@ EFI_STATUS
 \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


@@ -77,13 +77,13 @@ EFI_STATUS
   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


@@ -95,7 +95,7 @@ EFI_STATUS
   @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


@@ -136,7 +136,7 @@ EFI_STATUS
   @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


@@ -155,10 +155,10 @@ EFI_STATUS
 \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


@@ -189,9 +189,9 @@ EFI_STATUS
 ///\r
 struct _EFI_BLOCK_IO2_PROTOCOL {\r
   ///\r
 ///\r
 struct _EFI_BLOCK_IO2_PROTOCOL {\r
   ///\r

-  /// A pointer to the EFI_BLOCK_IO_MEDIA data for this device. \r
+  /// A pointer to the EFI_BLOCK_IO_MEDIA data for this device.\r

   /// Type EFI_BLOCK_IO_MEDIA is defined in BlockIo.h.\r
   /// Type EFI_BLOCK_IO_MEDIA is defined in BlockIo.h.\r

-  ///  \r
+  ///\r

   EFI_BLOCK_IO_MEDIA      *Media;\r
 \r
   EFI_BLOCK_RESET_EX      Reset;\r
   EFI_BLOCK_IO_MEDIA      *Media;\r
 \r
   EFI_BLOCK_RESET_EX      Reset;\r

diff --git a/MdePkg/Include/Protocol/BluetoothConfig.h b/MdePkg/Include/Protocol/BluetoothConfig.h
index 1460ee9eb616a2181462cbc42f1e30c1e8396e79..4f19a1ea31b9ba146a6b50fc601e1b27b21b17a5 100644 (file)
--- a/MdePkg/Include/Protocol/BluetoothConfig.h
+++ b/MdePkg/Include/Protocol/BluetoothConfig.h
@@ -2,16 +2,16 @@
   EFI Bluetooth Configuration Protocol as defined in UEFI 2.7.\r
   This protocol abstracts user interface configuration for Bluetooth device.\r
 \r
   EFI Bluetooth Configuration Protocol as defined in UEFI 2.7.\r
   This protocol abstracts user interface configuration for Bluetooth device.\r
 \r

-  Copyright (c) 2015 - 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) 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
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r

-  @par Revision Reference:          \r
+  @par Revision Reference:\r

   This Protocol is introduced in UEFI Specification 2.7\r
 \r
 **/\r
   This Protocol is introduced in UEFI Specification 2.7\r
 \r
 **/\r


@@ -25,7 +25,7 @@
   { \\r
     0x62960cf3, 0x40ff, 0x4263, { 0xa7, 0x7c, 0xdf, 0xde, 0xbd, 0x19, 0x1b, 0x4b } \\r
   }\r
   { \\r
     0x62960cf3, 0x40ff, 0x4263, { 0xa7, 0x7c, 0xdf, 0xde, 0xbd, 0x19, 0x1b, 0x4b } \\r
   }\r

-  \r
+\r

 typedef struct _EFI_BLUETOOTH_CONFIG_PROTOCOL EFI_BLUETOOTH_CONFIG_PROTOCOL;\r
 \r
 typedef UINT32      EFI_BLUETOOTH_CONFIG_REMOTE_DEVICE_STATE_TYPE;\r
 typedef struct _EFI_BLUETOOTH_CONFIG_PROTOCOL EFI_BLUETOOTH_CONFIG_PROTOCOL;\r
 \r
 typedef UINT32      EFI_BLUETOOTH_CONFIG_REMOTE_DEVICE_STATE_TYPE;\r


@@ -41,7 +41,7 @@ typedef struct {
   ///\r
   BLUETOOTH_ADDRESS         BDAddr;\r
   ///\r
   ///\r
   BLUETOOTH_ADDRESS         BDAddr;\r
   ///\r

-  /// State of the remote deive \r
+  /// State of the remote deive\r

   ///\r
   UINT8                     RemoteDeviceState;\r
   ///\r
   ///\r
   UINT8                     RemoteDeviceState;\r
   ///\r


@@ -113,12 +113,12 @@ typedef enum {
 ///\r
 typedef enum {\r
   ///\r
 ///\r
 typedef enum {\r
   ///\r

-  /// For SSP - passkey entry. Input buffer is Passkey (4 bytes). No output buffer. \r
+  /// For SSP - passkey entry. Input buffer is Passkey (4 bytes). No output buffer.\r

   /// See Bluetooth HCI command for detail.\r
   ///\r
   EfiBluetoothCallbackTypeUserPasskeyNotification,\r
   ///\r
   /// See Bluetooth HCI command for detail.\r
   ///\r
   EfiBluetoothCallbackTypeUserPasskeyNotification,\r
   ///\r

-  /// For SSP - just work and numeric comparison. Input buffer is numeric value (4 bytes). \r
+  /// For SSP - just work and numeric comparison. Input buffer is numeric value (4 bytes).\r

   /// Output buffer is BOOLEAN (1 byte). See Bluetooth HCI command for detail.\r
   ///\r
   EfiBluetoothCallbackTypeUserConfirmationRequest,\r
   /// Output buffer is BOOLEAN (1 byte). See Bluetooth HCI command for detail.\r
   ///\r
   EfiBluetoothCallbackTypeUserConfirmationRequest,\r


@@ -127,7 +127,7 @@ typedef enum {
   ///\r
   EfiBluetoothCallbackTypeOOBDataRequest,\r
   ///\r
   ///\r
   EfiBluetoothCallbackTypeOOBDataRequest,\r
   ///\r

-  /// For legacy paring. No input buffer. Output buffer is PIN code( <= 16 bytes). \r
+  /// For legacy paring. No input buffer. Output buffer is PIN code( <= 16 bytes).\r

   /// See Bluetooth HCI command for detail.\r
   ///\r
   EfiBluetoothCallbackTypePinCodeRequest,\r
   /// See Bluetooth HCI command for detail.\r
   ///\r
   EfiBluetoothCallbackTypePinCodeRequest,\r


@@ -139,44 +139,44 @@ typedef enum {
 ///\r
 typedef enum {\r
   ///\r
 ///\r
 typedef enum {\r
   ///\r

-  /// This callback is called when Bluetooth receive Disconnection_Complete event. Input buffer is Event \r
+  /// This callback is called when Bluetooth receive Disconnection_Complete event. Input buffer is Event\r

   /// Parameters of Disconnection_Complete Event defined in Bluetooth specification.\r
   ///\r
   EfiBluetoothConnCallbackTypeDisconnected,\r
   ///\r
   /// Parameters of Disconnection_Complete Event defined in Bluetooth specification.\r
   ///\r
   EfiBluetoothConnCallbackTypeDisconnected,\r
   ///\r

-  /// This callback is called when Bluetooth receive Connection_Complete event. Input buffer is Event \r
+  /// This callback is called when Bluetooth receive Connection_Complete event. Input buffer is Event\r

   /// Parameters of Connection_Complete Event defined in Bluetooth specification.\r
   ///\r
   EfiBluetoothConnCallbackTypeConnected,\r
   ///\r
   /// Parameters of Connection_Complete Event defined in Bluetooth specification.\r
   ///\r
   EfiBluetoothConnCallbackTypeConnected,\r
   ///\r

-  /// This callback is called when Bluetooth receive Authentication_Complete event. Input buffer is Event \r
+  /// This callback is called when Bluetooth receive Authentication_Complete event. Input buffer is Event\r

   /// Parameters of Authentication_Complete Event defined in Bluetooth specification.\r
   ///\r
   EfiBluetoothConnCallbackTypeAuthenticated,\r
   ///\r
   /// Parameters of Authentication_Complete Event defined in Bluetooth specification.\r
   ///\r
   EfiBluetoothConnCallbackTypeAuthenticated,\r
   ///\r

-  /// This callback is called when Bluetooth receive Encryption_Change event. Input buffer is Event \r
+  /// This callback is called when Bluetooth receive Encryption_Change event. Input buffer is Event\r

   /// Parameters of Encryption_Change Event defined in Bluetooth specification.\r
   ///\r
   EfiBluetoothConnCallbackTypeEncrypted\r
 } EFI_BLUETOOTH_CONNECT_COMPLETE_CALLBACK_TYPE;\r
 \r
   /// Parameters of Encryption_Change Event defined in Bluetooth specification.\r
   ///\r
   EfiBluetoothConnCallbackTypeEncrypted\r
 } EFI_BLUETOOTH_CONNECT_COMPLETE_CALLBACK_TYPE;\r
 \r

-  \r
+\r

 /**\r
   Initialize Bluetooth host controller and local device.\r
 \r
   @param  This          Pointer to the EFI_BLUETOOTH_CONFIG_PROTOCOL instance.\r
 \r
   @retval EFI_SUCCESS           The Bluetooth host controller and local device is initialized successfully.\r
 /**\r
   Initialize Bluetooth host controller and local device.\r
 \r
   @param  This          Pointer to the EFI_BLUETOOTH_CONFIG_PROTOCOL instance.\r
 \r
   @retval EFI_SUCCESS           The Bluetooth host controller and local device is initialized successfully.\r

-  @retval EFI_DEVICE_ERROR      A hardware error occurred trying to initialize the Bluetooth host controller \r
+  @retval EFI_DEVICE_ERROR      A hardware error occurred trying to initialize the Bluetooth host controller\r

                                 and local device.\r
 \r
 **/\r
                                 and local device.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_INIT)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL  *This\r
   );\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_INIT)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL  *This\r
   );\r

-  \r
+\r

 /**\r
   Callback function, it is called if a Bluetooth device is found during scan process.\r
 \r
 /**\r
   Callback function, it is called if a Bluetooth device is found during scan process.\r
 \r


@@ -194,16 +194,16 @@ EFI_STATUS
   IN VOID                                     *Context,\r
   IN EFI_BLUETOOTH_SCAN_CALLBACK_INFORMATION  *CallbackInfo\r
   );\r
   IN VOID                                     *Context,\r
   IN EFI_BLUETOOTH_SCAN_CALLBACK_INFORMATION  *CallbackInfo\r
   );\r

-  \r
+\r

 /**\r
   Scan Bluetooth device.\r
 \r
   @param  This          Pointer to the EFI_BLUETOOTH_CONFIG_PROTOCOL instance.\r
 /**\r
   Scan Bluetooth device.\r
 \r
   @param  This          Pointer to the EFI_BLUETOOTH_CONFIG_PROTOCOL instance.\r

-  @param  ReScan        If TRUE, a new scan request is submitted no matter there is scan result before. \r
-                        If FALSE and there is scan result, the previous scan result is returned and no scan request \r
+  @param  ReScan        If TRUE, a new scan request is submitted no matter there is scan result before.\r
+                        If FALSE and there is scan result, the previous scan result is returned and no scan request\r

                         is submitted.\r
   @param  ScanType      Bluetooth scan type, Inquiry and/or Page. See Bluetooth specification for detail.\r
                         is submitted.\r
   @param  ScanType      Bluetooth scan type, Inquiry and/or Page. See Bluetooth specification for detail.\r

-  @param  Callback      The callback function. This function is called if a Bluetooth device is found during scan \r
+  @param  Callback      The callback function. This function is called if a Bluetooth device is found during scan\r

                         process.\r
   @param  Context       Data passed into Callback function. This is optional parameter and may be NULL.\r
 \r
                         process.\r
   @param  Context       Data passed into Callback function. This is optional parameter and may be NULL.\r
 \r


@@ -211,7 +211,7 @@ EFI_STATUS
   @retval EFI_DEVICE_ERROR      A hardware error occurred trying to scan the Bluetooth device.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR      A hardware error occurred trying to scan the Bluetooth device.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_SCAN)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_SCAN)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r


@@ -220,7 +220,7 @@ EFI_STATUS
   IN EFI_BLUETOOTH_CONFIG_SCAN_CALLBACK_FUNCTION    Callback,\r
   IN VOID                                           *Context\r
   );\r
   IN EFI_BLUETOOTH_CONFIG_SCAN_CALLBACK_FUNCTION    Callback,\r
   IN VOID                                           *Context\r
   );\r

-  \r
+\r

 /**\r
   Connect a Bluetooth device.\r
 \r
 /**\r
   Connect a Bluetooth device.\r
 \r


@@ -233,7 +233,7 @@ EFI_STATUS
   @retval EFI_DEVICE_ERROR      A hardware error occurred trying to connect the Bluetooth device.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR      A hardware error occurred trying to connect the Bluetooth device.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_CONNECT)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_CONNECT)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r


@@ -253,14 +253,14 @@ EFI_STATUS
   @retval EFI_DEVICE_ERROR      A hardware error occurred trying to disconnect the Bluetooth device.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR      A hardware error occurred trying to disconnect the Bluetooth device.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_DISCONNECT)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r
   IN BLUETOOTH_ADDRESS                              *BD_ADDR,\r
   IN UINT8                                          Reason\r
   );\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_DISCONNECT)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r
   IN BLUETOOTH_ADDRESS                              *BD_ADDR,\r
   IN UINT8                                          Reason\r
   );\r

-  \r
+\r

 /**\r
   Get Bluetooth configuration data.\r
 \r
 /**\r
   Get Bluetooth configuration data.\r
 \r


@@ -280,7 +280,7 @@ EFI_STATUS
                                 *DataSize has been updated with the size needed to complete the request.\r
 \r
 **/\r
                                 *DataSize has been updated with the size needed to complete the request.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_GET_DATA)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_GET_DATA)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r


@@ -288,7 +288,7 @@ EFI_STATUS
   IN OUT UINTN                                      *DataSize,\r
   IN OUT VOID                                       *Data\r
   );\r
   IN OUT UINTN                                      *DataSize,\r
   IN OUT VOID                                       *Data\r
   );\r

-  \r
+\r

 /**\r
   Set Bluetooth configuration data.\r
 \r
 /**\r
   Set Bluetooth configuration data.\r
 \r


@@ -305,7 +305,7 @@ EFI_STATUS
   @retval EFI_BUFFER_TOO_SMALL  Cannot set configuration data.\r
 \r
 **/\r
   @retval EFI_BUFFER_TOO_SMALL  Cannot set configuration data.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_SET_DATA)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_SET_DATA)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r


@@ -313,7 +313,7 @@ EFI_STATUS
   IN UINTN                                          DataSize,\r
   IN VOID                                           *Data\r
   );\r
   IN UINTN                                          DataSize,\r
   IN VOID                                           *Data\r
   );\r

-  \r
+\r

 /**\r
   Get remove Bluetooth device configuration data.\r
 \r
 /**\r
   Get remove Bluetooth device configuration data.\r
 \r


@@ -334,7 +334,7 @@ EFI_STATUS
                                 *DataSize has been updated with the size needed to complete the request.\r
 \r
 **/\r
                                 *DataSize has been updated with the size needed to complete the request.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_GET_REMOTE_DATA)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_GET_REMOTE_DATA)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r


@@ -343,7 +343,7 @@ EFI_STATUS
   IN OUT UINTN                                      *DataSize,\r
   IN OUT VOID                                       *Data\r
   );\r
   IN OUT UINTN                                      *DataSize,\r
   IN OUT VOID                                       *Data\r
   );\r

-  \r
+\r

 /**\r
   The callback function for PIN code.\r
 \r
 /**\r
   The callback function for PIN code.\r
 \r


@@ -352,14 +352,14 @@ EFI_STATUS
   @param  CallbackType        Callback type in EFI_BLUETOOTH_PIN_CALLBACK_TYPE.\r
   @param  InputBuffer         A pointer to the buffer of data that is input from callback caller.\r
   @param  InputBufferSize     Indicates the size, in bytes, of the data buffer specified by InputBuffer.\r
   @param  CallbackType        Callback type in EFI_BLUETOOTH_PIN_CALLBACK_TYPE.\r
   @param  InputBuffer         A pointer to the buffer of data that is input from callback caller.\r
   @param  InputBufferSize     Indicates the size, in bytes, of the data buffer specified by InputBuffer.\r

-  @param  OutputBuffer        A pointer to the buffer of data that will be output from callback callee. \r
+  @param  OutputBuffer        A pointer to the buffer of data that will be output from callback callee.\r

                               Callee allocates this buffer by using EFI Boot Service AllocatePool().\r
   @param  OutputBufferSize    Indicates the size, in bytes, of the data buffer specified by OutputBuffer.\r
 \r
   @retval EFI_SUCCESS   The callback function complete successfully.\r
 \r
 **/\r
                               Callee allocates this buffer by using EFI Boot Service AllocatePool().\r
   @param  OutputBufferSize    Indicates the size, in bytes, of the data buffer specified by OutputBuffer.\r
 \r
   @retval EFI_SUCCESS   The callback function complete successfully.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_PIN_CALLBACK_FUNCTION)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                        *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_PIN_CALLBACK_FUNCTION)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                        *This,\r


@@ -370,7 +370,7 @@ EFI_STATUS
   OUT VOID                                                **OutputBuffer,\r
   OUT UINTN                                               *OutputBufferSize\r
   );\r
   OUT VOID                                                **OutputBuffer,\r
   OUT UINTN                                               *OutputBufferSize\r
   );\r

-  \r
+\r

 /**\r
   Register PIN callback function.\r
 \r
 /**\r
   Register PIN callback function.\r
 \r


@@ -381,7 +381,7 @@ EFI_STATUS
   @retval EFI_SUCCESS   The PIN callback function is registered successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The PIN callback function is registered successfully.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_PIN_CALLBACK)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                        *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_PIN_CALLBACK)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                        *This,\r


@@ -400,7 +400,7 @@ EFI_STATUS
   @retval EFI_SUCCESS   The callback function complete successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The callback function complete successfully.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_GET_LINK_KEY_CALLBACK_FUNCTION)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL        *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_GET_LINK_KEY_CALLBACK_FUNCTION)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL        *This,\r


@@ -408,7 +408,7 @@ EFI_STATUS
   IN BLUETOOTH_ADDRESS                    *BDAddr,\r
   OUT UINT8                               LinkKey[BLUETOOTH_HCI_LINK_KEY_SIZE]\r
   );\r
   IN BLUETOOTH_ADDRESS                    *BDAddr,\r
   OUT UINT8                               LinkKey[BLUETOOTH_HCI_LINK_KEY_SIZE]\r
   );\r

-  \r
+\r

 /**\r
   Register get link key callback function.\r
 \r
 /**\r
   Register get link key callback function.\r
 \r


@@ -419,14 +419,14 @@ EFI_STATUS
   @retval EFI_SUCCESS   The link key callback function is registered successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The link key callback function is registered successfully.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_GET_LINK_KEY_CALLBACK)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                                  *This,\r
   IN EFI_BLUETOOTH_CONFIG_REGISTER_GET_LINK_KEY_CALLBACK_FUNCTION   Callback,\r
   IN VOID                                                           *Context\r
   );\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_GET_LINK_KEY_CALLBACK)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                                  *This,\r
   IN EFI_BLUETOOTH_CONFIG_REGISTER_GET_LINK_KEY_CALLBACK_FUNCTION   Callback,\r
   IN VOID                                                           *Context\r
   );\r

-  \r
+\r

 /**\r
   The callback function to set link key.\r
 \r
 /**\r
   The callback function to set link key.\r
 \r


@@ -438,7 +438,7 @@ EFI_STATUS
   @retval EFI_SUCCESS   The callback function complete successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The callback function complete successfully.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_SET_LINK_KEY_CALLBACK_FUNCTION)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL        *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_SET_LINK_KEY_CALLBACK_FUNCTION)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL        *This,\r


@@ -446,7 +446,7 @@ EFI_STATUS
   IN BLUETOOTH_ADDRESS                    *BDAddr,\r
   IN UINT8                                LinkKey[BLUETOOTH_HCI_LINK_KEY_SIZE]\r
   );\r
   IN BLUETOOTH_ADDRESS                    *BDAddr,\r
   IN UINT8                                LinkKey[BLUETOOTH_HCI_LINK_KEY_SIZE]\r
   );\r

-  \r
+\r

 /**\r
   Register set link key callback function.\r
 \r
 /**\r
   Register set link key callback function.\r
 \r


@@ -457,14 +457,14 @@ EFI_STATUS
   @retval EFI_SUCCESS   The link key callback function is registered successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The link key callback function is registered successfully.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_SET_LINK_KEY_CALLBACK)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                                  *This,\r
   IN EFI_BLUETOOTH_CONFIG_REGISTER_SET_LINK_KEY_CALLBACK_FUNCTION   Callback,\r
   IN VOID                                                           *Context\r
   );\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_SET_LINK_KEY_CALLBACK)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                                  *This,\r
   IN EFI_BLUETOOTH_CONFIG_REGISTER_SET_LINK_KEY_CALLBACK_FUNCTION   Callback,\r
   IN VOID                                                           *Context\r
   );\r

-  \r
+\r

 /**\r
   The callback function. It is called after connect completed.\r
 \r
 /**\r
   The callback function. It is called after connect completed.\r
 \r


@@ -478,7 +478,7 @@ EFI_STATUS
   @retval EFI_SUCCESS   The callback function complete successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The callback function complete successfully.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK_FUNCTION)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK_FUNCTION)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                  *This,\r


@@ -488,7 +488,7 @@ EFI_STATUS
   IN VOID                                           *InputBuffer,\r
   IN UINTN                                          InputBufferSize\r
   );\r
   IN VOID                                           *InputBuffer,\r
   IN UINTN                                          InputBufferSize\r
   );\r

-  \r
+\r

 /**\r
   Register link connect complete callback function.\r
 \r
 /**\r
   Register link connect complete callback function.\r
 \r


@@ -499,14 +499,14 @@ EFI_STATUS
   @retval EFI_SUCCESS   The link connect complete callback function is registered successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The link connect complete callback function is registered successfully.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                                      *This,\r
   IN EFI_BLUETOOTH_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK_FUNCTION   Callback,\r
   IN VOID                                                               *Context\r
   );\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLUETOOTH_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK)(\r
   IN EFI_BLUETOOTH_CONFIG_PROTOCOL                                      *This,\r
   IN EFI_BLUETOOTH_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK_FUNCTION   Callback,\r
   IN VOID                                                               *Context\r
   );\r

-  \r
+\r

 ///\r
 /// This protocol abstracts user interface configuration for Bluetooth device.\r
 ///\r
 ///\r
 /// This protocol abstracts user interface configuration for Bluetooth device.\r
 ///\r

diff --git a/MdePkg/Include/Protocol/BluetoothHc.h b/MdePkg/Include/Protocol/BluetoothHc.h
index b82c3285a09eb60d72007d9e5efe5e8379b77d31..eff0144a5a0340fab0ffa9ff6c6549f85ee663d5 100644 (file)
--- a/MdePkg/Include/Protocol/BluetoothHc.h
+++ b/MdePkg/Include/Protocol/BluetoothHc.h
@@ -2,7 +2,7 @@
   EFI Bluetooth Host Controller Protocol as defined in UEFI 2.5.\r
   This protocol abstracts the Bluetooth host controller layer message transmit and receive.\r
 \r
   EFI Bluetooth Host Controller Protocol as defined in UEFI 2.5.\r
   This protocol abstracts the Bluetooth host controller layer message transmit and receive.\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 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


@@ -23,7 +23,7 @@
   { \\r
     0xb3930571, 0xbeba, 0x4fc5, { 0x92, 0x3, 0x94, 0x27, 0x24, 0x2e, 0x6a, 0x43 } \\r
   }\r
   { \\r
     0xb3930571, 0xbeba, 0x4fc5, { 0x92, 0x3, 0x94, 0x27, 0x24, 0x2e, 0x6a, 0x43 } \\r
   }\r

-  \r
+\r

 typedef struct _EFI_BLUETOOTH_HC_PROTOCOL EFI_BLUETOOTH_HC_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_BLUETOOTH_HC_PROTOCOL EFI_BLUETOOTH_HC_PROTOCOL;\r
 \r
 /**\r

diff --git a/MdePkg/Include/Protocol/BootManagerPolicy.h b/MdePkg/Include/Protocol/BootManagerPolicy.h
index e19ad81a2e9d5bffbfdf2f24d94aeeba5107ac32..e371b7b74068e3d3c987fbabdda8ee55d43e58d2 100644 (file)
--- a/MdePkg/Include/Protocol/BootManagerPolicy.h
+++ b/MdePkg/Include/Protocol/BootManagerPolicy.h
@@ -4,14 +4,14 @@
   This protocol is used by EFI Applications to request the UEFI Boot Manager\r
   to connect devices using platform policy.\r
 \r
   This protocol is used by EFI Applications to request the UEFI Boot Manager\r
   to connect devices using platform policy.\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
+  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 __BOOT_MANAGER_POLICY_H__\r
 **/\r
 \r
 #ifndef __BOOT_MANAGER_POLICY_H__\r


@@ -53,7 +53,7 @@ typedef struct _EFI_BOOT_MANAGER_POLICY_PROTOCOL EFI_BOOT_MANAGER_POLICY_PROTOCO
                         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


@@ -61,7 +61,7 @@ typedef struct _EFI_BOOT_MANAGER_POLICY_PROTOCOL EFI_BOOT_MANAGER_POLICY_PROTOCO
   @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


@@ -80,7 +80,7 @@ EFI_STATUS
   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


@@ -98,7 +98,7 @@ EFI_STATUS
   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


@@ -115,7 +115,7 @@ EFI_STATUS
   @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

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BOOT_MANAGER_POLICY_CONNECT_DEVICE_CLASS)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BOOT_MANAGER_POLICY_CONNECT_DEVICE_CLASS)(\r

diff --git a/MdePkg/Include/Protocol/BusSpecificDriverOverride.h b/MdePkg/Include/Protocol/BusSpecificDriverOverride.h
index 2e7f1cc52293717d354982d654cb4df316fe9e92..4a84f2b22ee795e05ba61ec756809934f54ad20a 100644 (file)
--- a/MdePkg/Include/Protocol/BusSpecificDriverOverride.h
+++ b/MdePkg/Include/Protocol/BusSpecificDriverOverride.h
@@ -6,14 +6,14 @@
   instance of this protocol for every PCI controller that has a PCI option ROM that contains one or\r
   more UEFI drivers. The protocol instance is attached to the handle of the PCI controller.\r
 \r
   instance of this protocol for every PCI controller that has a PCI option ROM that contains one or\r
   more UEFI drivers. The protocol instance is attached to the handle of the PCI controller.\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
+  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


@@ -34,14 +34,14 @@ typedef struct _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL  EFI_BUS_SPECIFIC_DRIV
 // Prototypes for the Bus Specific Driver Override Protocol\r
 //\r
 \r
 // Prototypes for the Bus Specific Driver Override Protocol\r
 //\r
 \r

-/**                                                                   \r
+/**\r

   Uses a bus specific algorithm to retrieve a driver image handle for a controller.\r
   Uses a bus specific algorithm to retrieve a driver image handle for a controller.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_BUS_SPECIFIC_DRIVER_\r
   @param  This                  A pointer to the EFI_BUS_SPECIFIC_DRIVER_\r

-                                OVERRIDE_PROTOCOL instance.              \r
+                                OVERRIDE_PROTOCOL instance.\r

   @param  DriverImageHandle     On input, a pointer to the previous driver image handle returned\r
   @param  DriverImageHandle     On input, a pointer to the previous driver image handle returned\r

-                                by GetDriver(). On output, a pointer to the next driver         \r
-                                image handle. Passing in a NULL, will return the first driver   \r
+                                by GetDriver(). On output, a pointer to the next driver\r
+                                image handle. Passing in a NULL, will return the first driver\r

                                 image handle.\r
 \r
   @retval EFI_SUCCESS           A bus specific override driver is returned in DriverImageHandle.\r
                                 image handle.\r
 \r
   @retval EFI_SUCCESS           A bus specific override driver is returned in DriverImageHandle.\r

diff --git a/MdePkg/Include/Protocol/Capsule.h b/MdePkg/Include/Protocol/Capsule.h
index 7d51a075998a1a341e84cae2a71a41924757b412..e2cf25f20f5c1fb33fd08175b1d7a68ede57c279 100644 (file)
--- a/MdePkg/Include/Protocol/Capsule.h
+++ b/MdePkg/Include/Protocol/Capsule.h
@@ -1,16 +1,16 @@
 /** @file\r
   Capsule Architectural Protocol as defined in PI1.0a Specification VOLUME 2 DXE\r
 \r
 /** @file\r
   Capsule Architectural Protocol as defined in PI1.0a Specification VOLUME 2 DXE\r
 \r

-  The DXE Driver that produces this protocol must be a runtime driver. \r
-  The driver is responsible for initializing the CapsuleUpdate() and \r
-  QueryCapsuleCapabilities() fields of the UEFI Runtime Services Table. \r
-  After the two fields of the UEFI Runtime Services Table have been initialized, \r
-  the driver must install the EFI_CAPSULE_ARCH_PROTOCOL_GUID on a new handle \r
-  with a NULL interface pointer. The installation of this protocol informs \r
-  the DXE Foundation that the Capsule related services are now available and \r
+  The DXE Driver that produces this protocol must be a runtime driver.\r
+  The driver is responsible for initializing the CapsuleUpdate() and\r
+  QueryCapsuleCapabilities() fields of the UEFI Runtime Services Table.\r
+  After the two fields of the UEFI Runtime Services Table have been initialized,\r
+  the driver must install the EFI_CAPSULE_ARCH_PROTOCOL_GUID on a new handle\r
+  with a NULL interface pointer. The installation of this protocol informs\r
+  the DXE Foundation that the Capsule related services are now available and\r

   that the DXE Foundation must update the 32-bit CRC of the UEFI Runtime Services Table.\r
 \r
   that the DXE Foundation must update the 32-bit CRC of the UEFI Runtime Services Table.\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

diff --git a/MdePkg/Include/Protocol/ComponentName.h b/MdePkg/Include/Protocol/ComponentName.h
index 26dec3c10179476b7ab8c263ababfdc1a95cb00e..900807ce6e1035f461d70cd406ea233cf36bbb04 100644 (file)
--- a/MdePkg/Include/Protocol/ComponentName.h
+++ b/MdePkg/Include/Protocol/ComponentName.h
@@ -1,15 +1,15 @@
 /** @file\r
   EFI Component Name Protocol as defined in the EFI 1.1 specification.\r
 /** @file\r
   EFI Component Name Protocol as defined in the EFI 1.1 specification.\r

-  This protocol is used to retrieve user readable names of EFI Drivers \r
+  This protocol is used to retrieve user readable names of EFI Drivers\r

   and controllers managed by EFI Drivers.\r
 \r
   and controllers managed by EFI Drivers.\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
-    \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


@@ -110,7 +110,7 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// This protocol is used to retrieve user readable names of drivers \r
+/// This protocol is used to retrieve user readable names of drivers\r

 /// and controllers managed by UEFI Drivers.\r
 ///\r
 struct _EFI_COMPONENT_NAME_PROTOCOL {\r
 /// and controllers managed by UEFI Drivers.\r
 ///\r
 struct _EFI_COMPONENT_NAME_PROTOCOL {\r


@@ -119,7 +119,7 @@ struct _EFI_COMPONENT_NAME_PROTOCOL {
   ///\r
   /// A Null-terminated ASCII string that contains one or more\r
   /// ISO 639-2 language codes. This is the list of language codes\r
   ///\r
   /// A Null-terminated ASCII string that contains one or more\r
   /// ISO 639-2 language codes. This is the list of language codes\r

-  /// that this protocol supports.  \r
+  /// that this protocol supports.\r

   ///\r
   CHAR8                                   *SupportedLanguages;\r
 };\r
   ///\r
   CHAR8                                   *SupportedLanguages;\r
 };\r

diff --git a/MdePkg/Include/Protocol/ComponentName2.h b/MdePkg/Include/Protocol/ComponentName2.h
index b4e8a4d9a4a5587af43d690c151ba765edc2bc37..f02183e4c4985bd7bcee06c69784d728bc7d0b19 100644 (file)
--- a/MdePkg/Include/Protocol/ComponentName2.h
+++ b/MdePkg/Include/Protocol/ComponentName2.h
@@ -1,16 +1,16 @@
 /** @file\r
   UEFI Component Name 2 Protocol as defined in the UEFI 2.1 specification.\r
 /** @file\r
   UEFI Component Name 2 Protocol as defined in the UEFI 2.1 specification.\r

-  This protocol is used to retrieve user readable names of drivers \r
+  This protocol is used to retrieve user readable names of drivers\r

   and controllers managed by UEFI Drivers.\r
 \r
   and controllers managed by UEFI Drivers.\r
 \r

-  Copyright (c) 2006 - 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
+  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,7 +32,7 @@ typedef struct _EFI_COMPONENT_NAME2_PROTOCOL  EFI_COMPONENT_NAME2_PROTOCOL;
 \r
   @param  This       A pointer to the\r
                      EFI_COMPONENT_NAME2_PROTOCOL instance.\r
 \r
   @param  This       A pointer to the\r
                      EFI_COMPONENT_NAME2_PROTOCOL instance.\r

-  \r
+\r

   @param  Language   A pointer to a Null-terminated ASCII string\r
                      array indicating the language. This is the\r
                      language of the driver name that the caller\r
   @param  Language   A pointer to a Null-terminated ASCII string\r
                      array indicating the language. This is the\r
                      language of the driver name that the caller\r


@@ -42,7 +42,7 @@ typedef struct _EFI_COMPONENT_NAME2_PROTOCOL  EFI_COMPONENT_NAME2_PROTOCOL;
                      driver is up to the driver writer. Language\r
                      is specified in RFC 4646 language code\r
                      format.\r
                      driver is up to the driver writer. Language\r
                      is specified in RFC 4646 language code\r
                      format.\r

-  \r
+\r

   @param  DriverName A pointer to the string to return.\r
                      This string is the name of the\r
                      driver specified by This in the language\r
   @param  DriverName A pointer to the string to return.\r
                      This string is the name of the\r
                      driver specified by This in the language\r


@@ -52,11 +52,11 @@ typedef struct _EFI_COMPONENT_NAME2_PROTOCOL  EFI_COMPONENT_NAME2_PROTOCOL;
                                 Driver specified by This and the\r
                                 language specified by Language\r
                                 was returned in DriverName.\r
                                 Driver specified by This and the\r
                                 language specified by Language\r
                                 was returned in DriverName.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER Language is NULL.\r
   @retval EFI_INVALID_PARAMETER Language is NULL.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER DriverName is NULL.\r
   @retval EFI_INVALID_PARAMETER DriverName is NULL.\r

-  \r
+\r

   @retval EFI_UNSUPPORTED       The driver specified by This\r
                                 does not support the language\r
                                 specified by Language.\r
   @retval EFI_UNSUPPORTED       The driver specified by This\r
                                 does not support the language\r
                                 specified by Language.\r


@@ -150,7 +150,7 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// This protocol is used to retrieve user readable names of drivers \r
+/// This protocol is used to retrieve user readable names of drivers\r

 /// and controllers managed by UEFI Drivers.\r
 ///\r
 struct _EFI_COMPONENT_NAME2_PROTOCOL {\r
 /// and controllers managed by UEFI Drivers.\r
 ///\r
 struct _EFI_COMPONENT_NAME2_PROTOCOL {\r


@@ -162,7 +162,7 @@ struct _EFI_COMPONENT_NAME2_PROTOCOL {
   /// supported language codes. This is the list of language codes that\r
   /// this protocol supports. The number of languages supported by a\r
   /// driver is up to the driver writer. SupportedLanguages is\r
   /// supported language codes. This is the list of language codes that\r
   /// this protocol supports. The number of languages supported by a\r
   /// driver is up to the driver writer. SupportedLanguages is\r

-  /// specified in RFC 4646 format.  \r
+  /// specified in RFC 4646 format.\r

   ///\r
   CHAR8                                    *SupportedLanguages;\r
 };\r
   ///\r
   CHAR8                                    *SupportedLanguages;\r
 };\r

diff --git a/MdePkg/Include/Protocol/Cpu.h b/MdePkg/Include/Protocol/Cpu.h
index 1b469aa07e1a700820658bded174773398d30ca4..68fafb6c4c8d561559547f3089f36f49c095a235 100644 (file)
--- a/MdePkg/Include/Protocol/Cpu.h
+++ b/MdePkg/Include/Protocol/Cpu.h
@@ -3,14 +3,14 @@
 \r
   This code abstracts the DXE core from processor implementation details.\r
 \r
 \r
   This code abstracts the DXE core from processor implementation details.\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


@@ -61,14 +61,14 @@ VOID
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function flushes the range of addresses from Start to Start+Length \r
-  from the processor's data cache. If Start is not aligned to a cache line \r
-  boundary, then the bytes before Start to the preceding cache line boundary \r
-  are also flushed. If Start+Length is not aligned to a cache line boundary, \r
-  then the bytes past Start+Length to the end of the next cache line boundary \r
-  are also flushed. The FlushType of EfiCpuFlushTypeWriteBackInvalidate must be \r
-  supported. If the data cache is fully coherent with all DMA operations, then \r
-  this function can just return EFI_SUCCESS. If the processor does not support \r
+  This function flushes the range of addresses from Start to Start+Length\r
+  from the processor's data cache. If Start is not aligned to a cache line\r
+  boundary, then the bytes before Start to the preceding cache line boundary\r
+  are also flushed. If Start+Length is not aligned to a cache line boundary,\r
+  then the bytes past Start+Length to the end of the next cache line boundary\r
+  are also flushed. The FlushType of EfiCpuFlushTypeWriteBackInvalidate must be\r
+  supported. If the data cache is fully coherent with all DMA operations, then\r
+  this function can just return EFI_SUCCESS. If the processor does not support\r

   flushing a range of the data cache, then the entire data cache can be flushed.\r
 \r
   @param  This             The EFI_CPU_ARCH_PROTOCOL instance.\r
   flushing a range of the data cache, then the entire data cache can be flushed.\r
 \r
   @param  This             The EFI_CPU_ARCH_PROTOCOL instance.\r


@@ -98,7 +98,7 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  This function enables interrupt processing by the processor. \r
+  This function enables interrupt processing by the processor.\r

 \r
   @param  This             The EFI_CPU_ARCH_PROTOCOL instance.\r
 \r
 \r
   @param  This             The EFI_CPU_ARCH_PROTOCOL instance.\r
 \r


@@ -130,8 +130,8 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  This function retrieves the processor's current interrupt state a returns it in \r
-  State. If interrupts are currently enabled, then TRUE is returned. If interrupts \r
+  This function retrieves the processor's current interrupt state a returns it in\r
+  State. If interrupts are currently enabled, then TRUE is returned. If interrupts\r

   are currently disabled, then FALSE is returned.\r
 \r
   @param  This             The EFI_CPU_ARCH_PROTOCOL instance.\r
   are currently disabled, then FALSE is returned.\r
 \r
   @param  This             The EFI_CPU_ARCH_PROTOCOL instance.\r


@@ -152,9 +152,9 @@ EFI_STATUS
 \r
 /**\r
   This function generates an INIT on the processor. If this function succeeds, then the\r
 \r
 /**\r
   This function generates an INIT on the processor. If this function succeeds, then the\r

-  processor will be reset, and control will not be returned to the caller. If InitType is \r
-  not supported by this processor, or the processor cannot programmatically generate an \r
-  INIT without help from external hardware, then EFI_UNSUPPORTED is returned. If an error \r
+  processor will be reset, and control will not be returned to the caller. If InitType is\r
+  not supported by this processor, or the processor cannot programmatically generate an\r
+  INIT without help from external hardware, then EFI_UNSUPPORTED is returned. If an error\r

   occurs attempting to generate an INIT, then EFI_DEVICE_ERROR is returned.\r
 \r
   @param  This             The EFI_CPU_ARCH_PROTOCOL instance.\r
   occurs attempting to generate an INIT, then EFI_DEVICE_ERROR is returned.\r
 \r
   @param  This             The EFI_CPU_ARCH_PROTOCOL instance.\r


@@ -175,9 +175,9 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \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
 \r
   @param  This             The EFI_CPU_ARCH_PROTOCOL instance.\r
   The installed handler is called once for each processor interrupt or exception.\r
 \r
   @param  This             The EFI_CPU_ARCH_PROTOCOL instance.\r


@@ -280,17 +280,17 @@ struct _EFI_CPU_ARCH_PROTOCOL {
   EFI_CPU_GET_TIMER_VALUE             GetTimerValue;\r
   EFI_CPU_SET_MEMORY_ATTRIBUTES       SetMemoryAttributes;\r
   ///\r
   EFI_CPU_GET_TIMER_VALUE             GetTimerValue;\r
   EFI_CPU_SET_MEMORY_ATTRIBUTES       SetMemoryAttributes;\r
   ///\r

-  /// The number of timers that are available in a processor. The value in this \r
-  /// field is a constant that must not be modified after the CPU Architectural \r
+  /// The number of timers that are available in a processor. The value in this\r
+  /// field is a constant that must not be modified after the CPU Architectural\r

   /// Protocol is installed. All consumers must treat this as a read-only field.\r
   ///\r
   UINT32                              NumberOfTimers;\r
   ///\r
   /// Protocol is installed. All consumers must treat this as a read-only field.\r
   ///\r
   UINT32                              NumberOfTimers;\r
   ///\r

-  /// The size, in bytes, of the alignment required for DMA buffer allocations. \r
-  /// This is typically the size of the largest data cache line in the platform. \r
-  /// The value in this field is a constant that must not be modified after the \r
-  /// CPU Architectural Protocol is installed. All consumers must treat this as \r
-  /// a read-only field.  \r
+  /// The size, in bytes, of the alignment required for DMA buffer allocations.\r
+  /// This is typically the size of the largest data cache line in the platform.\r
+  /// The value in this field is a constant that must not be modified after the\r
+  /// CPU Architectural Protocol is installed. All consumers must treat this as\r
+  /// a read-only field.\r

   ///\r
   UINT32                              DmaBufferAlignment;\r
 };\r
   ///\r
   UINT32                              DmaBufferAlignment;\r
 };\r

diff --git a/MdePkg/Include/Protocol/CpuIo2.h b/MdePkg/Include/Protocol/CpuIo2.h
index 7dea37136f5339e24db0c22bbf7e585f6a4f2de6..dd5308de1a01bee43cf2e631540fedf278ca7166 100644 (file)
--- a/MdePkg/Include/Protocol/CpuIo2.h
+++ b/MdePkg/Include/Protocol/CpuIo2.h
@@ -1,18 +1,18 @@
 /** @file\r
   This files describes the CPU I/O 2 Protocol.\r
 /** @file\r
   This files describes the CPU I/O 2 Protocol.\r

-  \r
+\r

   This protocol provides an I/O abstraction for a system processor. This protocol\r
   is used by a PCI root bridge I/O driver to perform memory-mapped I/O and I/O transactions.\r
   The I/O or memory primitives can be used by the consumer of the protocol to materialize\r
   bus-specific configuration cycles, such as the transitional configuration address and data\r
   This protocol provides an I/O abstraction for a system processor. This protocol\r
   is used by a PCI root bridge I/O driver to perform memory-mapped I/O and I/O transactions.\r
   The I/O or memory primitives can be used by the consumer of the protocol to materialize\r
   bus-specific configuration cycles, such as the transitional configuration address and data\r

-  ports for PCI. Only drivers that require direct access to the entire system should use this \r
-  protocol. \r
-  \r
+  ports for PCI. Only drivers that require direct access to the entire system should use this\r
+  protocol.\r
+\r

   Note: This is a boot-services only protocol and it may not be used by runtime drivers after\r
   ExitBootServices(). It is different from the Framework CPU I/O Protocol, which is a runtime\r
   protocol and can be used by runtime drivers after ExitBootServices().\r
 \r
   Note: This is a boot-services only protocol and it may not be used by runtime drivers after\r
   ExitBootServices(). It is different from the Framework CPU I/O Protocol, which is a runtime\r
   protocol and can be used by runtime drivers after ExitBootServices().\r
 \r

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


@@ -22,7 +22,7 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  This Protocol is defined in UEFI Platform Initialization Specification 1.2 \r
+  This Protocol is defined in UEFI Platform Initialization Specification 1.2\r

   Volume 5: Standards\r
 \r
 **/\r
   Volume 5: Standards\r
 \r
 **/\r


@@ -57,35 +57,35 @@ typedef enum {
 } EFI_CPU_IO_PROTOCOL_WIDTH;\r
 \r
 /**\r
 } EFI_CPU_IO_PROTOCOL_WIDTH;\r
 \r
 /**\r

-  Enables a driver to access registers in the PI CPU I/O space. \r
+  Enables a driver to access registers in the PI CPU I/O space.\r

 \r
 \r

-  The Io.Read() and Io.Write() functions enable a driver to access PCI controller \r
-  registers in the PI CPU I/O space. \r
+  The Io.Read() and Io.Write() functions enable a driver to access PCI controller\r
+  registers in the PI CPU I/O space.\r

 \r
 \r

-  The I/O operations are carried out exactly as requested. The caller is responsible \r
-  for satisfying any alignment and I/O width restrictions that a PI System on a \r
-  platform might require. For example on some platforms, width requests of \r
-  EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will \r
+  The I/O operations are carried out exactly as requested. The caller is responsible\r
+  for satisfying any alignment and I/O width restrictions that a PI System on a\r
+  platform might require. For example on some platforms, width requests of\r
+  EfiCpuIoWidthUint64 do not work. Misaligned buffers, on the other hand, will\r

   be handled by the driver.\r
   be handled by the driver.\r

-  \r
-  If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32, \r
-  or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for \r
+\r
+  If Width is EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, EfiCpuIoWidthUint32,\r
+  or EfiCpuIoWidthUint64, then both Address and Buffer are incremented for\r

   each of the Count operations that is performed.\r
   each of the Count operations that is performed.\r

-  \r
-  If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16, \r
-  EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is \r
-  incremented for each of the Count operations that is performed. The read or \r
+\r
+  If Width is EfiCpuIoWidthFifoUint8, EfiCpuIoWidthFifoUint16,\r
+  EfiCpuIoWidthFifoUint32, or EfiCpuIoWidthFifoUint64, then only Buffer is\r
+  incremented for each of the Count operations that is performed. The read or\r

   write operation is performed Count times on the same Address.\r
   write operation is performed Count times on the same Address.\r

-  \r
-  If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16, \r
-  EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is \r
-  incremented for each of the Count operations that is performed. The read or \r
+\r
+  If Width is EfiCpuIoWidthFillUint8, EfiCpuIoWidthFillUint16,\r
+  EfiCpuIoWidthFillUint32, or EfiCpuIoWidthFillUint64, then only Address is\r
+  incremented for each of the Count operations that is performed. The read or\r

   write operation is performed Count times from the first element of Buffer.\r
 \r
   @param[in]       This     A pointer to the EFI_CPU_IO2_PROTOCOL instance.\r
   @param[in]       Width    Signifies the width of the I/O or Memory operation.\r
   write operation is performed Count times from the first element of Buffer.\r
 \r
   @param[in]       This     A pointer to the EFI_CPU_IO2_PROTOCOL instance.\r
   @param[in]       Width    Signifies the width of the I/O or Memory operation.\r

-  @param[in]       Address  The base address of the I/O operation. \r
-  @param[in]       Count    The number of I/O operations to perform. The number \r
+  @param[in]       Address  The base address of the I/O operation.\r
+  @param[in]       Count    The number of I/O operations to perform. The number\r

                             of bytes moved is Width size * Count, starting at Address.\r
   @param[in, out]  Buffer   For read operations, the destination buffer to store the results.\r
                             For write operations, the source buffer from which to write data.\r
                             of bytes moved is Width size * Count, starting at Address.\r
   @param[in, out]  Buffer   For read operations, the destination buffer to store the results.\r
                             For write operations, the source buffer from which to write data.\r


@@ -94,7 +94,7 @@ typedef enum {
   @retval EFI_INVALID_PARAMETER  Width is invalid for this PI system.\r
   @retval EFI_INVALID_PARAMETER  Buffer is NULL.\r
   @retval EFI_UNSUPPORTED        The Buffer is not aligned for the given Width.\r
   @retval EFI_INVALID_PARAMETER  Width is invalid for this PI system.\r
   @retval EFI_INVALID_PARAMETER  Buffer is NULL.\r
   @retval EFI_UNSUPPORTED        The Buffer is not aligned for the given Width.\r

-  @retval EFI_UNSUPPORTED        The address range specified by Address, Width, \r
+  @retval EFI_UNSUPPORTED        The address range specified by Address, Width,\r

                                  and Count is not valid for this PI system.\r
 \r
 **/\r
                                  and Count is not valid for this PI system.\r
 \r
 **/\r

diff --git a/MdePkg/Include/Protocol/DebugPort.h b/MdePkg/Include/Protocol/DebugPort.h
index 2e09033b10859150e82a77f1beffad4b399d48aa..e7295b1afd90a5e2a6d025a6e2319c8565fe4034 100644 (file)
--- a/MdePkg/Include/Protocol/DebugPort.h
+++ b/MdePkg/Include/Protocol/DebugPort.h
@@ -1,17 +1,17 @@
 /** @file\r
 /** @file\r

-  \r
+\r

   The file defines the EFI Debugport protocol.\r
   This protocol is used by debug agent to communicate with the\r
   remote debug host.\r
   The file defines the EFI Debugport protocol.\r
   This protocol is used by debug agent to communicate with the\r
   remote debug host.\r

-  \r
-  Copyright (c) 2006 - 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
 \r

-  THE PROGRAM 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


@@ -35,14 +35,14 @@ typedef struct _EFI_DEBUGPORT_PROTOCOL EFI_DEBUGPORT_PROTOCOL;
 // DebugPort member functions\r
 //\r
 \r
 // DebugPort member functions\r
 //\r
 \r

-/**                                                                 \r
+/**\r

   Resets the debugport.\r
   Resets the debugport.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEBUGPORT_PROTOCOL instance.\r
   @param  This                  A pointer to the EFI_DEBUGPORT_PROTOCOL instance.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The debugport device was reset and is in usable state.\r
   @retval EFI_DEVICE_ERROR      The debugport device could not be reset and is unusable.\r
   @retval EFI_SUCCESS           The debugport device was reset and is in usable state.\r
   @retval EFI_DEVICE_ERROR      The debugport device could not be reset and is unusable.\r

-                                   \r
+\r

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


@@ -50,19 +50,19 @@ EFI_STATUS
   IN EFI_DEBUGPORT_PROTOCOL               *This\r
   );\r
 \r
   IN EFI_DEBUGPORT_PROTOCOL               *This\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Writes data to the debugport.\r
   Writes data to the debugport.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEBUGPORT_PROTOCOL instance.\r
   @param  Timeout               The number of microseconds to wait before timing out a write operation.\r
   @param  BufferSize            On input, the requested number of bytes of data to write. On output, the\r
                                 number of bytes of data actually written.\r
   @param  This                  A pointer to the EFI_DEBUGPORT_PROTOCOL instance.\r
   @param  Timeout               The number of microseconds to wait before timing out a write operation.\r
   @param  BufferSize            On input, the requested number of bytes of data to write. On output, the\r
                                 number of bytes of data actually written.\r

-  @param  Buffer                A pointer to a buffer containing the data to write.                                \r
-                                  \r
+  @param  Buffer                A pointer to a buffer containing the data to write.\r
+\r

   @retval EFI_SUCCESS           The data was written.\r
   @retval EFI_DEVICE_ERROR      The device reported an error.\r
   @retval EFI_TIMEOUT           The data write was stopped due to a timeout.\r
   @retval EFI_SUCCESS           The data was written.\r
   @retval EFI_DEVICE_ERROR      The device reported an error.\r
   @retval EFI_TIMEOUT           The data write was stopped due to a timeout.\r

-                                   \r
+\r

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


@@ -73,20 +73,20 @@ EFI_STATUS
   IN VOID                                 *Buffer\r
   );\r
 \r
   IN VOID                                 *Buffer\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Reads data from the debugport.\r
   Reads data from the debugport.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEBUGPORT_PROTOCOL instance.\r
   @param  Timeout               The number of microseconds to wait before timing out a read operation.\r
   @param  BufferSize            On input, the requested number of bytes of data to read. On output, the\r
                                 number of bytes of data actually number of bytes\r
                                 of data read and returned in Buffer.\r
   @param  Buffer                A pointer to a buffer into which the data read will be saved.\r
   @param  This                  A pointer to the EFI_DEBUGPORT_PROTOCOL instance.\r
   @param  Timeout               The number of microseconds to wait before timing out a read operation.\r
   @param  BufferSize            On input, the requested number of bytes of data to read. On output, the\r
                                 number of bytes of data actually number of bytes\r
                                 of data read and returned in Buffer.\r
   @param  Buffer                A pointer to a buffer into which the data read will be saved.\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The data was read.\r
   @retval EFI_DEVICE_ERROR      The device reported an error.\r
   @retval EFI_TIMEOUT           The operation was stopped due to a timeout or overrun.\r
   @retval EFI_SUCCESS           The data was read.\r
   @retval EFI_DEVICE_ERROR      The device reported an error.\r
   @retval EFI_TIMEOUT           The operation was stopped due to a timeout or overrun.\r

-                                   \r
+\r

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


@@ -97,15 +97,15 @@ EFI_STATUS
   OUT VOID                                *Buffer\r
   );\r
 \r
   OUT VOID                                *Buffer\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Checks to see if any data is available to be read from the debugport device.\r
   Checks to see if any data is available to be read from the debugport device.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEBUGPORT_PROTOCOL instance.\r
   @param  This                  A pointer to the EFI_DEBUGPORT_PROTOCOL instance.\r

-                                  \r
+\r

   @retval EFI_SUCCESS           At least one byte of data is available to be read.\r
   @retval EFI_DEVICE_ERROR      The debugport device is not functioning correctly.\r
   @retval EFI_NOT_READY         No data is available to be read.\r
   @retval EFI_SUCCESS           At least one byte of data is available to be read.\r
   @retval EFI_DEVICE_ERROR      The debugport device is not functioning correctly.\r
   @retval EFI_NOT_READY         No data is available to be read.\r

-                                   \r
+\r

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

diff --git a/MdePkg/Include/Protocol/DebugSupport.h b/MdePkg/Include/Protocol/DebugSupport.h
index 52c4042bacee3a457b53059e3a7d81332642a1da..9863302f71f510b980db27fee414a15c5b9a0858 100644 (file)
--- a/MdePkg/Include/Protocol/DebugSupport.h
+++ b/MdePkg/Include/Protocol/DebugSupport.h
@@ -5,16 +5,16 @@
   The DebugSupport protocol is used by source level debuggers to abstract the\r
   processor and handle context save and restore operations.\r
 \r
   The DebugSupport protocol is used by source level debuggers to abstract the\r
   processor and handle context save and restore operations.\r
 \r

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

 Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>\r
 \r
 Portions copyright (c) 2011 - 2013, ARM Ltd. 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
+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


@@ -183,7 +183,7 @@ typedef struct {
   UINT8   Xmm6[16];\r
   UINT8   Xmm7[16];\r
   //\r
   UINT8   Xmm6[16];\r
   UINT8   Xmm7[16];\r
   //\r

-  // NOTE: UEFI 2.0 spec definition as follows. \r
+  // NOTE: UEFI 2.0 spec definition as follows.\r

   //\r
   UINT8   Reserved11[14 * 16];\r
 } EFI_FX_SAVE_STATE_X64;\r
   //\r
   UINT8   Reserved11[14 * 16];\r
 } EFI_FX_SAVE_STATE_X64;\r


@@ -626,12 +626,12 @@ typedef union {
 // DebugSupport callback function prototypes\r
 //\r
 \r
 // DebugSupport callback function prototypes\r
 //\r
 \r

-/**                                                                 \r
+/**\r

   Registers and enables an exception callback function for the specified exception.\r
   Registers and enables an exception callback function for the specified exception.\r

-    \r
+\r

   @param  ExceptionType         Exception types in EBC, IA-32, x64, or IPF.\r
   @param  SystemContext         Exception content.\r
   @param  ExceptionType         Exception types in EBC, IA-32, x64, or IPF.\r
   @param  SystemContext         Exception content.\r

-                                   \r
+\r

 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r


@@ -640,11 +640,11 @@ VOID
   IN OUT EFI_SYSTEM_CONTEXT               SystemContext\r
   );\r
 \r
   IN OUT EFI_SYSTEM_CONTEXT               SystemContext\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Registers and enables the on-target debug agent's periodic entry point.\r
   Registers and enables the on-target debug agent's periodic entry point.\r

-      \r
+\r

   @param  SystemContext         Exception content.\r
   @param  SystemContext         Exception content.\r

-                                   \r
+\r

 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r


@@ -669,16 +669,16 @@ typedef enum {
 // DebugSupport member function definitions\r
 //\r
 \r
 // DebugSupport member function definitions\r
 //\r
 \r

-/**                                                                 \r
+/**\r

   Returns the maximum value that may be used for the ProcessorIndex parameter in\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

   @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
   @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.                                      \r
-                                \r
-  @retval EFI_SUCCESS           The function completed successfully.  \r
-                                   \r
+                                processor index is returned.\r
+\r
+  @retval EFI_SUCCESS           The function completed successfully.\r
+\r

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


@@ -687,20 +687,20 @@ EFI_STATUS
   OUT UINTN                              *MaxProcessorIndex\r
   );\r
 \r
   OUT UINTN                              *MaxProcessorIndex\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Registers a function to be called back periodically in interrupt context.\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
-                                \r
+                                function was previously registered.\r
+  @retval EFI_OUT_OF_RESOURCES  System has insufficient memory resources to register new callback\r
+                                function.\r
+\r

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


@@ -710,21 +710,21 @@ EFI_STATUS
   IN EFI_PERIODIC_CALLBACK               PeriodicCallback\r
   );\r
 \r
   IN EFI_PERIODIC_CALLBACK               PeriodicCallback\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Registers a function to be called when a given processor exception occurs.\r
   Registers a function to be called when a given processor exception occurs.\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.                                                           \r
-                                \r
+                                function was previously registered.\r
+  @retval EFI_OUT_OF_RESOURCES  System has insufficient memory resources to register new callback\r
+                                function.\r
+\r

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


@@ -735,18 +735,18 @@ EFI_STATUS
   IN EFI_EXCEPTION_TYPE                  ExceptionType\r
   );\r
 \r
   IN EFI_EXCEPTION_TYPE                  ExceptionType\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Invalidates processor instruction cache for a memory range. Subsequent execution in this range\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
-  @retval EFI_SUCCESS           The function completed successfully.  \r
-                                \r
+                                cache to invalidate.\r
+\r
+  @retval EFI_SUCCESS           The function completed successfully.\r
+\r

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


@@ -758,8 +758,8 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// This protocol provides the services to allow the debug agent to register \r
-/// callback functions that are called either periodically or when specific \r
+/// This protocol provides the services to allow the debug agent to register\r
+/// callback functions that are called either periodically or when specific\r

 /// processor exceptions occur.\r
 ///\r
 struct _EFI_DEBUG_SUPPORT_PROTOCOL {\r
 /// processor exceptions occur.\r
 ///\r
 struct _EFI_DEBUG_SUPPORT_PROTOCOL {\r


@@ -775,4 +775,4 @@ struct _EFI_DEBUG_SUPPORT_PROTOCOL {
 \r
 extern EFI_GUID gEfiDebugSupportProtocolGuid;\r
 \r
 \r
 extern EFI_GUID gEfiDebugSupportProtocolGuid;\r
 \r

-#endif \r
+#endif\r

diff --git a/MdePkg/Include/Protocol/Decompress.h b/MdePkg/Include/Protocol/Decompress.h
index 8a4bac2b16d65c325f0f0f9e568c4d6425479668..fe43668d63466d984829d1ff73698a7db08b967c 100644 (file)
--- a/MdePkg/Include/Protocol/Decompress.h
+++ b/MdePkg/Include/Protocol/Decompress.h
@@ -1,14 +1,14 @@
 /** @file\r
   The Decompress Protocol Interface as defined in UEFI spec\r
 \r
 /** @file\r
   The Decompress Protocol Interface as defined in UEFI spec\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
+  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


@@ -23,16 +23,16 @@
 typedef struct _EFI_DECOMPRESS_PROTOCOL  EFI_DECOMPRESS_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_DECOMPRESS_PROTOCOL  EFI_DECOMPRESS_PROTOCOL;\r
 \r
 /**\r

-  The GetInfo() function retrieves the size of the uncompressed buffer \r
-  and the temporary scratch buffer required to decompress the buffer \r
+  The GetInfo() function retrieves the size of the uncompressed buffer\r
+  and the temporary scratch buffer required to decompress the buffer\r

   specified by Source and SourceSize.  If the size of the uncompressed\r
   specified by Source and SourceSize.  If the size of the uncompressed\r

-  buffer or the size of the scratch buffer cannot be determined from \r
-  the compressed data specified by Source and SourceData, then \r
+  buffer or the size of the scratch buffer cannot be determined from\r
+  the compressed data specified by Source and SourceData, then\r

   EFI_INVALID_PARAMETER is returned.  Otherwise, the size of the uncompressed\r
   EFI_INVALID_PARAMETER is returned.  Otherwise, the size of the uncompressed\r

-  buffer is returned in DestinationSize, the size of the scratch buffer is \r
+  buffer is returned in DestinationSize, the size of the scratch buffer is\r

   returned in ScratchSize, and EFI_SUCCESS is returned.\r
 \r
   returned in ScratchSize, and EFI_SUCCESS is returned.\r
 \r

-  The GetInfo() function does not have a scratch buffer available to perform \r
+  The GetInfo() function does not have a scratch buffer available to perform\r

   a thorough checking of the validity of the source data. It just retrieves\r
   the 'Original Size' field from the beginning bytes of the source data and\r
   output it as DestinationSize.  And ScratchSize is specific to the decompression\r
   a thorough checking of the validity of the source data. It just retrieves\r
   the 'Original Size' field from the beginning bytes of the source data and\r
   output it as DestinationSize.  And ScratchSize is specific to the decompression\r


@@ -68,15 +68,15 @@ EFI_STATUS
 /**\r
   The Decompress() function extracts decompressed data to its original form.\r
 \r
 /**\r
   The Decompress() function extracts decompressed data to its original form.\r
 \r

-  This protocol is designed so that the decompression algorithm can be \r
-  implemented without using any memory services.  As a result, the \r
-  Decompress() function is not allowed to call AllocatePool() or \r
-  AllocatePages() in its implementation.  It is the caller's responsibility \r
+  This protocol is designed so that the decompression algorithm can be\r
+  implemented without using any memory services.  As a result, the\r
+  Decompress() function is not allowed to call AllocatePool() or\r
+  AllocatePages() in its implementation.  It is the caller's responsibility\r

   to allocate and free the Destination and Scratch buffers.\r
 \r
   to allocate and free the Destination and Scratch buffers.\r
 \r

-  If the compressed source data specified by Source and SourceSize is \r
-  successfully decompressed into Destination, then EFI_SUCCESS is returned.  \r
-  If the compressed source data specified by Source and SourceSize is not in \r
+  If the compressed source data specified by Source and SourceSize is\r
+  successfully decompressed into Destination, then EFI_SUCCESS is returned.\r
+  If the compressed source data specified by Source and SourceSize is not in\r

   a valid compressed data format, then EFI_INVALID_PARAMETER is returned.\r
 \r
   @param  This            A pointer to the EFI_DECOMPRESS_PROTOCOL instance.\r
   a valid compressed data format, then EFI_INVALID_PARAMETER is returned.\r
 \r
   @param  This            A pointer to the EFI_DECOMPRESS_PROTOCOL instance.\r


@@ -87,7 +87,7 @@ EFI_STATUS
   @param  DestinationSize The size of destination buffer. The size of destination\r
                           buffer needed is obtained from GetInfo().\r
   @param  Scratch         A temporary scratch buffer that is used to perform the\r
   @param  DestinationSize The size of destination buffer. The size of destination\r
                           buffer needed is obtained from GetInfo().\r
   @param  Scratch         A temporary scratch buffer that is used to perform the\r

-                          decompression.          \r
+                          decompression.\r

   @param  ScratchSize     The size of scratch buffer. The size of scratch buffer needed\r
                           is obtained from GetInfo().\r
 \r
   @param  ScratchSize     The size of scratch buffer. The size of scratch buffer needed\r
                           is obtained from GetInfo().\r
 \r

diff --git a/MdePkg/Include/Protocol/DeferredImageLoad.h b/MdePkg/Include/Protocol/DeferredImageLoad.h
index e2f8b5a544114b290c3839c7633e2edf4d123489..5731a51f0cde7cbeeeedf1f3e5b2b563c71dd7d3 100644 (file)
--- a/MdePkg/Include/Protocol/DeferredImageLoad.h
+++ b/MdePkg/Include/Protocol/DeferredImageLoad.h
@@ -1,19 +1,19 @@
 /** @file\r
   UEFI 2.2 Deferred Image Load Protocol definition.\r
 \r
 /** @file\r
   UEFI 2.2 Deferred Image Load Protocol definition.\r
 \r

-  This protocol returns information about images whose load was denied because of security \r
-  considerations. This information can be used by the Boot Manager or another agent to reevaluate the \r
-  images when the current security profile has been changed, such as when the current user profile \r
+  This protocol returns information about images whose load was denied because of security\r
+  considerations. This information can be used by the Boot Manager or another agent to reevaluate the\r
+  images when the current security profile has been changed, such as when the current user profile\r

   changes. There can be more than one instance of this protocol installed.\r
 \r
   changes. There can be more than one instance of this protocol installed.\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
+  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
 \r

-  THE PROGRAM 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


@@ -33,28 +33,28 @@ typedef struct _EFI_DEFERRED_IMAGE_LOAD_PROTOCOL  EFI_DEFERRED_IMAGE_LOAD_PROTOC
 /**\r
   Returns information about a deferred image.\r
 \r
 /**\r
   Returns information about a deferred image.\r
 \r

-  This function returns information about a single deferred image. The deferred images are numbered \r
-  consecutively, starting with 0.  If there is no image which corresponds to ImageIndex, then \r
-  EFI_NOT_FOUND is returned. All deferred images may be returned by iteratively calling this \r
+  This function returns information about a single deferred image. The deferred images are numbered\r
+  consecutively, starting with 0.  If there is no image which corresponds to ImageIndex, then\r
+  EFI_NOT_FOUND is returned. All deferred images may be returned by iteratively calling this\r

   function until EFI_NOT_FOUND is returned.\r
   function until EFI_NOT_FOUND is returned.\r

-  Image may be NULL and ImageSize set to 0 if the decision to defer execution was made because \r
+  Image may be NULL and ImageSize set to 0 if the decision to defer execution was made because\r

   of the location of the executable image rather than its actual contents.  record handle until\r
   of the location of the executable image rather than its actual contents.  record handle until\r

-  there are no more, at which point UserInfo will point to NULL. \r
+  there are no more, at which point UserInfo will point to NULL.\r

 \r
   @param[in]  This               Points to this instance of the EFI_DEFERRED_IMAGE_LOAD_PROTOCOL.\r
   @param[in]  ImageIndex         Zero-based index of the deferred index.\r
 \r
   @param[in]  This               Points to this instance of the EFI_DEFERRED_IMAGE_LOAD_PROTOCOL.\r
   @param[in]  ImageIndex         Zero-based index of the deferred index.\r

-  @param[out] ImageDevicePath    On return, points to a pointer to the device path of the image. \r
-                                 The device path should not be freed by the caller. \r
-  @param[out] Image              On return, points to the first byte of the image or NULL if the  \r
-                                 image is not available. The image should not be freed by the caller \r
-                                 unless LoadImage() has been called successfully.  \r
+  @param[out] ImageDevicePath    On return, points to a pointer to the device path of the image.\r
+                                 The device path should not be freed by the caller.\r
+  @param[out] Image              On return, points to the first byte of the image or NULL if the\r
+                                 image is not available. The image should not be freed by the caller\r
+                                 unless LoadImage() has been called successfully.\r

   @param[out] ImageSize          On return, the size of the image, or 0 if the image is not available.\r
   @param[out] ImageSize          On return, the size of the image, or 0 if the image is not available.\r

-  @param[out] BootOption         On return, points to TRUE if the image was intended as a boot option \r
-                                 or FALSE if it was not intended as a boot option. \r
- \r
+  @param[out] BootOption         On return, points to TRUE if the image was intended as a boot option\r
+                                 or FALSE if it was not intended as a boot option.\r
+\r

   @retval EFI_SUCCESS            Image information returned successfully.\r
   @retval EFI_NOT_FOUND          ImageIndex does not refer to a valid image.\r
   @retval EFI_SUCCESS            Image information returned successfully.\r
   @retval EFI_NOT_FOUND          ImageIndex does not refer to a valid image.\r

-  @retval EFI_INVALID_PARAMETER  ImageDevicePath is NULL or Image is NULL or ImageSize is NULL or \r
+  @retval EFI_INVALID_PARAMETER  ImageDevicePath is NULL or Image is NULL or ImageSize is NULL or\r

                                  BootOption is NULL.\r
 **/\r
 typedef\r
                                  BootOption is NULL.\r
 **/\r
 typedef\r

diff --git a/MdePkg/Include/Protocol/DeviceIo.h b/MdePkg/Include/Protocol/DeviceIo.h
index 99763d2bd773fe9a4ee600b29762ec4f59ed3afa..e54b4694e35ed2765a5f5176624660a3efa49186 100644 (file)
--- a/MdePkg/Include/Protocol/DeviceIo.h
+++ b/MdePkg/Include/Protocol/DeviceIo.h
@@ -4,14 +4,14 @@
   Device IO is used to abstract hardware access to devices. It includes\r
   memory mapped IO, IO, PCI Config space, and DMA.\r
 \r
   Device IO is used to abstract hardware access to devices. It includes\r
   memory mapped IO, IO, PCI Config space, and DMA.\r
 \r

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


@@ -27,16 +27,16 @@ typedef struct _EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_PROTOCOL;
 \r
 ///\r
 /// Protocol GUID name defined in EFI1.1.\r
 \r
 ///\r
 /// Protocol GUID name defined in EFI1.1.\r

-/// \r
+///\r

 #define DEVICE_IO_PROTOCOL  EFI_DEVICE_IO_PROTOCOL_GUID\r
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r
 #define DEVICE_IO_PROTOCOL  EFI_DEVICE_IO_PROTOCOL_GUID\r
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r

-/// \r
+///\r

 typedef EFI_DEVICE_IO_PROTOCOL  EFI_DEVICE_IO_INTERFACE;\r
 \r
 ///\r
 typedef EFI_DEVICE_IO_PROTOCOL  EFI_DEVICE_IO_INTERFACE;\r
 \r
 ///\r

-/// Device IO Access Width \r
+/// Device IO Access Width\r

 ///\r
 typedef enum {\r
   IO_UINT8  = 0,\r
 ///\r
 typedef enum {\r
   IO_UINT8  = 0,\r


@@ -44,7 +44,7 @@ typedef enum {
   IO_UINT32 = 2,\r
   IO_UINT64 = 3,\r
   //\r
   IO_UINT32 = 2,\r
   IO_UINT64 = 3,\r
   //\r

-  // Below enumerations are added in "Extensible Firmware Interface Specification, \r
+  // Below enumerations are added in "Extensible Firmware Interface Specification,\r

   // Version 1.10, Specification Update, Version 001".\r
   //\r
   MMIO_COPY_UINT8  = 4,\r
   // Version 1.10, Specification Update, Version 001".\r
   //\r
   MMIO_COPY_UINT8  = 4,\r


@@ -53,23 +53,23 @@ typedef enum {
   MMIO_COPY_UINT64 = 7\r
 } EFI_IO_WIDTH;\r
 \r
   MMIO_COPY_UINT64 = 7\r
 } EFI_IO_WIDTH;\r
 \r

-/**                                                                 \r
+/**\r

   Enables a driver to access device registers in the appropriate memory or I/O space.\r
   Enables a driver to access device registers in the appropriate memory or I/O space.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.\r
   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.\r

-  @param  Width                 Signifies the width of the I/O operations.                                                                   \r
-  @param  Address               The base address of the I/O operations. \r
+  @param  Width                 Signifies the width of the I/O operations.\r
+  @param  Address               The base address of the I/O operations.\r

   @param  Count                 The number of I/O operations to perform.\r
   @param  Buffer                For read operations, the destination buffer to store the results. For write\r
                                 operations, the source buffer to write data from. If\r
                                 Width is MMIO_COPY_UINT8, MMIO_COPY_UINT16,\r
                                 MMIO_COPY_UINT32, or MMIO_COPY_UINT64, then\r
   @param  Count                 The number of I/O operations to perform.\r
   @param  Buffer                For read operations, the destination buffer to store the results. For write\r
                                 operations, the source buffer to write data from. If\r
                                 Width is MMIO_COPY_UINT8, MMIO_COPY_UINT16,\r
                                 MMIO_COPY_UINT32, or MMIO_COPY_UINT64, then\r

-                                Buffer is interpreted as a base address of an I/O operation such as Address. \r
+                                Buffer is interpreted as a base address of an I/O operation such as Address.\r

 \r
   @retval EFI_SUCCESS           The data was read from or written to the device.\r
 \r
   @retval EFI_SUCCESS           The data was read from or written to the device.\r

-  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.      \r
+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r

   @retval EFI_INVALID_PARAMETER Width is invalid.\r
   @retval EFI_INVALID_PARAMETER Width is invalid.\r

-                                   \r
+\r

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


@@ -86,19 +86,19 @@ typedef struct {
   EFI_DEVICE_IO Write;\r
 } EFI_IO_ACCESS;\r
 \r
   EFI_DEVICE_IO Write;\r
 } EFI_IO_ACCESS;\r
 \r

-/**                                                                 \r
+/**\r

   Provides an EFI Device Path for a PCI device with the given PCI configuration space address.\r
   Provides an EFI Device Path for a PCI device with the given PCI configuration space address.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.\r
   @param  PciAddress            The PCI configuration space address of the device whose Device Path\r
   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.\r
   @param  PciAddress            The PCI configuration space address of the device whose Device Path\r

-                                is going to be returned.  \r
+                                is going to be returned.\r

   @param  PciDevicePath         A pointer to the pointer for the EFI Device Path for PciAddress.\r
   @param  PciDevicePath         A pointer to the pointer for the EFI Device Path for PciAddress.\r

-                                Memory for the Device Path is allocated from the pool.          \r
+                                Memory for the Device Path is allocated from the pool.\r

 \r
   @retval EFI_SUCCESS           The PciDevicePath returns a pointer to a valid EFI Device Path.\r
 \r
   @retval EFI_SUCCESS           The PciDevicePath returns a pointer to a valid EFI Device Path.\r

-  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.      \r
+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r

   @retval EFI_UNSUPPORTED       The PciAddress does not map to a valid EFI Device Path.\r
   @retval EFI_UNSUPPORTED       The PciAddress does not map to a valid EFI Device Path.\r

-                                   \r
+\r

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


@@ -118,7 +118,7 @@ typedef enum {
   /// A write operation to system memory by a bus master.\r
   ///\r
   EfiBusMasterWrite,\r
   /// A write operation to system memory by a bus master.\r
   ///\r
   EfiBusMasterWrite,\r

-  \r
+\r

   ///\r
   /// Provides both read and write access to system memory\r
   /// by both the processor and a bus master. The buffer is\r
   ///\r
   /// Provides both read and write access to system memory\r
   /// by both the processor and a bus master. The buffer is\r


@@ -128,9 +128,9 @@ typedef enum {
   EfiBusMasterCommonBuffer\r
 } EFI_IO_OPERATION_TYPE;\r
 \r
   EfiBusMasterCommonBuffer\r
 } EFI_IO_OPERATION_TYPE;\r
 \r

-/**                                                                 \r
+/**\r

   Provides the device-specific addresses needed to access system memory.\r
   Provides the device-specific addresses needed to access system memory.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE 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 device.\r
   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE 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 device.\r


@@ -141,11 +141,11 @@ typedef enum {
   @param  Mapping               A resulting value to pass to Unmap().\r
 \r
   @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.\r
   @param  Mapping               A resulting value to pass to Unmap().\r
 \r
   @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.\r

-  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.      \r
+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r

   @retval EFI_UNSUPPORTED       The HostAddress cannot be mapped as a common buffer.\r
   @retval EFI_INVALID_PARAMETER The Operation or HostAddress is undefined.\r
   @retval EFI_DEVICE_ERROR      The system hardware could not map the requested address.\r
   @retval EFI_UNSUPPORTED       The HostAddress cannot be mapped as a common buffer.\r
   @retval EFI_INVALID_PARAMETER The Operation or HostAddress is undefined.\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


@@ -158,15 +158,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
+\r

   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.\r
   @param  Mapping               A resulting value to pass to Unmap().\r
 \r
   @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.\r
   @retval EFI_DEVICE_ERROR      The system hardware could not map the requested address.\r
   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.\r
   @param  Mapping               A resulting value to pass to Unmap().\r
 \r
   @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.\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


@@ -175,22 +175,22 @@ EFI_STATUS
   IN VOID                             *Mapping\r
   );\r
 \r
   IN VOID                             *Mapping\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Allocates pages that are suitable for an EFIBusMasterCommonBuffer mapping.\r
   Allocates pages that are suitable for an EFIBusMasterCommonBuffer mapping.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.\r
   @param  Type                  The type allocation to perform.\r
   @param  MemoryType            The type of memory to allocate, EfiBootServicesData or\r
                                 EfiRuntimeServicesData.\r
   @param  Pages                 The number of pages to allocate.\r
   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.\r
   @param  Type                  The type allocation to perform.\r
   @param  MemoryType            The type of memory to allocate, EfiBootServicesData or\r
                                 EfiRuntimeServicesData.\r
   @param  Pages                 The number of pages to allocate.\r

-  @param  HostAddress           A pointer to store the base address of the allocated range.                                \r
+  @param  HostAddress           A pointer to store the base address of the allocated range.\r

 \r
   @retval EFI_SUCCESS           The requested memory pages were allocated.\r
   @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.\r
   @retval EFI_INVALID_PARAMETER The requested memory type is invalid.\r
   @retval EFI_UNSUPPORTED       The requested HostAddress is not supported on\r
 \r
   @retval EFI_SUCCESS           The requested memory pages were allocated.\r
   @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.\r
   @retval EFI_INVALID_PARAMETER The requested memory type is invalid.\r
   @retval EFI_UNSUPPORTED       The requested HostAddress is not supported on\r

-                                this platform.                               \r
-                                   \r
+                                this platform.\r
+\r

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


@@ -202,14 +202,14 @@ EFI_STATUS
   IN OUT EFI_PHYSICAL_ADDRESS         *HostAddress\r
   );\r
 \r
   IN OUT EFI_PHYSICAL_ADDRESS         *HostAddress\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Flushes any posted write data to the device.\r
   Flushes any posted write data to the device.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.\r
 \r
   @retval EFI_SUCCESS           The buffers were flushed.\r
   @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.\r
 \r
   @retval EFI_SUCCESS           The buffers were flushed.\r

-  @retval EFI_DEVICE_ERROR      The buffers were not flushed due to a hardware error.                                 \r
-  \r
+  @retval EFI_DEVICE_ERROR      The buffers were not flushed due to a hardware error.\r
+\r

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


@@ -217,18 +217,18 @@ EFI_STATUS
   IN EFI_DEVICE_IO_PROTOCOL  *This\r
   );\r
 \r
   IN EFI_DEVICE_IO_PROTOCOL  *This\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Frees pages that were allocated with AllocateBuffer().\r
   Frees pages that were allocated with AllocateBuffer().\r

-    \r
-  @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.  \r
+\r
+  @param  This                  A pointer to the EFI_DEVICE_IO_INTERFACE instance.\r

   @param  Pages                 The number of pages to free.\r
   @param  HostAddress           The base address of the range to free.\r
 \r
   @retval EFI_SUCCESS           The requested memory pages were allocated.\r
   @retval EFI_NOT_FOUND         The requested memory pages were not allocated with\r
   @param  Pages                 The number of pages to free.\r
   @param  HostAddress           The base address of the range to free.\r
 \r
   @retval EFI_SUCCESS           The requested memory pages were allocated.\r
   @retval EFI_NOT_FOUND         The requested memory pages were not allocated with\r

-                                AllocateBuffer().  \r
+                                AllocateBuffer().\r

   @retval EFI_INVALID_PARAMETER HostAddress is not page aligned or Pages is invalid.\r
   @retval EFI_INVALID_PARAMETER HostAddress is not page aligned or Pages is invalid.\r

-  \r
+\r

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


@@ -239,7 +239,7 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// This protocol provides the basic Memory, I/O, and PCI interfaces that \r
+/// This protocol provides the basic Memory, I/O, and PCI interfaces that\r

 /// are used to abstract accesses to devices.\r
 ///\r
 struct _EFI_DEVICE_IO_PROTOCOL {\r
 /// are used to abstract accesses to devices.\r
 ///\r
 struct _EFI_DEVICE_IO_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index fb8ab564c5114a3a013209ba362bce2ee6ddcb7e..4588f271663695b23f65841f09bea40f372123ae 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -2,17 +2,17 @@
   The device path protocol as defined in UEFI 2.0.\r
 \r
   The device path represents a programmatic path to a device,\r
   The device path protocol as defined in UEFI 2.0.\r
 \r
   The device path represents a programmatic path to a device,\r

-  from a software point of view. The path must persist from boot to boot, so \r
+  from a software point of view. The path must persist from boot to boot, so\r

   it can not contain things like PCI bus numbers that change from boot to boot.\r
 \r
   it can not contain things like PCI bus numbers that change from boot to boot.\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
-    \r
-THE PROGRAM 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


@@ -39,11 +39,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #pragma pack(1)\r
 \r
 /**\r
 #pragma pack(1)\r
 \r
 /**\r

-  This protocol can be used on any device handle to obtain generic path/location \r
-  information concerning the physical device or logical device. If the handle does \r
-  not logically map to a physical device, the handle may not necessarily support \r
-  the device path protocol. The device path describes the location of the device \r
-  the handle is for. The size of the Device Path can be determined from the structures \r
+  This protocol can be used on any device handle to obtain generic path/location\r
+  information concerning the physical device or logical device. If the handle does\r
+  not logically map to a physical device, the handle may not necessarily support\r
+  the device path protocol. The device path describes the location of the device\r
+  the handle is for. The size of the Device Path can be determined from the structures\r

   that make up the Device Path.\r
 **/\r
 typedef struct {\r
   that make up the Device Path.\r
 **/\r
 typedef struct {\r


@@ -53,20 +53,20 @@ typedef struct {
                     ///< 0x04 Media Device Path.\r
                     ///< 0x05 BIOS Boot Specification Device Path.\r
                     ///< 0x7F End of Hardware Device Path.\r
                     ///< 0x04 Media Device Path.\r
                     ///< 0x05 BIOS Boot Specification Device Path.\r
                     ///< 0x7F End of Hardware Device Path.\r

-                    \r
+\r

   UINT8 SubType;    ///< Varies by Type\r
                     ///< 0xFF End Entire Device Path, or\r
                     ///< 0x01 End This Instance of a Device Path and start a new\r
                     ///< Device Path.\r
   UINT8 SubType;    ///< Varies by Type\r
                     ///< 0xFF End Entire Device Path, or\r
                     ///< 0x01 End This Instance of a Device Path and start a new\r
                     ///< Device Path.\r

-                    \r
+\r

   UINT8 Length[2];  ///< Specific Device Path data. Type and Sub-Type define\r
                     ///< type of data. Size of data is included in Length.\r
   UINT8 Length[2];  ///< Specific Device Path data. Type and Sub-Type define\r
                     ///< type of data. Size of data is included in Length.\r

-                    \r
+\r

 } EFI_DEVICE_PATH_PROTOCOL;\r
 \r
 ///\r
 /// Device Path protocol definition for backward-compatible with EFI1.1.\r
 } EFI_DEVICE_PATH_PROTOCOL;\r
 \r
 ///\r
 /// Device Path protocol definition for backward-compatible with EFI1.1.\r

-/// \r
+///\r

 typedef EFI_DEVICE_PATH_PROTOCOL  EFI_DEVICE_PATH;\r
 \r
 ///\r
 typedef EFI_DEVICE_PATH_PROTOCOL  EFI_DEVICE_PATH;\r
 \r
 ///\r


@@ -1072,8 +1072,8 @@ typedef struct {
 #define MEDIA_PROTOCOL_DP         0x05\r
 \r
 ///\r
 #define MEDIA_PROTOCOL_DP         0x05\r
 \r
 ///\r

-/// The Media Protocol Device Path is used to denote the protocol that is being \r
-/// used in a device path at the location of the path specified. \r
+/// The Media Protocol Device Path is used to denote the protocol that is being\r
+/// used in a device path at the location of the path specified.\r

 /// Many protocols are inherent to the style of device path.\r
 ///\r
 typedef struct {\r
 /// Many protocols are inherent to the style of device path.\r
 ///\r
 typedef struct {\r


@@ -1268,7 +1268,7 @@ typedef union {
   SAS_DEVICE_PATH                            Sas;\r
   SASEX_DEVICE_PATH                          SasEx;\r
   NVME_NAMESPACE_DEVICE_PATH                 NvmeNamespace;\r
   SAS_DEVICE_PATH                            Sas;\r
   SASEX_DEVICE_PATH                          SasEx;\r
   NVME_NAMESPACE_DEVICE_PATH                 NvmeNamespace;\r

-  DNS_DEVICE_PATH                            Dns; \r
+  DNS_DEVICE_PATH                            Dns;\r

   URI_DEVICE_PATH                            Uri;\r
   BLUETOOTH_DEVICE_PATH                      Bluetooth;\r
   WIFI_DEVICE_PATH                           WiFi;\r
   URI_DEVICE_PATH                            Uri;\r
   BLUETOOTH_DEVICE_PATH                      Bluetooth;\r
   WIFI_DEVICE_PATH                           WiFi;\r


@@ -1348,7 +1348,7 @@ typedef union {
 } EFI_DEV_PATH_PTR;\r
 \r
 #pragma pack()\r
 } EFI_DEV_PATH_PTR;\r
 \r
 #pragma pack()\r

-                                             \r
+\r

 #define END_DEVICE_PATH_TYPE                 0x7f\r
 #define END_ENTIRE_DEVICE_PATH_SUBTYPE       0xFF\r
 #define END_INSTANCE_DEVICE_PATH_SUBTYPE     0x01\r
 #define END_DEVICE_PATH_TYPE                 0x7f\r
 #define END_ENTIRE_DEVICE_PATH_SUBTYPE       0xFF\r
 #define END_INSTANCE_DEVICE_PATH_SUBTYPE     0x01\r

diff --git a/MdePkg/Include/Protocol/DevicePathFromText.h b/MdePkg/Include/Protocol/DevicePathFromText.h
index 6e6e7e296ed6ba94e5f7468703c2fb75ce8945c2..86a10a33e284a3cc50fbad48eda865910036302b 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePathFromText.h
+++ b/MdePkg/Include/Protocol/DevicePathFromText.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL as defined in UEFI 2.0.  \r
+  EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL as defined in UEFI 2.0.\r

   This protocol provides service to convert text to device paths and device nodes.\r
 \r
   This protocol provides service to convert text to device paths and device nodes.\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
+  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,8 +39,8 @@ typedef
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_FROM_TEXT_NODE)(\r
   IN CONST CHAR16                 *TextDeviceNode\r
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_FROM_TEXT_NODE)(\r
   IN CONST CHAR16                 *TextDeviceNode\r

-  );    \r
-  \r
+  );\r
+\r

 \r
 /**\r
   Convert text to the binary representation of a device node.\r
 \r
 /**\r
   Convert text to the binary representation of a device node.\r


@@ -57,7 +57,7 @@ typedef
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_FROM_TEXT_PATH)(\r
   IN CONST CHAR16                 *TextDevicePath\r
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_FROM_TEXT_PATH)(\r
   IN CONST CHAR16                 *TextDevicePath\r

-  );  \r
+  );\r

 \r
 ///\r
 /// This protocol converts text to device paths and device nodes.\r
 \r
 ///\r
 /// This protocol converts text to device paths and device nodes.\r

diff --git a/MdePkg/Include/Protocol/DevicePathToText.h b/MdePkg/Include/Protocol/DevicePathToText.h
index f7a6c180035031abe2eb4b35c4202cfe90fd3f6e..5b12cdf74f058957d7238e66cce949a7d2866dc5 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePathToText.h
+++ b/MdePkg/Include/Protocol/DevicePathToText.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL as defined in UEFI 2.0.  \r
+  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL as defined in UEFI 2.0.\r

   This protocol provides service to convert device nodes and paths to text.\r
 \r
   This protocol provides service to convert device nodes and paths to text.\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
+  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


@@ -45,7 +45,7 @@ CHAR16*
   IN CONST EFI_DEVICE_PATH_PROTOCOL   *DeviceNode,\r
   IN BOOLEAN                          DisplayOnly,\r
   IN BOOLEAN                          AllowShortcuts\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL   *DeviceNode,\r
   IN BOOLEAN                          DisplayOnly,\r
   IN BOOLEAN                          AllowShortcuts\r

-  );      \r
+  );\r

 \r
 /**\r
   Convert a device path to its text representation.\r
 \r
 /**\r
   Convert a device path to its text representation.\r


@@ -54,7 +54,7 @@ CHAR16*
   @param  DisplayOnly    If DisplayOnly is TRUE, then the shorter text representation\r
                          of the display node is used, where applicable. If DisplayOnly\r
                          is FALSE, then the longer text representation of the display node\r
   @param  DisplayOnly    If DisplayOnly is TRUE, then the shorter text representation\r
                          of the display node is used, where applicable. If DisplayOnly\r
                          is FALSE, then the longer text representation of the display node\r

-                         is used.  \r
+                         is used.\r

   @param  AllowShortcuts The AllowShortcuts is FALSE, then the shortcut forms of\r
                          text representation for a device node cannot be used.\r
 \r
   @param  AllowShortcuts The AllowShortcuts is FALSE, then the shortcut forms of\r
                          text representation for a device node cannot be used.\r
 \r


@@ -68,7 +68,7 @@ CHAR16*
   IN CONST EFI_DEVICE_PATH_PROTOCOL   *DevicePath,\r
   IN BOOLEAN                          DisplayOnly,\r
   IN BOOLEAN                          AllowShortcuts\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL   *DevicePath,\r
   IN BOOLEAN                          DisplayOnly,\r
   IN BOOLEAN                          AllowShortcuts\r

-  );    \r
+  );\r

 \r
 ///\r
 /// This protocol converts device paths and device nodes to text.\r
 \r
 ///\r
 /// This protocol converts device paths and device nodes to text.\r

diff --git a/MdePkg/Include/Protocol/DevicePathUtilities.h b/MdePkg/Include/Protocol/DevicePathUtilities.h
index 72ea8da0171c2eb3e1725c2f2e8808a03b5223ff..e15c4c659f1337dbdc80a3608df27f56b9e13221 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePathUtilities.h
+++ b/MdePkg/Include/Protocol/DevicePathUtilities.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  EFI_DEVICE_PATH_UTILITIES_PROTOCOL as defined in UEFI 2.0.  \r
+  EFI_DEVICE_PATH_UTILITIES_PROTOCOL as defined in UEFI 2.0.\r

   Use to create and manipulate device paths and device nodes.\r
 \r
   Use to create and manipulate device paths and device nodes.\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
+  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


@@ -30,15 +30,15 @@
   @param  DevicePath Points to the start of the EFI device path.\r
 \r
   @return Size  Size of the specified device path, in bytes, including the end-of-path tag.\r
   @param  DevicePath Points to the start of the EFI device path.\r
 \r
   @return Size  Size of the specified device path, in bytes, including the end-of-path tag.\r

-  @retval 0     DevicePath is NULL   \r
+  @retval 0     DevicePath is NULL\r

 \r
 **/\r
 typedef\r
 UINTN\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
 \r
 **/\r
 typedef\r
 UINTN\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r

-  );    \r
-  \r
+  );\r
+\r

 \r
 /**\r
   Create a duplicate of the specified path.\r
 \r
 /**\r
   Create a duplicate of the specified path.\r


@@ -53,11 +53,11 @@ typedef
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r

-  );      \r
+  );\r

 \r
 /**\r
   Create a new path by appending the second device path to the first.\r
 \r
 /**\r
   Create a new path by appending the second device path to the first.\r

-  If Src1 is NULL and Src2 is non-NULL, then a duplicate of Src2 is returned. \r
+  If Src1 is NULL and Src2 is non-NULL, then a duplicate of Src2 is returned.\r

   If Src1 is non-NULL and Src2 is NULL, then a duplicate of Src1 is returned.\r
   If Src1 and Src2 are both NULL, then a copy of an end-of-device-path is returned.\r
 \r
   If Src1 is non-NULL and Src2 is NULL, then a duplicate of Src1 is returned.\r
   If Src1 and Src2 are both NULL, then a copy of an end-of-device-path is returned.\r
 \r


@@ -73,11 +73,11 @@ EFI_DEVICE_PATH_PROTOCOL*
 (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_PATH)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *Src1,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *Src2\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_PATH)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *Src1,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *Src2\r

-  );     \r
-  \r
+  );\r
+\r

 /**\r
   Creates a new path by appending the device node to the device path.\r
 /**\r
   Creates a new path by appending the device node to the device path.\r

-  If DeviceNode is NULL then a copy of DevicePath is returned. \r
+  If DeviceNode is NULL then a copy of DevicePath is returned.\r

   If DevicePath is NULL then a copy of DeviceNode, followed by an end-of-device path device node is returned.\r
   If both DeviceNode and DevicePath are NULL then a copy of an end-of-device-path device node is returned.\r
 \r
   If DevicePath is NULL then a copy of DeviceNode, followed by an end-of-device path device node is returned.\r
   If both DeviceNode and DevicePath are NULL then a copy of an end-of-device-path device node is returned.\r
 \r


@@ -110,7 +110,7 @@ EFI_DEVICE_PATH_PROTOCOL*
 (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_INSTANCE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePathInstance\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_INSTANCE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePathInstance\r

-  );  \r
+  );\r

 \r
 /**\r
   Creates a copy of the current device path instance and returns a pointer to the next device path\r
 \r
 /**\r
   Creates a copy of the current device path instance and returns a pointer to the next device path\r


@@ -119,7 +119,7 @@ EFI_DEVICE_PATH_PROTOCOL*
   @param  DevicePathInstance     On input, this holds the pointer to the current device path\r
                                  instance. On output, this holds the pointer to the next\r
                                  device path instance or NULL if there are no more device\r
   @param  DevicePathInstance     On input, this holds the pointer to the current device path\r
                                  instance. On output, this holds the pointer to the next\r
                                  device path instance or NULL if there are no more device\r

-                                 path instances in the device path.  \r
+                                 path instances in the device path.\r

   @param  DevicePathInstanceSize On output, this holds the size of the device path instance,\r
                                  in bytes or zero, if DevicePathInstance is NULL.\r
                                  If NULL, then the instance size is not output.\r
   @param  DevicePathInstanceSize On output, this holds the size of the device path instance,\r
                                  in bytes or zero, if DevicePathInstance is NULL.\r
                                  If NULL, then the instance size is not output.\r


@@ -133,7 +133,7 @@ EFI_DEVICE_PATH_PROTOCOL*
 (EFIAPI *EFI_DEVICE_PATH_UTILS_GET_NEXT_INSTANCE)(\r
   IN  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathInstance,\r
   OUT UINTN                         *DevicePathInstanceSize\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_GET_NEXT_INSTANCE)(\r
   IN  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathInstance,\r
   OUT UINTN                         *DevicePathInstanceSize\r

-  );  \r
+  );\r

 \r
 /**\r
   Creates a device node\r
 \r
 /**\r
   Creates a device node\r


@@ -156,7 +156,7 @@ EFI_DEVICE_PATH_PROTOCOL*
   IN UINT8                          NodeType,\r
   IN UINT8                          NodeSubType,\r
   IN UINT16                         NodeLength\r
   IN UINT8                          NodeType,\r
   IN UINT8                          NodeSubType,\r
   IN UINT16                         NodeLength\r

-);   \r
+);\r

 \r
 /**\r
   Returns whether a device path is multi-instance.\r
 \r
 /**\r
   Returns whether a device path is multi-instance.\r


@@ -171,11 +171,11 @@ typedef
 BOOLEAN\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_IS_MULTI_INSTANCE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL         *DevicePath\r
 BOOLEAN\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_IS_MULTI_INSTANCE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL         *DevicePath\r

-  );                                                                                                       \r
-  \r
+  );\r
+\r

 ///\r
 /// This protocol is used to creates and manipulates device paths and device nodes.\r
 ///\r
 /// This protocol is used to creates and manipulates device paths and device nodes.\r

-/// \r
+///\r

 typedef struct {\r
   EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE GetDevicePathSize;\r
   EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH      DuplicateDevicePath;\r
 typedef struct {\r
   EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE GetDevicePathSize;\r
   EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH      DuplicateDevicePath;\r


@@ -187,6 +187,6 @@ typedef struct {
   EFI_DEVICE_PATH_UTILS_CREATE_NODE          CreateDeviceNode;\r
 } EFI_DEVICE_PATH_UTILITIES_PROTOCOL;\r
 \r
   EFI_DEVICE_PATH_UTILS_CREATE_NODE          CreateDeviceNode;\r
 } EFI_DEVICE_PATH_UTILITIES_PROTOCOL;\r
 \r

-extern EFI_GUID gEfiDevicePathUtilitiesProtocolGuid; \r
+extern EFI_GUID gEfiDevicePathUtilitiesProtocolGuid;\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Protocol/Dhcp4.h b/MdePkg/Include/Protocol/Dhcp4.h
index c25af45299a73e3ae2ea58fe5ff58e12df299c01..434eb09311fea4b8848bacdd91128c1d35ad69f1 100644 (file)
--- a/MdePkg/Include/Protocol/Dhcp4.h
+++ b/MdePkg/Include/Protocol/Dhcp4.h
@@ -4,16 +4,16 @@
   These protocols are used to collect configuration information for the EFI IPv4 Protocol\r
   drivers and to provide DHCPv4 server and PXE boot server discovery services.\r
 \r
   These protocols are used to collect configuration information for the EFI IPv4 Protocol\r
   drivers and to provide DHCPv4 server and PXE boot server discovery services.\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
-    \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
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r

-  @par Revision Reference:          \r
+  @par Revision Reference:\r

   This Protocol was introduced in UEFI Specification 2.0.\r
 \r
 **/\r
   This Protocol was introduced in UEFI Specification 2.0.\r
 \r
 **/\r


@@ -82,7 +82,7 @@ typedef struct {
   ///\r
   UINT32              Size;\r
   ///\r
   ///\r
   UINT32              Size;\r
   ///\r

-  /// Length of the EFI_DHCP4_PACKET from the first byte of the Header field \r
+  /// Length of the EFI_DHCP4_PACKET from the first byte of the Header field\r

   /// to the last byte of the Option[] field.\r
   ///\r
   UINT32              Length;\r
   /// to the last byte of the Option[] field.\r
   ///\r
   UINT32              Length;\r


@@ -183,24 +183,24 @@ typedef enum{
   ///\r
   Dhcp4BoundCompleted = 0x08,\r
   ///\r
   ///\r
   Dhcp4BoundCompleted = 0x08,\r
   ///\r

-  /// It is time to enter the Dhcp4Renewing state and to contact the server \r
+  /// It is time to enter the Dhcp4Renewing state and to contact the server\r

   /// that originally issued the network address. No packet is associated with this event.\r
   ///\r
   Dhcp4EnterRenewing  = 0x09,\r
   ///\r
   /// that originally issued the network address. No packet is associated with this event.\r
   ///\r
   Dhcp4EnterRenewing  = 0x09,\r
   ///\r

-  /// It is time to enter the Dhcp4Rebinding state and to contact any server. \r
+  /// It is time to enter the Dhcp4Rebinding state and to contact any server.\r

   /// No packet is associated with this event.\r
   ///\r
   Dhcp4EnterRebinding = 0x0a,\r
   ///\r
   /// No packet is associated with this event.\r
   ///\r
   Dhcp4EnterRebinding = 0x0a,\r
   ///\r

-  /// The configured IP address was lost either because the lease has expired, \r
-  /// the user released the configuration, or a DHCPNAK packet was received in \r
+  /// The configured IP address was lost either because the lease has expired,\r
+  /// the user released the configuration, or a DHCPNAK packet was received in\r

   /// the Dhcp4Renewing or Dhcp4Rebinding state. No packet is associated with this event.\r
   ///\r
   Dhcp4AddressLost    = 0x0b,\r
   ///\r
   /// the Dhcp4Renewing or Dhcp4Rebinding state. No packet is associated with this event.\r
   ///\r
   Dhcp4AddressLost    = 0x0b,\r
   ///\r

-  /// The DHCP process failed because a DHCPNAK packet was received or the user \r
-  /// aborted the DHCP process at a time when the configuration was not available yet. \r
+  /// The DHCP process failed because a DHCPNAK packet was received or the user\r
+  /// aborted the DHCP process at a time when the configuration was not available yet.\r

   /// No packet is associated with this event.\r
   ///\r
   Dhcp4Fail           = 0x0c\r
   /// No packet is associated with this event.\r
   ///\r
   Dhcp4Fail           = 0x0c\r


@@ -208,7 +208,7 @@ typedef enum{
 \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


@@ -257,8 +257,8 @@ typedef struct {
   ///\r
   UINT32                      DiscoverTryCount;\r
   ///\r
   ///\r
   UINT32                      DiscoverTryCount;\r
   ///\r

-  /// The maximum amount of time (in seconds) to wait for returned packets in each \r
-  /// of the retries. Timeout values of zero will default to a timeout value \r
+  /// The maximum amount of time (in seconds) to wait for returned packets in each\r
+  /// of the retries. Timeout values of zero will default to a timeout value\r

   /// of one second. Set to NULL to use default timeout values.\r
   ///\r
   UINT32                      *DiscoverTimeout;\r
   /// of one second. Set to NULL to use default timeout values.\r
   ///\r
   UINT32                      *DiscoverTimeout;\r


@@ -269,21 +269,21 @@ typedef struct {
   ///\r
   UINT32                      RequestTryCount;\r
   ///\r
   ///\r
   UINT32                      RequestTryCount;\r
   ///\r

-  /// The maximum amount of time (in seconds) to wait for return packets in each of the retries. \r
-  /// Timeout values of zero will default to a timeout value of one second. \r
+  /// The maximum amount of time (in seconds) to wait for return packets in each of the retries.\r
+  /// Timeout values of zero will default to a timeout value of one second.\r

   /// Set to NULL to use default timeout values.\r
   ///\r
   UINT32                      *RequestTimeout;\r
   ///\r
   /// For a DHCPDISCOVER, setting this parameter to the previously allocated IP\r
   /// Set to NULL to use default timeout values.\r
   ///\r
   UINT32                      *RequestTimeout;\r
   ///\r
   /// For a DHCPDISCOVER, setting this parameter to the previously allocated IP\r

-  /// address will cause the EFI DHCPv4 Protocol driver to enter the Dhcp4InitReboot state. \r
+  /// address will cause the EFI DHCPv4 Protocol driver to enter the Dhcp4InitReboot state.\r

   /// And set this field to 0.0.0.0 to enter the Dhcp4Init state.\r
   /// For a DHCPINFORM this parameter should be set to the client network address\r
   /// which was assigned to the client during a DHCPDISCOVER.\r
   ///\r
   EFI_IPv4_ADDRESS            ClientAddress;\r
   ///\r
   /// And set this field to 0.0.0.0 to enter the Dhcp4Init state.\r
   /// For a DHCPINFORM this parameter should be set to the client network address\r
   /// which was assigned to the client during a DHCPDISCOVER.\r
   ///\r
   EFI_IPv4_ADDRESS            ClientAddress;\r
   ///\r

-  /// The callback function to intercept various events that occurred in \r
+  /// The callback function to intercept various events that occurred in\r

   /// the DHCP configuration process. Set to NULL to ignore all those events.\r
   ///\r
   EFI_DHCP4_CALLBACK          Dhcp4Callback;\r
   /// the DHCP configuration process. Set to NULL to ignore all those events.\r
   ///\r
   EFI_DHCP4_CALLBACK          Dhcp4Callback;\r


@@ -308,7 +308,7 @@ typedef struct {
 \r
 typedef struct {\r
   ///\r
 \r
 typedef struct {\r
   ///\r

-  /// The EFI DHCPv4 Protocol driver operating state. \r
+  /// The EFI DHCPv4 Protocol driver operating state.\r

   ///\r
   EFI_DHCP4_STATE             State;\r
   ///\r
   ///\r
   EFI_DHCP4_STATE             State;\r
   ///\r


@@ -329,7 +329,7 @@ typedef struct {
   ///\r
   EFI_IPv4_ADDRESS            ServerAddress;\r
   ///\r
   ///\r
   EFI_IPv4_ADDRESS            ServerAddress;\r
   ///\r

-  /// The router IP address that was acquired from the DHCP server. \r
+  /// The router IP address that was acquired from the DHCP server.\r

   /// May be zero if the server does not offer this address.\r
   ///\r
   EFI_IPv4_ADDRESS            RouterAddress;\r
   /// May be zero if the server does not offer this address.\r
   ///\r
   EFI_IPv4_ADDRESS            RouterAddress;\r


@@ -338,8 +338,8 @@ typedef struct {
   ///\r
   EFI_IPv4_ADDRESS            SubnetMask;\r
   ///\r
   ///\r
   EFI_IPv4_ADDRESS            SubnetMask;\r
   ///\r

-  /// The lease time (in 1-second units) of the configured IP address. \r
-  /// The value 0xFFFFFFFF means that the lease time is infinite. \r
+  /// The lease time (in 1-second units) of the configured IP address.\r
+  /// The value 0xFFFFFFFF means that the lease time is infinite.\r

   /// A default lease of 7 days is used if the DHCP server does not provide a value.\r
   ///\r
   UINT32                      LeaseTime;\r
   /// A default lease of 7 days is used if the DHCP server does not provide a value.\r
   ///\r
   UINT32                      LeaseTime;\r


@@ -356,12 +356,12 @@ typedef struct {
   ///\r
   EFI_IPv4_ADDRESS            ListenAddress;\r
   ///\r
   ///\r
   EFI_IPv4_ADDRESS            ListenAddress;\r
   ///\r

-  /// The subnet mask of above listening unicast/broadcast IP address. \r
+  /// The subnet mask of above listening unicast/broadcast IP address.\r

   /// Ignored if ListenAddress is a multicast address.\r
   ///\r
   EFI_IPv4_ADDRESS            SubnetMask;\r
   ///\r
   /// Ignored if ListenAddress is a multicast address.\r
   ///\r
   EFI_IPv4_ADDRESS            SubnetMask;\r
   ///\r

-  /// Alternate station source (or listening) port number. \r
+  /// Alternate station source (or listening) port number.\r

   /// If zero, then the default station port number (68) will be used.\r
   ///\r
   UINT16                      ListenPort;\r
   /// If zero, then the default station port number (68) will be used.\r
   ///\r
   UINT16                      ListenPort;\r


@@ -374,7 +374,7 @@ typedef struct {
   ///\r
   EFI_STATUS              Status;\r
   ///\r
   ///\r
   EFI_STATUS              Status;\r
   ///\r

-  /// If not NULL, the event that will be signaled when the collection process \r
+  /// If not NULL, the event that will be signaled when the collection process\r

   /// completes. If NULL, this function will busy-wait until the collection process competes.\r
   ///\r
   EFI_EVENT               CompletionEvent;\r
   /// completes. If NULL, this function will busy-wait until the collection process competes.\r
   ///\r
   EFI_EVENT               CompletionEvent;\r


@@ -395,7 +395,7 @@ typedef struct {
   ///\r
   UINT32                  ListenPointCount;\r
   ///\r
   ///\r
   UINT32                  ListenPointCount;\r
   ///\r

-  /// An array of station address and port number pairs that are used as receiving filters. \r
+  /// An array of station address and port number pairs that are used as receiving filters.\r

   /// The first entry is also used as the source address and source port of the outgoing packet.\r
   ///\r
   EFI_DHCP4_LISTEN_POINT  *ListenPoints;\r
   /// The first entry is also used as the source address and source port of the outgoing packet.\r
   ///\r
   EFI_DHCP4_LISTEN_POINT  *ListenPoints;\r


@@ -420,7 +420,7 @@ typedef struct {
 \r
 /**\r
   Returns the current operating mode and cached data packet for the EFI DHCPv4 Protocol driver.\r
 \r
 /**\r
   Returns the current operating mode and cached data packet for the EFI DHCPv4 Protocol driver.\r

-  \r
+\r

   The GetModeData() function returns the current operating mode and cached data\r
   packet for the EFI DHCPv4 Protocol driver.\r
 \r
   The GetModeData() function returns the current operating mode and cached data\r
   packet for the EFI DHCPv4 Protocol driver.\r
 \r


@@ -510,7 +510,7 @@ EFI_STATUS
   time when each event occurs in this process, the callback function that was set\r
   by EFI_DHCP4_PROTOCOL.Configure() will be called and the user can take this\r
   opportunity to control the process.\r
   time when each event occurs in this process, the callback function that was set\r
   by EFI_DHCP4_PROTOCOL.Configure() will be called and the user can take this\r
   opportunity to control the process.\r

-  \r
+\r

   @param  This            The pointer to the EFI_DHCP4_PROTOCOL instance.\r
   @param  CompletionEvent If not NULL, it indicates the event that will be signaled when the\r
                           EFI DHCPv4 Protocol driver is transferred into the\r
   @param  This            The pointer to the EFI_DHCP4_PROTOCOL instance.\r
   @param  CompletionEvent If not NULL, it indicates the event that will be signaled when the\r
                           EFI DHCPv4 Protocol driver is transferred into the\r


@@ -544,7 +544,7 @@ EFI_STATUS
 \r
 /**\r
   Extends the lease time by sending a request packet.\r
 \r
 /**\r
   Extends the lease time by sending a request packet.\r

-  \r
+\r

   The RenewRebind() function is used to manually extend the lease time when the\r
   EFI DHCPv4 Protocol driver is in the Dhcp4Bound state, and the lease time has\r
   not expired yet. This function will send a request packet to the previously\r
   The RenewRebind() function is used to manually extend the lease time when the\r
   EFI DHCPv4 Protocol driver is in the Dhcp4Bound state, and the lease time has\r
   not expired yet. This function will send a request packet to the previously\r


@@ -617,7 +617,7 @@ EFI_STATUS
 \r
 /**\r
   Stops the current address configuration.\r
 \r
 /**\r
   Stops the current address configuration.\r

-  \r
+\r

   The Stop() function is used to stop the DHCP configuration process. After this\r
   function is called successfully, the EFI DHCPv4 Protocol driver is transferred\r
   into the Dhcp4Stopped state. EFI_DHCP4_PROTOCOL.Configure() needs to be called\r
   The Stop() function is used to stop the DHCP configuration process. After this\r
   function is called successfully, the EFI DHCPv4 Protocol driver is transferred\r
   into the Dhcp4Stopped state. EFI_DHCP4_PROTOCOL.Configure() needs to be called\r


@@ -686,7 +686,7 @@ EFI_STATUS
 \r
 /**\r
   Transmits a DHCP formatted packet and optionally waits for responses.\r
 \r
 /**\r
   Transmits a DHCP formatted packet and optionally waits for responses.\r

-  \r
+\r

   The TransmitReceive() function is used to transmit a DHCP packet and optionally\r
   wait for the response from servers. This function does not change the state of\r
   the EFI DHCPv4 Protocol driver. It can be used at any time because of this.\r
   The TransmitReceive() function is used to transmit a DHCP packet and optionally\r
   wait for the response from servers. This function does not change the state of\r
   the EFI DHCPv4 Protocol driver. It can be used at any time because of this.\r


@@ -719,7 +719,7 @@ EFI_STATUS
 \r
 /**\r
   Parses the packed DHCP option data.\r
 \r
 /**\r
   Parses the packed DHCP option data.\r

-  \r
+\r

   The Parse() function is used to retrieve the option list from a DHCP packet.\r
   If *OptionCount isn't zero, and there is enough space for all the DHCP options\r
   in the Packet, each element of PacketOptionList is set to point to somewhere in\r
   The Parse() function is used to retrieve the option list from a DHCP packet.\r
   If *OptionCount isn't zero, and there is enough space for all the DHCP options\r
   in the Packet, each element of PacketOptionList is set to point to somewhere in\r

diff --git a/MdePkg/Include/Protocol/Dhcp6.h b/MdePkg/Include/Protocol/Dhcp6.h
index 42c70632be37e17a838a19fdb14dda3080550f96..e421aebf2c6ca01e1fb7ff09c4bd62824866ecee 100644 (file)
--- a/MdePkg/Include/Protocol/Dhcp6.h
+++ b/MdePkg/Include/Protocol/Dhcp6.h
@@ -2,16 +2,16 @@
   UEFI Dynamic Host Configuration Protocol 6 Definition, which is used to get IPv6\r
   addresses and other configuration parameters from DHCPv6 servers.\r
 \r
   UEFI Dynamic Host Configuration Protocol 6 Definition, which is used to get IPv6\r
   addresses and other configuration parameters from DHCPv6 servers.\r
 \r

-  Copyright (c) 2008 - 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
-\r
-  @par Revision Reference:          \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
+  @par Revision Reference:\r

   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r
   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r


@@ -31,9 +31,9 @@
 \r
 typedef struct _EFI_DHCP6_PROTOCOL EFI_DHCP6_PROTOCOL;\r
 \r
 \r
 typedef struct _EFI_DHCP6_PROTOCOL EFI_DHCP6_PROTOCOL;\r
 \r

-typedef enum { \r
+typedef enum {\r

   ///\r
   ///\r

-  /// The EFI DHCPv6 Protocol instance is configured, and start() needs \r
+  /// The EFI DHCPv6 Protocol instance is configured, and start() needs\r

   /// to be called\r
   ///\r
   Dhcp6Init                    = 0x0,\r
   /// to be called\r
   ///\r
   Dhcp6Init                    = 0x0,\r


@@ -43,7 +43,7 @@ typedef enum {
   ///\r
   Dhcp6Selecting               = 0x1,\r
   ///\r
   ///\r
   Dhcp6Selecting               = 0x1,\r
   ///\r

-  /// A Request is sent out to the DHCPv6 server, and the EFI DHCPv6 \r
+  /// A Request is sent out to the DHCPv6 server, and the EFI DHCPv6\r

   /// Protocol instance is waiting for Reply packet.\r
   ///\r
   Dhcp6Requesting              = 0x2,\r
   /// Protocol instance is waiting for Reply packet.\r
   ///\r
   Dhcp6Requesting              = 0x2,\r


@@ -54,7 +54,7 @@ typedef enum {
   ///\r
   Dhcp6Declining               = 0x3,\r
   ///\r
   ///\r
   Dhcp6Declining               = 0x3,\r
   ///\r

-  /// A Confirm packet is sent out to confirm the IPv6 addresses of the \r
+  /// A Confirm packet is sent out to confirm the IPv6 addresses of the\r

   /// configured IA, and the EFI DHCPv6 Protocol instance is waiting for Reply packet.\r
   ///\r
   Dhcp6Confirming              = 0x4,\r
   /// configured IA, and the EFI DHCPv6 Protocol instance is waiting for Reply packet.\r
   ///\r
   Dhcp6Confirming              = 0x4,\r


@@ -80,55 +80,55 @@ typedef enum {
 } EFI_DHCP6_STATE;\r
 \r
 typedef enum {\r
 } EFI_DHCP6_STATE;\r
 \r
 typedef enum {\r

-  ///     \r
+  ///\r

   /// A Solicit packet is about to be sent. The packet is passed to Dhcp6Callback and\r
   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6SendSolicit             = 0x0,\r
   /// A Solicit packet is about to be sent. The packet is passed to Dhcp6Callback and\r
   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6SendSolicit             = 0x0,\r

-  ///     \r
+  ///\r

   /// An Advertise packet is received and will be passed to Dhcp6Callback.\r
   ///\r
   Dhcp6RcvdAdvertise           = 0x1,\r
   /// An Advertise packet is received and will be passed to Dhcp6Callback.\r
   ///\r
   Dhcp6RcvdAdvertise           = 0x1,\r

-  ///     \r
+  ///\r

   /// It is time for Dhcp6Callback to determine whether select the default Advertise\r
   /// packet by RFC 3315 policy, or overwrite it by specific user policy.\r
   ///\r
   Dhcp6SelectAdvertise         = 0x2,\r
   /// It is time for Dhcp6Callback to determine whether select the default Advertise\r
   /// packet by RFC 3315 policy, or overwrite it by specific user policy.\r
   ///\r
   Dhcp6SelectAdvertise         = 0x2,\r

-  ///     \r
+  ///\r

   /// A Request packet is about to be sent. The packet is passed to Dhcp6Callback and\r
   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6SendRequest             = 0x3,\r
   /// A Request packet is about to be sent. The packet is passed to Dhcp6Callback and\r
   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6SendRequest             = 0x3,\r

-  ///     \r
+  ///\r

   /// A Reply packet is received and will be passed to Dhcp6Callback.\r
   ///\r
   Dhcp6RcvdReply               = 0x4,\r
   /// A Reply packet is received and will be passed to Dhcp6Callback.\r
   ///\r
   Dhcp6RcvdReply               = 0x4,\r

-  ///     \r
+  ///\r

   /// A Reconfigure packet is received and will be passed to Dhcp6Callback.\r
   ///\r
   Dhcp6RcvdReconfigure         = 0x5,\r
   /// A Reconfigure packet is received and will be passed to Dhcp6Callback.\r
   ///\r
   Dhcp6RcvdReconfigure         = 0x5,\r

-  ///     \r
+  ///\r

   /// A Decline packet is about to be sent. The packet is passed to Dhcp6Callback and\r
   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6SendDecline             = 0x6,\r
   /// A Decline packet is about to be sent. The packet is passed to Dhcp6Callback and\r
   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6SendDecline             = 0x6,\r

-  ///     \r
+  ///\r

   /// A Confirm packet is about to be sent. The packet is passed to Dhcp6Callback and\r
   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6SendConfirm             = 0x7,\r
   /// A Confirm packet is about to be sent. The packet is passed to Dhcp6Callback and\r
   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6SendConfirm             = 0x7,\r

-  ///     \r
+  ///\r

   /// A Release packet is about to be sent. The packet is passed to Dhcp6Callback and\r
   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6SendRelease             = 0x8,\r
   /// A Release packet is about to be sent. The packet is passed to Dhcp6Callback and\r
   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6SendRelease             = 0x8,\r

-  ///     \r
+  ///\r

   /// A Renew packet is about to be sent. The packet is passed to Dhcp6Callback and\r
   /// A Renew packet is about to be sent. The packet is passed to Dhcp6Callback and\r

-  /// can be modified or replaced in Dhcp6Callback. \r
+  /// can be modified or replaced in Dhcp6Callback.\r

   ///\r
   Dhcp6EnterRenewing           = 0x9,\r
   ///\r
   Dhcp6EnterRenewing           = 0x9,\r

-  ///     \r
-  /// A Rebind packet is about to be sent. The packet is passed to Dhcp6Callback and \r
+  ///\r
+  /// A Rebind packet is about to be sent. The packet is passed to Dhcp6Callback and\r

   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6EnterRebinding          = 0xa\r
   /// can be modified or replaced in Dhcp6Callback.\r
   ///\r
   Dhcp6EnterRebinding          = 0xa\r


@@ -147,7 +147,7 @@ typedef enum {
 ///\r
 /// EFI_DHCP6_PACKET_OPTION\r
 /// defines the format of the DHCPv6 option, See RFC 3315 for more information.\r
 ///\r
 /// EFI_DHCP6_PACKET_OPTION\r
 /// defines the format of the DHCPv6 option, See RFC 3315 for more information.\r

-/// This data structure is used to reference option data that is packed in the DHCPv6 packet. \r
+/// This data structure is used to reference option data that is packed in the DHCPv6 packet.\r

 ///\r
 typedef struct {\r
   ///\r
 ///\r
 typedef struct {\r
   ///\r


@@ -167,7 +167,7 @@ typedef struct {
 \r
 ///\r
 /// EFI_DHCP6_HEADER\r
 \r
 ///\r
 /// EFI_DHCP6_HEADER\r

-/// defines the format of the DHCPv6 header. See RFC 3315 for more information. \r
+/// defines the format of the DHCPv6 header. See RFC 3315 for more information.\r

 ///\r
 typedef struct{\r
   ///\r
 ///\r
 typedef struct{\r
   ///\r


@@ -181,7 +181,7 @@ typedef struct{
 } EFI_DHCP6_HEADER;\r
 \r
 ///\r
 } EFI_DHCP6_HEADER;\r
 \r
 ///\r

-/// EFI_DHCP6_PACKET \r
+/// EFI_DHCP6_PACKET\r

 /// defines the format of the DHCPv6 packet. See RFC 3315 for more information.\r
 ///\r
 typedef struct {\r
 /// defines the format of the DHCPv6 packet. See RFC 3315 for more information.\r
 ///\r
 typedef struct {\r


@@ -225,19 +225,19 @@ typedef struct {
   ///\r
   UINT32                       Irt;\r
   ///\r
   ///\r
   UINT32                       Irt;\r
   ///\r

-  /// Maximum retransmission count for one packet. If Mrc is zero, there's no upper limit \r
+  /// Maximum retransmission count for one packet. If Mrc is zero, there's no upper limit\r

   /// for retransmission count.\r
   ///\r
   UINT32                       Mrc;\r
   ///\r
   /// for retransmission count.\r
   ///\r
   UINT32                       Mrc;\r
   ///\r

-  /// Maximum retransmission timeout for each retry. It's the upper bound of the number of \r
-  /// retransmission timeout. If Mrt is zero, there is no upper limit for retransmission \r
+  /// Maximum retransmission timeout for each retry. It's the upper bound of the number of\r
+  /// retransmission timeout. If Mrt is zero, there is no upper limit for retransmission\r

   /// timeout.\r
   ///\r
   UINT32                       Mrt;\r
   ///\r
   /// timeout.\r
   ///\r
   UINT32                       Mrt;\r
   ///\r

-  /// Maximum retransmission duration for one packet. It's the upper bound of the numbers \r
-  /// the client may retransmit a message. If Mrd is zero, there's no upper limit for \r
+  /// Maximum retransmission duration for one packet. It's the upper bound of the numbers\r
+  /// the client may retransmit a message. If Mrd is zero, there's no upper limit for\r

   /// retransmission duration.\r
   ///\r
   UINT32                       Mrd;\r
   /// retransmission duration.\r
   ///\r
   UINT32                       Mrd;\r


@@ -281,7 +281,7 @@ typedef struct {
   ///\r
   UINT32                       IaAddressCount;\r
   ///\r
   ///\r
   UINT32                       IaAddressCount;\r
   ///\r

-  /// List of the IPv6 addresses of the configured IA. When the state of the configured IA is \r
+  /// List of the IPv6 addresses of the configured IA. When the state of the configured IA is\r

   /// in Dhcp6Bound, Dhcp6Renewing and Dhcp6Rebinding, the IPv6 addresses are usable.\r
   ///\r
   EFI_DHCP6_IA_ADDRESS         IaAddress[1];\r
   /// in Dhcp6Bound, Dhcp6Renewing and Dhcp6Rebinding, the IPv6 addresses are usable.\r
   ///\r
   EFI_DHCP6_IA_ADDRESS         IaAddress[1];\r


@@ -300,39 +300,39 @@ typedef struct {
 } EFI_DHCP6_MODE_DATA;\r
 \r
 /**\r
 } EFI_DHCP6_MODE_DATA;\r
 \r
 /**\r

-  EFI_DHCP6_CALLBACK is provided by the consumer of the EFI DHCPv6 Protocol instance to \r
+  EFI_DHCP6_CALLBACK is provided by the consumer of the EFI DHCPv6 Protocol instance to\r

   intercept events that occurs in the DHCPv6 S.A.R.R process.\r
 \r
   intercept events that occurs in the DHCPv6 S.A.R.R process.\r
 \r

-  @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance that is used to configure this \r
+  @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance that is used to configure this\r

                                 callback function.\r
   @param[in]  Context           Pointer to the context that is initialized by EFI_DHCP6_PROTOCOL.Configure().\r
   @param[in]  CurrentState      The current state of the configured IA.\r
   @param[in]  Dhcp6Event        The event that occurs in the current state, which usually means a state transition.\r
   @param[in]  Packet            Pointer to the DHCPv6 packet that is about to be sent or has been received.\r
                                 callback function.\r
   @param[in]  Context           Pointer to the context that is initialized by EFI_DHCP6_PROTOCOL.Configure().\r
   @param[in]  CurrentState      The current state of the configured IA.\r
   @param[in]  Dhcp6Event        The event that occurs in the current state, which usually means a state transition.\r
   @param[in]  Packet            Pointer to the DHCPv6 packet that is about to be sent or has been received.\r

-                                The EFI DHCPv6 Protocol instance is responsible for freeing the buffer. \r
-  @param[out] NewPacket         Pointer to the new DHCPv6 packet to overwrite the Packet. NewPacket can not \r
-                                share the buffer with Packet. If *NewPacket is not NULL, the EFI DHCPv6 \r
+                                The EFI DHCPv6 Protocol instance is responsible for freeing the buffer.\r
+  @param[out] NewPacket         Pointer to the new DHCPv6 packet to overwrite the Packet. NewPacket can not\r
+                                share the buffer with Packet. If *NewPacket is not NULL, the EFI DHCPv6\r

                                 Protocol instance is responsible for freeing the buffer.\r
 \r
   @retval EFI_SUCCESS           Tell the EFI DHCPv6 Protocol instance to continue the DHCPv6 S.A.R.R process.\r
                                 Protocol instance is responsible for freeing the buffer.\r
 \r
   @retval EFI_SUCCESS           Tell the EFI DHCPv6 Protocol instance to continue the DHCPv6 S.A.R.R process.\r

-  @retval EFI_ABORTED           Tell the EFI DHCPv6 Protocol instance to abort the DHCPv6 S.A.R.R process, \r
+  @retval EFI_ABORTED           Tell the EFI DHCPv6 Protocol instance to abort the DHCPv6 S.A.R.R process,\r

                                 and the state of the configured IA will be transferred to Dhcp6Init.\r
 \r
 **/\r
                                 and the state of the configured IA will be transferred to Dhcp6Init.\r
 \r
 **/\r

-typedef \r
-EFI_STATUS \r
+typedef\r
+EFI_STATUS\r

 (EFIAPI *EFI_DHCP6_CALLBACK)(\r
   IN EFI_DHCP6_PROTOCOL        *This,\r
   IN VOID                      *Context,\r
   IN EFI_DHCP6_STATE           CurrentState,\r
   IN EFI_DHCP6_EVENT           Dhcp6Event,\r
 (EFIAPI *EFI_DHCP6_CALLBACK)(\r
   IN EFI_DHCP6_PROTOCOL        *This,\r
   IN VOID                      *Context,\r
   IN EFI_DHCP6_STATE           CurrentState,\r
   IN EFI_DHCP6_EVENT           Dhcp6Event,\r

-  IN EFI_DHCP6_PACKET          *Packet,        \r
+  IN EFI_DHCP6_PACKET          *Packet,\r

   OUT EFI_DHCP6_PACKET         **NewPacket OPTIONAL\r
   );\r
 \r
 typedef struct {\r
   ///\r
   OUT EFI_DHCP6_PACKET         **NewPacket OPTIONAL\r
   );\r
 \r
 typedef struct {\r
   ///\r

-  /// The callback function is to intercept various events that occur in the DHCPv6 S.A.R.R \r
+  /// The callback function is to intercept various events that occur in the DHCPv6 S.A.R.R\r

   /// process. Set to NULL to ignore all those events.\r
   ///\r
   EFI_DHCP6_CALLBACK           Dhcp6Callback;\r
   /// process. Set to NULL to ignore all those events.\r
   ///\r
   EFI_DHCP6_CALLBACK           Dhcp6Callback;\r


@@ -345,11 +345,11 @@ typedef struct {
   ///\r
   UINT32                       OptionCount;\r
   ///\r
   ///\r
   UINT32                       OptionCount;\r
   ///\r

-  /// List of the DHCPv6 options to be included in Solicit and Request packet. The buffer \r
-  /// can be freed after EFI_DHCP6_PROTOCOL.Configure() returns. Ignored if \r
-  /// OptionCount is zero. OptionList should not contain Client Identifier option \r
-  /// and any IA option, which will be appended by EFI DHCPv6 Protocol instance \r
-  /// automatically. \r
+  /// List of the DHCPv6 options to be included in Solicit and Request packet. The buffer\r
+  /// can be freed after EFI_DHCP6_PROTOCOL.Configure() returns. Ignored if\r
+  /// OptionCount is zero. OptionList should not contain Client Identifier option\r
+  /// and any IA option, which will be appended by EFI DHCPv6 Protocol instance\r
+  /// automatically.\r

   ///\r
   EFI_DHCP6_PACKET_OPTION      **OptionList;\r
   ///\r
   ///\r
   EFI_DHCP6_PACKET_OPTION      **OptionList;\r
   ///\r


@@ -357,40 +357,40 @@ typedef struct {
   ///\r
   EFI_DHCP6_IA_DESCRIPTOR      IaDescriptor;\r
   ///\r
   ///\r
   EFI_DHCP6_IA_DESCRIPTOR      IaDescriptor;\r
   ///\r

-  /// If not NULL, the event will be signaled when any IPv6 address information of the \r
-  /// configured IA is updated, including IPv6 address, preferred lifetime and valid \r
-  /// lifetime, or the DHCPv6 S.A.R.R process fails. Otherwise, Start(), \r
-  /// renewrebind(), decline(), release() and stop() will be blocking \r
+  /// If not NULL, the event will be signaled when any IPv6 address information of the\r
+  /// configured IA is updated, including IPv6 address, preferred lifetime and valid\r
+  /// lifetime, or the DHCPv6 S.A.R.R process fails. Otherwise, Start(),\r
+  /// renewrebind(), decline(), release() and stop() will be blocking\r

   /// operations, and they will wait for the exchange process completion or failure.\r
   ///\r
   EFI_EVENT                    IaInfoEvent;\r
   ///\r
   /// operations, and they will wait for the exchange process completion or failure.\r
   ///\r
   EFI_EVENT                    IaInfoEvent;\r
   ///\r

-  /// If TRUE, the EFI DHCPv6 Protocol instance is willing to accept Reconfigure packet. \r
-  /// Otherwise, it will ignore it. Reconfigure Accept option can not be specified through \r
+  /// If TRUE, the EFI DHCPv6 Protocol instance is willing to accept Reconfigure packet.\r
+  /// Otherwise, it will ignore it. Reconfigure Accept option can not be specified through\r

   /// OptionList parameter.\r
   ///\r
   BOOLEAN                      ReconfigureAccept;\r
   ///\r
   /// OptionList parameter.\r
   ///\r
   BOOLEAN                      ReconfigureAccept;\r
   ///\r

-  /// If TRUE, the EFI DHCPv6 Protocol instance will send Solicit packet with Rapid \r
-  /// Commit option. Otherwise, Rapid Commit option will not be included in Solicit \r
+  /// If TRUE, the EFI DHCPv6 Protocol instance will send Solicit packet with Rapid\r
+  /// Commit option. Otherwise, Rapid Commit option will not be included in Solicit\r

   /// packet. Rapid Commit option can not be specified through OptionList parameter.\r
   ///\r
   BOOLEAN                      RapidCommit;\r
   ///\r
   /// packet. Rapid Commit option can not be specified through OptionList parameter.\r
   ///\r
   BOOLEAN                      RapidCommit;\r
   ///\r

-  /// Parameter to control Solicit packet retransmission behavior. The \r
+  /// Parameter to control Solicit packet retransmission behavior. The\r

   /// buffer can be freed after EFI_DHCP6_PROTOCOL.Configure() returns.\r
   ///\r
   EFI_DHCP6_RETRANSMISSION     *SolicitRetransmission;\r
 } EFI_DHCP6_CONFIG_DATA;\r
 \r
 /**\r
   /// buffer can be freed after EFI_DHCP6_PROTOCOL.Configure() returns.\r
   ///\r
   EFI_DHCP6_RETRANSMISSION     *SolicitRetransmission;\r
 } EFI_DHCP6_CONFIG_DATA;\r
 \r
 /**\r

-  EFI_DHCP6_INFO_CALLBACK is provided by the consumer of the EFI DHCPv6 Protocol \r
+  EFI_DHCP6_INFO_CALLBACK is provided by the consumer of the EFI DHCPv6 Protocol\r

   instance to intercept events that occurs in the DHCPv6 Information Request exchange process.\r
 \r
   instance to intercept events that occurs in the DHCPv6 Information Request exchange process.\r
 \r

-  @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance that is used to configure this \r
+  @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance that is used to configure this\r

                                 callback function.\r
   @param[in]  Context           Pointer to the context that is initialized in the EFI_DHCP6_PROTOCOL.InfoRequest().\r
                                 callback function.\r
   @param[in]  Context           Pointer to the context that is initialized in the EFI_DHCP6_PROTOCOL.InfoRequest().\r

-  @param[in]  Packet            Pointer to Reply packet that has been received. The EFI DHCPv6 Protocol instance is \r
+  @param[in]  Packet            Pointer to Reply packet that has been received. The EFI DHCPv6 Protocol instance is\r

                                 responsible for freeing the buffer.\r
 \r
   @retval EFI_SUCCESS           Tell the EFI DHCPv6 Protocol instance to finish Information Request exchange process.\r
                                 responsible for freeing the buffer.\r
 \r
   @retval EFI_SUCCESS           Tell the EFI DHCPv6 Protocol instance to finish Information Request exchange process.\r


@@ -410,20 +410,20 @@ EFI_STATUS
   Retrieve the current operating mode data and configuration data for the EFI DHCPv6 Protocol instance.\r
 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r
   Retrieve the current operating mode data and configuration data for the EFI DHCPv6 Protocol instance.\r
 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r

-  @param[out] Dhcp6ModeData     Pointer to the DHCPv6 mode data structure. The caller is responsible for freeing this \r
+  @param[out] Dhcp6ModeData     Pointer to the DHCPv6 mode data structure. The caller is responsible for freeing this\r

                                 structure and each reference buffer.\r
                                 structure and each reference buffer.\r

-  @param[out] Dhcp6ConfigData   Pointer to the DHCPv6 configuration data structure. The caller is responsible for \r
+  @param[out] Dhcp6ConfigData   Pointer to the DHCPv6 configuration data structure. The caller is responsible for\r

                                 freeing this structure and each reference buffer.\r
 \r
   @retval EFI_SUCCESS           The mode data was returned.\r
   @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Protocol instance has not been configured when Dhcp6ConfigData is not NULL.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE:\r
                                 freeing this structure and each reference buffer.\r
 \r
   @retval EFI_SUCCESS           The mode data was returned.\r
   @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Protocol instance has not been configured when Dhcp6ConfigData is not NULL.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE:\r

-                                - This is NULL. \r
+                                - This is NULL.\r

                                 - Both Dhcp6ConfigData and Dhcp6ModeData are NULL.\r
 \r
 **/\r
                                 - Both Dhcp6ConfigData and Dhcp6ModeData are NULL.\r
 \r
 **/\r

-typedef \r
-EFI_STATUS \r
+typedef\r
+EFI_STATUS\r

 (EFIAPI *EFI_DHCP6_GET_MODE_DATA)(\r
   IN EFI_DHCP6_PROTOCOL        *This,\r
   OUT EFI_DHCP6_MODE_DATA      *Dhcp6ModeData OPTIONAL,\r
 (EFIAPI *EFI_DHCP6_GET_MODE_DATA)(\r
   IN EFI_DHCP6_PROTOCOL        *This,\r
   OUT EFI_DHCP6_MODE_DATA      *Dhcp6ModeData OPTIONAL,\r


@@ -433,15 +433,15 @@ EFI_STATUS
 /**\r
   Initialize or clean up the configuration data for the EFI DHCPv6 Protocol instance.\r
 \r
 /**\r
   Initialize or clean up the configuration data for the EFI DHCPv6 Protocol instance.\r
 \r

-  The Configure() function is used to initialize or clean up the configuration data of the EFI \r
+  The Configure() function is used to initialize or clean up the configuration data of the EFI\r

   DHCPv6 Protocol instance.\r
   DHCPv6 Protocol instance.\r

-  - When Dhcp6CfgData is not NULL and Configure() is called successfully, the \r
-    configuration data will be initialized in the EFI DHCPv6 Protocol instance and the state of the \r
+  - When Dhcp6CfgData is not NULL and Configure() is called successfully, the\r
+    configuration data will be initialized in the EFI DHCPv6 Protocol instance and the state of the\r

     configured IA will be transferred into Dhcp6Init.\r
     configured IA will be transferred into Dhcp6Init.\r

-  - When Dhcp6CfgData is NULL and Configure() is called successfully, the configuration \r
+  - When Dhcp6CfgData is NULL and Configure() is called successfully, the configuration\r

     data will be cleaned up and no IA will be associated with the EFI DHCPv6 Protocol instance.\r
 \r
     data will be cleaned up and no IA will be associated with the EFI DHCPv6 Protocol instance.\r
 \r

-  To update the configuration data for an EFI DCHPv6 Protocol instance, the original data must be \r
+  To update the configuration data for an EFI DCHPv6 Protocol instance, the original data must be\r

   cleaned up before setting the new configuration data.\r
 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r
   cleaned up before setting the new configuration data.\r
 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r


@@ -449,24 +449,24 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS           The mode data was returned.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE\r
 \r
   @retval EFI_SUCCESS           The mode data was returned.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE\r

-                                - This is NULL. \r
+                                - This is NULL.\r

                                 - OptionCount > 0 and OptionList is NULL.\r
                                 - OptionList is not NULL, and Client Id option, Reconfigure Accept option,\r
                                   Rapid Commit option or any IA option is specified in the OptionList.\r
                                 - IaDescriptor.Type is neither EFI_DHCP6_IA_TYPE_NA nor EFI_DHCP6_IA_TYPE_NA.\r
                                 - IaDescriptor is not unique.\r
                                 - Both IaInfoEvent and SolicitRetransimssion are NULL.\r
                                 - OptionCount > 0 and OptionList is NULL.\r
                                 - OptionList is not NULL, and Client Id option, Reconfigure Accept option,\r
                                   Rapid Commit option or any IA option is specified in the OptionList.\r
                                 - IaDescriptor.Type is neither EFI_DHCP6_IA_TYPE_NA nor EFI_DHCP6_IA_TYPE_NA.\r
                                 - IaDescriptor is not unique.\r
                                 - Both IaInfoEvent and SolicitRetransimssion are NULL.\r

-                                - SolicitRetransmission is not NULL, and both SolicitRetransimssion->Mrc and \r
+                                - SolicitRetransmission is not NULL, and both SolicitRetransimssion->Mrc and\r

                                   SolicitRetransmission->Mrd are zero.\r
                                   SolicitRetransmission->Mrd are zero.\r

-  @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Protocol instance has been already configured \r
+  @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Protocol instance has been already configured\r

                                 when Dhcp6CfgData is not NULL.\r
                                 when Dhcp6CfgData is not NULL.\r

-                                The EFI DHCPv6 Protocol instance has already started the \r
+                                The EFI DHCPv6 Protocol instance has already started the\r

                                 DHCPv6 S.A.R.R when Dhcp6CfgData is NULL.\r
   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR      An unexpected system or network error occurred.\r
 \r
 **/\r
                                 DHCPv6 S.A.R.R when Dhcp6CfgData is NULL.\r
   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR      An unexpected system or network error occurred.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_DHCP6_CONFIGURE)(\r
   IN EFI_DHCP6_PROTOCOL        *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_DHCP6_CONFIGURE)(\r
   IN EFI_DHCP6_PROTOCOL        *This,\r


@@ -476,13 +476,13 @@ EFI_STATUS
 /**\r
   Start the DHCPv6 S.A.R.R process.\r
 \r
 /**\r
   Start the DHCPv6 S.A.R.R process.\r
 \r

-  The Start() function starts the DHCPv6 S.A.R.R process. This function can be called only when \r
+  The Start() function starts the DHCPv6 S.A.R.R process. This function can be called only when\r

   the state of the configured IA is in the Dhcp6Init state. If the DHCPv6 S.A.R.R process completes\r
   the state of the configured IA is in the Dhcp6Init state. If the DHCPv6 S.A.R.R process completes\r

-  successfully, the state of the configured IA will be transferred through Dhcp6Selecting and \r
-  Dhcp6Requesting to Dhcp6Bound state. The update of the IPv6 addresses will be notified through \r
-  EFI_DHCP6_CONFIG_DATA.IaInfoEvent. At the time when each event occurs in this process, the \r
-  callback function set by EFI_DHCP6_PROTOCOL.Configure() will be called and the user can take \r
-  this opportunity to control the process. If EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL, the \r
+  successfully, the state of the configured IA will be transferred through Dhcp6Selecting and\r
+  Dhcp6Requesting to Dhcp6Bound state. The update of the IPv6 addresses will be notified through\r
+  EFI_DHCP6_CONFIG_DATA.IaInfoEvent. At the time when each event occurs in this process, the\r
+  callback function set by EFI_DHCP6_PROTOCOL.Configure() will be called and the user can take\r
+  this opportunity to control the process. If EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL, the\r

   Start() function call is a blocking operation. It will return after the DHCPv6 S.A.R.R process\r
   completes or aborted by users. If the process is aborted by system or network error, the state of\r
   the configured IA will be transferred to Dhcp6Init. The Start() function can be called again to\r
   Start() function call is a blocking operation. It will return after the DHCPv6 S.A.R.R process\r
   completes or aborted by users. If the process is aborted by system or network error, the state of\r
   the configured IA will be transferred to Dhcp6Init. The Start() function can be called again to\r


@@ -490,10 +490,10 @@ EFI_STATUS
 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r
 \r
 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r
 \r

-  @retval EFI_SUCCESS           The DHCPv6 S.A.R.R process is completed and at least one IPv6 \r
-                                address has been bound to the configured IA when \r
-                                EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL. \r
-                                The DHCPv6 S.A.R.R process is started when \r
+  @retval EFI_SUCCESS           The DHCPv6 S.A.R.R process is completed and at least one IPv6\r
+                                address has been bound to the configured IA when\r
+                                EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL.\r
+                                The DHCPv6 S.A.R.R process is started when\r

                                 EFI_DHCP6_CONFIG_DATA.IaInfoEvent is not NULL.\r
   @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Child instance hasn't been configured.\r
   @retval EFI_INVALID_PARAMETER This is NULL.\r
                                 EFI_DHCP6_CONFIG_DATA.IaInfoEvent is not NULL.\r
   @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Child instance hasn't been configured.\r
   @retval EFI_INVALID_PARAMETER This is NULL.\r


@@ -501,13 +501,13 @@ EFI_STATUS
   @retval EFI_ALREADY_STARTED   The DHCPv6 S.A.R.R process has already started.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred.\r
   @retval EFI_NO_RESPONSE       The DHCPv6 S.A.R.R process failed because of no response.\r
   @retval EFI_ALREADY_STARTED   The DHCPv6 S.A.R.R process has already started.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred.\r
   @retval EFI_NO_RESPONSE       The DHCPv6 S.A.R.R process failed because of no response.\r

-  @retval EFI_NO_MAPPING        No IPv6 address has been bound to the configured IA after the \r
+  @retval EFI_NO_MAPPING        No IPv6 address has been bound to the configured IA after the\r

                                 DHCPv6 S.A.R.R process.\r
   @retval EFI_ABORTED           The DHCPv6 S.A.R.R process aborted by user.\r
   @retval EFI_NO_MEDIA          There was a media error.\r
 \r
 **/\r
                                 DHCPv6 S.A.R.R process.\r
   @retval EFI_ABORTED           The DHCPv6 S.A.R.R process aborted by user.\r
   @retval EFI_NO_MEDIA          There was a media error.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_DHCP6_START)(\r
   IN EFI_DHCP6_PROTOCOL        *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_DHCP6_START)(\r
   IN EFI_DHCP6_PROTOCOL        *This\r


@@ -517,19 +517,19 @@ EFI_STATUS
   Request configuration information without the assignment of any IA addresses of the client.\r
 \r
   The InfoRequest() function is used to request configuration information without the assignment\r
   Request configuration information without the assignment of any IA addresses of the client.\r
 \r
   The InfoRequest() function is used to request configuration information without the assignment\r

-  of any IPv6 address of the client. Client sends out Information Request packet to obtain \r
-  the required configuration information, and DHCPv6 server responds with Reply packet containing \r
-  the information for the client. The received Reply packet will be passed to the user by \r
+  of any IPv6 address of the client. Client sends out Information Request packet to obtain\r
+  the required configuration information, and DHCPv6 server responds with Reply packet containing\r
+  the information for the client. The received Reply packet will be passed to the user by\r

   ReplyCallback function. If user returns EFI_NOT_READY from ReplyCallback, the EFI DHCPv6\r
   ReplyCallback function. If user returns EFI_NOT_READY from ReplyCallback, the EFI DHCPv6\r

-  Protocol instance will continue to receive other Reply packets unless timeout according to \r
-  the Retransmission parameter. Otherwise, the Information Request exchange process will be \r
+  Protocol instance will continue to receive other Reply packets unless timeout according to\r
+  the Retransmission parameter. Otherwise, the Information Request exchange process will be\r

   finished successfully if user returns EFI_SUCCESS from ReplyCallback.\r
 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r
   @param[in]  SendClientId      If TRUE, the EFI DHCPv6 Protocol instance will build Client\r
                                 Identifier option and include it into Information Request\r
                                 packet. If FALSE, Client Identifier option will not be included.\r
   finished successfully if user returns EFI_SUCCESS from ReplyCallback.\r
 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r
   @param[in]  SendClientId      If TRUE, the EFI DHCPv6 Protocol instance will build Client\r
                                 Identifier option and include it into Information Request\r
                                 packet. If FALSE, Client Identifier option will not be included.\r

-                                Client Identifier option can not be specified through OptionList \r
+                                Client Identifier option can not be specified through OptionList\r

                                 parameter.\r
   @param[in]  OptionRequest     Pointer to the Option Request option in the Information Request\r
                                 packet. Option Request option can not be specified through\r
                                 parameter.\r
   @param[in]  OptionRequest     Pointer to the Option Request option in the Information Request\r
                                 packet. Option Request option can not be specified through\r


@@ -543,29 +543,29 @@ EFI_STATUS
                                 returns.\r
   @param[in]  TimeoutEvent      If not NULL, this event is signaled when the information request\r
                                 exchange aborted because of no response. If NULL, the function\r
                                 returns.\r
   @param[in]  TimeoutEvent      If not NULL, this event is signaled when the information request\r
                                 exchange aborted because of no response. If NULL, the function\r

-                                call is a blocking operation; and it will return after the \r
+                                call is a blocking operation; and it will return after the\r

                                 information-request exchange process finish or aborted by users.\r
   @param[in]  ReplyCallback     The callback function is to intercept various events that occur\r
                                 in the Information Request exchange process. It should not be\r
                                 set to NULL.\r
   @param[in]  CallbackContext   Pointer to the context that will be passed to ReplyCallback.\r
 \r
                                 information-request exchange process finish or aborted by users.\r
   @param[in]  ReplyCallback     The callback function is to intercept various events that occur\r
                                 in the Information Request exchange process. It should not be\r
                                 set to NULL.\r
   @param[in]  CallbackContext   Pointer to the context that will be passed to ReplyCallback.\r
 \r

-  @retval EFI_SUCCESS           The DHCPv6 S.A.R.R process is completed and at least one IPv6 \r
-  @retval EFI_SUCCESS           The DHCPv6 information request exchange process completed \r
+  @retval EFI_SUCCESS           The DHCPv6 S.A.R.R process is completed and at least one IPv6\r
+  @retval EFI_SUCCESS           The DHCPv6 information request exchange process completed\r

                                 when TimeoutEvent is NULL. Information Request packet has been\r
                                 sent to DHCPv6 server when TimeoutEvent is not NULL.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE:\r
                                 when TimeoutEvent is NULL. Information Request packet has been\r
                                 sent to DHCPv6 server when TimeoutEvent is not NULL.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE:\r

-                                - This is NULL. \r
+                                - This is NULL.\r

                                 - OptionRequest is NULL or OptionRequest->OpCode is invalid.\r
                                 - OptionCount > 0 and OptionList is NULL.\r
                                 - OptionRequest is NULL or OptionRequest->OpCode is invalid.\r
                                 - OptionCount > 0 and OptionList is NULL.\r

-                                - OptionList is not NULL, and Client Identify option or \r
+                                - OptionList is not NULL, and Client Identify option or\r

                                   Option Request option is specified in the OptionList.\r
                                 - Retransimssion is NULL.\r
                                 - Both Retransimssion->Mrc and Retransmission->Mrd are zero.\r
                                 - ReplyCallback is NULL.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred.\r
                                   Option Request option is specified in the OptionList.\r
                                 - Retransimssion is NULL.\r
                                 - Both Retransimssion->Mrc and Retransmission->Mrd are zero.\r
                                 - ReplyCallback is NULL.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred.\r

-  @retval EFI_NO_RESPONSE       The DHCPv6 information request exchange process failed \r
-                                because of no response, or not all requested-options are \r
+  @retval EFI_NO_RESPONSE       The DHCPv6 information request exchange process failed\r
+                                because of no response, or not all requested-options are\r

                                 responded by DHCPv6 servers when Timeout happened.\r
   @retval EFI_ABORTED           The DHCPv6 information request exchange process aborted by user.\r
 \r
                                 responded by DHCPv6 servers when Timeout happened.\r
   @retval EFI_ABORTED           The DHCPv6 information request exchange process aborted by user.\r
 \r


@@ -578,7 +578,7 @@ EFI_STATUS
   IN EFI_DHCP6_PACKET_OPTION   *OptionRequest,\r
   IN UINT32                    OptionCount,\r
   IN EFI_DHCP6_PACKET_OPTION   *OptionList[] OPTIONAL,\r
   IN EFI_DHCP6_PACKET_OPTION   *OptionRequest,\r
   IN UINT32                    OptionCount,\r
   IN EFI_DHCP6_PACKET_OPTION   *OptionList[] OPTIONAL,\r

-  IN EFI_DHCP6_RETRANSMISSION  *Retransmission, \r
+  IN EFI_DHCP6_RETRANSMISSION  *Retransmission,\r

   IN EFI_EVENT                 TimeoutEvent OPTIONAL,\r
   IN EFI_DHCP6_INFO_CALLBACK   ReplyCallback,\r
   IN VOID                      *CallbackContext OPTIONAL\r
   IN EFI_EVENT                 TimeoutEvent OPTIONAL,\r
   IN EFI_DHCP6_INFO_CALLBACK   ReplyCallback,\r
   IN VOID                      *CallbackContext OPTIONAL\r


@@ -588,38 +588,38 @@ EFI_STATUS
   Manually extend the valid and preferred lifetimes for the IPv6 addresses of the configured\r
   IA and update other configuration parameters by sending Renew or Rebind packet.\r
 \r
   Manually extend the valid and preferred lifetimes for the IPv6 addresses of the configured\r
   IA and update other configuration parameters by sending Renew or Rebind packet.\r
 \r

-  The RenewRebind() function is used to manually extend the valid and preferred lifetimes for the \r
-  IPv6 addresses of the configured IA and update other configuration parameters by sending Renew or \r
-  Rebind packet. \r
-  - When RebindRequest is FALSE and the state of the configured IA is Dhcp6Bound, it \r
-  will send Renew packet to the previously DHCPv6 server and transfer the state of the configured \r
-  IA to Dhcp6Renewing. If valid Reply packet received, the state transfers to Dhcp6Bound \r
-  and the valid and preferred timer restarts. If fails, the state transfers to Dhcp6Bound but the \r
-  timer continues. \r
-  - When RebindRequest is TRUE and the state of the configured IA is Dhcp6Bound, it will \r
-  send Rebind packet. If valid Reply packet received, the state transfers to Dhcp6Bound and the \r
+  The RenewRebind() function is used to manually extend the valid and preferred lifetimes for the\r
+  IPv6 addresses of the configured IA and update other configuration parameters by sending Renew or\r
+  Rebind packet.\r
+  - When RebindRequest is FALSE and the state of the configured IA is Dhcp6Bound, it\r
+  will send Renew packet to the previously DHCPv6 server and transfer the state of the configured\r
+  IA to Dhcp6Renewing. If valid Reply packet received, the state transfers to Dhcp6Bound\r
+  and the valid and preferred timer restarts. If fails, the state transfers to Dhcp6Bound but the\r
+  timer continues.\r
+  - When RebindRequest is TRUE and the state of the configured IA is Dhcp6Bound, it will\r
+  send Rebind packet. If valid Reply packet received, the state transfers to Dhcp6Bound and the\r

   valid and preferred timer restarts. If fails, the state transfers to Dhcp6Init and the IA can't\r
   be used.\r
 \r
   @param[in]  This              Pointer to the EFI_DHCP4_PROTOCOL instance.\r
   valid and preferred timer restarts. If fails, the state transfers to Dhcp6Init and the IA can't\r
   be used.\r
 \r
   @param[in]  This              Pointer to the EFI_DHCP4_PROTOCOL instance.\r

-  @param[in]  RebindRequest     If TRUE, it will send Rebind packet and enter the Dhcp6Rebinding state. \r
+  @param[in]  RebindRequest     If TRUE, it will send Rebind packet and enter the Dhcp6Rebinding state.\r

                                 Otherwise, it will send Renew packet and enter the Dhcp6Renewing state.\r
 \r
                                 Otherwise, it will send Renew packet and enter the Dhcp6Renewing state.\r
 \r

-  @retval EFI_SUCCESS           The DHCPv6 renew/rebind exchange process has completed and at \r
+  @retval EFI_SUCCESS           The DHCPv6 renew/rebind exchange process has completed and at\r

                                 least one IPv6 address of the configured IA has been bound again\r
                                 least one IPv6 address of the configured IA has been bound again\r

-                                when EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL. \r
-                                The EFI DHCPv6 Protocol instance has sent Renew or Rebind packet \r
+                                when EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL.\r
+                                The EFI DHCPv6 Protocol instance has sent Renew or Rebind packet\r

                                 when EFI_DHCP6_CONFIG_DATA.IaInfoEvent is not NULL.\r
   @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Child instance hasn't been configured, or the state\r
                                 of the configured IA is not in Dhcp6Bound.\r
                                 when EFI_DHCP6_CONFIG_DATA.IaInfoEvent is not NULL.\r
   @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Child instance hasn't been configured, or the state\r
                                 of the configured IA is not in Dhcp6Bound.\r

-  @retval EFI_ALREADY_STARTED   The state of the configured IA has already entered Dhcp6Renewing \r
-                                when RebindRequest is FALSE. \r
-                                The state of the configured IA has already entered Dhcp6Rebinding \r
+  @retval EFI_ALREADY_STARTED   The state of the configured IA has already entered Dhcp6Renewing\r
+                                when RebindRequest is FALSE.\r
+                                The state of the configured IA has already entered Dhcp6Rebinding\r

                                 when RebindRequest is TRUE.\r
   @retval EFI_INVALID_PARAMETER This is NULL.\r
   @retval EFI_DEVICE_ERROR      An unexpected system or system error occurred.\r
   @retval EFI_NO_RESPONSE       The DHCPv6 renew/rebind exchange process failed because of no response.\r
                                 when RebindRequest is TRUE.\r
   @retval EFI_INVALID_PARAMETER This is NULL.\r
   @retval EFI_DEVICE_ERROR      An unexpected system or system error occurred.\r
   @retval EFI_NO_RESPONSE       The DHCPv6 renew/rebind exchange process failed because of no response.\r

-  @retval EFI_NO_MAPPING        No IPv6 address has been bound to the configured IA after the DHCPv6 \r
+  @retval EFI_NO_MAPPING        No IPv6 address has been bound to the configured IA after the DHCPv6\r

                                 renew/rebind exchange process.\r
   @retval EFI_ABORTED           The DHCPv6 renew/rebind exchange process aborted by user.\r
 \r
                                 renew/rebind exchange process.\r
   @retval EFI_ABORTED           The DHCPv6 renew/rebind exchange process aborted by user.\r
 \r


@@ -635,34 +635,34 @@ EFI_STATUS
   Inform that one or more IPv6 addresses assigned by a server are already in use by\r
   another node.\r
 \r
   Inform that one or more IPv6 addresses assigned by a server are already in use by\r
   another node.\r
 \r

-  The Decline() function is used to manually decline the assignment of IPv6 addresses, which \r
-  have been already used by another node. If all IPv6 addresses of the configured IA are declined \r
-  through this function, the state of the IA will switch through Dhcp6Declining to Dhcp6Init, \r
-  otherwise, the state of the IA will restore to Dhcp6Bound after the declining process. The \r
-  Decline() can only be called when the IA is in Dhcp6Bound state. If the \r
-  EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL, this function is a blocking operation. It \r
+  The Decline() function is used to manually decline the assignment of IPv6 addresses, which\r
+  have been already used by another node. If all IPv6 addresses of the configured IA are declined\r
+  through this function, the state of the IA will switch through Dhcp6Declining to Dhcp6Init,\r
+  otherwise, the state of the IA will restore to Dhcp6Bound after the declining process. The\r
+  Decline() can only be called when the IA is in Dhcp6Bound state. If the\r
+  EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL, this function is a blocking operation. It\r

   will return after the declining process finishes, or aborted by user.\r
 \r
   @param[in]  This              Pointer to the EFI_DHCP4_PROTOCOL instance.\r
   will return after the declining process finishes, or aborted by user.\r
 \r
   @param[in]  This              Pointer to the EFI_DHCP4_PROTOCOL instance.\r

-  @param[in]  AddressCount      Number of declining IPv6 addresses. \r
+  @param[in]  AddressCount      Number of declining IPv6 addresses.\r

   @param[in]  Addresses         Pointer to the buffer stored all the declining IPv6 addresses.\r
 \r
   @param[in]  Addresses         Pointer to the buffer stored all the declining IPv6 addresses.\r
 \r

-  @retval EFI_SUCCESS           The DHCPv6 decline exchange process has completed when \r
+  @retval EFI_SUCCESS           The DHCPv6 decline exchange process has completed when\r

                                 EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL.\r
                                 EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL.\r

-                                The EFI DHCPv6 Protocol instance has sent Decline packet when \r
+                                The EFI DHCPv6 Protocol instance has sent Decline packet when\r

                                 EFI_DHCP6_CONFIG_DATA.IaInfoEvent is not NULL.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE\r
                                 EFI_DHCP6_CONFIG_DATA.IaInfoEvent is not NULL.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE\r

-                                - This is NULL.  \r
+                                - This is NULL.\r

                                 - AddressCount is zero or Addresses is NULL.\r
                                 - AddressCount is zero or Addresses is NULL.\r

-  @retval EFI_NOT_FOUND         Any specified IPv6 address is not correlated with the configured IA \r
+  @retval EFI_NOT_FOUND         Any specified IPv6 address is not correlated with the configured IA\r

                                 for this instance.\r
                                 for this instance.\r

-  @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Child instance hasn't been configured, or the \r
+  @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Child instance hasn't been configured, or the\r

                                 state of the configured IA is not in Dhcp6Bound.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred.\r
   @retval EFI_ABORTED           The DHCPv6 decline exchange process aborted by user.\r
 \r
 **/\r
                                 state of the configured IA is not in Dhcp6Bound.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred.\r
   @retval EFI_ABORTED           The DHCPv6 decline exchange process aborted by user.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_DHCP6_DECLINE)(\r
   IN EFI_DHCP6_PROTOCOL        *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_DHCP6_DECLINE)(\r
   IN EFI_DHCP6_PROTOCOL        *This,\r


@@ -675,32 +675,32 @@ EFI_STATUS
 \r
   The Release() function is used to manually release the one or more IPv6 address. If AddressCount\r
   is zero, it will release all IPv6 addresses of the configured IA. If all IPv6 addresses of the IA\r
 \r
   The Release() function is used to manually release the one or more IPv6 address. If AddressCount\r
   is zero, it will release all IPv6 addresses of the configured IA. If all IPv6 addresses of the IA\r

-  are released through this function, the state of the IA will switch through Dhcp6Releasing to \r
+  are released through this function, the state of the IA will switch through Dhcp6Releasing to\r

   Dhcp6Init, otherwise, the state of the IA will restore to Dhcp6Bound after the releasing process.\r
   The Release() can only be called when the IA is in Dhcp6Bound state. If the\r
   EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL, the function is a blocking operation. It will return\r
   Dhcp6Init, otherwise, the state of the IA will restore to Dhcp6Bound after the releasing process.\r
   The Release() can only be called when the IA is in Dhcp6Bound state. If the\r
   EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL, the function is a blocking operation. It will return\r

-  after the releasing process finishes, or aborted by user. \r
+  after the releasing process finishes, or aborted by user.\r

 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r
 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r

-  @param[in]  AddressCount      Number of releasing IPv6 addresses. \r
+  @param[in]  AddressCount      Number of releasing IPv6 addresses.\r

   @param[in]  Addresses         Pointer to the buffer stored all the releasing IPv6 addresses.\r
                                 Ignored if AddressCount is zero.\r
   @param[in]  Addresses         Pointer to the buffer stored all the releasing IPv6 addresses.\r
                                 Ignored if AddressCount is zero.\r

-  @retval EFI_SUCCESS           The DHCPv6 release exchange process has completed when \r
+  @retval EFI_SUCCESS           The DHCPv6 release exchange process has completed when\r

                                 EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL.\r
                                 EFI_DHCP6_CONFIG_DATA.IaInfoEvent is NULL.\r

-                                The EFI DHCPv6 Protocol instance has sent Release packet when \r
+                                The EFI DHCPv6 Protocol instance has sent Release packet when\r

                                 EFI_DHCP6_CONFIG_DATA.IaInfoEvent is not NULL.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE\r
                                 EFI_DHCP6_CONFIG_DATA.IaInfoEvent is not NULL.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE\r

-                                - This is NULL.  \r
+                                - This is NULL.\r

                                 - AddressCount is not zero or Addresses is NULL.\r
   @retval EFI_NOT_FOUND         Any specified IPv6 address is not correlated with the configured\r
                                 IA for this instance.\r
                                 - AddressCount is not zero or Addresses is NULL.\r
   @retval EFI_NOT_FOUND         Any specified IPv6 address is not correlated with the configured\r
                                 IA for this instance.\r

-  @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Child instance hasn't been configured, or the \r
+  @retval EFI_ACCESS_DENIED     The EFI DHCPv6 Child instance hasn't been configured, or the\r

                                 state of the configured IA is not in Dhcp6Bound.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred.\r
                                 state of the configured IA is not in Dhcp6Bound.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred.\r

-  @retval EFI_ABORTED           The DHCPv6 release exchange process aborted by user. \r
+  @retval EFI_ABORTED           The DHCPv6 release exchange process aborted by user.\r

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

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_DHCP6_RELEASE)(\r
   IN EFI_DHCP6_PROTOCOL        *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_DHCP6_RELEASE)(\r
   IN EFI_DHCP6_PROTOCOL        *This,\r


@@ -713,7 +713,7 @@ EFI_STATUS
 \r
   The Stop() function is used to stop the DHCPv6 S.A.R.R process. If this function is called\r
   successfully, all the IPv6 addresses of the configured IA will be released and the state of\r
 \r
   The Stop() function is used to stop the DHCPv6 S.A.R.R process. If this function is called\r
   successfully, all the IPv6 addresses of the configured IA will be released and the state of\r

-  the configured IA will be transferred to Dhcp6Init.   \r
+  the configured IA will be transferred to Dhcp6Init.\r

 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r
 \r
 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r
 \r


@@ -725,7 +725,7 @@ EFI_STATUS
   @retval EFI_INVALID_PARAMETER This is NULL.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER This is NULL.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_DHCP6_STOP)(\r
   IN EFI_DHCP6_PROTOCOL        *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_DHCP6_STOP)(\r
   IN EFI_DHCP6_PROTOCOL        *This\r


@@ -734,7 +734,7 @@ EFI_STATUS
 /**\r
   Parse the option data in the DHCPv6 packet.\r
 \r
 /**\r
   Parse the option data in the DHCPv6 packet.\r
 \r

-  The Parse() function is used to retrieve the option list in the DHCPv6 packet. \r
+  The Parse() function is used to retrieve the option list in the DHCPv6 packet.\r

 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r
 \r
 \r
   @param[in]  This              Pointer to the EFI_DHCP6_PROTOCOL instance.\r
 \r


@@ -751,7 +751,7 @@ EFI_STATUS
                                 - Packet is not a well-formed DHCPv6 packet.\r
                                 - OptionCount is NULL.\r
                                 - *OptionCount is not zero and PacketOptionList is NULL.\r
                                 - Packet is not a well-formed DHCPv6 packet.\r
                                 - OptionCount is NULL.\r
                                 - *OptionCount is not zero and PacketOptionList is NULL.\r

-  @retval EFI_BUFFER_TOO_SMALL  *OptionCount is smaller than the number of options that were \r
+  @retval EFI_BUFFER_TOO_SMALL  *OptionCount is smaller than the number of options that were\r

                                 found in the Packet.\r
 \r
 **/\r
                                 found in the Packet.\r
 \r
 **/\r

diff --git a/MdePkg/Include/Protocol/DiskInfo.h b/MdePkg/Include/Protocol/DiskInfo.h
index 09fe34ada6b1250e0e1d771a5330ce888bceaa0b..64e90044586970d4c6e2f8f659786cfe918b12b1 100644 (file)
--- a/MdePkg/Include/Protocol/DiskInfo.h
+++ b/MdePkg/Include/Protocol/DiskInfo.h
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  Provides the basic interfaces to abstract platform information regarding an \r
-  IDE controller.  \r
+  Provides the basic interfaces to abstract platform information regarding an\r
+  IDE controller.\r

 \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


@@ -14,7 +14,7 @@
   @par Revision Reference:\r
   This Protocol is defined in UEFI Platform Initialization Specification 1.6\r
   Volume 5: Standards\r
   @par Revision Reference:\r
   This Protocol is defined in UEFI Platform Initialization Specification 1.6\r
   Volume 5: Standards\r

-  \r
+\r

 **/\r
 \r
 #ifndef __DISK_INFO_H__\r
 **/\r
 \r
 #ifndef __DISK_INFO_H__\r


@@ -91,7 +91,7 @@ typedef struct _EFI_DISK_INFO_PROTOCOL  EFI_DISK_INFO_PROTOCOL;
 \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


@@ -100,9 +100,9 @@ typedef struct _EFI_DISK_INFO_PROTOCOL  EFI_DISK_INFO_PROTOCOL;
   @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
 typedef\r
 \r
 **/\r
 typedef\r


@@ -119,16 +119,16 @@ EFI_STATUS
   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
 typedef\r
 \r
 **/\r
 typedef\r


@@ -141,8 +141,8 @@ EFI_STATUS
 \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


@@ -168,7 +168,7 @@ EFI_STATUS
 /**\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


@@ -189,7 +189,7 @@ EFI_STATUS
 ///\r
 struct _EFI_DISK_INFO_PROTOCOL {\r
   ///\r
 ///\r
 struct _EFI_DISK_INFO_PROTOCOL {\r
   ///\r

-  /// A GUID that defines the format of buffers for the other member functions \r
+  /// A GUID that defines the format of buffers for the other member functions\r

   /// of this protocol.\r
   ///\r
   EFI_GUID                  Interface;\r
   /// of this protocol.\r
   ///\r
   EFI_GUID                  Interface;\r


@@ -209,7 +209,7 @@ struct _EFI_DISK_INFO_PROTOCOL {
   ///\r
   EFI_DISK_INFO_SENSE_DATA  SenseData;\r
   ///\r
   ///\r
   EFI_DISK_INFO_SENSE_DATA  SenseData;\r
   ///\r

-  /// Specific controller. \r
+  /// Specific controller.\r

   ///\r
   EFI_DISK_INFO_WHICH_IDE   WhichIde;\r
 };\r
   ///\r
   EFI_DISK_INFO_WHICH_IDE   WhichIde;\r
 };\r

diff --git a/MdePkg/Include/Protocol/DiskIo.h b/MdePkg/Include/Protocol/DiskIo.h
index 6874b7e6e30c95c58c97a46433fe7a835a5ef853..9cf0f0a70382b2c6ec8211810bc02dd2149e0ed2 100644 (file)
--- a/MdePkg/Include/Protocol/DiskIo.h
+++ b/MdePkg/Include/Protocol/DiskIo.h
@@ -5,14 +5,14 @@
   oriented devices. The Disk IO protocol is intended to layer on top of the\r
   Block IO protocol.\r
 \r
   oriented devices. The Disk IO protocol is intended to layer on top of the\r
   Block IO protocol.\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
+  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


@@ -26,14 +26,14 @@
 \r
 ///\r
 /// Protocol GUID name defined in EFI1.1.\r
 \r
 ///\r
 /// Protocol GUID name defined in EFI1.1.\r

-/// \r
+///\r

 #define DISK_IO_PROTOCOL  EFI_DISK_IO_PROTOCOL_GUID\r
 \r
 typedef struct _EFI_DISK_IO_PROTOCOL EFI_DISK_IO_PROTOCOL;\r
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r
 #define DISK_IO_PROTOCOL  EFI_DISK_IO_PROTOCOL_GUID\r
 \r
 typedef struct _EFI_DISK_IO_PROTOCOL EFI_DISK_IO_PROTOCOL;\r
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r

-/// \r
+///\r

 typedef EFI_DISK_IO_PROTOCOL  EFI_DISK_IO;\r
 \r
 /**\r
 typedef EFI_DISK_IO_PROTOCOL  EFI_DISK_IO;\r
 \r
 /**\r


@@ -95,7 +95,7 @@ EFI_STATUS
 \r
 ///\r
 /// Revision defined in EFI1.1\r
 \r
 ///\r
 /// Revision defined in EFI1.1\r

-/// \r
+///\r

 #define EFI_DISK_IO_INTERFACE_REVISION  EFI_DISK_IO_PROTOCOL_REVISION\r
 \r
 ///\r
 #define EFI_DISK_IO_INTERFACE_REVISION  EFI_DISK_IO_PROTOCOL_REVISION\r
 \r
 ///\r

diff --git a/MdePkg/Include/Protocol/DiskIo2.h b/MdePkg/Include/Protocol/DiskIo2.h
index 6e0665b1dc2572d96d0c088f395c5323ca9085ff..81cb6a3c674805185e39c96367177a441ffd076c 100644 (file)
--- a/MdePkg/Include/Protocol/DiskIo2.h
+++ b/MdePkg/Include/Protocol/DiskIo2.h
@@ -4,14 +4,14 @@
   The Disk I/O 2 protocol defines an extension to the Disk I/O protocol to enable\r
   non-blocking / asynchronous byte-oriented disk operation.\r
 \r
   The Disk I/O 2 protocol defines an extension to the Disk I/O protocol to enable\r
   non-blocking / asynchronous byte-oriented disk operation.\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/MdePkg/Include/Protocol/Dns4.h b/MdePkg/Include/Protocol/Dns4.h
index f96c50f9a7a66825494058f5b1714336e0374e1a..42b215b4d07253f3ce1375fe5a11507ed5616b2e 100644 (file)
--- a/MdePkg/Include/Protocol/Dns4.h
+++ b/MdePkg/Include/Protocol/Dns4.h
@@ -4,7 +4,7 @@
   DNSv4 Service Binding Protocol (DNSv4SB)\r
   DNSv4 Protocol (DNSv4)\r
 \r
   DNSv4 Service Binding Protocol (DNSv4SB)\r
   DNSv4 Protocol (DNSv4)\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


@@ -38,23 +38,23 @@ typedef struct _EFI_DNS4_PROTOCOL EFI_DNS4_PROTOCOL;
 ///\r
 typedef struct {\r
   ///\r
 ///\r
 typedef struct {\r
   ///\r

-  /// Count of the DNS servers. When used with GetModeData(), \r
-  /// this field is the count of originally configured servers when \r
-  /// Configure() was called for this instance. When used with \r
-  /// Configure() this is the count of caller-supplied servers. If the \r
-  /// DnsServerListCount is zero, the DNS server configuration \r
+  /// Count of the DNS servers. When used with GetModeData(),\r
+  /// this field is the count of originally configured servers when\r
+  /// Configure() was called for this instance. When used with\r
+  /// Configure() this is the count of caller-supplied servers. If the\r
+  /// DnsServerListCount is zero, the DNS server configuration\r

   /// will be retrieved from DHCP server automatically.\r
   ///\r
   UINTN                         DnsServerListCount;\r
   ///\r
   /// will be retrieved from DHCP server automatically.\r
   ///\r
   UINTN                         DnsServerListCount;\r
   ///\r

-  /// Pointer to DNS server list containing DnsServerListCount entries or NULL \r
-  /// if DnsServerListCountis 0. For Configure(), this will be NULL when there are \r
-  /// no caller supplied server addresses, and, the DNS instance will retrieve \r
-  /// DNS server from DHCP Server. The provided DNS server list is \r
-  /// recommended to be filled up in the sequence of preference. When \r
-  /// used with GetModeData(), the buffer containing the list will \r
-  /// be allocated by the driver implementing this protocol and must be \r
-  /// freed by the caller. When used with Configure(), the buffer \r
+  /// Pointer to DNS server list containing DnsServerListCount entries or NULL\r
+  /// if DnsServerListCountis 0. For Configure(), this will be NULL when there are\r
+  /// no caller supplied server addresses, and, the DNS instance will retrieve\r
+  /// DNS server from DHCP Server. The provided DNS server list is\r
+  /// recommended to be filled up in the sequence of preference. When\r
+  /// used with GetModeData(), the buffer containing the list will\r
+  /// be allocated by the driver implementing this protocol and must be\r
+  /// freed by the caller. When used with Configure(), the buffer\r

   /// containing the list will be allocated and released by the caller.\r
   ///\r
   EFI_IPv4_ADDRESS              *DnsServerList;\r
   /// containing the list will be allocated and released by the caller.\r
   ///\r
   EFI_IPv4_ADDRESS              *DnsServerList;\r


@@ -68,10 +68,10 @@ typedef struct {
   ///\r
   BOOLEAN                       EnableDnsCache;\r
   ///\r
   ///\r
   BOOLEAN                       EnableDnsCache;\r
   ///\r

-  /// Use the protocol number defined in "Links to UEFI-Related \r
-  /// Documents"(http://uefi.org/uefi) under the heading "IANA \r
-  /// Protocol Numbers". Only TCP or UDP are supported, and other \r
-  /// protocol values are invalid. An implementation can choose to \r
+  /// Use the protocol number defined in "Links to UEFI-Related\r
+  /// Documents"(http://uefi.org/uefi) under the heading "IANA\r
+  /// Protocol Numbers". Only TCP or UDP are supported, and other\r
+  /// protocol values are invalid. An implementation can choose to\r

   /// support only UDP, or both TCP and UDP.\r
   ///\r
   UINT8                         Protocol;\r
   /// support only UDP, or both TCP and UDP.\r
   ///\r
   UINT8                         Protocol;\r


@@ -135,10 +135,10 @@ typedef struct {
   ///\r
   UINT32                        DnsServerCount;\r
   ///\r
   ///\r
   UINT32                        DnsServerCount;\r
   ///\r

-  /// Pointer to common list of addresses of all configured DNS server \r
-  /// used by EFI_DNS4_PROTOCOL instances. List will include \r
-  /// DNS servers configured by this or any other EFI_DNS4_PROTOCOL instance. \r
-  /// The storage for this list is allocated by the driver publishing this \r
+  /// Pointer to common list of addresses of all configured DNS server\r
+  /// used by EFI_DNS4_PROTOCOL instances. List will include\r
+  /// DNS servers configured by this or any other EFI_DNS4_PROTOCOL instance.\r
+  /// The storage for this list is allocated by the driver publishing this\r

   /// protocol, and must be freed by the caller.\r
   ///\r
   EFI_IPv4_ADDRESS              *DnsServerList;\r
   /// protocol, and must be freed by the caller.\r
   ///\r
   EFI_IPv4_ADDRESS              *DnsServerList;\r


@@ -147,8 +147,8 @@ typedef struct {
   ///\r
   UINT32                        DnsCacheCount;\r
   ///\r
   ///\r
   UINT32                        DnsCacheCount;\r
   ///\r

-  /// Pointer to a buffer containing DnsCacheCount DNS Cache \r
-  /// entry structures. The storage for this list is allocated by the driver \r
+  /// Pointer to a buffer containing DnsCacheCount DNS Cache\r
+  /// entry structures. The storage for this list is allocated by the driver\r

   /// publishing this protocol and must be freed by caller.\r
   ///\r
   EFI_DNS4_CACHE_ENTRY          *DnsCacheList;\r
   /// publishing this protocol and must be freed by caller.\r
   ///\r
   EFI_DNS4_CACHE_ENTRY          *DnsCacheList;\r


@@ -311,7 +311,7 @@ EFI_STATUS
   @retval EFI_SUCCESS             The operation completed successfully.\r
   @retval EFI_UNSUPPORTED         The designated protocol is not supported.\r
   @retval EFI_INVALID_PARAMETER   This is NULL.\r
   @retval EFI_SUCCESS             The operation completed successfully.\r
   @retval EFI_UNSUPPORTED         The designated protocol is not supported.\r
   @retval EFI_INVALID_PARAMETER   This is NULL.\r

-                                  The StationIp address provided in DnsConfigData is not a \r
+                                  The StationIp address provided in DnsConfigData is not a\r

                                   valid unicast.\r
                                   DnsServerList is NULL while DnsServerListCount\r
                                   is not ZERO.\r
                                   valid unicast.\r
                                   DnsServerList is NULL while DnsServerListCount\r
                                   is not ZERO.\r


@@ -321,8 +321,8 @@ EFI_STATUS
                                   allocated.\r
   @retval EFI_DEVICE_ERROR        An unexpected system or network error occurred. The\r
                                   EFI DNSv4 Protocol instance is not configured.\r
                                   allocated.\r
   @retval EFI_DEVICE_ERROR        An unexpected system or network error occurred. The\r
                                   EFI DNSv4 Protocol instance is not configured.\r

-  @retval EFI_ALREADY_STARTED     Second call to Configure() with DnsConfigData. To \r
-                                  reconfigure the instance the caller must call Configure() \r
+  @retval EFI_ALREADY_STARTED     Second call to Configure() with DnsConfigData. To\r
+                                  reconfigure the instance the caller must call Configure()\r

                                   with NULL first to return driver to unconfigured state.\r
 **/\r
 typedef\r
                                   with NULL first to return driver to unconfigured state.\r
 **/\r
 typedef\r


@@ -363,7 +363,7 @@ EFI_STATUS
 /**\r
   IPv4 address to host name translation also known as Reverse DNS lookup.\r
 \r
 /**\r
   IPv4 address to host name translation also known as Reverse DNS lookup.\r
 \r

-  The IpToHostName() function is used to translate the host address to host name. A type PTR \r
+  The IpToHostName() function is used to translate the host address to host name. A type PTR\r

   query is used to get the primary name of the host. Support of this function is optional.\r
 \r
   @param[in]  This                Pointer to EFI_DNS4_PROTOCOL instance.\r
   query is used to get the primary name of the host. Support of this function is optional.\r
 \r
   @param[in]  This                Pointer to EFI_DNS4_PROTOCOL instance.\r


@@ -391,7 +391,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Retrieve arbitrary information from the DNS server. \r
+  Retrieve arbitrary information from the DNS server.\r

 \r
   This GeneralLookup() function retrieves arbitrary information from the DNS. The caller\r
   supplies a QNAME, QTYPE, and QCLASS, and all of the matching RRs are returned. All\r
 \r
   This GeneralLookup() function retrieves arbitrary information from the DNS. The caller\r
   supplies a QNAME, QTYPE, and QCLASS, and all of the matching RRs are returned. All\r

diff --git a/MdePkg/Include/Protocol/Dns6.h b/MdePkg/Include/Protocol/Dns6.h
index 813893addd6b060ca6ac9badfcede3b9dd1a1b8e..6bb43584d480e7905a1b8fca59ad889c4cbde1ef 100644 (file)
--- a/MdePkg/Include/Protocol/Dns6.h
+++ b/MdePkg/Include/Protocol/Dns6.h
@@ -4,7 +4,7 @@
   DNSv6 Service Binding Protocol (DNSv6SB)\r
   DNSv6 Protocol (DNSv6)\r
 \r
   DNSv6 Service Binding Protocol (DNSv6SB)\r
   DNSv6 Protocol (DNSv6)\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


@@ -49,8 +49,8 @@ typedef struct {
   ///\r
   UINT8                         Protocol;\r
   ///\r
   ///\r
   UINT8                         Protocol;\r
   ///\r

-  /// The local IP address to use. Set to zero to let the underlying IPv6 \r
-  /// driver choose a source address. If not zero it must be one of the \r
+  /// The local IP address to use. Set to zero to let the underlying IPv6\r
+  /// driver choose a source address. If not zero it must be one of the\r

   /// configured IP addresses in the underlying IPv6 driver.\r
   ///\r
   EFI_IPv6_ADDRESS              StationIp;\r
   /// configured IP addresses in the underlying IPv6 driver.\r
   ///\r
   EFI_IPv6_ADDRESS              StationIp;\r


@@ -59,23 +59,23 @@ typedef struct {
   ///\r
   UINT16                        LocalPort;\r
   ///\r
   ///\r
   UINT16                        LocalPort;\r
   ///\r

-  /// Count of the DNS servers. When used with GetModeData(), \r
-  /// this field is the count of originally configured servers when \r
-  /// Configure() was called for this instance. When used with \r
-  /// Configure() this is the count of caller-supplied servers. If the \r
-  /// DnsServerListCount is zero, the DNS server configuration \r
+  /// Count of the DNS servers. When used with GetModeData(),\r
+  /// this field is the count of originally configured servers when\r
+  /// Configure() was called for this instance. When used with\r
+  /// Configure() this is the count of caller-supplied servers. If the\r
+  /// DnsServerListCount is zero, the DNS server configuration\r

   /// will be retrieved from DHCP server automatically.\r
   ///\r
   UINT32                        DnsServerCount;\r
   ///\r
   /// Pointer to DNS server list containing DnsServerListCount\r
   /// will be retrieved from DHCP server automatically.\r
   ///\r
   UINT32                        DnsServerCount;\r
   ///\r
   /// Pointer to DNS server list containing DnsServerListCount\r

-  /// entries or NULL if DnsServerListCount is 0. For Configure(), \r
-  /// this will be NULL when there are no caller supplied server addresses \r
-  /// and the DNS instance will retrieve DNS server from DHCP Server. \r
-  /// The provided DNS server list is recommended to be filled up in the sequence \r
-  /// of preference. When used with GetModeData(), the buffer containing the list \r
-  /// will be allocated by the driver implementing this protocol and must be \r
-  /// freed by the caller. When used with Configure(), the buffer \r
+  /// entries or NULL if DnsServerListCount is 0. For Configure(),\r
+  /// this will be NULL when there are no caller supplied server addresses\r
+  /// and the DNS instance will retrieve DNS server from DHCP Server.\r
+  /// The provided DNS server list is recommended to be filled up in the sequence\r
+  /// of preference. When used with GetModeData(), the buffer containing the list\r
+  /// will be allocated by the driver implementing this protocol and must be\r
+  /// freed by the caller. When used with Configure(), the buffer\r

   /// containing the list will be allocated and released by the caller.\r
   ///\r
   EFI_IPv6_ADDRESS              *DnsServerList;\r
   /// containing the list will be allocated and released by the caller.\r
   ///\r
   EFI_IPv6_ADDRESS              *DnsServerList;\r


@@ -121,21 +121,21 @@ typedef struct {
   ///\r
   /// Number of configured DNS6 servers.\r
   ///\r
   ///\r
   /// Number of configured DNS6 servers.\r
   ///\r

-  UINT32                               DnsServerCount;\r
+  UINT32                         DnsServerCount;\r

   ///\r
   ///\r

-  /// Pointer to common list of addresses of all configured DNS server used by EFI_DNS6_PROTOCOL \r
-  /// instances. List will include DNS servers configured by this or any other EFI_DNS6_PROTOCOL \r
-  /// instance. The storage for this list is allocated by the driver publishing this protocol, \r
+  /// Pointer to common list of addresses of all configured DNS server used by EFI_DNS6_PROTOCOL\r
+  /// instances. List will include DNS servers configured by this or any other EFI_DNS6_PROTOCOL\r
+  /// instance. The storage for this list is allocated by the driver publishing this protocol,\r

   /// and must be freed by the caller.\r
   ///\r
   /// and must be freed by the caller.\r
   ///\r

-  EFI_IPv6_ADDRESS                     *DnsServerList;\r
+  EFI_IPv6_ADDRESS               *DnsServerList;\r

   ///\r
   /// Number of DNS Cache entries. The DNS Cache is shared among all DNS instances.\r
   ///\r
   UINT32                        DnsCacheCount;\r
   ///\r
   ///\r
   /// Number of DNS Cache entries. The DNS Cache is shared among all DNS instances.\r
   ///\r
   UINT32                        DnsCacheCount;\r
   ///\r

-  /// Pointer to a buffer containing DnsCacheCount DNS Cache \r
-  /// entry structures. The storage for thislist is allocated by the driver \r
+  /// Pointer to a buffer containing DnsCacheCount DNS Cache\r
+  /// entry structures. The storage for thislist is allocated by the driver\r

   /// publishing this protocol and must be freed by caller.\r
   ///\r
   EFI_DNS6_CACHE_ENTRY          *DnsCacheList;\r
   /// publishing this protocol and must be freed by caller.\r
   ///\r
   EFI_DNS6_CACHE_ENTRY          *DnsCacheList;\r


@@ -272,7 +272,7 @@ typedef struct {
   This function is used to retrieve DNS mode data for this DNS instance.\r
 \r
   @param[in]   This                Pointer to EFI_DNS6_PROTOCOL instance.\r
   This function is used to retrieve DNS mode data for this DNS instance.\r
 \r
   @param[in]   This                Pointer to EFI_DNS6_PROTOCOL instance.\r

-  @param[out]  DnsModeData         Pointer to the caller-allocated storage for the \r
+  @param[out]  DnsModeData         Pointer to the caller-allocated storage for the\r

                                    EFI_DNS6_MODE_DATA data.\r
 \r
   @retval EFI_SUCCESS             The operation completed successfully.\r
                                    EFI_DNS6_MODE_DATA data.\r
 \r
   @retval EFI_SUCCESS             The operation completed successfully.\r


@@ -296,7 +296,7 @@ EFI_STATUS
   EFI DNSv6 Protocol driver instance. Reset the DNS instance if DnsConfigData is NULL.\r
 \r
   @param[in]  This                Pointer to EFI_DNS6_PROTOCOL instance.\r
   EFI DNSv6 Protocol driver instance. Reset the DNS instance if DnsConfigData is NULL.\r
 \r
   @param[in]  This                Pointer to EFI_DNS6_PROTOCOL instance.\r

-  @param[in]  DnsConfigData       Pointer to the configuration data structure. All associated \r
+  @param[in]  DnsConfigData       Pointer to the configuration data structure. All associated\r

                                   storage to be allocated and released by caller.\r
 \r
   @retval EFI_SUCCESS             The operation completed successfully.\r
                                   storage to be allocated and released by caller.\r
 \r
   @retval EFI_SUCCESS             The operation completed successfully.\r


@@ -308,8 +308,8 @@ EFI_STATUS
   @retval EFI_DEVICE_ERROR        An unexpected system or network error occurred. The\r
                                   EFI DNSv6 Protocol instance is not configured.\r
   @retval EFI_UNSUPPORTED         The designated protocol is not supported.\r
   @retval EFI_DEVICE_ERROR        An unexpected system or network error occurred. The\r
                                   EFI DNSv6 Protocol instance is not configured.\r
   @retval EFI_UNSUPPORTED         The designated protocol is not supported.\r

-  @retval EFI_ALREADY_STARTED     Second call to Configure() with DnsConfigData. To \r
-                                  reconfigure the instance the caller must call Configure() with \r
+  @retval EFI_ALREADY_STARTED     Second call to Configure() with DnsConfigData. To\r
+                                  reconfigure the instance the caller must call Configure() with\r

                                   NULL first to return driver to unconfigured state.\r
 **/\r
 typedef\r
                                   NULL first to return driver to unconfigured state.\r
 **/\r
 typedef\r

diff --git a/MdePkg/Include/Protocol/DriverBinding.h b/MdePkg/Include/Protocol/DriverBinding.h
index 216ae3c57dafcce0a72a104d368a6ad027db61ac..00f00b7a8f7b7e3bfb9070354149450f2412d05b 100644 (file)
--- a/MdePkg/Include/Protocol/DriverBinding.h
+++ b/MdePkg/Include/Protocol/DriverBinding.h
@@ -1,17 +1,17 @@
 /** @file\r
   UEFI DriverBinding Protocol is defined in UEFI specification.\r
 /** @file\r
   UEFI DriverBinding Protocol is defined in UEFI specification.\r

-  \r
-  This protocol is produced by every driver that follows the UEFI Driver Model, \r
+\r
+  This protocol is produced by every driver that follows the UEFI Driver Model,\r

   and it is the central component that allows drivers and controllers to be managed.\r
 \r
   and it is the central component that allows drivers and controllers to be managed.\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
-    \r
-THE PROGRAM 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


@@ -29,33 +29,33 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 typedef struct _EFI_DRIVER_BINDING_PROTOCOL  EFI_DRIVER_BINDING_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_DRIVER_BINDING_PROTOCOL  EFI_DRIVER_BINDING_PROTOCOL;\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
   it further tests to see if this driver supports creating a handle for the specified child device.\r
 \r

-  This function checks to see if the driver specified by This supports the device specified by \r
-  ControllerHandle. Drivers will typically use the device path attached to \r
-  ControllerHandle and/or the services from the bus I/O abstraction attached to \r
-  ControllerHandle to determine if the driver supports ControllerHandle. This function \r
-  may be called many times during platform initialization. In order to reduce boot times, the tests \r
-  performed by this function must be very small, and take as little time as possible to execute. This \r
-  function must not change the state of any hardware devices, and this function must be aware that the \r
-  device specified by ControllerHandle may already be managed by the same driver or a \r
-  different driver. This function must match its calls to AllocatePages() with FreePages(), \r
-  AllocatePool() with FreePool(), and OpenProtocol() with CloseProtocol().  \r
-  Because ControllerHandle may have been previously started by the same driver, if a protocol is \r
-  already in the opened state, then it must not be closed with CloseProtocol(). This is required \r
+  This function checks to see if the driver specified by This supports the device specified by\r
+  ControllerHandle. Drivers will typically use the device path attached to\r
+  ControllerHandle and/or the services from the bus I/O abstraction attached to\r
+  ControllerHandle to determine if the driver supports ControllerHandle. This function\r
+  may be called many times during platform initialization. In order to reduce boot times, the tests\r
+  performed by this function must be very small, and take as little time as possible to execute. This\r
+  function must not change the state of any hardware devices, and this function must be aware that the\r
+  device specified by ControllerHandle may already be managed by the same driver or a\r
+  different driver. This function must match its calls to AllocatePages() with FreePages(),\r
+  AllocatePool() with FreePool(), and OpenProtocol() with CloseProtocol().\r
+  Because ControllerHandle may have been previously started by the same driver, if a protocol is\r
+  already in the opened state, then it must not be closed with CloseProtocol(). This is required\r

   to guarantee the state of ControllerHandle is not modified by this function.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   to guarantee the state of ControllerHandle is not modified by this function.\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


@@ -82,28 +82,28 @@ EFI_STATUS
   Starts a device controller or a bus controller.\r
 \r
   The Start() function is designed to be invoked from the EFI boot service ConnectController().\r
   Starts a device controller or a bus controller.\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, \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,\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.  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


@@ -123,10 +123,10 @@ EFI_STATUS
 \r
 /**\r
   Stops a device controller or a bus controller.\r
 \r
 /**\r
   Stops a device controller or a bus controller.\r

-  \r
-  The Stop() 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
+\r
+  The Stop() 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


@@ -134,13 +134,13 @@ EFI_STATUS
      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
                                 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


@@ -157,14 +157,14 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// This protocol provides the services required to determine if a driver supports a given controller. \r
+/// This protocol provides the services required to determine if a driver supports a given controller.\r

 /// If a controller is supported, then it also provides routines to start and stop the controller.\r
 ///\r
 struct _EFI_DRIVER_BINDING_PROTOCOL {\r
   EFI_DRIVER_BINDING_SUPPORTED  Supported;\r
   EFI_DRIVER_BINDING_START      Start;\r
   EFI_DRIVER_BINDING_STOP       Stop;\r
 /// If a controller is supported, then it also provides routines to start and stop the controller.\r
 ///\r
 struct _EFI_DRIVER_BINDING_PROTOCOL {\r
   EFI_DRIVER_BINDING_SUPPORTED  Supported;\r
   EFI_DRIVER_BINDING_START      Start;\r
   EFI_DRIVER_BINDING_STOP       Stop;\r

-  \r
+\r

   ///\r
   /// The version number of the UEFI driver that produced the\r
   /// EFI_DRIVER_BINDING_PROTOCOL. This field is used by\r
   ///\r
   /// The version number of the UEFI driver that produced the\r
   /// EFI_DRIVER_BINDING_PROTOCOL. This field is used by\r


@@ -178,20 +178,20 @@ struct _EFI_DRIVER_BINDING_PROTOCOL {
   /// 0xffffffef are reserved for IHV-developed drivers.\r
   ///\r
   UINT32                        Version;\r
   /// 0xffffffef are reserved for IHV-developed drivers.\r
   ///\r
   UINT32                        Version;\r

-  \r
+\r

   ///\r
   /// The image handle of the UEFI driver that produced this instance\r
   /// of the EFI_DRIVER_BINDING_PROTOCOL.\r
   ///\r
   EFI_HANDLE                    ImageHandle;\r
   ///\r
   /// The image handle of the UEFI driver that produced this instance\r
   /// of the EFI_DRIVER_BINDING_PROTOCOL.\r
   ///\r
   EFI_HANDLE                    ImageHandle;\r

-  \r
+\r

   ///\r
   /// The handle on which this instance of the\r
   /// EFI_DRIVER_BINDING_PROTOCOL is installed. In most\r
   /// cases, this is the same handle as ImageHandle. However, for\r
   /// UEFI drivers that produce more than one instance of the\r
   /// EFI_DRIVER_BINDING_PROTOCOL, this value may not be\r
   ///\r
   /// The handle on which this instance of the\r
   /// EFI_DRIVER_BINDING_PROTOCOL is installed. In most\r
   /// cases, this is the same handle as ImageHandle. However, for\r
   /// UEFI drivers that produce more than one instance of the\r
   /// EFI_DRIVER_BINDING_PROTOCOL, this value may not be\r

-  /// the same as ImageHandle.  \r
+  /// the same as ImageHandle.\r

   ///\r
   EFI_HANDLE                    DriverBindingHandle;\r
 };\r
   ///\r
   EFI_HANDLE                    DriverBindingHandle;\r
 };\r

diff --git a/MdePkg/Include/Protocol/DriverConfiguration.h b/MdePkg/Include/Protocol/DriverConfiguration.h
index f714732f43867c0c6fdcb6ecb07ff6cee5d1c5a3..b439c59b7c04064f4c226ffbce7620af6d14afbe 100644 (file)
--- a/MdePkg/Include/Protocol/DriverConfiguration.h
+++ b/MdePkg/Include/Protocol/DriverConfiguration.h
@@ -1,14 +1,14 @@
 /** @file\r
   EFI Driver Configuration Protocol\r
 \r
 /** @file\r
   EFI Driver Configuration Protocol\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
+  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


@@ -24,11 +24,11 @@
   { \\r
     0x107a772b, 0xd5e1, 0x11d4, {0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\r
   }\r
   { \\r
     0x107a772b, 0xd5e1, 0x11d4, {0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\r
   }\r

- \r
+\r

 typedef struct _EFI_DRIVER_CONFIGURATION_PROTOCOL  EFI_DRIVER_CONFIGURATION_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_DRIVER_CONFIGURATION_PROTOCOL  EFI_DRIVER_CONFIGURATION_PROTOCOL;\r
 \r
 /**\r

-  Allows the user to set controller specific options for a controller that a \r
+  Allows the user to set controller specific options for a controller that a\r

   driver is currently managing.\r
 \r
   @param  This             A pointer to the EFI_DRIVER_CONFIGURATION_PROTOCOL instance.\r
   driver is currently managing.\r
 \r
   @param  This             A pointer to the EFI_DRIVER_CONFIGURATION_PROTOCOL instance.\r


@@ -154,9 +154,9 @@ struct _EFI_DRIVER_CONFIGURATION_PROTOCOL {
   EFI_DRIVER_CONFIGURATION_OPTIONS_VALID  OptionsValid;\r
   EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS ForceDefaults;\r
   ///\r
   EFI_DRIVER_CONFIGURATION_OPTIONS_VALID  OptionsValid;\r
   EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS ForceDefaults;\r
   ///\r

-  /// A Null-terminated ASCII string that contains one or more \r
-  /// ISO 639-2 language codes.  This is the list of language \r
-  /// codes that this protocol supports.  \r
+  /// A Null-terminated ASCII string that contains one or more\r
+  /// ISO 639-2 language codes.  This is the list of language\r
+  /// codes that this protocol supports.\r

   ///\r
   CHAR8                                   *SupportedLanguages;\r
 };\r
   ///\r
   CHAR8                                   *SupportedLanguages;\r
 };\r

diff --git a/MdePkg/Include/Protocol/DriverConfiguration2.h b/MdePkg/Include/Protocol/DriverConfiguration2.h
index 9c5f221f1efa2e3efbd0ec261a4088020da121a2..2ec957461fadcf59f967230dfd3716d2a626e0c9 100644 (file)
--- a/MdePkg/Include/Protocol/DriverConfiguration2.h
+++ b/MdePkg/Include/Protocol/DriverConfiguration2.h
@@ -1,14 +1,14 @@
 /** @file\r
   UEFI Driver Configuration2 Protocol\r
 \r
 /** @file\r
   UEFI Driver Configuration2 Protocol\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
+  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


@@ -22,7 +22,7 @@
   { \\r
     0xbfd7dc1d, 0x24f1, 0x40d9, {0x82, 0xe7, 0x2e, 0x09, 0xbb, 0x6b, 0x4e, 0xbe } \\r
   }\r
   { \\r
     0xbfd7dc1d, 0x24f1, 0x40d9, {0x82, 0xe7, 0x2e, 0x09, 0xbb, 0x6b, 0x4e, 0xbe } \\r
   }\r

-  \r
+\r

 typedef struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL  EFI_DRIVER_CONFIGURATION2_PROTOCOL;\r
 \r
 typedef enum {\r
 typedef struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL  EFI_DRIVER_CONFIGURATION2_PROTOCOL;\r
 \r
 typedef enum {\r


@@ -55,7 +55,7 @@ typedef enum {
 #define EFI_DRIVER_CONFIGURATION_PERORMANCE_DEFAULTS    0x00000003\r
 \r
 /**\r
 #define EFI_DRIVER_CONFIGURATION_PERORMANCE_DEFAULTS    0x00000003\r
 \r
 /**\r

-  Allows the user to set controller specific options for a controller that a \r
+  Allows the user to set controller specific options for a controller that a\r

   driver is currently managing.\r
 \r
   @param  This             A pointer to the EFI_DRIVER_CONFIGURATION2_PROTOCOL instance.\r
   driver is currently managing.\r
 \r
   @param  This             A pointer to the EFI_DRIVER_CONFIGURATION2_PROTOCOL instance.\r


@@ -180,7 +180,7 @@ struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL {
   EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS  ForceDefaults;\r
   ///\r
   /// A Null-terminated ASCII string that contains one or more RFC 4646\r
   EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS  ForceDefaults;\r
   ///\r
   /// A Null-terminated ASCII string that contains one or more RFC 4646\r

-  /// language codes.  This is the list of language codes that this protocol supports.  \r
+  /// language codes.  This is the list of language codes that this protocol supports.\r

   ///\r
   CHAR8                                     *SupportedLanguages;\r
 };\r
   ///\r
   CHAR8                                     *SupportedLanguages;\r
 };\r

diff --git a/MdePkg/Include/Protocol/DriverDiagnostics.h b/MdePkg/Include/Protocol/DriverDiagnostics.h
index 916e4a5d629392bd86f51e696973c0bf159253ff..2e346d7c251f397d199c56b0db3c6a71fcb0bed8 100644 (file)
--- a/MdePkg/Include/Protocol/DriverDiagnostics.h
+++ b/MdePkg/Include/Protocol/DriverDiagnostics.h
@@ -1,14 +1,14 @@
 /** @file\r
   EFI Driver Diagnostics Protocol\r
 \r
 /** @file\r
   EFI Driver Diagnostics Protocol\r
 \r

-Copyright (c) 2006 - 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) 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
-    \r
-THE PROGRAM 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


@@ -41,7 +41,7 @@ typedef enum {
   ///\r
   EfiDriverDiagnosticTypeManufacturing= 2,\r
   ///\r
   ///\r
   EfiDriverDiagnosticTypeManufacturing= 2,\r
   ///\r

-  /// This is an optional diagnostic type that would only be used in the situation where an \r
+  /// This is an optional diagnostic type that would only be used in the situation where an\r

   /// EFI_NOT_READY had been returned by a previous call to RunDiagnostics()\r
   /// and there is a desire to cancel the current running diagnostics operation.\r
   ///\r
   /// EFI_NOT_READY had been returned by a previous call to RunDiagnostics()\r
   /// and there is a desire to cancel the current running diagnostics operation.\r
   ///\r


@@ -121,8 +121,8 @@ struct _EFI_DRIVER_DIAGNOSTICS_PROTOCOL {
   EFI_DRIVER_DIAGNOSTICS_RUN_DIAGNOSTICS  RunDiagnostics;\r
   ///\r
   /// A Null-terminated ASCII string that contains one or more ISO 639-2\r
   EFI_DRIVER_DIAGNOSTICS_RUN_DIAGNOSTICS  RunDiagnostics;\r
   ///\r
   /// A Null-terminated ASCII string that contains one or more ISO 639-2\r

-  /// language codes.  This is the list of language codes that this protocol supports.  \r
-  ///  \r
+  /// language codes.  This is the list of language codes that this protocol supports.\r
+  ///\r

   CHAR8                                   *SupportedLanguages;\r
 };\r
 \r
   CHAR8                                   *SupportedLanguages;\r
 };\r
 \r

diff --git a/MdePkg/Include/Protocol/DriverDiagnostics2.h b/MdePkg/Include/Protocol/DriverDiagnostics2.h
index ab6323bb50a445c540325880dea18cd1eb9f65f8..df168a5b8723306f37b02a0eb1853d6c607ce2c7 100644 (file)
--- a/MdePkg/Include/Protocol/DriverDiagnostics2.h
+++ b/MdePkg/Include/Protocol/DriverDiagnostics2.h
@@ -1,14 +1,14 @@
 /** @file\r
   UEFI Driver Diagnostics2 Protocol\r
 \r
 /** @file\r
   UEFI Driver Diagnostics2 Protocol\r
 \r

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


@@ -21,7 +21,7 @@
   { \\r
     0x4d330321, 0x025f, 0x4aac, {0x90, 0xd8, 0x5e, 0xd9, 0x00, 0x17, 0x3b, 0x63 } \\r
   }\r
   { \\r
     0x4d330321, 0x025f, 0x4aac, {0x90, 0xd8, 0x5e, 0xd9, 0x00, 0x17, 0x3b, 0x63 } \\r
   }\r

-  \r
+\r

 typedef struct _EFI_DRIVER_DIAGNOSTICS2_PROTOCOL  EFI_DRIVER_DIAGNOSTICS2_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_DRIVER_DIAGNOSTICS2_PROTOCOL  EFI_DRIVER_DIAGNOSTICS2_PROTOCOL;\r
 \r
 /**\r


@@ -31,7 +31,7 @@ typedef struct _EFI_DRIVER_DIAGNOSTICS2_PROTOCOL  EFI_DRIVER_DIAGNOSTICS2_PROTOC
   @param  ControllerHandle The handle of the controller to run diagnostics on.\r
   @param  ChildHandle      The handle of the child controller to run diagnostics on\r
                            This is an optional parameter that may be NULL.  It will\r
   @param  ControllerHandle The handle of the controller to run diagnostics on.\r
   @param  ChildHandle      The handle of the child controller to run diagnostics on\r
                            This is an optional parameter that may be NULL.  It will\r

-                           be NULL for device drivers.  It will also be NULL for \r
+                           be NULL for device drivers.  It will also be NULL for\r

                            bus drivers that wish to run diagnostics on the bus\r
                            controller.  It will not be NULL for a bus driver that\r
                            wishes to run diagnostics on one of its child controllers.\r
                            bus drivers that wish to run diagnostics on the bus\r
                            controller.  It will not be NULL for a bus driver that\r
                            wishes to run diagnostics on one of its child controllers.\r


@@ -101,8 +101,8 @@ struct _EFI_DRIVER_DIAGNOSTICS2_PROTOCOL {
   EFI_DRIVER_DIAGNOSTICS2_RUN_DIAGNOSTICS RunDiagnostics;\r
   ///\r
   /// A Null-terminated ASCII string that contains one or more RFC 4646\r
   EFI_DRIVER_DIAGNOSTICS2_RUN_DIAGNOSTICS RunDiagnostics;\r
   ///\r
   /// A Null-terminated ASCII string that contains one or more RFC 4646\r

-  /// language codes.  This is the list of language codes that this protocol supports.  \r
-  ///    \r
+  /// language codes.  This is the list of language codes that this protocol supports.\r
+  ///\r

   CHAR8                                   *SupportedLanguages;\r
 };\r
 \r
   CHAR8                                   *SupportedLanguages;\r
 };\r
 \r

diff --git a/MdePkg/Include/Protocol/DriverFamilyOverride.h b/MdePkg/Include/Protocol/DriverFamilyOverride.h
index 691fb8d1f64a581593fd4b6ce9c4039329f3555d..ab1234dcdb729dce3c9236ef5d3f2b13011ca803 100644 (file)
--- a/MdePkg/Include/Protocol/DriverFamilyOverride.h
+++ b/MdePkg/Include/Protocol/DriverFamilyOverride.h
@@ -1,14 +1,14 @@
 /** @file\r
   UEFI Driver Family Protocol\r
 \r
 /** @file\r
   UEFI Driver Family 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
-    \r
-THE PROGRAM 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


@@ -19,14 +19,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   { \\r
     0xb1ee129e, 0xda36, 0x4181, { 0x91, 0xf8, 0x4, 0xa4, 0x92, 0x37, 0x66, 0xa7 } \\r
   }\r
   { \\r
     0xb1ee129e, 0xda36, 0x4181, { 0x91, 0xf8, 0x4, 0xa4, 0x92, 0x37, 0x66, 0xa7 } \\r
   }\r

-  \r
+\r

 typedef struct _EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL  EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL;\r
 \r
 //\r
 // Prototypes for the Driver Family Override Protocol\r
 //\r
 typedef struct _EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL  EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL;\r
 \r
 //\r
 // Prototypes for the Driver Family Override Protocol\r
 //\r

-// \r
-/**                                                                 \r
+//\r
+/**\r

   This function returns the version value associated with the driver specified by This.\r
 \r
   Retrieves the version of the driver that is used by the EFI Boot Service ConnectController()\r
   This function returns the version value associated with the driver specified by This.\r
 \r
   Retrieves the version of the driver that is used by the EFI Boot Service ConnectController()\r


@@ -35,10 +35,10 @@ typedef struct _EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL  EFI_DRIVER_FAMILY_OVERRIDE_
   the drivers with higher values returned by GetVersion() are higher priority than drivers that\r
   return lower values from GetVersion().\r
 \r
   the drivers with higher values returned by GetVersion() are higher priority than drivers that\r
   return lower values from GetVersion().\r
 \r

-  @param  This                  A pointer to the EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL instance.                            \r
-                                \r
-  @return The version value associated with the driver specified by This.                                  \r
-                                   \r
+  @param  This                  A pointer to the EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL instance.\r
+\r
+  @return The version value associated with the driver specified by This.\r
+\r

 **/\r
 typedef\r
 UINT32\r
 **/\r
 typedef\r
 UINT32\r


@@ -47,15 +47,15 @@ UINT32
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// When installed, the Driver Family Override Protocol produces a GUID that represents \r
-/// a family of drivers.  Drivers with the same GUID are members of the same family \r
-/// When drivers are connected to controllers, drivers with a higher revision value \r
-/// in the same driver family are connected with a higher priority than drivers \r
+/// When installed, the Driver Family Override Protocol produces a GUID that represents\r
+/// a family of drivers.  Drivers with the same GUID are members of the same family\r
+/// When drivers are connected to controllers, drivers with a higher revision value\r
+/// in the same driver family are connected with a higher priority than drivers\r

 /// with a lower revision value in the same driver family.  The EFI Boot Service\r
 /// with a lower revision value in the same driver family.  The EFI Boot Service\r

-/// Connect Controller uses five rules to build a prioritized list of drivers when \r
+/// Connect Controller uses five rules to build a prioritized list of drivers when\r

 /// a request is made to connect a driver to a controller.  The Driver Family Protocol\r
 /// a request is made to connect a driver to a controller.  The Driver Family Protocol\r

-/// rule is between the Platform Specific Driver Override Protocol and above the \r
-/// Bus Specific Driver Override Protocol.  \r
+/// rule is between the Platform Specific Driver Override Protocol and above the\r
+/// Bus Specific Driver Override Protocol.\r

 ///\r
 struct _EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL {\r
   EFI_DRIVER_FAMILY_OVERRIDE_GET_VERSION GetVersion;\r
 ///\r
 struct _EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL {\r
   EFI_DRIVER_FAMILY_OVERRIDE_GET_VERSION GetVersion;\r

diff --git a/MdePkg/Include/Protocol/DriverHealth.h b/MdePkg/Include/Protocol/DriverHealth.h
index c87c19c1a365303b1f6c9c06996e468b8b383ca4..011f941b92779a72cfcf291df2254d47c65c8345 100644 (file)
--- a/MdePkg/Include/Protocol/DriverHealth.h
+++ b/MdePkg/Include/Protocol/DriverHealth.h
@@ -5,33 +5,33 @@
   the health status for a controller to be retrieved. If a controller is not in a usable\r
   state, status messages may be reported to the user, repair operations can be invoked,\r
   and the user may be asked to make software and/or hardware configuration changes.\r
   the health status for a controller to be retrieved. If a controller is not in a usable\r
   state, status messages may be reported to the user, repair operations can be invoked,\r
   and the user may be asked to make software and/or hardware configuration changes.\r

-  \r
-  The Driver Health Protocol is optionally produced by a driver that follows the \r
-  EFI Driver Model.  If an EFI Driver needs to report health status to the platform, \r
-  provide warning or error messages to the user, perform length repair operations, \r
-  or request the user to make hardware or software configuration changes, then the \r
+\r
+  The Driver Health Protocol is optionally produced by a driver that follows the\r
+  EFI Driver Model.  If an EFI Driver needs to report health status to the platform,\r
+  provide warning or error messages to the user, perform length repair operations,\r
+  or request the user to make hardware or software configuration changes, then the\r

   Driver Health Protocol must be produced.\r
   Driver Health Protocol must be produced.\r

- \r
-  A controller that is managed by driver that follows the EFI Driver Model and \r
-  produces the Driver Health Protocol must report the current health of the \r
-  controllers that the driver is currently managing.  The controller can initially \r
-  be healthy, failed, require repair, or require configuration.  If a controller \r
-  requires configuration, and the user make configuration changes, the controller \r
-  may then need to be reconnected or the system may need to be rebooted for the \r
-  configuration changes to take affect. \r
-\r
-  Copyright (c) 2009 - 2013, 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
-  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
+  A controller that is managed by driver that follows the EFI Driver Model and\r
+  produces the Driver Health Protocol must report the current health of the\r
+  controllers that the driver is currently managing.  The controller can initially\r
+  be healthy, failed, require repair, or require configuration.  If a controller\r
+  requires configuration, and the user make configuration changes, the controller\r
+  may then need to be reconnected or the system may need to be rebooted for the\r
+  configuration changes to take affect.\r
+\r
+  Copyright (c) 2009 - 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
+  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
   @par Revision Reference:\r
 \r
   @par Revision Reference:\r

-  This Protocol is defined in UEFI Specification 2.3d \r
+  This Protocol is defined in UEFI Specification 2.3d\r

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


@@ -42,7 +42,7 @@
   { \\r
     0x2a534210, 0x9280, 0x41d8, { 0xae, 0x79, 0xca, 0xda, 0x1, 0xa2, 0xb1, 0x27 } \\r
   }\r
   { \\r
     0x2a534210, 0x9280, 0x41d8, { 0xae, 0x79, 0xca, 0xda, 0x1, 0xa2, 0xb1, 0x27 } \\r
   }\r

-  \r
+\r

 typedef struct _EFI_DRIVER_HEALTH_PROTOCOL  EFI_DRIVER_HEALTH_PROTOCOL;\r
 \r
 ///\r
 typedef struct _EFI_DRIVER_HEALTH_PROTOCOL  EFI_DRIVER_HEALTH_PROTOCOL;\r
 \r
 ///\r


@@ -63,12 +63,12 @@ typedef enum {
 typedef struct {\r
   EFI_HII_HANDLE  HiiHandle;\r
   EFI_STRING_ID   StringId;\r
 typedef struct {\r
   EFI_HII_HANDLE  HiiHandle;\r
   EFI_STRING_ID   StringId;\r

-  \r
+\r

   ///\r
   ///\r

-  /// 64-bit numeric value of the warning/error specified by this message. \r
-  ///   A value of 0x0000000000000000 is used to indicate that MessageCode is not specified. \r
+  /// 64-bit numeric value of the warning/error specified by this message.\r
+  ///   A value of 0x0000000000000000 is used to indicate that MessageCode is not specified.\r

   ///   The values  0x0000000000000001 to 0x0fffffffffffffff are reserved for allocation by the UEFI Specification.\r
   ///   The values  0x0000000000000001 to 0x0fffffffffffffff are reserved for allocation by the UEFI Specification.\r

-  ///   The values  0x1000000000000000 to 0x1fffffffffffffff are reserved for IHV-developed drivers. \r
+  ///   The values  0x1000000000000000 to 0x1fffffffffffffff are reserved for IHV-developed drivers.\r

   ///   The values 0x8000000000000000 to 0x8fffffffffffffff is reserved for platform/OEM drivers.\r
   ///   All other values are reserved and should not be used.\r
   ///\r
   ///   The values 0x8000000000000000 to 0x8fffffffffffffff is reserved for platform/OEM drivers.\r
   ///   All other values are reserved and should not be used.\r
   ///\r


@@ -78,11 +78,11 @@ typedef struct {
 /**\r
   Reports the progress of a repair operation\r
 \r
 /**\r
   Reports the progress of a repair operation\r
 \r

-  @param[in]  Value             A value between 0 and Limit that identifies the current \r
+  @param[in]  Value             A value between 0 and Limit that identifies the current\r

                                 progress of the repair operation.\r
                                 progress of the repair operation.\r

-  \r
+\r

   @param[in]  Limit             The maximum value of Value for the current repair operation.\r
   @param[in]  Limit             The maximum value of Value for the current repair operation.\r

-                                For example, a driver that wants to specify progress in \r
+                                For example, a driver that wants to specify progress in\r

                                 percent would use a Limit value of 100.\r
 **/\r
 typedef\r
                                 percent would use a Limit value of 100.\r
 **/\r
 typedef\r


@@ -93,88 +93,88 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Retrieves the health status of a controller in the platform.  This function can also \r
-  optionally return warning messages, error messages, and a set of HII Forms that may \r
-  be repair a controller that is not proper configured. \r
-  \r
+  Retrieves the health status of a controller in the platform.  This function can also\r
+  optionally return warning messages, error messages, and a set of HII Forms that may\r
+  be repair a controller that is not proper configured.\r
+\r

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

-  @param[in] ControllerHandle The handle of the controller to retrieve the health status \r
-                              on.  This is an optional parameter that may be NULL.  If \r
-                              this parameter is NULL, then the value of ChildHandle is \r
-                              ignored, and the combined health status of all the devices \r
+  @param[in] ControllerHandle The handle of the controller to retrieve the health status\r
+                              on.  This is an optional parameter that may be NULL.  If\r
+                              this parameter is NULL, then the value of ChildHandle is\r
+                              ignored, and the combined health status of all the devices\r

                               that the driver is managing is returned.\r
 \r
                               that the driver is managing is returned.\r
 \r

-  @param[in] ChildHandle      The handle of the child controller to retrieve the health \r
-                              status on.  This is an optional parameter that may be NULL.  \r
-                              This parameter is ignored of ControllerHandle is NULL.  It \r
-                              will be NULL for device drivers.  It will also be NULL for \r
-                              bus drivers when an attempt is made to collect the health \r
-                              status of the bus controller.  If will not be NULL when an \r
-                              attempt is made to collect the health status for a child \r
+  @param[in] ChildHandle      The handle of the child controller to retrieve the health\r
+                              status on.  This is an optional parameter that may be NULL.\r
+                              This parameter is ignored of ControllerHandle is NULL.  It\r
+                              will be NULL for device drivers.  It will also be NULL for\r
+                              bus drivers when an attempt is made to collect the health\r
+                              status of the bus controller.  If will not be NULL when an\r
+                              attempt is made to collect the health status for a child\r

                               controller produced by the driver.\r
 \r
                               controller produced by the driver.\r
 \r

-  @param[out] HealthStatus    A pointer to the health status that is returned by this \r
-                              function.  This is an optional parameter that may be NULL.  \r
-                              This parameter is ignored of ControllerHandle is NULL.  \r
-                              The health status for the controller specified by \r
-                              ControllerHandle and ChildHandle is returned. \r
-\r
-  @param[out] MessageList     A pointer to an array of warning or error messages associated \r
-                              with the controller specified by ControllerHandle and \r
-                              ChildHandle.  This is an optional parameter that may be NULL.  \r
-                              MessageList is allocated by this function with the EFI Boot \r
-                              Service AllocatePool(), and it is the caller's responsibility \r
-                              to free MessageList with the EFI Boot Service FreePool().  \r
-                              Each message is specified by tuple of an EFI_HII_HANDLE and \r
-                              an EFI_STRING_ID.  The array of messages is terminated by tuple \r
-                              containing a EFI_HII_HANDLE with a value of NULL.  The \r
-                              EFI_HII_STRING_PROTOCOL.GetString() function can be used to \r
-                              retrieve the warning or error message as a Null-terminated \r
-                              string in a specific language.  Messages may be \r
-                              returned for any of the HealthStatus values except \r
-                              EfiDriverHealthStatusReconnectRequired and \r
+  @param[out] HealthStatus    A pointer to the health status that is returned by this\r
+                              function.  This is an optional parameter that may be NULL.\r
+                              This parameter is ignored of ControllerHandle is NULL.\r
+                              The health status for the controller specified by\r
+                              ControllerHandle and ChildHandle is returned.\r
+\r
+  @param[out] MessageList     A pointer to an array of warning or error messages associated\r
+                              with the controller specified by ControllerHandle and\r
+                              ChildHandle.  This is an optional parameter that may be NULL.\r
+                              MessageList is allocated by this function with the EFI Boot\r
+                              Service AllocatePool(), and it is the caller's responsibility\r
+                              to free MessageList with the EFI Boot Service FreePool().\r
+                              Each message is specified by tuple of an EFI_HII_HANDLE and\r
+                              an EFI_STRING_ID.  The array of messages is terminated by tuple\r
+                              containing a EFI_HII_HANDLE with a value of NULL.  The\r
+                              EFI_HII_STRING_PROTOCOL.GetString() function can be used to\r
+                              retrieve the warning or error message as a Null-terminated\r
+                              string in a specific language.  Messages may be\r
+                              returned for any of the HealthStatus values except\r
+                              EfiDriverHealthStatusReconnectRequired and\r

                               EfiDriverHealthStatusRebootRequired.\r
 \r
                               EfiDriverHealthStatusRebootRequired.\r
 \r

-  @param[out] FormHiiHandle   A pointer to the HII handle containing the HII form used when \r
-                              configuration is required. The HII handle is associated with \r
+  @param[out] FormHiiHandle   A pointer to the HII handle containing the HII form used when\r
+                              configuration is required. The HII handle is associated with\r

                               the controller specified by ControllerHandle and ChildHandle.\r
                               If this is NULL, then no HII form is available. An HII handle\r
                               the controller specified by ControllerHandle and ChildHandle.\r
                               If this is NULL, then no HII form is available. An HII handle\r

-                              will only be returned with a HealthStatus value of \r
+                              will only be returned with a HealthStatus value of\r

                               EfiDriverHealthStatusConfigurationRequired.\r
 \r
                               EfiDriverHealthStatusConfigurationRequired.\r
 \r

-  @retval EFI_SUCCESS           ControllerHandle is NULL, and all the controllers \r
-                                managed by this driver specified by This have a health \r
-                                status of EfiDriverHealthStatusHealthy with no warning \r
-                                messages to be returned.  The ChildHandle, HealthStatus, \r
+  @retval EFI_SUCCESS           ControllerHandle is NULL, and all the controllers\r
+                                managed by this driver specified by This have a health\r
+                                status of EfiDriverHealthStatusHealthy with no warning\r
+                                messages to be returned.  The ChildHandle, HealthStatus,\r

                                 MessageList, and FormList parameters are ignored.\r
 \r
                                 MessageList, and FormList parameters are ignored.\r
 \r

-  @retval EFI_DEVICE_ERROR      ControllerHandle is NULL, and one or more of the \r
-                                controllers managed by this driver specified by This \r
-                                do not have a health status of EfiDriverHealthStatusHealthy.  \r
-                                The ChildHandle, HealthStatus, MessageList, and \r
+  @retval EFI_DEVICE_ERROR      ControllerHandle is NULL, and one or more of the\r
+                                controllers managed by this driver specified by This\r
+                                do not have a health status of EfiDriverHealthStatusHealthy.\r
+                                The ChildHandle, HealthStatus, MessageList, and\r

                                 FormList parameters are ignored.\r
 \r
                                 FormList parameters are ignored.\r
 \r

-  @retval EFI_DEVICE_ERROR      ControllerHandle is NULL, and one or more of the \r
-                                controllers managed by this driver specified by This \r
-                                have one or more warning and/or error messages.  \r
-                                The ChildHandle, HealthStatus, MessageList, and \r
+  @retval EFI_DEVICE_ERROR      ControllerHandle is NULL, and one or more of the\r
+                                controllers managed by this driver specified by This\r
+                                have one or more warning and/or error messages.\r
+                                The ChildHandle, HealthStatus, MessageList, and\r

                                 FormList parameters are ignored.\r
 \r
                                 FormList parameters are ignored.\r
 \r

-  @retval EFI_SUCCESS           ControllerHandle is not NULL and the health status \r
-                                of the controller specified by ControllerHandle and \r
-                                ChildHandle was returned in HealthStatus.  A list \r
-                                of warning and error messages may be optionally \r
-                                returned in MessageList, and a list of HII Forms \r
+  @retval EFI_SUCCESS           ControllerHandle is not NULL and the health status\r
+                                of the controller specified by ControllerHandle and\r
+                                ChildHandle was returned in HealthStatus.  A list\r
+                                of warning and error messages may be optionally\r
+                                returned in MessageList, and a list of HII Forms\r

                                 may be optionally returned in FormList.\r
 \r
                                 may be optionally returned in FormList.\r
 \r

-  @retval EFI_UNSUPPORTED       ControllerHandle is not NULL, and the controller \r
-                                specified by ControllerHandle and ChildHandle is not \r
+  @retval EFI_UNSUPPORTED       ControllerHandle is not NULL, and the controller\r
+                                specified by ControllerHandle and ChildHandle is not\r

                                 currently being managed by the driver specified by This.\r
 \r
   @retval EFI_INVALID_PARAMETER HealthStatus is NULL.\r
 \r
                                 currently being managed by the driver specified by This.\r
 \r
   @retval EFI_INVALID_PARAMETER HealthStatus is NULL.\r
 \r

-  @retval EFI_OUT_OF_RESOURCES  MessageList is not NULL, and there are not enough \r
+  @retval EFI_OUT_OF_RESOURCES  MessageList is not NULL, and there are not enough\r

                                 resource available to allocate memory for MessageList.\r
 \r
 **/\r
                                 resource available to allocate memory for MessageList.\r
 \r
 **/\r


@@ -190,30 +190,30 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Performs a repair operation on a controller in the platform.  This function can \r
-  optionally report repair progress information back to the platform. \r
-  \r
+  Performs a repair operation on a controller in the platform.  This function can\r
+  optionally report repair progress information back to the platform.\r
+\r

   @param[in] This              A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance.\r
   @param[in] ControllerHandle  The handle of the controller to repair.\r
   @param[in] This              A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance.\r
   @param[in] ControllerHandle  The handle of the controller to repair.\r

-  @param[in] ChildHandle       The handle of the child controller to repair.  This is \r
-                               an optional parameter that may be NULL.  It will be NULL \r
-                               for device drivers.  It will also be NULL for bus \r
+  @param[in] ChildHandle       The handle of the child controller to repair.  This is\r
+                               an optional parameter that may be NULL.  It will be NULL\r
+                               for device drivers.  It will also be NULL for bus\r

                                drivers when an attempt is made to repair a bus controller.\r
                                drivers when an attempt is made to repair a bus controller.\r

-                               If will not be NULL when an attempt is made to repair a \r
+                               If will not be NULL when an attempt is made to repair a\r

                                child controller produced by the driver.\r
                                child controller produced by the driver.\r

-  @param[in] RepairNotify      A notification function that may be used by a driver to \r
-                               report the progress of the repair operation.  This is \r
-                               an optional parameter that may be NULL.  \r
+  @param[in] RepairNotify      A notification function that may be used by a driver to\r
+                               report the progress of the repair operation.  This is\r
+                               an optional parameter that may be NULL.\r

 \r
 \r
 \r
 \r

-  @retval EFI_SUCCESS           An attempt to repair the controller specified by \r
-                                ControllerHandle and ChildHandle was performed.  \r
-                                The result of the repair operation can bet \r
+  @retval EFI_SUCCESS           An attempt to repair the controller specified by\r
+                                ControllerHandle and ChildHandle was performed.\r
+                                The result of the repair operation can bet\r

                                 determined by calling GetHealthStatus().\r
                                 determined by calling GetHealthStatus().\r

-  @retval EFI_UNSUPPORTED       The driver specified by This is not currently \r
-                                managing the controller specified by ControllerHandle \r
+  @retval EFI_UNSUPPORTED       The driver specified by This is not currently\r
+                                managing the controller specified by ControllerHandle\r

                                 and ChildHandle.\r
                                 and ChildHandle.\r

-  @retval EFI_OUT_OF_RESOURCES  There are not enough resources to perform the \r
+  @retval EFI_OUT_OF_RESOURCES  There are not enough resources to perform the\r

                                 repair operation.\r
 \r
 */\r
                                 repair operation.\r
 \r
 */\r


@@ -228,10 +228,10 @@ EFI_STATUS
 \r
 ///\r
 /// When installed, the Driver Health Protocol produces a collection of services\r
 \r
 ///\r
 /// When installed, the Driver Health Protocol produces a collection of services\r

-/// that allow the health status for a controller to be retrieved.  If a controller \r
-/// is not in a usable state, status messages may be reported to the user, repair \r
-/// operations can be invoked, and the user may be asked to make software and/or \r
-/// hardware configuration changes. \r
+/// that allow the health status for a controller to be retrieved.  If a controller\r
+/// is not in a usable state, status messages may be reported to the user, repair\r
+/// operations can be invoked, and the user may be asked to make software and/or\r
+/// hardware configuration changes.\r

 ///\r
 struct _EFI_DRIVER_HEALTH_PROTOCOL {\r
   EFI_DRIVER_HEALTH_GET_HEALTH_STATUS  GetHealthStatus;\r
 ///\r
 struct _EFI_DRIVER_HEALTH_PROTOCOL {\r
   EFI_DRIVER_HEALTH_GET_HEALTH_STATUS  GetHealthStatus;\r

diff --git a/MdePkg/Include/Protocol/DriverSupportedEfiVersion.h b/MdePkg/Include/Protocol/DriverSupportedEfiVersion.h
index 4925078a837c07fc70d8d1f9dbef2c8d6f98eaa0..6e427f9be11b0412f4849c5667af648e0a18a4d3 100644 (file)
--- a/MdePkg/Include/Protocol/DriverSupportedEfiVersion.h
+++ b/MdePkg/Include/Protocol/DriverSupportedEfiVersion.h
@@ -4,14 +4,14 @@
   required for EFI drivers that are on PCI and other plug-in\r
   cards.\r
 \r
   required for EFI drivers that are on PCI and other plug-in\r
   cards.\r
 \r

-  Copyright (c) 2006 - 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) 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


@@ -24,16 +24,16 @@
 \r
 ///\r
 /// The EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL provides a\r
 \r
 ///\r
 /// The EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL provides a\r

-/// mechanism for an EFI driver to publish the version of the EFI   \r
-/// specification it conforms to. This protocol must be placed on   \r
-/// the driver's image handle when the driver's entry point is   \r
+/// mechanism for an EFI driver to publish the version of the EFI\r
+/// specification it conforms to. This protocol must be placed on\r
+/// the driver's image handle when the driver's entry point is\r

 /// called.\r
 ///\r
 typedef struct _EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL {\r
   ///\r
 /// called.\r
 ///\r
 typedef struct _EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL {\r
   ///\r

-  /// The size, in bytes, of the entire structure. Future versions of this \r
+  /// The size, in bytes, of the entire structure. Future versions of this\r

   /// specification may grow the size of the structure.\r
   /// specification may grow the size of the structure.\r

-  /// \r
+  ///\r

   UINT32 Length;\r
   ///\r
   /// The latest version of the UEFI specification that this driver conforms to.\r
   UINT32 Length;\r
   ///\r
   /// The latest version of the UEFI specification that this driver conforms to.\r

diff --git a/MdePkg/Include/Protocol/Eap.h b/MdePkg/Include/Protocol/Eap.h
index eac2d5e5642a601039336fee8f9714dadb3d760d..ede56e7ae9ac79d7d0657f7963dcb9877aa39954 100644 (file)
--- a/MdePkg/Include/Protocol/Eap.h
+++ b/MdePkg/Include/Protocol/Eap.h
@@ -1,11 +1,11 @@
 /** @file\r
   EFI EAP(Extended Authenticaton Protocol) Protocol Definition\r
   The EFI EAP Protocol is used to abstract the ability to configure and extend the\r
 /** @file\r
   EFI EAP(Extended Authenticaton Protocol) Protocol Definition\r
   The EFI EAP Protocol is used to abstract the ability to configure and extend the\r

-  EAP framework. \r
+  EAP framework.\r

   The definitions in this file are defined in UEFI Specification 2.3.1B, which have\r
   not been verified by one implementation yet.\r
 \r
   The definitions in this file are defined in UEFI Specification 2.3.1B, which have\r
   not been verified by one implementation yet.\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


@@ -14,7 +14,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

-  @par Revision Reference:          \r
+  @par Revision Reference:\r

   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r
   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r


@@ -31,7 +31,7 @@
 typedef struct _EFI_EAP_PROTOCOL EFI_EAP_PROTOCOL;\r
 \r
 ///\r
 typedef struct _EFI_EAP_PROTOCOL EFI_EAP_PROTOCOL;\r
 \r
 ///\r

-/// Type for the identification number assigned to the Port by the  \r
+/// Type for the identification number assigned to the Port by the\r

 /// System in which the Port resides.\r
 ///\r
 typedef VOID *  EFI_PORT_HANDLE;\r
 /// System in which the Port resides.\r
 ///\r
 typedef VOID *  EFI_PORT_HANDLE;\r


@@ -61,7 +61,7 @@ typedef VOID *  EFI_PORT_HANDLE;
   @param[in]      RequestSize    Packet size in bytes for the most recently received\r
                                  EAP-Request packet.\r
   @param[in]      Buffer         Pointer to the buffer to hold the built packet.\r
   @param[in]      RequestSize    Packet size in bytes for the most recently received\r
                                  EAP-Request packet.\r
   @param[in]      Buffer         Pointer to the buffer to hold the built packet.\r

-  @param[in, out] BufferSize     Pointer to the buffer size in bytes. \r
+  @param[in, out] BufferSize     Pointer to the buffer size in bytes.\r

                                  On input, it is the buffer size provided by the caller.\r
                                  On output, it is the buffer size in fact needed to contain\r
                                  the packet.\r
                                  On input, it is the buffer size provided by the caller.\r
                                  On output, it is the buffer size in fact needed to contain\r
                                  the packet.\r


@@ -74,32 +74,32 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_BUILD_RESPONSE_PACKET)(\r
   IN EFI_PORT_HANDLE        PortNumber,\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_BUILD_RESPONSE_PACKET)(\r
   IN EFI_PORT_HANDLE        PortNumber,\r

-  IN UINT8                  *RequestBuffer, \r
-  IN UINTN                  RequestSize, \r
-  IN UINT8                  *Buffer, \r
+  IN UINT8                  *RequestBuffer,\r
+  IN UINTN                  RequestSize,\r
+  IN UINT8                  *Buffer,\r

   IN OUT UINTN              *BufferSize\r
   );\r
 \r
 /**\r
   Set the desired EAP authentication method for the Port.\r
 \r
   IN OUT UINTN              *BufferSize\r
   );\r
 \r
 /**\r
   Set the desired EAP authentication method for the Port.\r
 \r

-  The SetDesiredAuthMethod() function sets the desired EAP authentication method indicated \r
+  The SetDesiredAuthMethod() function sets the desired EAP authentication method indicated\r

   by EapAuthType for the Port.\r
   by EapAuthType for the Port.\r

-  \r
-  If EapAuthType is an invalid EAP authentication type, then EFI_INVALID_PARAMETER is \r
+\r
+  If EapAuthType is an invalid EAP authentication type, then EFI_INVALID_PARAMETER is\r

   returned.\r
   If the EAP authentication method of EapAuthType is unsupported by the Ports, then it will\r
   return EFI_UNSUPPORTED.\r
   returned.\r
   If the EAP authentication method of EapAuthType is unsupported by the Ports, then it will\r
   return EFI_UNSUPPORTED.\r

-  The cryptographic strength of EFI_EAP_TYPE_TLS shall be at least of hash strength \r
+  The cryptographic strength of EFI_EAP_TYPE_TLS shall be at least of hash strength\r

   SHA-256 and RSA key length of at least 2048 bits.\r
   SHA-256 and RSA key length of at least 2048 bits.\r

-  \r
-  @param[in] This                A pointer to the EFI_EAP_PROTOCOL instance that indicates \r
+\r
+  @param[in] This                A pointer to the EFI_EAP_PROTOCOL instance that indicates\r

                                  the calling context.\r
                                  the calling context.\r

-  @param[in] EapAuthType         The type of the EAP authentication method to register. It should \r
+  @param[in] EapAuthType         The type of the EAP authentication method to register. It should\r

                                  be the type value defined by RFC. See RFC 2284 for details.\r
   @param[in] Handler             The handler of the EAP authentication method to register.\r
 \r
                                  be the type value defined by RFC. See RFC 2284 for details.\r
   @param[in] Handler             The handler of the EAP authentication method to register.\r
 \r

-  @retval EFI_SUCCESS            The EAP authentication method of EapAuthType is \r
+  @retval EFI_SUCCESS            The EAP authentication method of EapAuthType is\r

                                  registered successfully.\r
   @retval EFI_INVALID_PARAMETER  EapAuthType is an invalid EAP authentication type.\r
   @retval EFI_UNSUPPORTED        The EAP authentication method of EapAuthType is\r
                                  registered successfully.\r
   @retval EFI_INVALID_PARAMETER  EapAuthType is an invalid EAP authentication type.\r
   @retval EFI_UNSUPPORTED        The EAP authentication method of EapAuthType is\r


@@ -109,28 +109,28 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_DESIRED_AUTHENTICATION_METHOD)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_DESIRED_AUTHENTICATION_METHOD)(\r

-  IN EFI_EAP_PROTOCOL            *This, \r
+  IN EFI_EAP_PROTOCOL            *This,\r

   IN UINT8                       EapAuthType\r
   );\r
 \r
 /**\r
   IN UINT8                       EapAuthType\r
   );\r
 \r
 /**\r

-  Register an EAP authentication method. \r
+  Register an EAP authentication method.\r
+\r
+  The RegisterAuthMethod() function registers the user provided EAP authentication method,\r
+  the type of which is EapAuthType and the handler of which is Handler.\r

 \r
 \r

-  The RegisterAuthMethod() function registers the user provided EAP authentication method, \r
-  the type of which is EapAuthType and the handler of which is Handler. \r
-  \r
-  If EapAuthType is an invalid EAP authentication type, then EFI_INVALID_PARAMETER is \r
+  If EapAuthType is an invalid EAP authentication type, then EFI_INVALID_PARAMETER is\r

   returned.\r
   returned.\r

-  If there is not enough system memory to perform the registration, then \r
+  If there is not enough system memory to perform the registration, then\r

   EFI_OUT_OF_RESOURCES is returned.\r
 \r
   EFI_OUT_OF_RESOURCES is returned.\r
 \r

-  @param[in] This                A pointer to the EFI_EAP_PROTOCOL instance that indicates \r
+  @param[in] This                A pointer to the EFI_EAP_PROTOCOL instance that indicates\r

                                  the calling context.\r
                                  the calling context.\r

-  @param[in] EapAuthType         The type of the EAP authentication method to register. It should \r
+  @param[in] EapAuthType         The type of the EAP authentication method to register. It should\r

                                  be the type value defined by RFC. See RFC 2284 for details.\r
   @param[in] Handler             The handler of the EAP authentication method to register.\r
 \r
                                  be the type value defined by RFC. See RFC 2284 for details.\r
   @param[in] Handler             The handler of the EAP authentication method to register.\r
 \r

-  @retval EFI_SUCCESS            The EAP authentication method of EapAuthType is \r
+  @retval EFI_SUCCESS            The EAP authentication method of EapAuthType is\r

                                  registered successfully.\r
   @retval EFI_INVALID_PARAMETER  EapAuthType is an invalid EAP authentication type.\r
   @retval EFI_OUT_OF_RESOURCES   There is not enough system memory to perform the registration.\r
                                  registered successfully.\r
   @retval EFI_INVALID_PARAMETER  EapAuthType is an invalid EAP authentication type.\r
   @retval EFI_OUT_OF_RESOURCES   There is not enough system memory to perform the registration.\r


@@ -139,17 +139,17 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_REGISTER_AUTHENTICATION_METHOD)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_REGISTER_AUTHENTICATION_METHOD)(\r

-  IN EFI_EAP_PROTOCOL                     *This, \r
-  IN UINT8                                EapAuthType, \r
+  IN EFI_EAP_PROTOCOL                     *This,\r
+  IN UINT8                                EapAuthType,\r

   IN EFI_EAP_BUILD_RESPONSE_PACKET        Handler\r
   );\r
 \r
 ///\r
   IN EFI_EAP_BUILD_RESPONSE_PACKET        Handler\r
   );\r
 \r
 ///\r

-/// EFI_EAP_PROTOCOL \r
-/// is used to configure the desired EAP authentication method for the EAP \r
+/// EFI_EAP_PROTOCOL\r
+/// is used to configure the desired EAP authentication method for the EAP\r

 /// framework and extend the EAP framework by registering new EAP authentication\r
 /// method on a Port. The EAP framework is built on a per-Port basis. Herein, a\r
 /// framework and extend the EAP framework by registering new EAP authentication\r
 /// method on a Port. The EAP framework is built on a per-Port basis. Herein, a\r

-/// Port means a NIC. For the details of EAP protocol, please refer to RFC 2284. \r
+/// Port means a NIC. For the details of EAP protocol, please refer to RFC 2284.\r

 ///\r
 struct _EFI_EAP_PROTOCOL {\r
   EFI_EAP_SET_DESIRED_AUTHENTICATION_METHOD   SetDesiredAuthMethod;\r
 ///\r
 struct _EFI_EAP_PROTOCOL {\r
   EFI_EAP_SET_DESIRED_AUTHENTICATION_METHOD   SetDesiredAuthMethod;\r

diff --git a/MdePkg/Include/Protocol/EapConfiguration.h b/MdePkg/Include/Protocol/EapConfiguration.h
index 1dc5efe0b9048c2c2de80beca18b2571964fb91d..6b97884890163ed2737e5091c4836a00b293ce74 100644 (file)
--- a/MdePkg/Include/Protocol/EapConfiguration.h
+++ b/MdePkg/Include/Protocol/EapConfiguration.h
@@ -1,7 +1,7 @@
 /** @file\r
   This file defines the EFI EAP Configuration protocol.\r
 \r
 /** @file\r
   This file defines the EFI EAP Configuration 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


@@ -156,4 +156,4 @@ struct _EFI_EAP_CONFIGURATION_PROTOCOL {
 \r
 extern EFI_GUID gEfiEapConfigurationProtocolGuid;\r
 \r
 \r
 extern EFI_GUID gEfiEapConfigurationProtocolGuid;\r
 \r

-#endif
\ No newline at end of file
+#endif\r

diff --git a/MdePkg/Include/Protocol/EapManagement.h b/MdePkg/Include/Protocol/EapManagement.h
index a20299be473b9aaedc76164ee71738546d5d8bd2..11308ed44f8c31927d6377703fe90ab97ed6ea14 100644 (file)
--- a/MdePkg/Include/Protocol/EapManagement.h
+++ b/MdePkg/Include/Protocol/EapManagement.h
@@ -1,12 +1,12 @@
 /** @file\r
   EFI EAP Management Protocol Definition\r
   The EFI EAP Management Protocol is designed to provide ease of management and\r
 /** @file\r
   EFI EAP Management Protocol Definition\r
   The EFI EAP Management Protocol is designed to provide ease of management and\r

-  ease of test for EAPOL state machine. It is intended for the supplicant side. \r
-  It conforms to IEEE 802.1x specification. \r
+  ease of test for EAPOL state machine. It is intended for the supplicant side.\r
+  It conforms to IEEE 802.1x specification.\r

   The definitions in this file are defined in UEFI Specification 2.2, which have\r
   not been verified by one implementation yet.\r
 \r
   The definitions in this file are defined in UEFI Specification 2.2, which have\r
   not been verified by one implementation yet.\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


@@ -15,7 +15,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

-  @par Revision Reference:          \r
+  @par Revision Reference:\r

   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r
   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r


@@ -43,22 +43,22 @@ typedef struct _EFI_EAP_MANAGEMENT_PROTOCOL EFI_EAP_MANAGEMENT_PROTOCOL;
 ///\r
 /// EFI_EAPOL_PORT_INFO\r
 ///\r
 ///\r
 /// EFI_EAPOL_PORT_INFO\r
 ///\r

-typedef struct _EFI_EAPOL_PORT_INFO {      \r
-  /// \r
-  /// The identification number assigned to the Port by the System in \r
+typedef struct _EFI_EAPOL_PORT_INFO {\r
+  ///\r
+  /// The identification number assigned to the Port by the System in\r

   /// which the Port resides.\r
   /// which the Port resides.\r

-  /// \r
+  ///\r

   EFI_PORT_HANDLE     PortNumber;\r
   EFI_PORT_HANDLE     PortNumber;\r

-  /// \r
-  /// The protocol version number of the EAPOL implementation \r
-  /// supported by the Port. \r
-  /// \r
+  ///\r
+  /// The protocol version number of the EAPOL implementation\r
+  /// supported by the Port.\r
+  ///\r

   UINT8               ProtocolVersion;\r
   UINT8               ProtocolVersion;\r

-  /// \r
-  /// The capabilities of the PAE associated with the Port. This field \r
-  /// indicates whether Authenticator functionality, Supplicant \r
+  ///\r
+  /// The capabilities of the PAE associated with the Port. This field\r
+  /// indicates whether Authenticator functionality, Supplicant\r

   /// functionality, both, or neither, is supported by the Port's PAE.\r
   /// functionality, both, or neither, is supported by the Port's PAE.\r

-  /// \r
+  ///\r

   UINT8               PaeCapabilities;\r
 } EFI_EAPOL_PORT_INFO;\r
 \r
   UINT8               PaeCapabilities;\r
 } EFI_EAPOL_PORT_INFO;\r
 \r


@@ -77,7 +77,7 @@ typedef enum _EFI_EAPOL_SUPPLICANT_PAE_STATE {
 } EFI_EAPOL_SUPPLICANT_PAE_STATE;\r
 \r
 ///\r
 } EFI_EAPOL_SUPPLICANT_PAE_STATE;\r
 \r
 ///\r

-/// Definitions for ValidFieldMask \r
+/// Definitions for ValidFieldMask\r

 ///\r
 ///@{\r
 #define AUTH_PERIOD_FIELD_VALID       0x01\r
 ///\r
 ///@{\r
 #define AUTH_PERIOD_FIELD_VALID       0x01\r


@@ -90,27 +90,27 @@ typedef enum _EFI_EAPOL_SUPPLICANT_PAE_STATE {
 /// EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION\r
 ///\r
 typedef struct _EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION {\r
 /// EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION\r
 ///\r
 typedef struct _EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION {\r

-  /// \r
+  ///\r

   /// Indicates which of the following fields are valid.\r
   /// Indicates which of the following fields are valid.\r

-  /// \r
-  UINT8       ValidFieldMask;  \r
+  ///\r
+  UINT8       ValidFieldMask;\r

   ///\r
   /// The initial value for the authWhile timer. Its default value is 30s.\r
   ///\r
   ///\r
   /// The initial value for the authWhile timer. Its default value is 30s.\r
   ///\r

-  UINTN       AuthPeriod;   \r
+  UINTN       AuthPeriod;\r
+  ///\r
+  /// The initial value for the heldWhile timer. Its default value is 60s.\r

   ///\r
   ///\r

-  /// The initial value for the heldWhile timer. Its default value is 60s. \r
+  UINTN       HeldPeriod;\r

   ///\r
   ///\r

-  UINTN       HeldPeriod;    \r
+  /// The initial value for the startWhen timer. Its default value is 30s.\r

   ///\r
   ///\r

-  /// The initial value for the startWhen timer. Its default value is 30s. \r
+  UINTN       StartPeriod;\r

   ///\r
   ///\r

-  UINTN       StartPeriod;    \r
-  ///   \r
-  /// The maximum number of successive EAPOL-Start messages will \r
-  /// be sent before the Supplicant assumes that there is no \r
+  /// The maximum number of successive EAPOL-Start messages will\r
+  /// be sent before the Supplicant assumes that there is no\r

   /// Authenticator present. Its default value is 3.\r
   /// Authenticator present. Its default value is 3.\r

-  /// \r
+  ///\r

   UINTN       MaxStart;\r
 } EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION;\r
 \r
   UINTN       MaxStart;\r
 } EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION;\r
 \r


@@ -120,17 +120,17 @@ typedef struct _EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION {
 typedef struct _EFI_EAPOL_SUPPLICANT_PAE_STATISTICS {\r
   ///\r
   /// The number of EAPOL frames of any type that have been received by this Supplican.\r
 typedef struct _EFI_EAPOL_SUPPLICANT_PAE_STATISTICS {\r
   ///\r
   /// The number of EAPOL frames of any type that have been received by this Supplican.\r

-  /// \r
+  ///\r

   UINTN     EapolFramesReceived;\r
   ///\r
   UINTN     EapolFramesReceived;\r
   ///\r

-  /// The number of EAPOL frames of any type that have been transmitted by this Supplicant. \r
+  /// The number of EAPOL frames of any type that have been transmitted by this Supplicant.\r

   ///\r
   UINTN     EapolFramesTransmitted;\r
   ///\r
   UINTN     EapolFramesTransmitted;\r

-  /// \r
-  /// The number of EAPOL Start frames that have been transmitted by this Supplicant. \r
-  /// \r
+  ///\r
+  /// The number of EAPOL Start frames that have been transmitted by this Supplicant.\r
+  ///\r

   UINTN     EapolStartFramesTransmitted;\r
   UINTN     EapolStartFramesTransmitted;\r

-  /// \r
+  ///\r

   /// The number of EAPOL Logoff frames that have been transmitted by this Supplicant.\r
   ///\r
   UINTN     EapolLogoffFramesTransmitted;\r
   /// The number of EAPOL Logoff frames that have been transmitted by this Supplicant.\r
   ///\r
   UINTN     EapolLogoffFramesTransmitted;\r


@@ -138,48 +138,48 @@ typedef struct _EFI_EAPOL_SUPPLICANT_PAE_STATISTICS {
   /// The number of EAP Resp/Id frames that have been transmitted by this Supplicant.\r
   ///\r
   UINTN     EapRespIdFramesTransmitted;\r
   /// The number of EAP Resp/Id frames that have been transmitted by this Supplicant.\r
   ///\r
   UINTN     EapRespIdFramesTransmitted;\r

-  ///   \r
-  /// The number of valid EAP Response frames (other than Resp/Id frames) that have been \r
+  ///\r
+  /// The number of valid EAP Response frames (other than Resp/Id frames) that have been\r

   /// transmitted by this Supplicant.\r
   ///\r
   UINTN     EapResponseFramesTransmitted;\r
   /// transmitted by this Supplicant.\r
   ///\r
   UINTN     EapResponseFramesTransmitted;\r

-  /// \r
+  ///\r

   /// The number of EAP Req/Id frames that have been received by this Supplicant.\r
   /// The number of EAP Req/Id frames that have been received by this Supplicant.\r

-  /// \r
+  ///\r

   UINTN     EapReqIdFramesReceived;\r
   ///\r
   UINTN     EapReqIdFramesReceived;\r
   ///\r

-  /// The number of EAP Request frames (other than Rq/Id frames) that have been received \r
+  /// The number of EAP Request frames (other than Rq/Id frames) that have been received\r

   /// by this Supplicant.\r
   ///\r
   UINTN     EapRequestFramesReceived;\r
   ///\r
   /// by this Supplicant.\r
   ///\r
   UINTN     EapRequestFramesReceived;\r
   ///\r

-  /// The number of EAPOL frames that have been received by this Supplicant in which the \r
+  /// The number of EAPOL frames that have been received by this Supplicant in which the\r

   /// frame type is not recognized.\r
   ///\r
   UINTN     InvalidEapolFramesReceived;\r
   /// frame type is not recognized.\r
   ///\r
   UINTN     InvalidEapolFramesReceived;\r

-  /// \r
-  /// The number of EAPOL frames that have been received by this Supplicant in which the \r
+  ///\r
+  /// The number of EAPOL frames that have been received by this Supplicant in which the\r

   /// Packet Body Length field (7.5.5) is invalid.\r
   /// Packet Body Length field (7.5.5) is invalid.\r

-  /// \r
+  ///\r

   UINTN     EapLengthErrorFramesReceived;\r
   UINTN     EapLengthErrorFramesReceived;\r

-  /// \r
+  ///\r

   /// The protocol version number carried in the most recently received EAPOL frame.\r
   /// The protocol version number carried in the most recently received EAPOL frame.\r

-  /// \r
+  ///\r

   UINTN     LastEapolFrameVersion;\r
   UINTN     LastEapolFrameVersion;\r

-  /// \r
+  ///\r

   /// The source MAC address carried in the most recently received EAPOL frame.\r
   /// The source MAC address carried in the most recently received EAPOL frame.\r

-  /// \r
+  ///\r

   UINTN     LastEapolFrameSource;\r
 } EFI_EAPOL_SUPPLICANT_PAE_STATISTICS;\r
 \r
 /**\r
   UINTN     LastEapolFrameSource;\r
 } EFI_EAPOL_SUPPLICANT_PAE_STATISTICS;\r
 \r
 /**\r

-  Read the system configuration information associated with the Port. \r
+  Read the system configuration information associated with the Port.\r

 \r
   The GetSystemConfiguration() function reads the system configuration\r
 \r
   The GetSystemConfiguration() function reads the system configuration\r

-  information associated with the Port, including the value of the \r
+  information associated with the Port, including the value of the\r

   SystemAuthControl parameter of the System is returned in SystemAuthControl\r
   and the Port's information is returned in the buffer pointed to by PortInfo.\r
   SystemAuthControl parameter of the System is returned in SystemAuthControl\r
   and the Port's information is returned in the buffer pointed to by PortInfo.\r

-  The Port's information is optional. \r
+  The Port's information is optional.\r

   If PortInfo is NULL, then reading the Port's information is ignored.\r
 \r
   If SystemAuthControl is NULL, then EFI_INVALID_PARAMETER is returned.\r
   If PortInfo is NULL, then reading the Port's information is ignored.\r
 \r
   If SystemAuthControl is NULL, then EFI_INVALID_PARAMETER is returned.\r


@@ -187,7 +187,7 @@ typedef struct _EFI_EAPOL_SUPPLICANT_PAE_STATISTICS {
   @param[in]  This               A pointer to the EFI_EAP_MANAGEMENT_PROTOCOL\r
                                  instance that indicates the calling context.\r
   @param[out] SystemAuthControl  Returns the value of the SystemAuthControl\r
   @param[in]  This               A pointer to the EFI_EAP_MANAGEMENT_PROTOCOL\r
                                  instance that indicates the calling context.\r
   @param[out] SystemAuthControl  Returns the value of the SystemAuthControl\r

-                                 parameter of the System. \r
+                                 parameter of the System.\r

                                  TRUE means Enabled. FALSE means Disabled.\r
   @param[out] PortInfo           Returns EFI_EAPOL_PORT_INFO structure to describe\r
                                  the Port's information. This parameter can be NULL\r
                                  TRUE means Enabled. FALSE means Disabled.\r
   @param[out] PortInfo           Returns EFI_EAPOL_PORT_INFO structure to describe\r
                                  the Port's information. This parameter can be NULL\r


@@ -202,21 +202,21 @@ typedef struct _EFI_EAPOL_SUPPLICANT_PAE_STATISTICS {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SYSTEM_CONFIGURATION)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SYSTEM_CONFIGURATION)(\r

-  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This, \r
-  OUT BOOLEAN                             *SystemAuthControl, \r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This,\r
+  OUT BOOLEAN                             *SystemAuthControl,\r

   OUT EFI_EAPOL_PORT_INFO                 *PortInfo OPTIONAL\r
   );\r
 \r
 /**\r
   OUT EFI_EAPOL_PORT_INFO                 *PortInfo OPTIONAL\r
   );\r
 \r
 /**\r

-  Set the system configuration information associated with the Port. \r
+  Set the system configuration information associated with the Port.\r

 \r
 \r

-  The SetSystemConfiguration() function sets the value of the SystemAuthControl \r
+  The SetSystemConfiguration() function sets the value of the SystemAuthControl\r

   parameter of the System to SystemAuthControl.\r
 \r
   @param[in] This                A pointer to the EFI_EAP_MANAGEMENT_PROTOCOL\r
                                  instance that indicates the calling context.\r
   parameter of the System to SystemAuthControl.\r
 \r
   @param[in] This                A pointer to the EFI_EAP_MANAGEMENT_PROTOCOL\r
                                  instance that indicates the calling context.\r

-  @param[in] SystemAuthControl   The desired value of the SystemAuthControl \r
-                                 parameter of the System. \r
+  @param[in] SystemAuthControl   The desired value of the SystemAuthControl\r
+                                 parameter of the System.\r

                                  TRUE means Enabled. FALSE means Disabled.\r
 \r
   @retval EFI_SUCCESS            The system configuration information of the\r
                                  TRUE means Enabled. FALSE means Disabled.\r
 \r
   @retval EFI_SUCCESS            The system configuration information of the\r


@@ -226,7 +226,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_SYSTEM_CONFIGURATION)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_SYSTEM_CONFIGURATION)(\r

-  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This, \r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This,\r

   IN BOOLEAN                              SystemAuthControl\r
   );\r
 \r
   IN BOOLEAN                              SystemAuthControl\r
   );\r
 \r


@@ -266,7 +266,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Notify the EAPOL state machines for the Port that the user of the System has \r
+  Notify the EAPOL state machines for the Port that the user of the System has\r

   logged off.\r
 \r
   The UserLogoff() function notifies the EAPOL state machines for the Port.\r
   logged off.\r
 \r
   The UserLogoff() function notifies the EAPOL state machines for the Port.\r


@@ -290,8 +290,8 @@ EFI_STATUS
   The GetSupplicantStatus() function reads the status of the Supplicant PAE state\r
   machine for the Port, including the current state CurrentState  and the configuration\r
   of the operational parameters Configuration. The configuration of the operational\r
   The GetSupplicantStatus() function reads the status of the Supplicant PAE state\r
   machine for the Port, including the current state CurrentState  and the configuration\r
   of the operational parameters Configuration. The configuration of the operational\r

-  parameters is optional. If Configuration is NULL, then reading the configuration \r
-  is ignored. The operational parameters in Configuration to be read can also be \r
+  parameters is optional. If Configuration is NULL, then reading the configuration\r
+  is ignored. The operational parameters in Configuration to be read can also be\r

   specified by Configuration.ValidFieldMask.\r
 \r
   If CurrentState is NULL, then EFI_INVALID_PARAMETER is returned.\r
   specified by Configuration.ValidFieldMask.\r
 \r
   If CurrentState is NULL, then EFI_INVALID_PARAMETER is returned.\r


@@ -303,11 +303,11 @@ EFI_STATUS
   @param[in, out] Configuration  Returns the configuration of the operational\r
                                  parameters of the Supplicant PAE state machine\r
                                  for the Port as required. This parameter can be\r
   @param[in, out] Configuration  Returns the configuration of the operational\r
                                  parameters of the Supplicant PAE state machine\r
                                  for the Port as required. This parameter can be\r

-                                 NULL to ignore reading the configuration. \r
-                                 On input, Configuration.ValidFieldMask specifies the \r
+                                 NULL to ignore reading the configuration.\r
+                                 On input, Configuration.ValidFieldMask specifies the\r

                                  operational parameters to be read.\r
                                  On output, Configuration returns the configuration\r
                                  operational parameters to be read.\r
                                  On output, Configuration returns the configuration\r

-                                 of the required operational parameters. \r
+                                 of the required operational parameters.\r

 \r
   @retval EFI_SUCCESS            The configuration of the operational parameter\r
                                  of the Supplicant PAE state machine for the Port\r
 \r
   @retval EFI_SUCCESS            The configuration of the operational parameter\r
                                  of the Supplicant PAE state machine for the Port\r


@@ -318,16 +318,16 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SUPPLICANT_STATUS)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SUPPLICANT_STATUS)(\r

-  IN EFI_EAP_MANAGEMENT_PROTOCOL                  *This, \r
-  OUT EFI_EAPOL_SUPPLICANT_PAE_STATE              *CurrentState, \r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL                  *This,\r
+  OUT EFI_EAPOL_SUPPLICANT_PAE_STATE              *CurrentState,\r

   IN OUT EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION   *Configuration  OPTIONAL\r
   );\r
 \r
 /**\r
   IN OUT EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION   *Configuration  OPTIONAL\r
   );\r
 \r
 /**\r

-  Set the configuration of the operational parameter of the Supplicant PAE \r
+  Set the configuration of the operational parameter of the Supplicant PAE\r

   state machine for the Port.\r
 \r
   state machine for the Port.\r
 \r

-  The SetSupplicantConfiguration() function sets the configuration of the \r
+  The SetSupplicantConfiguration() function sets the configuration of the\r

   operational Parameter of the Supplicant PAE state machine for the Port to\r
   Configuration. The operational parameters in Configuration to be set can be\r
   specified by Configuration.ValidFieldMask.\r
   operational Parameter of the Supplicant PAE state machine for the Port to\r
   Configuration. The operational parameters in Configuration to be set can be\r
   specified by Configuration.ValidFieldMask.\r


@@ -336,7 +336,7 @@ EFI_STATUS
 \r
   @param[in] This                A pointer to the EFI_EAP_MANAGEMENT_PROTOCOL\r
                                  instance that indicates the calling context.\r
 \r
   @param[in] This                A pointer to the EFI_EAP_MANAGEMENT_PROTOCOL\r
                                  instance that indicates the calling context.\r

-  @param[in] Configuration       The desired configuration of the operational \r
+  @param[in] Configuration       The desired configuration of the operational\r

                                  parameters of the Supplicant PAE state machine\r
                                  for the Port as required.\r
 \r
                                  parameters of the Supplicant PAE state machine\r
                                  for the Port as required.\r
 \r


@@ -349,23 +349,23 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_SUPPLICANT_CONFIGURATION)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_SUPPLICANT_CONFIGURATION)(\r

-  IN EFI_EAP_MANAGEMENT_PROTOCOL              *This, \r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL              *This,\r

   IN EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION   *Configuration\r
   );\r
 \r
 /**\r
   Read the statistical information regarding the operation of the Supplicant\r
   IN EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION   *Configuration\r
   );\r
 \r
 /**\r
   Read the statistical information regarding the operation of the Supplicant\r

-  associated with the Port. \r
+  associated with the Port.\r

 \r
 \r

-  The GetSupplicantStatistics() function reads the statistical information \r
+  The GetSupplicantStatistics() function reads the statistical information\r

   Statistics regarding the operation of the Supplicant associated with the Port.\r
   Statistics regarding the operation of the Supplicant associated with the Port.\r

-  \r
+\r

   If Statistics is NULL, then EFI_INVALID_PARAMETER is returned.\r
 \r
   @param[in]  This               A pointer to the EFI_EAP_MANAGEMENT_PROTOCOL\r
                                  instance that indicates the calling context.\r
   If Statistics is NULL, then EFI_INVALID_PARAMETER is returned.\r
 \r
   @param[in]  This               A pointer to the EFI_EAP_MANAGEMENT_PROTOCOL\r
                                  instance that indicates the calling context.\r

-  @param[out] Statistics         Returns the statistical information regarding the \r
-                                 operation of the Supplicant for the Port. \r
+  @param[out] Statistics         Returns the statistical information regarding the\r
+                                 operation of the Supplicant for the Port.\r

 \r
   @retval EFI_SUCCESS            The statistical information regarding the operation\r
                                  of the Supplicant for the Port is read successfully.\r
 \r
   @retval EFI_SUCCESS            The statistical information regarding the operation\r
                                  of the Supplicant for the Port is read successfully.\r


@@ -375,15 +375,15 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SUPPLICANT_STATISTICS)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SUPPLICANT_STATISTICS)(\r

-  IN EFI_EAP_MANAGEMENT_PROTOCOL              *This, \r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL              *This,\r

   OUT EFI_EAPOL_SUPPLICANT_PAE_STATISTICS     *Statistics\r
   );\r
 \r
 ///\r
   OUT EFI_EAPOL_SUPPLICANT_PAE_STATISTICS     *Statistics\r
   );\r
 \r
 ///\r

-/// EFI_EAP_MANAGEMENT_PROTOCOL \r
+/// EFI_EAP_MANAGEMENT_PROTOCOL\r

 /// is used to control, configure and monitor EAPOL state machine on\r
 /// a Port. EAPOL state machine is built on a per-Port basis. Herein,\r
 /// is used to control, configure and monitor EAPOL state machine on\r
 /// a Port. EAPOL state machine is built on a per-Port basis. Herein,\r

-/// a Port means a NIC. For the details of EAPOL, please refer to \r
+/// a Port means a NIC. For the details of EAPOL, please refer to\r

 /// IEEE 802.1x specification.\r
 ///\r
 struct _EFI_EAP_MANAGEMENT_PROTOCOL {\r
 /// IEEE 802.1x specification.\r
 ///\r
 struct _EFI_EAP_MANAGEMENT_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Ebc.h b/MdePkg/Include/Protocol/Ebc.h
index 0fcb82bce85b10aa7f2e77e9aedf4350f7edc2f8..edd5dc4a42dea5ad338db276790f61e8bcef698d 100644 (file)
--- a/MdePkg/Include/Protocol/Ebc.h
+++ b/MdePkg/Include/Protocol/Ebc.h
@@ -1,14 +1,14 @@
 /** @file\r
   Describes the protocol interface to the EBC interpreter.\r
 \r
 /** @file\r
   Describes the protocol interface to the EBC interpreter.\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
+  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


@@ -193,7 +193,7 @@ typedef struct _EFI_EBC_PROTOCOL EFI_EBC_PROTOCOL;
 \r
 /**\r
   Creates a thunk for an EBC entry point, returning the address of the thunk.\r
 \r
 /**\r
   Creates a thunk for an EBC entry point, returning the address of the thunk.\r

-  \r
+\r

   A PE32+ EBC image, like any other PE32+ image, contains an optional header that specifies the\r
   entry point for image execution. However, for EBC images, this is the entry point of EBC\r
   instructions, so is not directly executable by the native processor. Therefore, when an EBC image is\r
   A PE32+ EBC image, like any other PE32+ image, contains an optional header that specifies the\r
   entry point for image execution. However, for EBC images, this is the entry point of EBC\r
   instructions, so is not directly executable by the native processor. Therefore, when an EBC image is\r


@@ -229,7 +229,7 @@ EFI_STATUS
   @param  ImageHandle   Image handle of the EBC image that is being unloaded from memory.\r
 \r
   @retval EFI_SUCCESS            The function completed successfully.\r
   @param  ImageHandle   Image handle of the EBC image that is being unloaded from memory.\r
 \r
   @retval EFI_SUCCESS            The function completed successfully.\r

-  @retval EFI_INVALID_PARAMETER  Image handle is not recognized as belonging \r
+  @retval EFI_INVALID_PARAMETER  Image handle is not recognized as belonging\r

                                  to an EBC image that has been executed.\r
 **/\r
 typedef\r
                                  to an EBC image that has been executed.\r
 **/\r
 typedef\r


@@ -240,7 +240,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This is the prototype for the Flush callback routine. A pointer to a routine \r
+  This is the prototype for the Flush callback routine. A pointer to a routine\r

   of this type is passed to the EBC EFI_EBC_REGISTER_ICACHE_FLUSH protocol service.\r
 \r
   @param  Start  The beginning physical address to flush from the processor's instruction cache.\r
   of this type is passed to the EBC EFI_EBC_REGISTER_ICACHE_FLUSH protocol service.\r
 \r
   @param  Start  The beginning physical address to flush from the processor's instruction cache.\r


@@ -257,7 +257,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Registers a callback function that the EBC interpreter calls to flush \r
+  Registers a callback function that the EBC interpreter calls to flush\r

   the processor instruction cache following creation of thunks.\r
 \r
   @param  This       A pointer to the EFI_EBC_PROTOCOL instance.\r
   the processor instruction cache following creation of thunks.\r
 \r
   @param  This       A pointer to the EFI_EBC_PROTOCOL instance.\r


@@ -279,7 +279,7 @@ EFI_STATUS
   This function is called to get the version of the loaded EBC interpreter. The value and format of the\r
   returned version is identical to that returned by the EBC BREAK 1 instruction.\r
 \r
   This function is called to get the version of the loaded EBC interpreter. The value and format of the\r
   returned version is identical to that returned by the EBC BREAK 1 instruction.\r
 \r

-  @param  This       A pointer to the EFI_EBC_PROTOCOL instance.  \r
+  @param  This       A pointer to the EFI_EBC_PROTOCOL instance.\r

   @param  Version    Pointer to where to store the returned version of the interpreter.\r
 \r
   @retval EFI_SUCCESS            The function completed successfully.\r
   @param  Version    Pointer to where to store the returned version of the interpreter.\r
 \r
   @retval EFI_SUCCESS            The function completed successfully.\r

diff --git a/MdePkg/Include/Protocol/EdidActive.h b/MdePkg/Include/Protocol/EdidActive.h
index 6d776bd9024919218c46613765217d2d7a6b252b..679baffcb9f7092726dfd9ef536691645fb965a4 100644 (file)
--- a/MdePkg/Include/Protocol/EdidActive.h
+++ b/MdePkg/Include/Protocol/EdidActive.h
@@ -3,14 +3,14 @@
 \r
   Placed on the video output device child handle that is actively displaying output.\r
 \r
 \r
   Placed on the video output device child handle that is actively displaying output.\r
 \r

-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  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/MdePkg/Include/Protocol/EdidDiscovered.h b/MdePkg/Include/Protocol/EdidDiscovered.h
index 465aa323a6486286b4324a326a2c64a0c932e30e..9e2695f8a7f6d1c3bbf0e402a77b44cc17bab4f6 100644 (file)
--- a/MdePkg/Include/Protocol/EdidDiscovered.h
+++ b/MdePkg/Include/Protocol/EdidDiscovered.h
@@ -4,14 +4,14 @@
   This protocol is placed on the video output device child handle. It represents\r
   the EDID information being used for the output device represented by the child handle.\r
 \r
   This protocol is placed on the video output device child handle. It represents\r
   the EDID information being used for the output device represented by the child handle.\r
 \r

-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \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


@@ -33,7 +33,7 @@ typedef struct {
   /// minimum of 128 bytes.\r
   ///\r
   UINT32   SizeOfEdid;\r
   /// minimum of 128 bytes.\r
   ///\r
   UINT32   SizeOfEdid;\r

-  \r
+\r

   ///\r
   /// A pointer to a read-only array of bytes that contains the EDID\r
   /// information for an active video output device. This pointer is\r
   ///\r
   /// A pointer to a read-only array of bytes that contains the EDID\r
   /// information for an active video output device. This pointer is\r


@@ -41,7 +41,7 @@ typedef struct {
   /// device. The minimum size of a valid Edid buffer is 128 bytes.\r
   /// EDID information is defined in the E-EDID EEPROM\r
   /// specification published by VESA (www.vesa.org).\r
   /// device. The minimum size of a valid Edid buffer is 128 bytes.\r
   /// EDID information is defined in the E-EDID EEPROM\r
   /// specification published by VESA (www.vesa.org).\r

-  ///  \r
+  ///\r

   UINT8    *Edid;\r
 } EFI_EDID_DISCOVERED_PROTOCOL;\r
 \r
   UINT8    *Edid;\r
 } EFI_EDID_DISCOVERED_PROTOCOL;\r
 \r

diff --git a/MdePkg/Include/Protocol/EdidOverride.h b/MdePkg/Include/Protocol/EdidOverride.h
index 1e9631bc66cabd2c86e0fd3ecf152d97abe72671..818311d5ede7c1daf69636043c012e92e69b581e 100644 (file)
--- a/MdePkg/Include/Protocol/EdidOverride.h
+++ b/MdePkg/Include/Protocol/EdidOverride.h
@@ -4,14 +4,14 @@
   Allow platform to provide EDID information to the producer of the Graphics Output\r
   protocol.\r
 \r
   Allow platform to provide EDID information to the producer of the Graphics Output\r
   protocol.\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
+  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


@@ -55,13 +55,13 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// This protocol is produced by the platform to allow the platform to provide \r
+/// This protocol is produced by the platform to allow the platform to provide\r

 /// EDID information to the producer of the Graphics Output protocol.\r
 ///\r
 struct _EFI_EDID_OVERRIDE_PROTOCOL {\r
   EFI_EDID_OVERRIDE_PROTOCOL_GET_EDID   GetEdid;\r
 };\r
 /// EDID information to the producer of the Graphics Output protocol.\r
 ///\r
 struct _EFI_EDID_OVERRIDE_PROTOCOL {\r
   EFI_EDID_OVERRIDE_PROTOCOL_GET_EDID   GetEdid;\r
 };\r

-                                             \r
+\r

 extern EFI_GUID gEfiEdidOverrideProtocolGuid;\r
 \r
 #endif\r
 extern EFI_GUID gEfiEdidOverrideProtocolGuid;\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Protocol/ExtendedSalBootService.h b/MdePkg/Include/Protocol/ExtendedSalBootService.h
index bebdb7c3ae313f0a7629f6b3dfee1238af68934f..9147b82c33a089faf3766965dbda5e285a713ec7 100644 (file)
--- a/MdePkg/Include/Protocol/ExtendedSalBootService.h
+++ b/MdePkg/Include/Protocol/ExtendedSalBootService.h
@@ -1,18 +1,18 @@
 /** @file\r
   Definition of Extended SAL Boot Service Protocol\r
 \r
 /** @file\r
   Definition of Extended SAL Boot Service Protocol\r
 \r

-  The Extended SAL Boot Service Protocol provides a mechanisms for platform specific \r
+  The Extended SAL Boot Service Protocol provides a mechanisms for platform specific\r

   drivers to update the SAL System Table and register Extended SAL Procedures that are\r
   callable in physical or virtual mode using the SAL calling convention.\r
 \r
   drivers to update the SAL System Table and register Extended SAL Procedures that are\r
   callable in physical or virtual mode using the SAL calling convention.\r
 \r

-  Copyright (c) 2009 - 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) 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
 \r

-  THE PROGRAM 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


@@ -36,7 +36,7 @@ typedef struct _EXTENDED_SAL_BOOT_SERVICE_PROTOCOL EXTENDED_SAL_BOOT_SERVICE_PRO
                                 the major revision and the lower byte contains the minor revision.\r
   @param  OemId                 A pointer to a Null-terminated ASCII string that contains OEM unique string.\r
                                 The string cannot be longer than 32 bytes in total length\r
                                 the major revision and the lower byte contains the minor revision.\r
   @param  OemId                 A pointer to a Null-terminated ASCII string that contains OEM unique string.\r
                                 The string cannot be longer than 32 bytes in total length\r

-  @param  ProductId             A pointer to a Null-terminated ASCII string that uniquely identifies a family of \r
+  @param  ProductId             A pointer to a Null-terminated ASCII string that uniquely identifies a family of\r

                                 compatible products. The string cannot be longer than 32 bytes in total length.\r
 \r
   @retval EFI_SUCCESS           The SAL System Table header was updated successfully.\r
                                 compatible products. The string cannot be longer than 32 bytes in total length.\r
 \r
   @retval EFI_SUCCESS           The SAL System Table header was updated successfully.\r


@@ -63,7 +63,7 @@ EFI_STATUS
   to the SAL System Table.\r
 \r
   @param  This         A pointer to the EXTENDED_SAL_BOOT_SERVICE_PROTOCOL instance.\r
   to the SAL System Table.\r
 \r
   @param  This         A pointer to the EXTENDED_SAL_BOOT_SERVICE_PROTOCOL instance.\r

-  @param  TableEntry   Pointer to a buffer containing a SAL System Table entry that is EntrySize bytes \r
+  @param  TableEntry   Pointer to a buffer containing a SAL System Table entry that is EntrySize bytes\r

                        in length. The first byte of the TableEntry describes the type of entry.\r
   @param  EntrySize    The size, in bytes, of TableEntry.\r
 \r
                        in length. The first byte of the TableEntry describes the type of entry.\r
   @param  EntrySize    The size, in bytes, of TableEntry.\r
 \r


@@ -97,7 +97,7 @@ EFI_STATUS
   @param  Arg8               Eighth argument to the Extended SAL procedure.\r
   @param  VirtualMode        TRUE if the Extended SAL Procedure is being invoked in virtual mode.\r
                              FALSE if the Extended SAL Procedure is being invoked in physical mode.\r
   @param  Arg8               Eighth argument to the Extended SAL procedure.\r
   @param  VirtualMode        TRUE if the Extended SAL Procedure is being invoked in virtual mode.\r
                              FALSE if the Extended SAL Procedure is being invoked in physical mode.\r

-  @param  ModuleGlobal       A pointer to the global context associated with this Extended SAL Procedure. \r
+  @param  ModuleGlobal       A pointer to the global context associated with this Extended SAL Procedure.\r

 \r
   @return The result returned from the specified Extended SAL Procedure\r
 \r
 \r
   @return The result returned from the specified Extended SAL Procedure\r
 \r


@@ -115,7 +115,7 @@ SAL_RETURN_REGS
   IN  UINT64   Arg8,\r
   IN  BOOLEAN  VirtualMode,\r
   IN  VOID     *ModuleGlobal  OPTIONAL\r
   IN  UINT64   Arg8,\r
   IN  BOOLEAN  VirtualMode,\r
   IN  VOID     *ModuleGlobal  OPTIONAL\r

-  ); \r
+  );\r

 \r
 /**\r
   Registers an Extended SAL Procedure.\r
 \r
 /**\r
   Registers an Extended SAL Procedure.\r


@@ -124,16 +124,16 @@ SAL_RETURN_REGS
   ClassGuidHi, and FunctionId is added to the set of available Extended SAL Procedures.\r
 \r
   @param  This                   A pointer to the EXTENDED_SAL_BOOT_SERVICE_PROTOCOL instance.\r
   ClassGuidHi, and FunctionId is added to the set of available Extended SAL Procedures.\r
 \r
   @param  This                   A pointer to the EXTENDED_SAL_BOOT_SERVICE_PROTOCOL instance.\r

-  @param  ClassGuidLo            The lower 64-bits of  the class GUID for the Extended SAL Procedure being added.  \r
+  @param  ClassGuidLo            The lower 64-bits of  the class GUID for the Extended SAL Procedure being added.\r

                                  Each class GUID contains one or more functions specified by a Function ID.\r
                                  Each class GUID contains one or more functions specified by a Function ID.\r

-  @param  ClassGuidHi            The upper 64-bits of  the class GUID for the Extended SAL Procedure being added.  \r
+  @param  ClassGuidHi            The upper 64-bits of  the class GUID for the Extended SAL Procedure being added.\r

                                  Each class GUID contains one or more functions specified by a Function ID.\r
                                  Each class GUID contains one or more functions specified by a Function ID.\r

-  @param  FunctionId             The Function ID for the Extended SAL Procedure that is being added.  This Function \r
-                                 ID is a member of the Extended SAL Procedure class specified by ClassGuidLo \r
+  @param  FunctionId             The Function ID for the Extended SAL Procedure that is being added.  This Function\r
+                                 ID is a member of the Extended SAL Procedure class specified by ClassGuidLo\r

                                  and ClassGuidHi.\r
   @param  InternalSalProc        A pointer to the Extended SAL Procedure being added.\r
   @param  PhysicalModuleGlobal   Pointer to a  module global structure. This is a physical mode pointer.\r
                                  and ClassGuidHi.\r
   @param  InternalSalProc        A pointer to the Extended SAL Procedure being added.\r
   @param  PhysicalModuleGlobal   Pointer to a  module global structure. This is a physical mode pointer.\r

-                                 This pointer is passed to the Extended SAL Procedure specified by ClassGuidLo, \r
+                                 This pointer is passed to the Extended SAL Procedure specified by ClassGuidLo,\r

                                  ClassGuidHi, FunctionId, and InternalSalProc.  If the system is in physical mode,\r
                                  then this pointer is passed unmodified to InternalSalProc.  If the system is in\r
                                  virtual mode, then the virtual address associated with this pointer is passed to\r
                                  ClassGuidHi, FunctionId, and InternalSalProc.  If the system is in physical mode,\r
                                  then this pointer is passed unmodified to InternalSalProc.  If the system is in\r
                                  virtual mode, then the virtual address associated with this pointer is passed to\r


@@ -157,9 +157,9 @@ EFI_STATUS
 /**\r
   Calls a previously registered Extended SAL Procedure.\r
 \r
 /**\r
   Calls a previously registered Extended SAL Procedure.\r
 \r

-  This function calls the Extended SAL Procedure specified by ClassGuidLo, ClassGuidHi, \r
-  and FunctionId.  The set of previously registered Extended SAL Procedures is searched for a \r
-  matching ClassGuidLo, ClassGuidHi, and FunctionId.  If a match is not found, then \r
+  This function calls the Extended SAL Procedure specified by ClassGuidLo, ClassGuidHi,\r
+  and FunctionId.  The set of previously registered Extended SAL Procedures is searched for a\r
+  matching ClassGuidLo, ClassGuidHi, and FunctionId.  If a match is not found, then\r

   EFI_SAL_NOT_IMPLEMENTED is returned.\r
 \r
   @param  ClassGuidLo        The lower 64-bits of the class GUID for the Extended SAL Procedure\r
   EFI_SAL_NOT_IMPLEMENTED is returned.\r
 \r
   @param  ClassGuidLo        The lower 64-bits of the class GUID for the Extended SAL Procedure\r


@@ -175,9 +175,9 @@ EFI_STATUS
   @param  Arg7               Seventh argument to the Extended SAL procedure.\r
   @param  Arg8               Eighth argument to the Extended SAL procedure.\r
 \r
   @param  Arg7               Seventh argument to the Extended SAL procedure.\r
   @param  Arg8               Eighth argument to the Extended SAL procedure.\r
 \r

-  @retval EFI_SAL_NOT_IMPLEMENTED        The Extended SAL Procedure specified by ClassGuidLo, \r
+  @retval EFI_SAL_NOT_IMPLEMENTED        The Extended SAL Procedure specified by ClassGuidLo,\r

                                          ClassGuidHi, and FunctionId has not been registered.\r
                                          ClassGuidHi, and FunctionId has not been registered.\r

-  @retval EFI_SAL_VIRTUAL_ADDRESS_ERROR  This function was called in virtual mode before virtual mappings \r
+  @retval EFI_SAL_VIRTUAL_ADDRESS_ERROR  This function was called in virtual mode before virtual mappings\r

                                          for the specified Extended SAL Procedure are available.\r
   @retval Other                          The result returned from the specified Extended SAL Procedure\r
 \r
                                          for the specified Extended SAL Procedure are available.\r
   @retval Other                          The result returned from the specified Extended SAL Procedure\r
 \r


@@ -198,14 +198,14 @@ SAL_RETURN_REGS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The EXTENDED_SAL_BOOT_SERVICE_PROTOCOL provides a mechanisms for platform specific \r
+/// The EXTENDED_SAL_BOOT_SERVICE_PROTOCOL provides a mechanisms for platform specific\r

 /// drivers to update the SAL System Table and register Extended SAL Procedures that are\r
 /// callable in physical or virtual mode using the SAL calling convention.\r
 ///\r
 struct _EXTENDED_SAL_BOOT_SERVICE_PROTOCOL {\r
   EXTENDED_SAL_ADD_SST_INFO            AddSalSystemTableInfo;\r
   EXTENDED_SAL_ADD_SST_ENTRY           AddSalSystemTableEntry;\r
 /// drivers to update the SAL System Table and register Extended SAL Procedures that are\r
 /// callable in physical or virtual mode using the SAL calling convention.\r
 ///\r
 struct _EXTENDED_SAL_BOOT_SERVICE_PROTOCOL {\r
   EXTENDED_SAL_ADD_SST_INFO            AddSalSystemTableInfo;\r
   EXTENDED_SAL_ADD_SST_ENTRY           AddSalSystemTableEntry;\r

-  EXTENDED_SAL_REGISTER_INTERNAL_PROC  RegisterExtendedSalProc;   \r
+  EXTENDED_SAL_REGISTER_INTERNAL_PROC  RegisterExtendedSalProc;\r

   EXTENDED_SAL_PROC                    ExtendedSalProc;\r
 };\r
 \r
   EXTENDED_SAL_PROC                    ExtendedSalProc;\r
 };\r
 \r

diff --git a/MdePkg/Include/Protocol/ExtendedSalServiceClasses.h b/MdePkg/Include/Protocol/ExtendedSalServiceClasses.h
index aca61b3e5b67018abe8d584ee4865d526920d92a..916859bcbffc8561be6e1ef49db71083713030c8 100644 (file)
--- a/MdePkg/Include/Protocol/ExtendedSalServiceClasses.h
+++ b/MdePkg/Include/Protocol/ExtendedSalServiceClasses.h
@@ -1,14 +1,14 @@
 /** @file\r
   The standard set of Extended SAL service classes.\r
 \r
 /** @file\r
   The standard set of Extended SAL service classes.\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
+  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
 \r

-  THE PROGRAM 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


@@ -51,7 +51,7 @@ typedef enum {
 ///\r
 ///@{\r
 #define EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO 0x4d02efdb7e97a470\r
 ///\r
 ///@{\r
 #define EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO 0x4d02efdb7e97a470\r

-#define EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI 0x96a27bd29061ce8f \r
+#define EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI 0x96a27bd29061ce8f\r

 #define EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID  \\r
   { 0x7e97a470, 0xefdb, 0x4d02, {0x8f, 0xce, 0x61, 0x90, 0xd2, 0x7b, 0xa2, 0x96 } }\r
 \r
 #define EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID  \\r
   { 0x7e97a470, 0xefdb, 0x4d02, {0x8f, 0xce, 0x61, 0x90, 0xd2, 0x7b, 0xa2, 0x96 } }\r
 \r


@@ -71,7 +71,7 @@ typedef enum {
 /// Extended SAL Variable Services Class\r
 ///\r
 ///@{\r
 /// Extended SAL Variable Services Class\r
 ///\r
 ///@{\r

-#define EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO 0x4370c6414ecb6c53 \r
+#define EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO 0x4370c6414ecb6c53\r

 #define EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI 0x78836e490e3bb28c\r
 #define EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID  \\r
   { 0x4ecb6c53, 0xc641, 0x4370, {0x8c, 0xb2, 0x3b, 0x0e, 0x49, 0x6e, 0x83, 0x78 } }\r
 #define EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI 0x78836e490e3bb28c\r
 #define EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID  \\r
   { 0x4ecb6c53, 0xc641, 0x4370, {0x8c, 0xb2, 0x3b, 0x0e, 0x49, 0x6e, 0x83, 0x78 } }\r


@@ -165,7 +165,7 @@ typedef enum {
   CurrentProcInfoFunctionId,\r
   NumProcessorsFunctionId,\r
   SetMinStateFunctionId,\r
   CurrentProcInfoFunctionId,\r
   NumProcessorsFunctionId,\r
   SetMinStateFunctionId,\r

-  GetMinStateFunctionId               \r
+  GetMinStateFunctionId\r

 } EFI_EXTENDED_SAL_MP_SERVICES_FUNC_ID;\r
 ///@}\r
 \r
 } EFI_EXTENDED_SAL_MP_SERVICES_FUNC_ID;\r
 ///@}\r
 \r


@@ -204,7 +204,7 @@ typedef enum {
   EsalMcGetMcParamsFunctionId,\r
   EsalGetMcCheckinFlagsFunctionId,\r
   EsalGetPlatformBaseFreqFunctionId,\r
   EsalMcGetMcParamsFunctionId,\r
   EsalGetMcCheckinFlagsFunctionId,\r
   EsalGetPlatformBaseFreqFunctionId,\r

-  EsalPhysicalIdInfoFunctionId, \r
+  EsalPhysicalIdInfoFunctionId,\r

   EsalRegisterPhysicalAddrFunctionId\r
 } EFI_EXTENDED_SAL_BASE_SERVICES_FUNC_ID;\r
 ///@}\r
   EsalRegisterPhysicalAddrFunctionId\r
 } EFI_EXTENDED_SAL_BASE_SERVICES_FUNC_ID;\r
 ///@}\r

diff --git a/MdePkg/Include/Protocol/FirmwareVolume2.h b/MdePkg/Include/Protocol/FirmwareVolume2.h
index e54364b94248b572e159a27245308ab3f970ef7d..8a01ad5ac9055ce9af83b9682c6257b1c8bba790 100644 (file)
--- a/MdePkg/Include/Protocol/FirmwareVolume2.h
+++ b/MdePkg/Include/Protocol/FirmwareVolume2.h
@@ -1,18 +1,18 @@
 /** @file\r
 /** @file\r

-  The Firmware Volume Protocol provides file-level access to the firmware volume. \r
-  Each firmware volume driver must produce an instance of the \r
+  The Firmware Volume Protocol provides file-level access to the firmware volume.\r
+  Each firmware volume driver must produce an instance of the\r

   Firmware Volume Protocol if the firmware volume is to be visible to\r
   the system during the DXE phase. The Firmware Volume Protocol also provides\r
   mechanisms for determining and modifying some attributes of the firmware volume.\r
 \r
   Firmware Volume Protocol if the firmware volume is to be visible to\r
   the system during the DXE phase. The Firmware Volume Protocol also provides\r
   mechanisms for determining and modifying some attributes of the firmware volume.\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
+  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
   @par Revision Reference: PI\r
   Version 1.00.\r
 \r
   @par Revision Reference: PI\r
   Version 1.00.\r


@@ -98,7 +98,7 @@ typedef UINT64  EFI_FV_ATTRIBUTES;
   undefined.\r
 \r
   @param  This          Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r
   undefined.\r
 \r
   @param  This          Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r

-  \r
+\r

   @param  FvAttributes  Pointer to an EFI_FV_ATTRIBUTES in which\r
                         the attributes and current settings are\r
                         returned.\r
   @param  FvAttributes  Pointer to an EFI_FV_ATTRIBUTES in which\r
                         the attributes and current settings are\r
                         returned.\r


@@ -118,7 +118,7 @@ EFI_STATUS
 \r
 /**\r
   Modifies the current settings of the firmware volume according to the input parameter.\r
 \r
 /**\r
   Modifies the current settings of the firmware volume according to the input parameter.\r

-  \r
+\r

   The SetVolumeAttributes() function is used to set configurable\r
   firmware volume attributes. Only EFI_FV_READ_STATUS,\r
   EFI_FV_WRITE_STATUS, and EFI_FV_LOCK_STATUS may be modified, and\r
   The SetVolumeAttributes() function is used to set configurable\r
   firmware volume attributes. Only EFI_FV_READ_STATUS,\r
   EFI_FV_WRITE_STATUS, and EFI_FV_LOCK_STATUS may be modified, and\r


@@ -136,7 +136,7 @@ EFI_STATUS
   TPL_NOTIFY is undefined.\r
 \r
   @param  This          Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r
   TPL_NOTIFY is undefined.\r
 \r
   @param  This          Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r

-  \r
+\r

   @param  FvAttributes  On input, FvAttributes is a pointer to\r
                         an EFI_FV_ATTRIBUTES containing the\r
                         desired firmware volume settings. On\r
   @param  FvAttributes  On input, FvAttributes is a pointer to\r
                         an EFI_FV_ATTRIBUTES containing the\r
                         desired firmware volume settings. On\r


@@ -145,7 +145,7 @@ EFI_STATUS
                         unsuccessful return, FvAttributes is not\r
                         modified and the firmware volume\r
                         settings are not changed.\r
                         unsuccessful return, FvAttributes is not\r
                         modified and the firmware volume\r
                         settings are not changed.\r

-  \r
+\r

   @retval EFI_SUCCESS           The requested firmware volume attributes\r
                                 were set and the resulting\r
                                 EFI_FV_ATTRIBUTES is returned in\r
   @retval EFI_SUCCESS           The requested firmware volume attributes\r
                                 were set and the resulting\r
                                 EFI_FV_ATTRIBUTES is returned in\r


@@ -254,13 +254,13 @@ EFI_STATUS
   undefined.\r
 \r
   @param  This                  Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r
   undefined.\r
 \r
   @param  This                  Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r

-  \r
+\r

   @param  NameGuid              Pointer to an EFI_GUID, which is the file\r
                                 name. All firmware file names are EFI_GUIDs.\r
                                 A single firmware volume must not have two\r
                                 valid files with the same file name\r
                                 EFI_GUID.\r
   @param  NameGuid              Pointer to an EFI_GUID, which is the file\r
                                 name. All firmware file names are EFI_GUIDs.\r
                                 A single firmware volume must not have two\r
                                 valid files with the same file name\r
                                 EFI_GUID.\r

-  \r
+\r

   @param  Buffer                Pointer to a pointer to a buffer in which the\r
                                 file contents are returned, not including the\r
                                 file header.\r
   @param  Buffer                Pointer to a pointer to a buffer in which the\r
                                 file contents are returned, not including the\r
                                 file header.\r


@@ -268,19 +268,19 @@ EFI_STATUS
   @param  BufferSize            Pointer to a caller-allocated UINTN. It\r
                                 indicates the size of the memory\r
                                 represented by Buffer.\r
   @param  BufferSize            Pointer to a caller-allocated UINTN. It\r
                                 indicates the size of the memory\r
                                 represented by Buffer.\r

-  \r
+\r

   @param  FoundType             Pointer to a caller-allocated EFI_FV_FILETYPE.\r
   @param  FoundType             Pointer to a caller-allocated EFI_FV_FILETYPE.\r

-  \r
+\r

   @param  FileAttributes        Pointer to a  caller-allocated\r
                                 EFI_FV_FILE_ATTRIBUTES.\r
   @param  FileAttributes        Pointer to a  caller-allocated\r
                                 EFI_FV_FILE_ATTRIBUTES.\r

-  \r
+\r

   @param  AuthenticationStatus  Pointer to a caller-allocated\r
                                 UINT32 in which the\r
                                 authentication status is\r
                                 returned.\r
   @param  AuthenticationStatus  Pointer to a caller-allocated\r
                                 UINT32 in which the\r
                                 authentication status is\r
                                 returned.\r

-  \r
+\r

   @retval EFI_SUCCESS                 The call completed successfully.\r
   @retval EFI_SUCCESS                 The call completed successfully.\r

-  \r
+\r

   @retval EFI_WARN_BUFFER_TOO_SMALL   The buffer is too small to\r
                                       contain the requested\r
                                       output. The buffer is\r
   @retval EFI_WARN_BUFFER_TOO_SMALL   The buffer is too small to\r
                                       contain the requested\r
                                       output. The buffer is\r


@@ -342,56 +342,56 @@ EFI_STATUS
   undefined.\r
 \r
   @param  This                Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r
   undefined.\r
 \r
   @param  This                Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r

- \r
+\r

   @param NameGuid             Pointer to an EFI_GUID, which indicates the\r
                               file name from which the requested section\r
                               will be read.\r
   @param NameGuid             Pointer to an EFI_GUID, which indicates the\r
                               file name from which the requested section\r
                               will be read.\r

-  \r
+\r

   @param SectionType          Indicates the section type to return.\r
                               SectionType in conjunction with\r
                               SectionInstance indicates which section to\r
                               return.\r
   @param SectionType          Indicates the section type to return.\r
                               SectionType in conjunction with\r
                               SectionInstance indicates which section to\r
                               return.\r

-  \r
+\r

   @param SectionInstance      Indicates which instance of sections\r
                               with a type of SectionType to return.\r
                               SectionType in conjunction with\r
                               SectionInstance indicates which\r
                               section to return. SectionInstance is\r
                               zero based.\r
   @param SectionInstance      Indicates which instance of sections\r
                               with a type of SectionType to return.\r
                               SectionType in conjunction with\r
                               SectionInstance indicates which\r
                               section to return. SectionInstance is\r
                               zero based.\r

-  \r
+\r

   @param Buffer               Pointer to a pointer to a buffer in which the\r
                               section contents are returned, not including\r
                               the section header.\r
   @param Buffer               Pointer to a pointer to a buffer in which the\r
                               section contents are returned, not including\r
                               the section header.\r

-  \r
+\r

   @param BufferSize           Pointer to a caller-allocated UINTN. It\r
                               indicates the size of the memory\r
                               represented by Buffer.\r
   @param BufferSize           Pointer to a caller-allocated UINTN. It\r
                               indicates the size of the memory\r
                               represented by Buffer.\r

-  \r
+\r

   @param AuthenticationStatus Pointer to a caller-allocated\r
                               UINT32 in which the authentication\r
                               status is returned.\r
   @param AuthenticationStatus Pointer to a caller-allocated\r
                               UINT32 in which the authentication\r
                               status is returned.\r

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

   @retval EFI_SUCCESS   The call completed successfully.\r
   @retval EFI_SUCCESS   The call completed successfully.\r

-  \r
+\r

   @retval EFI_WARN_BUFFER_TOO_SMALL   The caller-allocated\r
                                       buffer is too small to\r
                                       contain the requested\r
                                       output. The buffer is\r
                                       filled and the output is\r
                                       truncated.\r
   @retval EFI_WARN_BUFFER_TOO_SMALL   The caller-allocated\r
                                       buffer is too small to\r
                                       contain the requested\r
                                       output. The buffer is\r
                                       filled and the output is\r
                                       truncated.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES  An allocation failure occurred.\r
   @retval EFI_OUT_OF_RESOURCES  An allocation failure occurred.\r

-  \r
+\r

   @retval EFI_NOT_FOUND   The requested file was not found in\r
                           the firmware volume. EFI_NOT_FOUND The\r
                           requested section was not found in the\r
                           specified file.\r
   @retval EFI_NOT_FOUND   The requested file was not found in\r
                           the firmware volume. EFI_NOT_FOUND The\r
                           requested section was not found in the\r
                           specified file.\r

-  \r
+\r

   @retval EFI_DEVICE_ERROR  A hardware error occurred when\r
                             attempting to access the firmware\r
                             volume.\r
   @retval EFI_DEVICE_ERROR  A hardware error occurred when\r
                             attempting to access the firmware\r
                             volume.\r

-  \r
+\r

   @retval EFI_ACCESS_DENIED The firmware volume is configured to\r
                             disallow reads. EFI_PROTOCOL_ERROR\r
                             The requested section was not found,\r
   @retval EFI_ACCESS_DENIED The firmware volume is configured to\r
                             disallow reads. EFI_PROTOCOL_ERROR\r
                             The requested section was not found,\r


@@ -472,7 +472,7 @@ typedef struct {
   Architectural Elements 84 August 21, 2006 Version 1.0\r
   WriteFile() is callable only from TPL_NOTIFY and below.\r
   Behavior of WriteFile() at any EFI_TPL above TPL_NOTIFY is\r
   Architectural Elements 84 August 21, 2006 Version 1.0\r
   WriteFile() is callable only from TPL_NOTIFY and below.\r
   Behavior of WriteFile() at any EFI_TPL above TPL_NOTIFY is\r

-  undefined. \r
+  undefined.\r

 \r
   @param This           Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r
 \r
 \r
   @param This           Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r
 \r


@@ -482,31 +482,31 @@ typedef struct {
                         write in the event of a power failure or\r
                         other system failure during the write\r
                         operation.\r
                         write in the event of a power failure or\r
                         other system failure during the write\r
                         operation.\r

- \r
+\r

   @param FileData       Pointer to an array of\r
                         EFI_FV_WRITE_FILE_DATA. Each element of\r
                         FileData[] represents a file to be written.\r
 \r
 \r
   @retval EFI_SUCCESS             The write completed successfully.\r
   @param FileData       Pointer to an array of\r
                         EFI_FV_WRITE_FILE_DATA. Each element of\r
                         FileData[] represents a file to be written.\r
 \r
 \r
   @retval EFI_SUCCESS             The write completed successfully.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES    The firmware volume does not\r
                                   have enough free space to\r
                                   storefile(s).\r
   @retval EFI_OUT_OF_RESOURCES    The firmware volume does not\r
                                   have enough free space to\r
                                   storefile(s).\r

-  \r
+\r

   @retval EFI_DEVICE_ERROR        A hardware error occurred when\r
                                   attempting to access the firmware volume.\r
   @retval EFI_DEVICE_ERROR        A hardware error occurred when\r
                                   attempting to access the firmware volume.\r

-  \r
+\r

   @retval EFI_WRITE_PROTECTED     The firmware volume is\r
                                   configured to disallow writes.\r
   @retval EFI_WRITE_PROTECTED     The firmware volume is\r
                                   configured to disallow writes.\r

-  \r
+\r

   @retval EFI_NOT_FOUND           A delete was requested, but the\r
                                   requested file was not found in the\r
                                   firmware volume.\r
   @retval EFI_NOT_FOUND           A delete was requested, but the\r
                                   requested file was not found in the\r
                                   firmware volume.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   A delete was requested with a\r
                                   multiple file write.\r
   @retval EFI_INVALID_PARAMETER   A delete was requested with a\r
                                   multiple file write.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   An unsupported WritePolicy was\r
                                   requested.\r
 \r
   @retval EFI_INVALID_PARAMETER   An unsupported WritePolicy was\r
                                   requested.\r
 \r


@@ -515,10 +515,10 @@ typedef struct {
 \r
   @retval EFI_INVALID_PARAMETER   A file system specific error\r
                                   has occurred.\r
 \r
   @retval EFI_INVALID_PARAMETER   A file system specific error\r
                                   has occurred.\r

-  \r
+\r

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

-EFI_STATUS \r
+EFI_STATUS\r

 (EFIAPI * EFI_FV_WRITE_FILE)(\r
   IN CONST  EFI_FIRMWARE_VOLUME2_PROTOCOL *This,\r
   IN        UINT32                        NumberOfFiles,\r
 (EFIAPI * EFI_FV_WRITE_FILE)(\r
   IN CONST  EFI_FIRMWARE_VOLUME2_PROTOCOL *This,\r
   IN        UINT32                        NumberOfFiles,\r


@@ -528,7 +528,7 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Retrieves information about the next file in the firmware volume store \r
+  Retrieves information about the next file in the firmware volume store\r

   that matches the search criteria.\r
 \r
   GetNextFile() is the interface that is used to search a firmware\r
   that matches the search criteria.\r
 \r
   GetNextFile() is the interface that is used to search a firmware\r


@@ -547,7 +547,7 @@ EFI_STATUS
   implementation specific and no semantic content is implied.\r
   GetNextFile() is callable only from TPL_NOTIFY and below.\r
   Behavior of GetNextFile() at any EFI_TPL above TPL_NOTIFY is\r
   implementation specific and no semantic content is implied.\r
   GetNextFile() is callable only from TPL_NOTIFY and below.\r
   Behavior of GetNextFile() at any EFI_TPL above TPL_NOTIFY is\r

-  undefined. \r
+  undefined.\r

 \r
   @param This       Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r
 \r
 \r
   @param This       Indicates the EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r
 \r


@@ -600,7 +600,7 @@ EFI_STATUS
   @retval EFI_ACCESS_DENIED The firmware volume is configured to\r
                             disallow reads.\r
 \r
   @retval EFI_ACCESS_DENIED The firmware volume is configured to\r
                             disallow reads.\r
 \r

-   \r
+\r

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


@@ -629,29 +629,29 @@ EFI_STATUS
   @param This             A pointer to the EFI_FIRMWARE_VOLUME2_PROTOCOL\r
                           instance that is the file handle the requested\r
                           information is for.\r
   @param This             A pointer to the EFI_FIRMWARE_VOLUME2_PROTOCOL\r
                           instance that is the file handle the requested\r
                           information is for.\r

-  \r
+\r

   @param InformationType  The type identifier for the\r
                           information being requested.\r
   @param InformationType  The type identifier for the\r
                           information being requested.\r

-  \r
+\r

   @param BufferSize       On input, the size of Buffer. On output,\r
                           the amount of data returned in Buffer. In\r
                           both cases, the size is measured in bytes.\r
   @param BufferSize       On input, the size of Buffer. On output,\r
                           the amount of data returned in Buffer. In\r
                           both cases, the size is measured in bytes.\r

-  \r
+\r

   @param Buffer           A pointer to the data buffer to return. The\r
                           buffer's type is indicated by InformationType.\r
   @param Buffer           A pointer to the data buffer to return. The\r
                           buffer's type is indicated by InformationType.\r

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

   @retval EFI_SUCCESS           The information was retrieved.\r
   @retval EFI_SUCCESS           The information was retrieved.\r

-  \r
+\r

   @retval EFI_UNSUPPORTED       The InformationType is not known.\r
   @retval EFI_UNSUPPORTED       The InformationType is not known.\r

-  \r
+\r

   @retval EFI_NO_MEDIA          The device has no medium.\r
   @retval EFI_NO_MEDIA          The device has no medium.\r

-  \r
+\r

   @retval EFI_DEVICE_ERROR      The device reported an error.\r
   @retval EFI_DEVICE_ERROR      The device reported an error.\r

-  \r
+\r

   @retval EFI_VOLUME_CORRUPTED  The file system structures are\r
                                 corrupted.\r
   @retval EFI_VOLUME_CORRUPTED  The file system structures are\r
                                 corrupted.\r

-  \r
+\r

   @retval EFI_BUFFER_TOO_SMALL  The BufferSize is too small to\r
                                 read the current directory\r
                                 entry. BufferSize has been\r
   @retval EFI_BUFFER_TOO_SMALL  The BufferSize is too small to\r
                                 read the current directory\r
                                 entry. BufferSize has been\r


@@ -740,14 +740,14 @@ struct _EFI_FIRMWARE_VOLUME2_PROTOCOL {
   EFI_FV_READ_SECTION     ReadSection;\r
   EFI_FV_WRITE_FILE       WriteFile;\r
   EFI_FV_GET_NEXT_FILE    GetNextFile;\r
   EFI_FV_READ_SECTION     ReadSection;\r
   EFI_FV_WRITE_FILE       WriteFile;\r
   EFI_FV_GET_NEXT_FILE    GetNextFile;\r

-  \r
+\r

   ///\r
   /// Data field that indicates the size in bytes\r
   /// of the Key input buffer for the\r
   ///\r
   /// Data field that indicates the size in bytes\r
   /// of the Key input buffer for the\r

-  /// GetNextFile() API.  \r
+  /// GetNextFile() API.\r

   ///\r
   UINT32                  KeySize;\r
   ///\r
   UINT32                  KeySize;\r

-  \r
+\r

   ///\r
   /// Handle of the parent firmware volume.\r
   ///\r
   ///\r
   /// Handle of the parent firmware volume.\r
   ///\r

diff --git a/MdePkg/Include/Protocol/FirmwareVolumeBlock.h b/MdePkg/Include/Protocol/FirmwareVolumeBlock.h
index bb32d103413c369f24b10d0dacc3dd0cfb29c248..f24bac6cff8269fd005b0f5990e7b2fd0b63ba95 100644 (file)
--- a/MdePkg/Include/Protocol/FirmwareVolumeBlock.h
+++ b/MdePkg/Include/Protocol/FirmwareVolumeBlock.h
@@ -1,14 +1,14 @@
 /** @file\r
   This file provides control over block-oriented firmware devices.\r
 \r
 /** @file\r
   This file provides control over block-oriented firmware devices.\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
-    \r
-THE PROGRAM 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
   @par Revision Reference: PI\r
   Version 1.0 and 1.2.\r
 \r
   @par Revision Reference: PI\r
   Version 1.0 and 1.2.\r


@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL is defined in PI 1.0 spec and its GUID value\r
 // is later updated to be the same as that of EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL\r
 //\r
 // EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL is defined in PI 1.0 spec and its GUID value\r
 // is later updated to be the same as that of EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL\r

-// defined in PI 1.2 spec. \r
+// defined in PI 1.2 spec.\r

 //\r
 #define EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL_GUID \\r
   { 0x8f644fa9, 0xe850, 0x4db1, {0x9c, 0xe2, 0xb, 0x44, 0x69, 0x8e, 0x8d, 0xa4 } }\r
 //\r
 #define EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL_GUID \\r
   { 0x8f644fa9, 0xe850, 0x4db1, {0x9c, 0xe2, 0xb, 0x44, 0x69, 0x8e, 0x8d, 0xa4 } }\r


@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 typedef struct _EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL;\r
 \r
 \r
 typedef struct _EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL;\r
 \r

-typedef EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL;    \r
+typedef EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL;\r

 \r
 /**\r
   The GetAttributes() function retrieves the attributes and\r
 \r
 /**\r
   The GetAttributes() function retrieves the attributes and\r


@@ -69,7 +69,7 @@ EFI_STATUS
                       settings of the firmware volume. Type\r
                       EFI_FVB_ATTRIBUTES_2 is defined in\r
                       EFI_FIRMWARE_VOLUME_HEADER.\r
                       settings of the firmware volume. Type\r
                       EFI_FVB_ATTRIBUTES_2 is defined in\r
                       EFI_FIRMWARE_VOLUME_HEADER.\r

-  \r
+\r

   @retval EFI_SUCCESS           The firmware volume attributes were returned.\r
 \r
   @retval EFI_INVALID_PARAMETER The attributes requested are in\r
   @retval EFI_SUCCESS           The firmware volume attributes were returned.\r
 \r
   @retval EFI_INVALID_PARAMETER The attributes requested are in\r


@@ -92,14 +92,14 @@ EFI_STATUS
   only for memory-mapped firmware volumes.\r
 \r
   @param This     Indicates the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL instance.\r
   only for memory-mapped firmware volumes.\r
 \r
   @param This     Indicates the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL instance.\r

-  \r
+\r

   @param Address  Pointer to a caller-allocated\r
                   EFI_PHYSICAL_ADDRESS that, on successful\r
                   return from GetPhysicalAddress(), contains the\r
                   base address of the firmware volume.\r
   @param Address  Pointer to a caller-allocated\r
                   EFI_PHYSICAL_ADDRESS that, on successful\r
                   return from GetPhysicalAddress(), contains the\r
                   base address of the firmware volume.\r

-  \r
+\r

   @retval EFI_SUCCESS       The firmware volume base address was returned.\r
   @retval EFI_SUCCESS       The firmware volume base address was returned.\r

-  \r
+\r

   @retval EFI_UNSUPPORTED   The firmware volume is not memory mapped.\r
 \r
 **/\r
   @retval EFI_UNSUPPORTED   The firmware volume is not memory mapped.\r
 \r
 **/\r


@@ -130,9 +130,9 @@ EFI_STATUS
                         blocks in this range have a size of\r
                         BlockSize.\r
 \r
                         blocks in this range have a size of\r
                         BlockSize.\r
 \r

-  \r
+\r

   @retval EFI_SUCCESS             The firmware volume base address was returned.\r
   @retval EFI_SUCCESS             The firmware volume base address was returned.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   The requested LBA is out of range.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER   The requested LBA is out of range.\r
 \r
 **/\r


@@ -163,7 +163,7 @@ EFI_STATUS
   aware that a read may be partially completed.\r
 \r
   @param This     Indicates the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL instance.\r
   aware that a read may be partially completed.\r
 \r
   @param This     Indicates the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL instance.\r

-  \r
+\r

   @param Lba      The starting logical block index\r
                   from which to read.\r
 \r
   @param Lba      The starting logical block index\r
                   from which to read.\r
 \r


@@ -179,15 +179,15 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS         The firmware volume was read successfully,\r
                               and contents are in Buffer.\r
 \r
   @retval EFI_SUCCESS         The firmware volume was read successfully,\r
                               and contents are in Buffer.\r

-  \r
+\r

   @retval EFI_BAD_BUFFER_SIZE Read attempted across an LBA\r
                               boundary. On output, NumBytes\r
                               contains the total number of bytes\r
                               returned in Buffer.\r
   @retval EFI_BAD_BUFFER_SIZE Read attempted across an LBA\r
                               boundary. On output, NumBytes\r
                               contains the total number of bytes\r
                               returned in Buffer.\r

-  \r
+\r

   @retval EFI_ACCESS_DENIED   The firmware volume is in the\r
                               ReadDisabled state.\r
   @retval EFI_ACCESS_DENIED   The firmware volume is in the\r
                               ReadDisabled state.\r

-  \r
+\r

   @retval EFI_DEVICE_ERROR    The block device is not\r
                               functioning correctly and could\r
                               not be read.\r
   @retval EFI_DEVICE_ERROR    The block device is not\r
                               functioning correctly and could\r
                               not be read.\r


@@ -215,7 +215,7 @@ EFI_STATUS
   unpredictability arises because, for a sticky-write firmware\r
   volume, a write may negate a bit in the EFI_FVB_ERASE_POLARITY\r
   state but cannot flip it back again.  Before calling the\r
   unpredictability arises because, for a sticky-write firmware\r
   volume, a write may negate a bit in the EFI_FVB_ERASE_POLARITY\r
   state but cannot flip it back again.  Before calling the\r

-  Write() function,  it is recommended for the caller to first call \r
+  Write() function,  it is recommended for the caller to first call\r

   the EraseBlocks() function to erase the specified block to\r
   write. A block erase cycle will transition bits from the\r
   (NOT)EFI_FVB_ERASE_POLARITY state back to the\r
   the EraseBlocks() function to erase the specified block to\r
   write. A block erase cycle will transition bits from the\r
   (NOT)EFI_FVB_ERASE_POLARITY state back to the\r


@@ -234,29 +234,29 @@ EFI_STATUS
   returns.\r
 \r
   @param This     Indicates the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL instance.\r
   returns.\r
 \r
   @param This     Indicates the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL instance.\r

-  \r
+\r

   @param Lba      The starting logical block index to write to.\r
   @param Lba      The starting logical block index to write to.\r

-  \r
+\r

   @param Offset   Offset into the block at which to begin writing.\r
   @param Offset   Offset into the block at which to begin writing.\r

-  \r
+\r

   @param NumBytes The pointer to a UINTN. At entry, *NumBytes\r
                   contains the total size of the buffer. At\r
                   exit, *NumBytes contains the total number of\r
                   bytes actually written.\r
   @param NumBytes The pointer to a UINTN. At entry, *NumBytes\r
                   contains the total size of the buffer. At\r
                   exit, *NumBytes contains the total number of\r
                   bytes actually written.\r

-  \r
+\r

   @param Buffer   The pointer to a caller-allocated buffer that\r
                   contains the source for the write.\r
   @param Buffer   The pointer to a caller-allocated buffer that\r
                   contains the source for the write.\r

-  \r
+\r

   @retval EFI_SUCCESS         The firmware volume was written successfully.\r
   @retval EFI_SUCCESS         The firmware volume was written successfully.\r

-  \r
+\r

   @retval EFI_BAD_BUFFER_SIZE The write was attempted across an\r
                               LBA boundary. On output, NumBytes\r
                               contains the total number of bytes\r
                               actually written.\r
   @retval EFI_BAD_BUFFER_SIZE The write was attempted across an\r
                               LBA boundary. On output, NumBytes\r
                               contains the total number of bytes\r
                               actually written.\r

-  \r
+\r

   @retval EFI_ACCESS_DENIED   The firmware volume is in the\r
                               WriteDisabled state.\r
   @retval EFI_ACCESS_DENIED   The firmware volume is in the\r
                               WriteDisabled state.\r

-  \r
+\r

   @retval EFI_DEVICE_ERROR    The block device is malfunctioning\r
                               and could not be written.\r
 \r
   @retval EFI_DEVICE_ERROR    The block device is malfunctioning\r
                               and could not be written.\r
 \r


@@ -317,7 +317,7 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS The erase request successfully\r
                       completed.\r
 \r
   @retval EFI_SUCCESS The erase request successfully\r
                       completed.\r

-  \r
+\r

   @retval EFI_ACCESS_DENIED   The firmware volume is in the\r
                               WriteDisabled state.\r
   @retval EFI_DEVICE_ERROR  The block device is not functioning\r
   @retval EFI_ACCESS_DENIED   The firmware volume is in the\r
                               WriteDisabled state.\r
   @retval EFI_DEVICE_ERROR  The block device is not functioning\r


@@ -326,7 +326,7 @@ EFI_STATUS
                             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
 typedef\r
 \r
 **/\r
 typedef\r


@@ -355,7 +355,7 @@ struct _EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL{
   EFI_FVB_ERASE_BLOCKS          EraseBlocks;\r
   ///\r
   /// The handle of the parent firmware volume.\r
   EFI_FVB_ERASE_BLOCKS          EraseBlocks;\r
   ///\r
   /// The handle of the parent firmware volume.\r

-  ///  \r
+  ///\r

   EFI_HANDLE                    ParentHandle;\r
 };\r
 \r
   EFI_HANDLE                    ParentHandle;\r
 };\r
 \r

diff --git a/MdePkg/Include/Protocol/FormBrowser2.h b/MdePkg/Include/Protocol/FormBrowser2.h
index 867b1e0ed0ac18f231f2cc726294d38c76af4582..13e29d0ccbea2a476513581c442b974a1a904c18 100644 (file)
--- a/MdePkg/Include/Protocol/FormBrowser2.h
+++ b/MdePkg/Include/Protocol/FormBrowser2.h
@@ -1,17 +1,17 @@
 /** @file\r
   This protocol is defined in UEFI spec.\r
 /** @file\r
   This protocol is defined in UEFI spec.\r

-  \r
-  The EFI_FORM_BROWSER2_PROTOCOL is the interface to call for drivers to \r
+\r
+  The EFI_FORM_BROWSER2_PROTOCOL is the interface to call for drivers to\r

   leverage the EFI configuration driver interface.\r
   leverage the EFI configuration driver interface.\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
+\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
-    \r
-THE PROGRAM 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


@@ -29,11 +29,11 @@ typedef struct _EFI_FORM_BROWSER2_PROTOCOL   EFI_FORM_BROWSER2_PROTOCOL;
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-   \r
+\r

   @param LeftColumn   The value that designates the text column\r
                       where the browser window will begin from\r
                       the left-hand side of the screen\r
   @param LeftColumn   The value that designates the text column\r
                       where the browser window will begin from\r
                       the left-hand side of the screen\r

-                      \r
+\r

   @param RightColumn  The value that designates the text\r
                       column where the browser window will end\r
                       on the right-hand side of the screen.\r
   @param RightColumn  The value that designates the text\r
                       column where the browser window will end\r
                       on the right-hand side of the screen.\r


@@ -44,7 +44,7 @@ typedef struct _EFI_FORM_BROWSER2_PROTOCOL   EFI_FORM_BROWSER2_PROTOCOL;
 \r
   @param BottomRow    The value that designates the text row from the\r
                       bottom of the screen where the browser\r
 \r
   @param BottomRow    The value that designates the text row from the\r
                       bottom of the screen where the browser\r

-                      window will end. \r
+                      window will end.\r

 **/\r
 typedef struct {\r
   UINTN   LeftColumn;\r
 **/\r
 typedef struct {\r
   UINTN   LeftColumn;\r


@@ -69,14 +69,14 @@ typedef UINTN EFI_BROWSER_ACTION_REQUEST;
 /**\r
   Initialize the browser to display the specified configuration forms.\r
 \r
 /**\r
   Initialize the browser to display the specified configuration forms.\r
 \r

-  This function is the primary interface to the internal forms-based browser. \r
-  The forms browser will display forms associated with the specified Handles. \r
-  The browser will select all forms in packages which have the specified Type \r
+  This function is the primary interface to the internal forms-based browser.\r
+  The forms browser will display forms associated with the specified Handles.\r
+  The browser will select all forms in packages which have the specified Type\r

   and (for EFI_HII_PACKAGE_TYPE_GUID) the specified PackageGuid.\r
 \r
   @param This            A pointer to the EFI_FORM_BROWSER2_PROTOCOL instance\r
 \r
   and (for EFI_HII_PACKAGE_TYPE_GUID) the specified PackageGuid.\r
 \r
   @param This            A pointer to the EFI_FORM_BROWSER2_PROTOCOL instance\r
 \r

-  @param Handles         A pointer to an array of Handles. This value should correspond \r
+  @param Handles         A pointer to an array of Handles. This value should correspond\r

                          to the value of the HII form package that is required to be displayed.\r
 \r
   @param HandleCount     The number of Handles specified in Handle.\r
                          to the value of the HII form package that is required to be displayed.\r
 \r
   @param HandleCount     The number of Handles specified in Handle.\r


@@ -90,17 +90,17 @@ typedef UINTN EFI_BROWSER_ACTION_REQUEST;
                          displayable page. If this field has a value of 0x0000, then the Forms Browser will\r
                          render the first enabled form in the form set.\r
 \r
                          displayable page. If this field has a value of 0x0000, then the Forms Browser will\r
                          render the first enabled form in the form set.\r
 \r

-  @param ScreenDimensions Points to recommended form dimensions, including any non-content area, in \r
+  @param ScreenDimensions Points to recommended form dimensions, including any non-content area, in\r

                           characters.\r
 \r
   @param ActionRequest   Points to the action recommended by the form.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully\r
                           characters.\r
 \r
   @param ActionRequest   Points to the action recommended by the form.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully\r

-  \r
+\r

   @retval EFI_NOT_FOUND         The variable was not found.\r
   @retval EFI_NOT_FOUND         The variable was not found.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER One of the parameters has an\r
   @retval EFI_INVALID_PARAMETER One of the parameters has an\r

-                                invalid value.  \r
+                                invalid value.\r

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


@@ -126,7 +126,7 @@ EFI_STATUS
 \r
   @param ResultsDataSize  A pointer to the size of the buffer\r
                           associated with ResultsData. On input, the size in\r
 \r
   @param ResultsDataSize  A pointer to the size of the buffer\r
                           associated with ResultsData. On input, the size in\r

-                          bytes of ResultsData. On output, the size of data \r
+                          bytes of ResultsData. On output, the size of data\r

                           returned in ResultsData.\r
 \r
   @param ResultsData    A string returned from an IFR browser or\r
                           returned in ResultsData.\r
 \r
   @param ResultsData    A string returned from an IFR browser or\r


@@ -148,7 +148,7 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS           The results have been distributed or are\r
                                 awaiting distribution.\r
 \r
   @retval EFI_SUCCESS           The results have been distributed or are\r
                                 awaiting distribution.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES  The ResultsDataSize specified\r
                                 was too small to contain the\r
                                 results data.\r
   @retval EFI_OUT_OF_RESOURCES  The ResultsDataSize specified\r
                                 was too small to contain the\r
                                 results data.\r


@@ -166,7 +166,7 @@ EFI_STATUS
 );\r
 \r
 ///\r
 );\r
 \r
 ///\r

-/// This interface will allow the caller to direct the configuration \r
+/// This interface will allow the caller to direct the configuration\r

 /// driver to use either the HII database or use the passed-in packet of data.\r
 ///\r
 struct _EFI_FORM_BROWSER2_PROTOCOL {\r
 /// driver to use either the HII database or use the passed-in packet of data.\r
 ///\r
 struct _EFI_FORM_BROWSER2_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Ftp4.h b/MdePkg/Include/Protocol/Ftp4.h
index 536b3f36352598f07cb3b0288873c3e58a6ee663..860353de2cbb65a5f0e2c2f917806fceaf254b17 100644 (file)
--- a/MdePkg/Include/Protocol/Ftp4.h
+++ b/MdePkg/Include/Protocol/Ftp4.h
@@ -1,13 +1,13 @@
 /** @file\r
   EFI FTPv4 (File Transfer Protocol version 4) Protocol Definition\r
 /** @file\r
   EFI FTPv4 (File Transfer Protocol version 4) Protocol Definition\r

-  The EFI FTPv4 Protocol is used to locate communication devices that are \r
+  The EFI FTPv4 Protocol is used to locate communication devices that are\r

   supported by an EFI FTPv4 Protocol driver and to create and destroy instances\r
   of the EFI FTPv4 Protocol child protocol driver that can use the underlying\r
   communication device.\r
   The definitions in this file are defined in UEFI Specification 2.3, which have\r
   not been verified by one implementation yet.\r
 \r
   supported by an EFI FTPv4 Protocol driver and to create and destroy instances\r
   of the EFI FTPv4 Protocol child protocol driver that can use the underlying\r
   communication device.\r
   The definitions in this file are defined in UEFI Specification 2.3, which have\r
   not been verified by one implementation yet.\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


@@ -16,7 +16,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

-  @par Revision Reference:          \r
+  @par Revision Reference:\r

   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r
   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r


@@ -41,103 +41,103 @@ typedef struct _EFI_FTP4_PROTOCOL EFI_FTP4_PROTOCOL;
 /// EFI_FTP4_CONNECTION_TOKEN\r
 ///\r
 typedef struct {\r
 /// EFI_FTP4_CONNECTION_TOKEN\r
 ///\r
 typedef struct {\r

-  /// \r
-  /// The Event to signal after the connection is established and Status field is updated \r
-  /// by the EFI FTP v4 Protocol driver. The type of Event must be \r
-  /// EVENT_NOTIFY_SIGNAL, and its Task Priority Level (TPL) must be lower than or \r
-  /// equal to TPL_CALLBACK. If it is set to NULL, this function will not return  until the \r
+  ///\r
+  /// The Event to signal after the connection is established and Status field is updated\r
+  /// by the EFI FTP v4 Protocol driver. The type of Event must be\r
+  /// EVENT_NOTIFY_SIGNAL, and its Task Priority Level (TPL) must be lower than or\r
+  /// equal to TPL_CALLBACK. If it is set to NULL, this function will not return  until the\r

   /// function completes.\r
   /// function completes.\r

-  /// \r
-  EFI_EVENT                            Event; \r
+  ///\r
+  EFI_EVENT                            Event;\r

   ///\r
   /// The variable to receive the result of the completed operation.\r
   /// EFI_SUCCESS:              The FTP connection is established successfully\r
   ///\r
   /// The variable to receive the result of the completed operation.\r
   /// EFI_SUCCESS:              The FTP connection is established successfully\r

-  /// EFI_ACCESS_DENIED:        The FTP server denied the access the user's request to access it. \r
-  /// EFI_CONNECTION_RESET:     The connect fails because the connection is reset either by instance \r
+  /// EFI_ACCESS_DENIED:        The FTP server denied the access the user's request to access it.\r
+  /// EFI_CONNECTION_RESET:     The connect fails because the connection is reset either by instance\r

   ///                           itself or communication peer.\r
   ///                           itself or communication peer.\r

-  /// EFI_TIMEOUT:              The connection establishment timer expired and no more specific \r
+  /// EFI_TIMEOUT:              The connection establishment timer expired and no more specific\r

   ///                           information is available.\r
   ///                           information is available.\r

-  /// EFI_NETWORK_UNREACHABLE:  The active open fails because an ICMP network unreachable error is \r
-  ///                           received. \r
-  /// EFI_HOST_UNREACHABLE:     The active open fails because an ICMP host unreachable error is \r
-  ///                           received. \r
-  /// EFI_PROTOCOL_UNREACHABLE: The active open fails because an ICMP protocol unreachable error is \r
+  /// EFI_NETWORK_UNREACHABLE:  The active open fails because an ICMP network unreachable error is\r
+  ///                           received.\r
+  /// EFI_HOST_UNREACHABLE:     The active open fails because an ICMP host unreachable error is\r
+  ///                           received.\r
+  /// EFI_PROTOCOL_UNREACHABLE: The active open fails because an ICMP protocol unreachable error is\r

   ///                           received.\r
   ///                           received.\r

-  /// EFI_PORT_UNREACHABLE:     The connection establishment timer times out and an ICMP port \r
+  /// EFI_PORT_UNREACHABLE:     The connection establishment timer times out and an ICMP port\r

   ///                           unreachable error is received.\r
   ///                           unreachable error is received.\r

-  /// EFI_ICMP_ERROR:           The connection establishment timer timeout and some other ICMP \r
+  /// EFI_ICMP_ERROR:           The connection establishment timer timeout and some other ICMP\r

   ///                           error is received.\r
   /// EFI_DEVICE_ERROR:         An unexpected system or network error occurred.\r
   ///                           error is received.\r
   /// EFI_DEVICE_ERROR:         An unexpected system or network error occurred.\r

-  /// \r
+  ///\r

   EFI_STATUS                           Status;\r
 } EFI_FTP4_CONNECTION_TOKEN;\r
 \r
 ///\r
   EFI_STATUS                           Status;\r
 } EFI_FTP4_CONNECTION_TOKEN;\r
 \r
 ///\r

-/// EFI_FTP4_CONFIG_DATA \r
+/// EFI_FTP4_CONFIG_DATA\r

 ///\r
 typedef struct {\r
 ///\r
 typedef struct {\r

-  /// \r
-  /// Pointer to a ASCII string that contains user name. The caller is \r
+  ///\r
+  /// Pointer to a ASCII string that contains user name. The caller is\r

   /// responsible for freeing Username after GetModeData() is called.\r
   /// responsible for freeing Username after GetModeData() is called.\r

-  /// \r
+  ///\r

   UINT8                                *Username;\r
   UINT8                                *Username;\r

-  /// \r
-  /// Pointer to a ASCII string that contains password. The caller is \r
+  ///\r
+  /// Pointer to a ASCII string that contains password. The caller is\r

   /// responsible for freeing Password after GetModeData() is called.\r
   /// responsible for freeing Password after GetModeData() is called.\r

-  /// \r
+  ///\r

   UINT8                                *Password;\r
   UINT8                                *Password;\r

-  /// \r
-  /// Set it to TRUE to initiate an active data connection. Set it to \r
+  ///\r
+  /// Set it to TRUE to initiate an active data connection. Set it to\r

   /// FALSE to initiate a passive data connection.\r
   /// FALSE to initiate a passive data connection.\r

-  /// \r
+  ///\r

   BOOLEAN                              Active;\r
   BOOLEAN                              Active;\r

-  /// \r
+  ///\r

   /// Boolean value indicating if default network settting used.\r
   /// Boolean value indicating if default network settting used.\r

-  /// \r
+  ///\r

   BOOLEAN                              UseDefaultSetting;\r
   BOOLEAN                              UseDefaultSetting;\r

-  /// \r
+  ///\r

   /// IP address of station if UseDefaultSetting is FALSE.\r
   /// IP address of station if UseDefaultSetting is FALSE.\r

-  /// \r
+  ///\r

   EFI_IPv4_ADDRESS                     StationIp;\r
   EFI_IPv4_ADDRESS                     StationIp;\r

-  /// \r
+  ///\r

   /// Subnet mask of station if UseDefaultSetting is FALSE.\r
   /// Subnet mask of station if UseDefaultSetting is FALSE.\r

-  /// \r
+  ///\r

   EFI_IPv4_ADDRESS                     SubnetMask;\r
   EFI_IPv4_ADDRESS                     SubnetMask;\r

-  /// \r
+  ///\r

   /// IP address of gateway if UseDefaultSetting is FALSE.\r
   /// IP address of gateway if UseDefaultSetting is FALSE.\r

-  /// \r
+  ///\r

   EFI_IPv4_ADDRESS                     GatewayIp;\r
   EFI_IPv4_ADDRESS                     GatewayIp;\r

-  /// \r
+  ///\r

   /// IP address of FTPv4 server.\r
   /// IP address of FTPv4 server.\r

-  /// \r
+  ///\r

   EFI_IPv4_ADDRESS                     ServerIp;\r
   EFI_IPv4_ADDRESS                     ServerIp;\r

-  /// \r
-  /// FTPv4 server port number of control connection, and the default \r
+  ///\r
+  /// FTPv4 server port number of control connection, and the default\r

   /// value is 21 as convention.\r
   /// value is 21 as convention.\r

-  /// \r
+  ///\r

   UINT16                               ServerPort;\r
   UINT16                               ServerPort;\r

-  /// \r
-  /// FTPv4 server port number of data connection. If it is zero, use \r
-  /// (ServerPort - 1) by convention. \r
-  /// \r
+  ///\r
+  /// FTPv4 server port number of data connection. If it is zero, use\r
+  /// (ServerPort - 1) by convention.\r
+  ///\r

   UINT16                               AltDataPort;\r
   UINT16                               AltDataPort;\r

-  /// \r
-  /// A byte indicate the representation type. The right 4 bit is used for \r
+  ///\r
+  /// A byte indicate the representation type. The right 4 bit is used for\r

   /// first parameter, the left 4 bit is use for second parameter\r
   /// - For the first parameter, 0x0 = image, 0x1 = EBCDIC, 0x2 = ASCII, 0x3 = local\r
   /// first parameter, the left 4 bit is use for second parameter\r
   /// - For the first parameter, 0x0 = image, 0x1 = EBCDIC, 0x2 = ASCII, 0x3 = local\r

-  /// - For the second parameter, 0x0 = Non-print, 0x1 = Telnet format effectors, 0x2 = \r
+  /// - For the second parameter, 0x0 = Non-print, 0x1 = Telnet format effectors, 0x2 =\r

   ///   Carriage Control.\r
   /// - If it is a local type, the second parameter is the local byte byte size.\r
   /// - If it is a image type, the second parameter is undefined.\r
   ///   Carriage Control.\r
   /// - If it is a local type, the second parameter is the local byte byte size.\r
   /// - If it is a image type, the second parameter is undefined.\r

-  /// \r
+  ///\r

   UINT8                                RepType;\r
   UINT8                                RepType;\r

-  /// \r
+  ///\r

   /// Defines the file structure in FTP used. 0x00 = file, 0x01 = record, 0x02 = page.\r
   /// Defines the file structure in FTP used. 0x00 = file, 0x01 = record, 0x02 = page.\r

-  /// \r
+  ///\r

   UINT8                                FileStruct;\r
   UINT8                                FileStruct;\r

-  /// \r
+  ///\r

   /// Defines the transifer mode used in FTP. 0x00 = stream, 0x01 = Block, 0x02 = Compressed.\r
   /// Defines the transifer mode used in FTP. 0x00 = stream, 0x01 = Block, 0x02 = Compressed.\r

-  /// \r
+  ///\r

   UINT8                                TransMode;\r
 } EFI_FTP4_CONFIG_DATA;\r
 \r
   UINT8                                TransMode;\r
 } EFI_FTP4_CONFIG_DATA;\r
 \r


@@ -149,9 +149,9 @@ typedef struct _EFI_FTP4_COMMAND_TOKEN EFI_FTP4_COMMAND_TOKEN;
   If it is receiving function that leads to inbound data, the callback function\r
   is called when data buffer is full. Then, old data in the data buffer should be\r
   flushed and new data is stored from the beginning of data buffer.\r
   If it is receiving function that leads to inbound data, the callback function\r
   is called when data buffer is full. Then, old data in the data buffer should be\r
   flushed and new data is stored from the beginning of data buffer.\r

-  If it is a transmit function that lead to outbound data and the size of \r
-  Data in daata buffer has been transmitted, this callback function is called to \r
-  supply additional data to be transmitted. \r
+  If it is a transmit function that lead to outbound data and the size of\r
+  Data in daata buffer has been transmitted, this callback function is called to\r
+  supply additional data to be transmitted.\r

 \r
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r
   @param[in] Token               Pointer to the token structure to provide the parameters that\r
 \r
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r
   @param[in] Token               Pointer to the token structure to provide the parameters that\r


@@ -160,8 +160,8 @@ typedef struct _EFI_FTP4_COMMAND_TOKEN EFI_FTP4_COMMAND_TOKEN;
 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r

-EFI_STATUS \r
-(EFIAPI *EFI_FTP4_DATA_CALLBACK)( \r
+EFI_STATUS\r
+(EFIAPI *EFI_FTP4_DATA_CALLBACK)(\r

   IN EFI_FTP4_PROTOCOL           *This,\r
   IN EFI_FTP4_COMMAND_TOKEN      *Token\r
   );\r
   IN EFI_FTP4_PROTOCOL           *This,\r
   IN EFI_FTP4_COMMAND_TOKEN      *Token\r
   );\r


@@ -170,57 +170,57 @@ EFI_STATUS
 /// EFI_FTP4_COMMAND_TOKEN\r
 ///\r
 struct _EFI_FTP4_COMMAND_TOKEN {\r
 /// EFI_FTP4_COMMAND_TOKEN\r
 ///\r
 struct _EFI_FTP4_COMMAND_TOKEN {\r

-  /// \r
-  /// The Event to signal after request is finished and Status field \r
-  /// is updated by the EFI FTP v4 Protocol driver. The type of Event \r
-  /// must be EVT_NOTIFY_SIGNAL, and its Task Priority Level \r
-  /// (TPL) must be lower than or equal to TPL_CALLBACK. If it is \r
-  /// set to NULL, related function must wait until the function \r
+  ///\r
+  /// The Event to signal after request is finished and Status field\r
+  /// is updated by the EFI FTP v4 Protocol driver. The type of Event\r
+  /// must be EVT_NOTIFY_SIGNAL, and its Task Priority Level\r
+  /// (TPL) must be lower than or equal to TPL_CALLBACK. If it is\r
+  /// set to NULL, related function must wait until the function\r

   /// completes.\r
   /// completes.\r

-  /// \r
-  EFI_EVENT                             Event; \r
-  /// \r
-  /// Pointer to a null-terminated ASCII name string. \r
-  /// \r
+  ///\r
+  EFI_EVENT                             Event;\r
+  ///\r
+  /// Pointer to a null-terminated ASCII name string.\r
+  ///\r

   UINT8                                 *Pathname;\r
   UINT8                                 *Pathname;\r

-  /// \r
+  ///\r

   /// The size of data buffer in bytes.\r
   /// The size of data buffer in bytes.\r

-  /// \r
-  UINT64                                DataBufferSize;        \r
-  /// \r
-  /// Pointer to the data buffer. Data downloaded from FTP server \r
+  ///\r
+  UINT64                                DataBufferSize;\r
+  ///\r
+  /// Pointer to the data buffer. Data downloaded from FTP server\r

   /// through connection is downloaded here.\r
   /// through connection is downloaded here.\r

-  /// \r
+  ///\r

   VOID                                  *DataBuffer;\r
   VOID                                  *DataBuffer;\r

-  /// \r
-  /// Pointer to a callback function. If it is receiving function that leads \r
-  /// to inbound data, the callback function is called when databuffer is \r
-  /// full. Then, old data in the data buffer should be flushed and new \r
-  /// data is stored from the beginning of data buffer. If it is a transmit \r
-  /// function that lead to outbound data and DataBufferSize of \r
-  /// Data in DataBuffer has been transmitted, this callback \r
-  /// function is called to supply additional data to be transmitted. The \r
-  /// size of additional data to be transmitted is indicated in \r
-  /// DataBufferSize, again. If there is no data remained, \r
+  ///\r
+  /// Pointer to a callback function. If it is receiving function that leads\r
+  /// to inbound data, the callback function is called when databuffer is\r
+  /// full. Then, old data in the data buffer should be flushed and new\r
+  /// data is stored from the beginning of data buffer. If it is a transmit\r
+  /// function that lead to outbound data and DataBufferSize of\r
+  /// Data in DataBuffer has been transmitted, this callback\r
+  /// function is called to supply additional data to be transmitted. The\r
+  /// size of additional data to be transmitted is indicated in\r
+  /// DataBufferSize, again. If there is no data remained,\r

   /// DataBufferSize should be set to 0.\r
   /// DataBufferSize should be set to 0.\r

-  /// \r
+  ///\r

   EFI_FTP4_DATA_CALLBACK                DataCallback;\r
   EFI_FTP4_DATA_CALLBACK                DataCallback;\r

-  /// \r
+  ///\r

   /// Pointer to the parameter for DataCallback.\r
   /// Pointer to the parameter for DataCallback.\r

-  /// \r
+  ///\r

   VOID                                  *Context;\r
   VOID                                  *Context;\r

-  /// \r
+  ///\r

   /// The variable to receive the result of the completed operation.\r
   /// EFI_SUCCESS:              The FTP command is completed successfully.\r
   /// EFI_ACCESS_DENIED:        The FTP server denied the access to the requested file.\r
   /// EFI_CONNECTION_RESET:     The connect fails because the connection is reset either\r
   ///                           by instance itself or communication peer.\r
   /// The variable to receive the result of the completed operation.\r
   /// EFI_SUCCESS:              The FTP command is completed successfully.\r
   /// EFI_ACCESS_DENIED:        The FTP server denied the access to the requested file.\r
   /// EFI_CONNECTION_RESET:     The connect fails because the connection is reset either\r
   ///                           by instance itself or communication peer.\r

-  /// EFI_TIMEOUT:              The connection establishment timer expired and no more \r
+  /// EFI_TIMEOUT:              The connection establishment timer expired and no more\r

   ///                           specific information is available.\r
   /// EFI_NETWORK_UNREACHABLE:  The active open fails because an ICMP network unreachable\r
   ///                           specific information is available.\r
   /// EFI_NETWORK_UNREACHABLE:  The active open fails because an ICMP network unreachable\r

-  ///                           error is received. \r
+  ///                           error is received.\r

   /// EFI_HOST_UNREACHABLE:     The active open fails because an ICMP host unreachable\r
   /// EFI_HOST_UNREACHABLE:     The active open fails because an ICMP host unreachable\r

-  ///                           error is received. \r
+  ///                           error is received.\r

   /// EFI_PROTOCOL_UNREACHABLE: The active open fails because an ICMP protocol unreachable\r
   ///                           error is received.\r
   /// EFI_PORT_UNREACHABLE:     The connection establishment timer times out and an ICMP port\r
   /// EFI_PROTOCOL_UNREACHABLE: The active open fails because an ICMP protocol unreachable\r
   ///                           error is received.\r
   /// EFI_PORT_UNREACHABLE:     The connection establishment timer times out and an ICMP port\r


@@ -236,14 +236,14 @@ struct _EFI_FTP4_COMMAND_TOKEN {
   Gets the current operational settings.\r
 \r
   The GetModeData() function reads the current operational settings of this\r
   Gets the current operational settings.\r
 \r
   The GetModeData() function reads the current operational settings of this\r

-  EFI FTPv4 Protocol driver instance. EFI_FTP4_CONFIG_DATA  is defined in the \r
+  EFI FTPv4 Protocol driver instance. EFI_FTP4_CONFIG_DATA  is defined in the\r

   EFI_FTP4_PROTOCOL.Configure.\r
 \r
   @param[in]  This               Pointer to the EFI_FTP4_PROTOCOL instance.\r
   EFI_FTP4_PROTOCOL.Configure.\r
 \r
   @param[in]  This               Pointer to the EFI_FTP4_PROTOCOL instance.\r

-  @param[out] ModeData           Pointer to storage for the EFI FTPv4 Protocol driver \r
+  @param[out] ModeData           Pointer to storage for the EFI FTPv4 Protocol driver\r

                                  mode data. The string buffers for Username and Password\r
                                  in EFI_FTP4_CONFIG_DATA are allocated by the function,\r
                                  mode data. The string buffers for Username and Password\r
                                  in EFI_FTP4_CONFIG_DATA are allocated by the function,\r

-                                 and the caller should take the responsibility to free the \r
+                                 and the caller should take the responsibility to free the\r

                                  buffer later.\r
 \r
   @retval EFI_SUCCESS            This function is called successfully.\r
                                  buffer later.\r
 \r
   @retval EFI_SUCCESS            This function is called successfully.\r


@@ -255,8 +255,8 @@ struct _EFI_FTP4_COMMAND_TOKEN {
   @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.\r
 \r
 **/\r

-typedef \r
-EFI_STATUS \r
+typedef\r
+EFI_STATUS\r

 (EFIAPI *EFI_FTP4_GET_MODE_DATA)(\r
   IN EFI_FTP4_PROTOCOL        *This,\r
   OUT EFI_FTP4_CONFIG_DATA    *ModeData\r
 (EFIAPI *EFI_FTP4_GET_MODE_DATA)(\r
   IN EFI_FTP4_PROTOCOL        *This,\r
   OUT EFI_FTP4_CONFIG_DATA    *ModeData\r


@@ -266,7 +266,7 @@ EFI_STATUS
   Disconnecting a FTP connection gracefully.\r
 \r
   The Connect() function will initiate a connection request to the remote FTP server\r
   Disconnecting a FTP connection gracefully.\r
 \r
   The Connect() function will initiate a connection request to the remote FTP server\r

-  with the corresponding connection token. If this function returns EFI_SUCCESS, the \r
+  with the corresponding connection token. If this function returns EFI_SUCCESS, the\r

   connection sequence is initiated successfully.  If the connection succeeds or faild\r
   due to any error, the Token->Event will be signaled and Token->Status will be updated\r
   accordingly.\r
   connection sequence is initiated successfully.  If the connection succeeds or faild\r
   due to any error, the Token->Event will be signaled and Token->Status will be updated\r
   accordingly.\r


@@ -280,7 +280,7 @@ EFI_STATUS
                                  - Token is NULL.\r
                                  - Token->Event is NULL.\r
   @retval EFI_NOT_STARTED        The EFI FTPv4 Protocol driver has not been started.\r
                                  - Token is NULL.\r
                                  - Token->Event is NULL.\r
   @retval EFI_NOT_STARTED        The EFI FTPv4 Protocol driver has not been started.\r

-  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP, \r
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP,\r

                                  RARP, etc.) is not finished yet.\r
   @retval EFI_OUT_OF_RESOURCES   Could not allocate enough resource to finish the operation.\r
   @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.\r
                                  RARP, etc.) is not finished yet.\r
   @retval EFI_OUT_OF_RESOURCES   Could not allocate enough resource to finish the operation.\r
   @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.\r


@@ -297,7 +297,7 @@ EFI_STATUS
   Disconnecting a FTP connection gracefully.\r
 \r
   The Close() function will initiate a close request to the remote FTP server with the\r
   Disconnecting a FTP connection gracefully.\r
 \r
   The Close() function will initiate a close request to the remote FTP server with the\r

-  corresponding connection token. If this function returns EFI_SUCCESS, the control \r
+  corresponding connection token. If this function returns EFI_SUCCESS, the control\r

   connection with the remote FTP server is closed.\r
 \r
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r
   connection with the remote FTP server is closed.\r
 \r
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r


@@ -309,7 +309,7 @@ EFI_STATUS
                                  - Token is NULL.\r
                                  - Token->Event is NULL.\r
   @retval EFI_NOT_STARTED        The EFI FTPv4 Protocol driver has not been started.\r
                                  - Token is NULL.\r
                                  - Token->Event is NULL.\r
   @retval EFI_NOT_STARTED        The EFI FTPv4 Protocol driver has not been started.\r

-  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP, \r
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP,\r

                                  RARP, etc.) is not finished yet.\r
   @retval EFI_OUT_OF_RESOURCES   Could not allocate enough resource to finish the operation.\r
   @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.\r
                                  RARP, etc.) is not finished yet.\r
   @retval EFI_OUT_OF_RESOURCES   Could not allocate enough resource to finish the operation.\r
   @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.\r


@@ -325,14 +325,14 @@ EFI_STATUS
 /**\r
   Sets or clears the operational parameters for the FTP child driver.\r
 \r
 /**\r
   Sets or clears the operational parameters for the FTP child driver.\r
 \r

-  The Configure() function will configure the connected FTP session with the \r
+  The Configure() function will configure the connected FTP session with the\r

   configuration setting specified in  FtpConfigData. The configuration data can\r
   be reset by calling Configure() with FtpConfigData set to NULL.\r
 \r
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r
   configuration setting specified in  FtpConfigData. The configuration data can\r
   be reset by calling Configure() with FtpConfigData set to NULL.\r
 \r
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r

-  @param[in] FtpConfigData       Pointer to configuration data that will be assigned to \r
+  @param[in] FtpConfigData       Pointer to configuration data that will be assigned to\r

                                  the FTP child driver instance. If NULL, the FTP child\r
                                  the FTP child driver instance. If NULL, the FTP child\r

-                                 driver instance is reset to startup defaults and all \r
+                                 driver instance is reset to startup defaults and all\r

                                  pending transmit and receive requests are flushed.\r
 \r
   @retval EFI_SUCCESS            The FTPv4 driver was configured successfully.\r
                                  pending transmit and receive requests are flushed.\r
 \r
   @retval EFI_SUCCESS            The FTPv4 driver was configured successfully.\r


@@ -342,13 +342,13 @@ EFI_STATUS
                                  - FtpConfigData.FileStruct is invalid.\r
                                  - FtpConfigData.TransMode is invalid.\r
                                  - IP address in FtpConfigData is invalid.\r
                                  - FtpConfigData.FileStruct is invalid.\r
                                  - FtpConfigData.TransMode is invalid.\r
                                  - IP address in FtpConfigData is invalid.\r

-  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP, \r
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP,\r

                                  RARP, etc.) is not finished yet.\r
   @retval EFI_UNSUPPORTED        One or more of the configuration parameters are not supported\r
                                  RARP, etc.) is not finished yet.\r
   @retval EFI_UNSUPPORTED        One or more of the configuration parameters are not supported\r

-                                 by this implementation. \r
-  @retval EFI_OUT_OF_RESOURCES   The EFI FTPv4 Protocol driver instance data could not be \r
+                                 by this implementation.\r
+  @retval EFI_OUT_OF_RESOURCES   The EFI FTPv4 Protocol driver instance data could not be\r

                                  allocated.\r
                                  allocated.\r

-  @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred. The EFI FTPv4 \r
+  @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred. The EFI FTPv4\r

                                  Protocol driver instance is not configured.\r
 \r
 **/\r
                                  Protocol driver instance is not configured.\r
 \r
 **/\r


@@ -361,15 +361,15 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Downloads a file from an FTPv4 server. \r
+  Downloads a file from an FTPv4 server.\r

 \r
   The ReadFile() function is used to initialize and start an FTPv4 download process\r
   and optionally wait for completion. When the download operation completes, whether\r
 \r
   The ReadFile() function is used to initialize and start an FTPv4 download process\r
   and optionally wait for completion. When the download operation completes, whether\r

-  successfully or not, the Token.Status field is updated by the EFI FTPv4 Protocol \r
+  successfully or not, the Token.Status field is updated by the EFI FTPv4 Protocol\r

   driver and then Token.Event is signaled (if it is not NULL).\r
 \r
   Data will be downloaded from the FTPv4 server into Token.DataBuffer. If the file size\r
   driver and then Token.Event is signaled (if it is not NULL).\r
 \r
   Data will be downloaded from the FTPv4 server into Token.DataBuffer. If the file size\r

-  is larger than Token.DataBufferSize, Token.DataCallback will be called to allow for \r
+  is larger than Token.DataBufferSize, Token.DataCallback will be called to allow for\r

   processing data and then new data will be placed at the beginning of Token.DataBuffer.\r
 \r
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r
   processing data and then new data will be placed at the beginning of Token.DataBuffer.\r
 \r
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r


@@ -384,29 +384,29 @@ EFI_STATUS
                                  - Token. DataBuffer is NULL.\r
                                  - Token. DataBufferSize is 0.\r
   @retval EFI_NOT_STARTED        The EFI FTPv4 Protocol driver has not been started.\r
                                  - Token. DataBuffer is NULL.\r
                                  - Token. DataBufferSize is 0.\r
   @retval EFI_NOT_STARTED        The EFI FTPv4 Protocol driver has not been started.\r

-  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP, \r
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP,\r

                                  RARP, etc.) is not finished yet.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR       An unexpected network error or system error occurred.\r
 \r
 **/\r
                                  RARP, etc.) is not finished yet.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR       An unexpected network error or system error occurred.\r
 \r
 **/\r

-typedef \r
-EFI_STATUS \r
+typedef\r
+EFI_STATUS\r

 (EFIAPI *EFI_FTP4_READ_FILE)(\r
   IN EFI_FTP4_PROTOCOL         *This,\r
   IN EFI_FTP4_COMMAND_TOKEN    *Token\r
   );\r
 \r
 /**\r
 (EFIAPI *EFI_FTP4_READ_FILE)(\r
   IN EFI_FTP4_PROTOCOL         *This,\r
   IN EFI_FTP4_COMMAND_TOKEN    *Token\r
   );\r
 \r
 /**\r

-  Uploads a file from an FTPv4 server. \r
+  Uploads a file from an FTPv4 server.\r

 \r
   The WriteFile() function is used to initialize and start an FTPv4 upload process and\r
   optionally wait for completion. When the upload operation completes, whether successfully\r
   or not, the Token.Status field is updated by the EFI FTPv4 Protocol driver and then\r
   Token.Event is signaled (if it is not NULL). Data to be  uploaded to server is stored\r
 \r
   The WriteFile() function is used to initialize and start an FTPv4 upload process and\r
   optionally wait for completion. When the upload operation completes, whether successfully\r
   or not, the Token.Status field is updated by the EFI FTPv4 Protocol driver and then\r
   Token.Event is signaled (if it is not NULL). Data to be  uploaded to server is stored\r

-  into Token.DataBuffer. Token.DataBufferSize is the number bytes to be transferred. \r
+  into Token.DataBuffer. Token.DataBufferSize is the number bytes to be transferred.\r

   If the file size is larger than Token.DataBufferSize, Token.DataCallback will be called\r
   If the file size is larger than Token.DataBufferSize, Token.DataCallback will be called\r

-  to allow for processing data and then new data will be placed at the beginning of \r
+  to allow for processing data and then new data will be placed at the beginning of\r

   Token.DataBuffer. Token.DataBufferSize is updated to reflect the actual number of bytes\r
   to be transferred. Token.DataBufferSize is set to 0 by the call back to indicate the\r
   completion of data transfer.\r
   Token.DataBuffer. Token.DataBufferSize is updated to reflect the actual number of bytes\r
   to be transferred. Token.DataBufferSize is set to 0 by the call back to indicate the\r
   completion of data transfer.\r


@@ -424,30 +424,30 @@ EFI_STATUS
                                  - Token. DataBuffer is NULL.\r
                                  - Token. DataBufferSize is 0.\r
   @retval EFI_NOT_STARTED        The EFI FTPv4 Protocol driver has not been started.\r
                                  - Token. DataBuffer is NULL.\r
                                  - Token. DataBufferSize is 0.\r
   @retval EFI_NOT_STARTED        The EFI FTPv4 Protocol driver has not been started.\r

-  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP, \r
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP,\r

                                  RARP, etc.) is not finished yet.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR       An unexpected network error or system error occurred.\r
 \r
 **/\r
                                  RARP, etc.) is not finished yet.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR       An unexpected network error or system error occurred.\r
 \r
 **/\r

-typedef \r
-EFI_STATUS \r
+typedef\r
+EFI_STATUS\r

 (EFIAPI *EFI_FTP4_WRITE_FILE)(\r
   IN EFI_FTP4_PROTOCOL         *This,\r
   IN EFI_FTP4_COMMAND_TOKEN    *Token\r
   );\r
 \r
 /**\r
 (EFIAPI *EFI_FTP4_WRITE_FILE)(\r
   IN EFI_FTP4_PROTOCOL         *This,\r
   IN EFI_FTP4_COMMAND_TOKEN    *Token\r
   );\r
 \r
 /**\r

-  Download a data file "directory" from a FTPv4 server. May be unsupported in some EFI \r
+  Download a data file "directory" from a FTPv4 server. May be unsupported in some EFI\r

   implementations.\r
 \r
   The ReadDirectory() function is used to return a list of files on the FTPv4 server that\r
   logically (or operationally) related to Token.Pathname, and optionally wait for completion.\r
   implementations.\r
 \r
   The ReadDirectory() function is used to return a list of files on the FTPv4 server that\r
   logically (or operationally) related to Token.Pathname, and optionally wait for completion.\r

-  When the download operation completes, whether successfully or not, the Token.Status field \r
+  When the download operation completes, whether successfully or not, the Token.Status field\r

   is updated by the EFI FTPv4 Protocol driver and then Token.Event is signaled (if it is not\r
   NULL). Data will be downloaded from the FTPv4 server into Token.DataBuffer. If the file size\r
   is larger than Token.DataBufferSize, Token.DataCallback will be called to allow for processing\r
   is updated by the EFI FTPv4 Protocol driver and then Token.Event is signaled (if it is not\r
   NULL). Data will be downloaded from the FTPv4 server into Token.DataBuffer. If the file size\r
   is larger than Token.DataBufferSize, Token.DataCallback will be called to allow for processing\r

-  data and then new data will be placed at the beginning of Token.DataBuffer. \r
+  data and then new data will be placed at the beginning of Token.DataBuffer.\r

 \r
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r
   @param[in] Token               Pointer to the token structure to provide the parameters that\r
 \r
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r
   @param[in] Token               Pointer to the token structure to provide the parameters that\r


@@ -461,7 +461,7 @@ EFI_STATUS
                                  - Token. DataBuffer is NULL.\r
                                  - Token. DataBufferSize is 0.\r
   @retval EFI_NOT_STARTED        The EFI FTPv4 Protocol driver has not been started.\r
                                  - Token. DataBuffer is NULL.\r
                                  - Token. DataBufferSize is 0.\r
   @retval EFI_NOT_STARTED        The EFI FTPv4 Protocol driver has not been started.\r

-  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP, \r
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, BOOTP,\r

                                  RARP, etc.) is not finished yet.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR       An unexpected network error or system error occurred.\r
                                  RARP, etc.) is not finished yet.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR       An unexpected network error or system error occurred.\r


@@ -475,15 +475,15 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Polls for incoming data packets and processes outgoing data packets. \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 the\r
   rate that data packets are moved between the communications device and the transmit\r
   and receive queues. In some systems, the periodic timer event in the managed network\r
 \r
   The Poll() function can be used by network drivers and applications to increase the\r
   rate that data packets are moved between the communications device and the transmit\r
   and receive queues. In some systems, the periodic timer event in the managed network\r

-  driver may not poll the underlying communications device fast enough to transmit \r
+  driver may not poll the underlying communications device fast enough to transmit\r

   and/or receive all data packets without missing incoming packets or dropping outgoing\r
   packets. Drivers and applications that are experiencing packet loss should try calling\r
   and/or receive all data packets without missing incoming packets or dropping outgoing\r
   packets. 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
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r
 \r
 \r
   @param[in] This                Pointer to the EFI_FTP4_PROTOCOL instance.\r
 \r


@@ -502,8 +502,8 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// EFI_FTP4_PROTOCOL \r
-/// provides basic services for client-side FTP (File Transfer Protocol) \r
+/// EFI_FTP4_PROTOCOL\r
+/// provides basic services for client-side FTP (File Transfer Protocol)\r

 /// operations.\r
 ///\r
 struct _EFI_FTP4_PROTOCOL {\r
 /// operations.\r
 ///\r
 struct _EFI_FTP4_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/GraphicsOutput.h b/MdePkg/Include/Protocol/GraphicsOutput.h
index 741007c15b2436d77f4bdad165d00d3210d1e1d2..7375d79638f35bc53669427c9141344a170f8c67 100644 (file)
--- a/MdePkg/Include/Protocol/GraphicsOutput.h
+++ b/MdePkg/Include/Protocol/GraphicsOutput.h
@@ -3,14 +3,14 @@
 \r
   Abstraction of a very simple graphics device.\r
 \r
 \r
   Abstraction of a very simple graphics device.\r
 \r

-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \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


@@ -33,18 +33,18 @@ typedef struct {
 \r
 typedef enum {\r
   ///\r
 \r
 typedef enum {\r
   ///\r

-  /// A pixel is 32-bits and byte zero represents red, byte one represents green, \r
-  /// byte two represents blue, and byte three is reserved. This is the definition \r
-  /// for the physical frame buffer. The byte values for the red, green, and blue \r
-  /// components represent the color intensity. This color intensity value range \r
+  /// A pixel is 32-bits and byte zero represents red, byte one represents green,\r
+  /// byte two represents blue, and byte three is reserved. This is the definition\r
+  /// for the physical frame buffer. The byte values for the red, green, and blue\r
+  /// components represent the color intensity. This color intensity value range\r

   /// from a minimum intensity of 0 to maximum intensity of 255.\r
   ///\r
   PixelRedGreenBlueReserved8BitPerColor,\r
   ///\r
   /// from a minimum intensity of 0 to maximum intensity of 255.\r
   ///\r
   PixelRedGreenBlueReserved8BitPerColor,\r
   ///\r

-  /// A pixel is 32-bits and byte zero represents blue, byte one represents green, \r
-  /// byte two represents red, and byte three is reserved. This is the definition \r
-  /// for the physical frame buffer. The byte values for the red, green, and blue \r
-  /// components represent the color intensity. This color intensity value range \r
+  /// A pixel is 32-bits and byte zero represents blue, byte one represents green,\r
+  /// byte two represents red, and byte three is reserved. This is the definition\r
+  /// for the physical frame buffer. The byte values for the red, green, and blue\r
+  /// components represent the color intensity. This color intensity value range\r

   /// from a minimum intensity of 0 to maximum intensity of 255.\r
   ///\r
   PixelBlueGreenRedReserved8BitPerColor,\r
   /// from a minimum intensity of 0 to maximum intensity of 255.\r
   ///\r
   PixelBlueGreenRedReserved8BitPerColor,\r


@@ -64,7 +64,7 @@ typedef enum {
 \r
 typedef struct {\r
   ///\r
 \r
 typedef struct {\r
   ///\r

-  /// The version of this data structure. A value of zero represents the \r
+  /// The version of this data structure. A value of zero represents the\r

   /// EFI_GRAPHICS_OUTPUT_MODE_INFORMATION structure as defined in this specification.\r
   ///\r
   UINT32                     Version;\r
   /// EFI_GRAPHICS_OUTPUT_MODE_INFORMATION structure as defined in this specification.\r
   ///\r
   UINT32                     Version;\r


@@ -77,18 +77,18 @@ typedef struct {
   ///\r
   UINT32                     VerticalResolution;\r
   ///\r
   ///\r
   UINT32                     VerticalResolution;\r
   ///\r

-  /// Enumeration that defines the physical format of the pixel. A value of PixelBltOnly \r
+  /// Enumeration that defines the physical format of the pixel. A value of PixelBltOnly\r

   /// implies that a linear frame buffer is not available for this mode.\r
   ///\r
   EFI_GRAPHICS_PIXEL_FORMAT  PixelFormat;\r
   ///\r
   /// implies that a linear frame buffer is not available for this mode.\r
   ///\r
   EFI_GRAPHICS_PIXEL_FORMAT  PixelFormat;\r
   ///\r

-  /// This bit-mask is only valid if PixelFormat is set to PixelPixelBitMask. \r
+  /// This bit-mask is only valid if PixelFormat is set to PixelPixelBitMask.\r

   /// A bit being set defines what bits are used for what purpose such as Red, Green, Blue, or Reserved.\r
   ///\r
   EFI_PIXEL_BITMASK          PixelInformation;\r
   ///\r
   /// Defines the number of pixel elements per video memory line.\r
   /// A bit being set defines what bits are used for what purpose such as Red, Green, Blue, or Reserved.\r
   ///\r
   EFI_PIXEL_BITMASK          PixelInformation;\r
   ///\r
   /// Defines the number of pixel elements per video memory line.\r

-  /// \r
+  ///\r

   UINT32                     PixelsPerScanLine;\r
 } EFI_GRAPHICS_OUTPUT_MODE_INFORMATION;\r
 \r
   UINT32                     PixelsPerScanLine;\r
 } EFI_GRAPHICS_OUTPUT_MODE_INFORMATION;\r
 \r


@@ -116,7 +116,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Set the video device into the specified mode and clears the visible portions of \r
+  Set the video device into the specified mode and clears the visible portions of\r

   the output display to black.\r
 \r
   @param  This              The EFI_GRAPHICS_OUTPUT_PROTOCOL instance.\r
   the output display to black.\r
 \r
   @param  This              The EFI_GRAPHICS_OUTPUT_PROTOCOL instance.\r


@@ -151,47 +151,47 @@ typedef union {
 ///\r
 typedef enum {\r
   ///\r
 ///\r
 typedef enum {\r
   ///\r

-  /// Write data from the BltBuffer pixel (0, 0) \r
-  /// directly to every pixel of the video display rectangle \r
-  /// (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height). \r
-  /// Only one pixel will be used from the BltBuffer. Delta is NOT used.  \r
+  /// Write data from the BltBuffer pixel (0, 0)\r
+  /// directly to every pixel of the video display rectangle\r
+  /// (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height).\r
+  /// Only one pixel will be used from the BltBuffer. Delta is NOT used.\r

   ///\r
   EfiBltVideoFill,\r
   ///\r
   EfiBltVideoFill,\r

-  \r
+\r

   ///\r
   ///\r

-  /// Read data from the video display rectangle \r
-  /// (SourceX, SourceY) (SourceX + Width, SourceY + Height) and place it in \r
-  /// the BltBuffer rectangle (DestinationX, DestinationY ) \r
-  /// (DestinationX + Width, DestinationY + Height). If DestinationX or \r
-  /// DestinationY is not zero then Delta must be set to the length in bytes \r
-  /// of a row in the BltBuffer.  \r
+  /// Read data from the video display rectangle\r
+  /// (SourceX, SourceY) (SourceX + Width, SourceY + Height) and place it in\r
+  /// the BltBuffer rectangle (DestinationX, DestinationY )\r
+  /// (DestinationX + Width, DestinationY + Height). If DestinationX or\r
+  /// DestinationY is not zero then Delta must be set to the length in bytes\r
+  /// of a row in the BltBuffer.\r

   ///\r
   EfiBltVideoToBltBuffer,\r
   ///\r
   EfiBltVideoToBltBuffer,\r

-  \r
+\r

   ///\r
   ///\r

-  /// Write data from the BltBuffer rectangle \r
-  /// (SourceX, SourceY) (SourceX + Width, SourceY + Height) directly to the \r
-  /// video display rectangle (DestinationX, DestinationY) \r
-  /// (DestinationX + Width, DestinationY + Height). If SourceX or SourceY is \r
-  /// not zero then Delta must be set to the length in bytes of a row in the \r
+  /// Write data from the BltBuffer rectangle\r
+  /// (SourceX, SourceY) (SourceX + Width, SourceY + Height) directly to the\r
+  /// video display rectangle (DestinationX, DestinationY)\r
+  /// (DestinationX + Width, DestinationY + Height). If SourceX or SourceY is\r
+  /// not zero then Delta must be set to the length in bytes of a row in the\r

   /// BltBuffer.\r
   ///\r
   /// BltBuffer.\r
   ///\r

-  EfiBltBufferToVideo, \r
-  \r
+  EfiBltBufferToVideo,\r
+\r

   ///\r
   /// Copy from the video display rectangle (SourceX, SourceY)\r
   ///\r
   /// Copy from the video display rectangle (SourceX, SourceY)\r

-  /// (SourceX + Width, SourceY + Height) to the video display rectangle \r
-  /// (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height). \r
+  /// (SourceX + Width, SourceY + Height) to the video display rectangle\r
+  /// (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height).\r

   /// The BltBuffer and Delta are not used in this mode.\r
   ///\r
   EfiBltVideoToVideo,\r
   /// The BltBuffer and Delta are not used in this mode.\r
   ///\r
   EfiBltVideoToVideo,\r

-  \r
+\r

   EfiGraphicsOutputBltOperationMax\r
 } EFI_GRAPHICS_OUTPUT_BLT_OPERATION;\r
 \r
 /**\r
   Blt a rectangle of pixels on the graphics screen. Blt stands for BLock Transfer.\r
   EfiGraphicsOutputBltOperationMax\r
 } EFI_GRAPHICS_OUTPUT_BLT_OPERATION;\r
 \r
 /**\r
   Blt a rectangle of pixels on the graphics screen. Blt stands for BLock Transfer.\r

-  \r
+\r

   @param  This         Protocol instance pointer.\r
   @param  BltBuffer    The data to transfer to the graphics screen.\r
                        Size is at least Width*Height*sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL).\r
   @param  This         Protocol instance pointer.\r
   @param  BltBuffer    The data to transfer to the graphics screen.\r
                        Size is at least Width*Height*sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL).\r


@@ -250,15 +250,15 @@ typedef struct {
   ///\r
   EFI_PHYSICAL_ADDRESS                   FrameBufferBase;\r
   ///\r
   ///\r
   EFI_PHYSICAL_ADDRESS                   FrameBufferBase;\r
   ///\r

-  /// Amount of frame buffer needed to support the active mode as defined by \r
+  /// Amount of frame buffer needed to support the active mode as defined by\r

   /// PixelsPerScanLine xVerticalResolution x PixelElementSize.\r
   ///\r
   UINTN                                  FrameBufferSize;\r
 } EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE;\r
 \r
 ///\r
   /// PixelsPerScanLine xVerticalResolution x PixelElementSize.\r
   ///\r
   UINTN                                  FrameBufferSize;\r
 } EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE;\r
 \r
 ///\r

-/// Provides a basic abstraction to set video modes and copy pixels to and from \r
-/// the graphics controller's frame buffer. The linear address of the hardware \r
+/// Provides a basic abstraction to set video modes and copy pixels to and from\r
+/// the graphics controller's frame buffer. The linear address of the hardware\r

 /// frame buffer is also exposed so software can write directly to the video hardware.\r
 ///\r
 struct _EFI_GRAPHICS_OUTPUT_PROTOCOL {\r
 /// frame buffer is also exposed so software can write directly to the video hardware.\r
 ///\r
 struct _EFI_GRAPHICS_OUTPUT_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/GuidedSectionExtraction.h b/MdePkg/Include/Protocol/GuidedSectionExtraction.h
index 020b20369afc77d2b0acd04c8e4a1e746054c9ec..f7f17cd748423f71af9996c3c896cbd0aaa71281 100644 (file)
--- a/MdePkg/Include/Protocol/GuidedSectionExtraction.h
+++ b/MdePkg/Include/Protocol/GuidedSectionExtraction.h
@@ -4,14 +4,14 @@
   instance of the GUIDed Section Extraction Protocol to extract\r
   the section stream contained therein.\r
 \r
   instance of the GUIDed Section Extraction Protocol to extract\r
   the section stream contained therein.\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
+  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
   @par Revision Reference: PI\r
   Version 1.00.\r
 \r
   @par Revision Reference: PI\r
   Version 1.00.\r


@@ -22,14 +22,14 @@
 #define __GUID_SECTION_EXTRACTION_PROTOCOL_H__\r
 \r
 //\r
 #define __GUID_SECTION_EXTRACTION_PROTOCOL_H__\r
 \r
 //\r

-// The protocol interface structures are identified by associating \r
-// them with a GUID. Each instance of a protocol with a given \r
-// GUID must have the same interface structure. While all instances \r
-// of the GUIDed Section Extraction Protocol must have the same \r
-// interface structure, they do not all have the same GUID. The \r
-// GUID that is associated with an instance of the GUIDed Section \r
-// Extraction Protocol is used to correlate it with the GUIDed \r
-// section type that it is intended to process. \r
+// The protocol interface structures are identified by associating\r
+// them with a GUID. Each instance of a protocol with a given\r
+// GUID must have the same interface structure. While all instances\r
+// of the GUIDed Section Extraction Protocol must have the same\r
+// interface structure, they do not all have the same GUID. The\r
+// GUID that is associated with an instance of the GUIDed Section\r
+// Extraction Protocol is used to correlate it with the GUIDed\r
+// section type that it is intended to process.\r

 //\r
 \r
 typedef struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL;\r
 //\r
 \r
 typedef struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL;\r


@@ -61,9 +61,9 @@ typedef struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL EFI_GUIDED_SECTION_EXTRAC
   EFI_TPL above TPL_NOTIFY is undefined. Type EFI_TPL is\r
   defined in RaiseTPL() in the UEFI 2.0 specification.\r
 \r
   EFI_TPL above TPL_NOTIFY is undefined. Type EFI_TPL is\r
   defined in RaiseTPL() in the UEFI 2.0 specification.\r
 \r

-  \r
+\r

   @param This         Indicates the EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL instance.\r
   @param This         Indicates the EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL instance.\r

-  \r
+\r

   @param InputSection Buffer containing the input GUIDed section\r
                       to be processed. OutputBuffer OutputBuffer\r
                       is allocated from boot services pool\r
   @param InputSection Buffer containing the input GUIDed section\r
                       to be processed. OutputBuffer OutputBuffer\r
                       is allocated from boot services pool\r

diff --git a/MdePkg/Include/Protocol/Hash.h b/MdePkg/Include/Protocol/Hash.h
index 0bee694a5b10d2b7b1b138631c86e4aff4f7e28f..1323dbe83743f60b9e1f44be7ad8e870c16ddf12 100644 (file)
--- a/MdePkg/Include/Protocol/Hash.h
+++ b/MdePkg/Include/Protocol/Hash.h
@@ -1,18 +1,18 @@
 /** @file\r
   EFI_HASH_SERVICE_BINDING_PROTOCOL as defined in UEFI 2.0.\r
   EFI_HASH_PROTOCOL as defined in UEFI 2.0.\r
 /** @file\r
   EFI_HASH_SERVICE_BINDING_PROTOCOL as defined in UEFI 2.0.\r
   EFI_HASH_PROTOCOL as defined in UEFI 2.0.\r

-  The EFI Hash Service Binding Protocol is used to locate hashing services support \r
-  provided by a driver and to create and destroy instances of the EFI Hash Protocol \r
+  The EFI Hash Service Binding Protocol is used to locate hashing services support\r
+  provided by a driver and to create and destroy instances of the EFI Hash Protocol\r

   so that a multiple drivers can use the underlying hashing services.\r
 \r
   so that a multiple drivers can use the underlying hashing services.\r
 \r

-Copyright (c) 2006 - 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) 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
-    \r
-THE PROGRAM 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


@@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   { \\r
     0x42881c98, 0xa4f3, 0x44b0, {0xa3, 0x9d, 0xdf, 0xa1, 0x86, 0x67, 0xd8, 0xcd } \\r
   }\r
   { \\r
     0x42881c98, 0xa4f3, 0x44b0, {0xa3, 0x9d, 0xdf, 0xa1, 0x86, 0x67, 0xd8, 0xcd } \\r
   }\r

-  \r
+\r

 #define EFI_HASH_PROTOCOL_GUID \\r
   { \\r
     0xc5184932, 0xdba5, 0x46db, {0xa5, 0xba, 0xcc, 0x0b, 0xda, 0x9c, 0x14, 0x35 } \\r
 #define EFI_HASH_PROTOCOL_GUID \\r
   { \\r
     0xc5184932, 0xdba5, 0x46db, {0xa5, 0xba, 0xcc, 0x0b, 0xda, 0x9c, 0x14, 0x35 } \\r


@@ -37,17 +37,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define EFI_HASH_ALGORITHM_SHA224_GUID \\r
   { \\r
     0x8df01a06, 0x9bd5, 0x4bf7, {0xb0, 0x21, 0xdb, 0x4f, 0xd9, 0xcc, 0xf4, 0x5b } \\r
 #define EFI_HASH_ALGORITHM_SHA224_GUID \\r
   { \\r
     0x8df01a06, 0x9bd5, 0x4bf7, {0xb0, 0x21, 0xdb, 0x4f, 0xd9, 0xcc, 0xf4, 0x5b } \\r

-  } \r
+  }\r

 \r
 #define EFI_HASH_ALGORITHM_SHA256_GUID \\r
   { \\r
     0x51aa59de, 0xfdf2, 0x4ea3, {0xbc, 0x63, 0x87, 0x5f, 0xb7, 0x84, 0x2e, 0xe9 } \\r
 \r
 #define EFI_HASH_ALGORITHM_SHA256_GUID \\r
   { \\r
     0x51aa59de, 0xfdf2, 0x4ea3, {0xbc, 0x63, 0x87, 0x5f, 0xb7, 0x84, 0x2e, 0xe9 } \\r

-  } \r
+  }\r

 \r
 #define EFI_HASH_ALGORITHM_SHA384_GUID \\r
   { \\r
     0xefa96432, 0xde33, 0x4dd2, {0xae, 0xe6, 0x32, 0x8c, 0x33, 0xdf, 0x77, 0x7a } \\r
 \r
 #define EFI_HASH_ALGORITHM_SHA384_GUID \\r
   { \\r
     0xefa96432, 0xde33, 0x4dd2, {0xae, 0xe6, 0x32, 0x8c, 0x33, 0xdf, 0x77, 0x7a } \\r

-  } \r
+  }\r

 \r
 #define EFI_HASH_ALGORITHM_SHA512_GUID \\r
   { \\r
 \r
 #define EFI_HASH_ALGORITHM_SHA512_GUID \\r
   { \\r


@@ -106,7 +106,7 @@ typedef union {
 \r
   @retval EFI_SUCCESS           Hash size returned successfully.\r
   @retval EFI_INVALID_PARAMETER HashSize is NULL or HashAlgorithm is NULL.\r
 \r
   @retval EFI_SUCCESS           Hash size returned successfully.\r
   @retval EFI_INVALID_PARAMETER HashSize is NULL or HashAlgorithm is NULL.\r

-  @retval EFI_UNSUPPORTED       The algorithm specified by HashAlgorithm is not supported \r
+  @retval EFI_UNSUPPORTED       The algorithm specified by HashAlgorithm is not supported\r

                                 by this driver.\r
 \r
 **/\r
                                 by this driver.\r
 \r
 **/\r


@@ -116,7 +116,7 @@ EFI_STATUS
   IN  CONST EFI_HASH_PROTOCOL     *This,\r
   IN  CONST EFI_GUID              *HashAlgorithm,\r
   OUT UINTN                       *HashSize\r
   IN  CONST EFI_HASH_PROTOCOL     *This,\r
   IN  CONST EFI_GUID              *HashAlgorithm,\r
   OUT UINTN                       *HashSize\r

-  );      \r
+  );\r

 \r
 /**\r
   Creates a hash for the specified message text.\r
 \r
 /**\r
   Creates a hash for the specified message text.\r


@@ -127,13 +127,13 @@ EFI_STATUS
                             existing hash (TRUE).\r
   @param[in]  Message       Points to the start of the message.\r
   @param[in]  MessageSize   The size of Message, in bytes.\r
                             existing hash (TRUE).\r
   @param[in]  Message       Points to the start of the message.\r
   @param[in]  MessageSize   The size of Message, in bytes.\r

-  @param[in,out]  Hash      On input, if Extend is TRUE, then this parameter holds a pointer \r
-                            to a pointer to an array containing the hash to extend. If Extend \r
-                            is FALSE, then this parameter holds a pointer to a pointer to a \r
-                            caller-allocated array that will receive the result of the hash \r
-                            computation. On output (regardless of the value of Extend), the \r
+  @param[in,out]  Hash      On input, if Extend is TRUE, then this parameter holds a pointer\r
+                            to a pointer to an array containing the hash to extend. If Extend\r
+                            is FALSE, then this parameter holds a pointer to a pointer to a\r
+                            caller-allocated array that will receive the result of the hash\r
+                            computation. On output (regardless of the value of Extend), the\r

                             array will contain the result of the hash computation.\r
                             array will contain the result of the hash computation.\r

-  \r
+\r

   @retval EFI_SUCCESS           Hash returned successfully.\r
   @retval EFI_INVALID_PARAMETER Message or Hash, HashAlgorithm is NULL or MessageSize is 0.\r
                                 MessageSize is not an integer multiple of block size.\r
   @retval EFI_SUCCESS           Hash returned successfully.\r
   @retval EFI_INVALID_PARAMETER Message or Hash, HashAlgorithm is NULL or MessageSize is 0.\r
                                 MessageSize is not an integer multiple of block size.\r


@@ -150,10 +150,10 @@ EFI_STATUS
   IN CONST UINT8                  *Message,\r
   IN UINT64                       MessageSize,\r
   IN OUT EFI_HASH_OUTPUT          *Hash\r
   IN CONST UINT8                  *Message,\r
   IN UINT64                       MessageSize,\r
   IN OUT EFI_HASH_OUTPUT          *Hash\r

-  );    \r
+  );\r

 \r
 ///\r
 \r
 ///\r

-/// This protocol allows creating a hash of an arbitrary message digest \r
+/// This protocol allows creating a hash of an arbitrary message digest\r

 /// using one or more hash algorithms.\r
 ///\r
 struct _EFI_HASH_PROTOCOL {\r
 /// using one or more hash algorithms.\r
 ///\r
 struct _EFI_HASH_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/HiiConfigAccess.h b/MdePkg/Include/Protocol/HiiConfigAccess.h
index 6cd28e569bab6b82f30091fd8e043a0accbc3190..4d6268b2181155eb22093396eedef1f2a709ccad 100644 (file)
--- a/MdePkg/Include/Protocol/HiiConfigAccess.h
+++ b/MdePkg/Include/Protocol/HiiConfigAccess.h
@@ -1,18 +1,18 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  The EFI HII results processing protocol invokes this type of protocol \r
-  when it needs to forward results to a driver's configuration handler. \r
-  This protocol is published by drivers providing and requesting \r
+  The EFI HII results processing protocol invokes this type of protocol\r
+  when it needs to forward results to a driver's configuration handler.\r
+  This protocol is published by drivers providing and requesting\r

   configuration data from HII. It may only be invoked by HII.\r
   configuration data from HII. It may only be invoked by HII.\r

-  \r
-Copyright (c) 2006 - 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
+\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
-    \r
-THE PROGRAM 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


@@ -43,7 +43,7 @@ typedef UINTN EFI_BROWSER_ACTION;
 #define EFI_BROWSER_ACTION_DEFAULT_FIRMWARE      0x4000\r
 \r
 /**\r
 #define EFI_BROWSER_ACTION_DEFAULT_FIRMWARE      0x4000\r
 \r
 /**\r

-   \r
+\r

   This function allows the caller to request the current\r
   configuration for one or more named elements. The resulting\r
   string is in <ConfigAltResp> format. Any and all alternative\r
   This function allows the caller to request the current\r
   configuration for one or more named elements. The resulting\r
   string is in <ConfigAltResp> format. Any and all alternative\r


@@ -64,12 +64,12 @@ typedef UINTN EFI_BROWSER_ACTION;
                     includes the routing information as well as\r
                     the configurable name / value pairs. It is\r
                     invalid for this string to be in\r
                     includes the routing information as well as\r
                     the configurable name / value pairs. It is\r
                     invalid for this string to be in\r

-                    <MultiConfigRequest> format. \r
-                    If a NULL is passed in for the Request field, \r
-                    all of the settings being abstracted by this function \r
-                    will be returned in the Results field.  In addition, \r
-                    if a ConfigHdr is passed in with no request elements, \r
-                    all of the settings being abstracted for that particular \r
+                    <MultiConfigRequest> format.\r
+                    If a NULL is passed in for the Request field,\r
+                    all of the settings being abstracted by this function\r
+                    will be returned in the Results field.  In addition,\r
+                    if a ConfigHdr is passed in with no request elements,\r
+                    all of the settings being abstracted for that particular\r

                     ConfigHdr reference will be returned in the Results Field.\r
 \r
   @param Progress   On return, points to a character in the\r
                     ConfigHdr reference will be returned in the Results Field.\r
 \r
   @param Progress   On return, points to a character in the\r


@@ -95,7 +95,7 @@ typedef UINTN EFI_BROWSER_ACTION;
                                   stored awaiting possible future\r
                                   protocols.\r
 \r
                                   stored awaiting possible future\r
                                   protocols.\r
 \r

-  @retval EFI_NOT_FOUND           A configuration element matching \r
+  @retval EFI_NOT_FOUND           A configuration element matching\r

                                   the routing data is not found.\r
                                   Progress set to the first character\r
                                   in the routing header.\r
                                   the routing data is not found.\r
                                   Progress set to the first character\r
                                   in the routing header.\r


@@ -121,7 +121,7 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-   \r
+\r

   This function applies changes in a driver's configuration.\r
   Input is a Configuration, which has the routing data for this\r
   driver followed by name / value configuration pairs. The driver\r
   This function applies changes in a driver's configuration.\r
   Input is a Configuration, which has the routing data for this\r
   driver followed by name / value configuration pairs. The driver\r


@@ -134,8 +134,8 @@ EFI_STATUS
   @param This           Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.\r
 \r
   @param Configuration  A null-terminated Unicode string in\r
   @param This           Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.\r
 \r
   @param Configuration  A null-terminated Unicode string in\r

-                        <ConfigString> format. \r
-  \r
+                        <ConfigString> format.\r
+\r

   @param 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 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


@@ -146,16 +146,16 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS             The results have been distributed or are\r
                                   awaiting distribution.\r
 \r
   @retval EFI_SUCCESS             The results have been distributed or are\r
                                   awaiting distribution.\r

-  \r
+\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
                                   protocols.\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
                                   protocols.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETERS  Passing in a NULL for the\r
                                   Results parameter would result\r
                                   in this type of error.\r
   @retval EFI_INVALID_PARAMETERS  Passing in a NULL for the\r
                                   Results parameter would result\r
                                   in this type of error.\r

-  \r
+\r

   @retval EFI_NOT_FOUND           Target for the specified routing data\r
                                   was not found\r
 \r
   @retval EFI_NOT_FOUND           Target for the specified routing data\r
                                   was not found\r
 \r


@@ -169,7 +169,7 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-   \r
+\r

   This function is called to provide results data to the driver.\r
   This data consists of a unique key that is used to identify\r
   which data is either being passed back or being asked for.\r
   This function is called to provide results data to the driver.\r
   This data consists of a unique key that is used to identify\r
   which data is either being passed back or being asked for.\r


@@ -178,7 +178,7 @@ EFI_STATUS
   @param  Action                 Specifies the type of action taken by the browser.\r
   @param  QuestionId             A unique value which is sent to the original\r
                                  exporting driver so that it can identify the type\r
   @param  Action                 Specifies the type of action taken by the browser.\r
   @param  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 generated the callback.\r
   @param  Type                   The type of value for the question.\r
   @param  Value                  A pointer to the data being sent to the original\r
                                  vary based on the opcode that generated the callback.\r
   @param  Type                   The type of value for the question.\r
   @param  Value                  A pointer to the data being sent to the original\r


@@ -204,7 +204,7 @@ EFI_STATUS
   OUT    EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
   )\r
   ;\r
   OUT    EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
   )\r
   ;\r

-  \r
+\r

 ///\r
 /// This protocol provides a callable interface between the HII and\r
 /// drivers. Only drivers which provide IFR data to HII are required\r
 ///\r
 /// This protocol provides a callable interface between the HII and\r
 /// drivers. Only drivers which provide IFR data to HII are required\r

diff --git a/MdePkg/Include/Protocol/HiiConfigKeyword.h b/MdePkg/Include/Protocol/HiiConfigKeyword.h
index 208336cb86221f777df084ab276607012e26da12..fa6adebcd57b4d02e64507f339dd6872ae4a4013 100644 (file)
--- a/MdePkg/Include/Protocol/HiiConfigKeyword.h
+++ b/MdePkg/Include/Protocol/HiiConfigKeyword.h
@@ -1,16 +1,16 @@
 /** @file\r
 /** @file\r

-  The file provides the mechanism to set and get the values \r
-  associated with a keyword exposed through a x-UEFI- prefixed \r
+  The file provides the mechanism to set and get the values\r
+  associated with a keyword exposed through a x-UEFI- prefixed\r

   configuration language namespace.\r
   configuration language namespace.\r

-  \r
-Copyright (c) 2015 - 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
+\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
-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


@@ -40,18 +40,18 @@ typedef struct _EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL EFI_CONFIG_KEYWORD_HANDLER_P
   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


@@ -59,18 +59,18 @@ typedef struct _EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL EFI_CONFIG_KEYWORD_HANDLER_P
 \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


@@ -78,23 +78,23 @@ typedef struct _EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL EFI_CONFIG_KEYWORD_HANDLER_P
 \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
 **/\r
                                   for more data.\r
 \r
   @retval EFI_DEVICE_ERROR        An unexpected system error occurred. See ProgressErr\r
                                   for more data.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_CONFIG_KEYWORD_HANDLER_SET_DATA) (\r
   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_CONFIG_KEYWORD_HANDLER_SET_DATA) (\r
   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This,\r


@@ -106,56 +106,56 @@ EFI_STATUS
 \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


@@ -165,7 +165,7 @@ EFI_STATUS
 \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


@@ -173,20 +173,20 @@ EFI_STATUS
                                   for more data.\r
 \r
 **/\r
                                   for more data.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_CONFIG_KEYWORD_HANDLER_GET_DATA) (\r
   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL  *This,\r
   IN CONST EFI_STRING                     NameSpaceId, OPTIONAL\r
   IN CONST EFI_STRING                     KeywordString, OPTIONAL\r
 EFI_STATUS\r
 (EFIAPI *EFI_CONFIG_KEYWORD_HANDLER_GET_DATA) (\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
 \r
 ///\r
   OUT UINT32                              *ProgressErr,\r
   OUT EFI_STRING                          *Results\r
   );\r
 \r
 ///\r

-/// The EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL provides the mechanism \r
-/// to set and get the values associated with a keyword exposed \r
+/// The EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL provides the mechanism\r
+/// to set and get the values associated with a keyword exposed\r

 /// through a x-UEFI- prefixed configuration language namespace\r
 ///\r
 \r
 /// through a x-UEFI- prefixed configuration language namespace\r
 ///\r
 \r

diff --git a/MdePkg/Include/Protocol/HiiConfigRouting.h b/MdePkg/Include/Protocol/HiiConfigRouting.h
index 467a2dcc8201ad3c86c4e9cc841e0136f04c4ff1..caffb168af614b9c669e98478d9ea59535557010 100644 (file)
--- a/MdePkg/Include/Protocol/HiiConfigRouting.h
+++ b/MdePkg/Include/Protocol/HiiConfigRouting.h
@@ -4,15 +4,15 @@
   It then serves as the single point to receive configuration\r
   information from configuration applications, routing the\r
   results to the appropriate drivers.\r
   It then serves as the single point to receive configuration\r
   information from configuration applications, routing the\r
   results to the appropriate drivers.\r

-  \r
-Copyright (c) 2006 - 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
+\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
-    \r
-THE PROGRAM 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


@@ -26,7 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 typedef struct _EFI_HII_CONFIG_ROUTING_PROTOCOL EFI_HII_CONFIG_ROUTING_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_HII_CONFIG_ROUTING_PROTOCOL EFI_HII_CONFIG_ROUTING_PROTOCOL;\r
 \r
 /**\r

-   \r
+\r

   This function allows the caller to request the current\r
   configuration for one or more named elements from one or more\r
   drivers. The resulting string is in the standard HII\r
   This function allows the caller to request the current\r
   configuration for one or more named elements from one or more\r
   drivers. The resulting string is in the standard HII\r


@@ -84,8 +84,8 @@ typedef struct _EFI_HII_CONFIG_ROUTING_PROTOCOL EFI_HII_CONFIG_ROUTING_PROTOCOL;
                                   for the Request parameter\r
                                   would result in this type of\r
                                   error. The Progress parameter\r
                                   for the Request parameter\r
                                   would result in this type of\r
                                   error. The Progress parameter\r

-                                  is set to NULL. \r
-  \r
+                                  is set to NULL.\r
+\r

   @retval EFI_NOT_FOUND           Routing data doesn't match any\r
                                   known driver. Progress set to\r
                                   the "G" in "GUID" of the\r
   @retval EFI_NOT_FOUND           Routing data doesn't match any\r
                                   known driver. Progress set to\r
                                   the "G" in "GUID" of the\r


@@ -100,8 +100,8 @@ typedef struct _EFI_HII_CONFIG_ROUTING_PROTOCOL EFI_HII_CONFIG_ROUTING_PROTOCOL;
                                   error, or the beginning of the\r
                                   string.\r
   @retval EFI_INVALID_PARAMETER   The ExtractConfig function of the\r
                                   error, or the beginning of the\r
                                   string.\r
   @retval EFI_INVALID_PARAMETER   The ExtractConfig function of the\r

-                                  underlying HII Configuration \r
-                                  Access Protocol returned \r
+                                  underlying HII Configuration\r
+                                  Access Protocol returned\r

                                   EFI_INVALID_PARAMETER. Progress\r
                                   set to most recent & before the\r
                                   error or the beginning of the\r
                                   EFI_INVALID_PARAMETER. Progress\r
                                   set to most recent & before the\r
                                   error or the beginning of the\r


@@ -118,32 +118,32 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-  This function allows the caller to request the current configuration \r
+  This function allows the caller to request the current configuration\r

   for the entirety of the current HII database and returns the data in\r
   a null-terminated string.\r
 \r
   This function allows the caller to request the current\r
   configuration for all of the current HII database. The results\r
   include both the current and alternate configurations as\r
   for the entirety of the current HII database and returns the data in\r
   a null-terminated string.\r
 \r
   This function allows the caller to request the current\r
   configuration for all of the current HII database. The results\r
   include both the current and alternate configurations as\r

-  described in ExtractConfig() above. \r
-  \r
+  described in ExtractConfig() above.\r
+\r

   @param This     Points to the EFI_HII_CONFIG_ROUTING_PROTOCOL instance.\r
   @param This     Points to the EFI_HII_CONFIG_ROUTING_PROTOCOL instance.\r

-  \r
+\r

   @param  Results Null-terminated Unicode string in\r
                   <MultiConfigAltResp> format which has all values\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
                   function. De-allocation is up to the caller.\r

-  \r
+\r

   @retval EFI_SUCCESS             The Results string is filled with the\r
                                   values corresponding to all requested\r
                                   names.\r
   @retval EFI_SUCCESS             The Results string is filled with the\r
                                   values corresponding to all requested\r
                                   names.\r

-  \r
+\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
                                   protocols.\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
                                   protocols.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETERS  For example, passing in a NULL\r
                                   for the Results parameter\r
                                   would result in this type of\r
   @retval EFI_INVALID_PARAMETERS  For example, passing in a NULL\r
                                   for the Results parameter\r
                                   would result in this type of\r


@@ -158,7 +158,7 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-   \r
+\r

   This function routes the results of processing forms to the\r
   appropriate targets. It scans for <ConfigHdr> within the string\r
   and passes the header and subsequent body to the driver whose\r
   This function routes the results of processing forms to the\r
   appropriate targets. It scans for <ConfigHdr> within the string\r
   and passes the header and subsequent body to the driver whose\r


@@ -182,16 +182,16 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS             The results have been distributed or are\r
                                   awaiting distribution.\r
 \r
   @retval EFI_SUCCESS             The results have been distributed or are\r
                                   awaiting distribution.\r

-  \r
+\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
                                   protocols.\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
                                   protocols.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETERS  Passing in a NULL for the\r
                                   Results parameter would result\r
                                   in this type of error.\r
   @retval EFI_INVALID_PARAMETERS  Passing in a NULL for the\r
                                   Results parameter would result\r
                                   in this type of error.\r

-  \r
+\r

   @retval EFI_NOT_FOUND           The target for the specified routing data\r
                                   was not found.\r
 \r
   @retval EFI_NOT_FOUND           The target for the specified routing data\r
                                   was not found.\r
 \r


@@ -206,7 +206,7 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-   \r
+\r

   This function extracts the current configuration from a block of\r
   bytes. To do so, it requires that the ConfigRequest string\r
   consists of a list of <BlockName> formatted names. It uses the\r
   This function extracts the current configuration from a block of\r
   bytes. To do so, it requires that the ConfigRequest string\r
   consists of a list of <BlockName> formatted names. It uses the\r


@@ -228,7 +228,7 @@ EFI_STATUS
 \r
   @param Config     The filled-in configuration string. String\r
                     allocated by the function. Returned only if\r
 \r
   @param Config     The filled-in configuration string. String\r
                     allocated by the function. Returned only if\r

-                    call is successful. The null-terminated string \r
+                    call is successful. The null-terminated string\r

                     will be <ConfigResp> format.\r
 \r
   @param Progress   A pointer to a string filled in with the\r
                     will be <ConfigResp> format.\r
 \r
   @param Progress   A pointer to a string filled in with the\r


@@ -256,7 +256,7 @@ EFI_STATUS
   @retval EFI_NOT_FOUND           The target for the specified routing data\r
                                   was not found. Progress points to the\r
                                   'G' in "GUID" of the errant routing\r
   @retval EFI_NOT_FOUND           The target for the specified routing data\r
                                   was not found. Progress points to the\r
                                   'G' in "GUID" of the errant routing\r

-                                  data. \r
+                                  data.\r

   @retval EFI_DEVICE_ERROR        The block is not large enough. Progress undefined.\r
 \r
   @retval EFI_INVALID_PARAMETER   Encountered non <BlockName>\r
   @retval EFI_DEVICE_ERROR        The block is not large enough. Progress undefined.\r
 \r
   @retval EFI_INVALID_PARAMETER   Encountered non <BlockName>\r


@@ -310,7 +310,7 @@ EFI_STATUS
 \r
   @param BlockSize      The length of the Block in units of UINT8.\r
                         On input, this is the size of the Block. On\r
 \r
   @param BlockSize      The length of the Block in units of UINT8.\r
                         On input, this is the size of the Block. On\r

-                        output, if successful, contains the largest \r
+                        output, if successful, contains the largest\r

                         index of the modified byte in the Block, or\r
                         the required buffer size if the Block is not\r
                         large enough.\r
                         index of the modified byte in the Block, or\r
                         the required buffer size if the Block is not\r
                         large enough.\r


@@ -339,7 +339,7 @@ EFI_STATUS
   @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
                                  routing data.\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
                                  routing data.\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


@@ -354,48 +354,48 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-  This helper function is to be called by drivers to extract portions of \r
+  This helper function is to be called by drivers to extract portions of\r

   a larger configuration string.\r
   a larger configuration string.\r

-          \r
+\r

   @param This              A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL instance.\r
   @param ConfigResp        A null-terminated string in <ConfigAltResp> format.\r
   @param This              A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL instance.\r
   @param ConfigResp        A null-terminated string in <ConfigAltResp> format.\r

-  @param Guid              A pointer to the GUID value to search for in the \r
-                           routing portion of the ConfigResp string when retrieving \r
-                           the requested data. If Guid is NULL, then all GUID \r
+  @param Guid              A pointer to the GUID value to search for in the\r
+                           routing portion of the ConfigResp string when retrieving\r
+                           the requested data. If Guid is NULL, then all GUID\r
+                           values will be searched for.\r
+  @param Name              A pointer to the NAME value to search for in the\r
+                           routing portion of the ConfigResp string when retrieving\r
+                           the requested data. If Name is NULL, then all Name\r

                            values will be searched for.\r
                            values will be searched for.\r

-  @param Name              A pointer to the NAME value to search for in the \r
-                           routing portion of the ConfigResp string when retrieving \r
-                           the requested data. If Name is NULL, then all Name \r
-                           values will be searched for.                         \r
-  @param DevicePath        A pointer to the PATH value to search for in the \r
-                           routing portion of the ConfigResp string when retrieving \r
-                           the requested data. If DevicePath is NULL, then all \r
-                           DevicePath values will be searched for.             \r
-  @param AltCfgId          A pointer to the ALTCFG value to search for in the \r
-                           routing portion of the ConfigResp string when retrieving \r
-                           the requested data.  If this parameter is NULL, \r
+  @param DevicePath        A pointer to the PATH value to search for in the\r
+                           routing portion of the ConfigResp string when retrieving\r
+                           the requested data. If DevicePath is NULL, then all\r
+                           DevicePath values will be searched for.\r
+  @param AltCfgId          A pointer to the ALTCFG value to search for in the\r
+                           routing portion of the ConfigResp string when retrieving\r
+                           the requested data.  If this parameter is NULL,\r

                            then the current setting will be retrieved.\r
                            then the current setting will be retrieved.\r

-  @param AltCfgResp        A pointer to a buffer which will be allocated by the \r
-                           function which contains the retrieved string as requested.  \r
-                           This buffer is only allocated if the call was successful. \r
+  @param AltCfgResp        A pointer to a buffer which will be allocated by the\r
+                           function which contains the retrieved string as requested.\r
+                           This buffer is only allocated if the call was successful.\r

                            The null-terminated string will be <ConfigResp> format.\r
                            The null-terminated string will be <ConfigResp> format.\r

-  \r
-  @retval EFI_SUCCESS             The request succeeded. The requested data was extracted \r
+\r
+  @retval EFI_SUCCESS             The request succeeded. The requested data was extracted\r

                                   and placed in the newly allocated AltCfgResp buffer.\r
                                   and placed in the newly allocated AltCfgResp buffer.\r

-  @retval EFI_OUT_OF_RESOURCES    Not enough memory to allocate AltCfgResp.    \r
+  @retval EFI_OUT_OF_RESOURCES    Not enough memory to allocate AltCfgResp.\r

   @retval EFI_INVALID_PARAMETER   Any parameter is invalid.\r
   @retval EFI_NOT_FOUND           The target for the specified routing data was not found.\r
 **/\r
 typedef\r
   @retval EFI_INVALID_PARAMETER   Any parameter is invalid.\r
   @retval EFI_NOT_FOUND           The target for the specified routing data was not found.\r
 **/\r
 typedef\r

-EFI_STATUS \r
+EFI_STATUS\r

 (EFIAPI * EFI_HII_GET_ALT_CFG)(\r
 (EFIAPI * EFI_HII_GET_ALT_CFG)(\r

-  IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL    *This, \r
-  IN  CONST EFI_STRING                         ConfigResp, \r
-  IN  CONST EFI_GUID                           *Guid, \r
-  IN  CONST EFI_STRING                         Name, \r
-  IN  CONST EFI_DEVICE_PATH_PROTOCOL           *DevicePath,  \r
+  IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL    *This,\r
+  IN  CONST EFI_STRING                         ConfigResp,\r
+  IN  CONST EFI_GUID                           *Guid,\r
+  IN  CONST EFI_STRING                         Name,\r
+  IN  CONST EFI_DEVICE_PATH_PROTOCOL           *DevicePath,\r

   IN  CONST UINT16                             *AltCfgId,\r
   IN  CONST UINT16                             *AltCfgId,\r

-  OUT EFI_STRING                               *AltCfgResp \r
+  OUT EFI_STRING                               *AltCfgResp\r

   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

diff --git a/MdePkg/Include/Protocol/HiiDatabase.h b/MdePkg/Include/Protocol/HiiDatabase.h
index 5ba50f8b15807300041355bee433005e3e170281..8a438786b1597e4d3ac3d0a67da3bc2167938f3d 100644 (file)
--- a/MdePkg/Include/Protocol/HiiDatabase.h
+++ b/MdePkg/Include/Protocol/HiiDatabase.h
@@ -1,15 +1,15 @@
 /** @file\r
   The file provides Database manager for HII-related data\r
   structures.\r
 /** @file\r
   The file provides Database manager for HII-related data\r
   structures.\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
-    \r
-THE PROGRAM 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,7 +25,7 @@ typedef struct _EFI_HII_DATABASE_PROTOCOL EFI_HII_DATABASE_PROTOCOL;
 \r
 ///\r
 /// EFI_HII_DATABASE_NOTIFY_TYPE.\r
 \r
 ///\r
 /// EFI_HII_DATABASE_NOTIFY_TYPE.\r

-/// \r
+///\r

 typedef UINTN   EFI_HII_DATABASE_NOTIFY_TYPE;\r
 \r
 #define EFI_HII_DATABASE_NOTIFY_NEW_PACK    0x00000001\r
 typedef UINTN   EFI_HII_DATABASE_NOTIFY_TYPE;\r
 \r
 #define EFI_HII_DATABASE_NOTIFY_NEW_PACK    0x00000001\r


@@ -33,7 +33,7 @@ typedef UINTN   EFI_HII_DATABASE_NOTIFY_TYPE;
 #define EFI_HII_DATABASE_NOTIFY_EXPORT_PACK 0x00000004\r
 #define EFI_HII_DATABASE_NOTIFY_ADD_PACK    0x00000008\r
 /**\r
 #define EFI_HII_DATABASE_NOTIFY_EXPORT_PACK 0x00000004\r
 #define EFI_HII_DATABASE_NOTIFY_ADD_PACK    0x00000008\r
 /**\r

-   \r
+\r

   Functions which are registered to receive notification of\r
   database events have this prototype. The actual event is encoded\r
   in NotifyType. The following table describes how PackageType,\r
   Functions which are registered to receive notification of\r
   database events have this prototype. The actual event is encoded\r
   in NotifyType. The following table describes how PackageType,\r


@@ -48,8 +48,8 @@ typedef UINTN   EFI_HII_DATABASE_NOTIFY_TYPE;
                       field of EFI_HII_PACKAGE_GUID_HEADER.\r
                       Otherwise, it must be NULL.\r
 \r
                       field of EFI_HII_PACKAGE_GUID_HEADER.\r
                       Otherwise, it must be NULL.\r
 \r

-  @param Package      Points to the package referred to by the notification. \r
-  \r
+  @param Package      Points to the package referred to by the notification.\r
+\r

   @param Handle       The handle of the package\r
                       list which contains the specified package.\r
 \r
   @param Handle       The handle of the package\r
                       list which contains the specified package.\r
 \r


@@ -80,7 +80,7 @@ EFI_STATUS
   be called. For each call to NewPackageList(), there should be a\r
   corresponding call to\r
   EFI_HII_DATABASE_PROTOCOL.RemovePackageList().\r
   be called. For each call to NewPackageList(), there should be a\r
   corresponding call to\r
   EFI_HII_DATABASE_PROTOCOL.RemovePackageList().\r

-  \r
+\r

   @param This           A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r
 \r
   @param PackageList    A pointer to an EFI_HII_PACKAGE_LIST_HEADER structure.\r
   @param This           A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r
 \r
   @param PackageList    A pointer to an EFI_HII_PACKAGE_LIST_HEADER structure.\r


@@ -88,7 +88,7 @@ EFI_STATUS
   @param DriverHandle   Associate the package list with this EFI handle.\r
                         If a NULL is specified, this data will not be associate\r
                         with any drivers and cannot have a callback induced.\r
   @param DriverHandle   Associate the package list with this EFI handle.\r
                         If a NULL is specified, this data will not be associate\r
                         with any drivers and cannot have a callback induced.\r

-  \r
+\r

   @param Handle         A pointer to the EFI_HII_HANDLE instance.\r
 \r
   @retval EFI_SUCCESS           The package list associated with the\r
   @param Handle         A pointer to the EFI_HII_HANDLE instance.\r
 \r
   @retval EFI_SUCCESS           The package list associated with the\r


@@ -121,10 +121,10 @@ EFI_STATUS
   be a corresponding call to RemovePackageList.\r
 \r
   @param This             A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r
   be a corresponding call to RemovePackageList.\r
 \r
   @param This             A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r

-  \r
+\r

   @param Handle           The handle that was registered to the data\r
                           that is requested for removal.\r
   @param Handle           The handle that was registered to the data\r
                           that is requested for removal.\r

-  \r
+\r

   @retval EFI_SUCCESS     The data associated with the Handle was\r
                           removed from the HII database.\r
   @retval EFI_NOT_FOUND   The specified Handle is not in database.\r
   @retval EFI_SUCCESS     The data associated with the Handle was\r
                           removed from the HII database.\r
   @retval EFI_NOT_FOUND   The specified Handle is not in database.\r


@@ -139,7 +139,7 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-   \r
+\r

   This function updates the existing package list (which has the\r
   specified Handle) in the HII databases, using the new package\r
   list specified by PackageList. The update process has the\r
   This function updates the existing package list (which has the\r
   specified Handle) in the HII databases, using the new package\r
   list specified by PackageList. The update process has the\r


@@ -162,18 +162,18 @@ EFI_STATUS
   ADD_PACK.\r
 \r
   @param This         A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r
   ADD_PACK.\r
 \r
   @param This         A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r

-  \r
+\r

   @param Handle       The handle that was registered to the data\r
                       that is requested for removal.\r
   @param Handle       The handle that was registered to the data\r
                       that is requested for removal.\r

-  \r
+\r

   @param PackageList  A pointer to an EFI_HII_PACKAGE_LIST\r
                       package.\r
   @param PackageList  A pointer to an EFI_HII_PACKAGE_LIST\r
                       package.\r

-  \r
+\r

   @retval EFI_SUCCESS            The HII database was successfully updated.\r
   @retval EFI_SUCCESS            The HII database was successfully updated.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES   Unable to allocate enough memory\r
                                  for the updated database.\r
   @retval EFI_OUT_OF_RESOURCES   Unable to allocate enough memory\r
                                  for the updated database.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER  PackageList was NULL.\r
   @retval EFI_NOT_FOUND          The specified Handle is not in database.\r
 \r
   @retval EFI_INVALID_PARAMETER  PackageList was NULL.\r
   @retval EFI_NOT_FOUND          The specified Handle is not in database.\r
 \r


@@ -188,25 +188,25 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  \r
-  This function returns a list of the package handles of the   \r
-  specified type that are currently active in the database. The   \r
-  pseudo-type EFI_HII_PACKAGE_TYPE_ALL will cause all package   \r
+\r
+  This function returns a list of the package handles of the\r
+  specified type that are currently active in the database. The\r
+  pseudo-type EFI_HII_PACKAGE_TYPE_ALL will cause all package\r

   handles to be listed.\r
   handles to be listed.\r

-  \r
+\r

   @param This                 A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r
   @param This                 A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r

-  \r
+\r

   @param PackageType          Specifies the package type of the packages\r
                               to list or EFI_HII_PACKAGE_TYPE_ALL for\r
                               all packages to be listed.\r
   @param PackageType          Specifies the package type of the packages\r
                               to list or EFI_HII_PACKAGE_TYPE_ALL for\r
                               all packages to be listed.\r

-  \r
+\r

   @param PackageGuid          If PackageType is\r
                               EFI_HII_PACKAGE_TYPE_GUID, then this is\r
                               the pointer to the GUID which must match\r
                               the Guid field of\r
                               EFI_HII_PACKAGE_GUID_HEADER. Otherwise, it\r
                               must be NULL.\r
   @param PackageGuid          If PackageType is\r
                               EFI_HII_PACKAGE_TYPE_GUID, then this is\r
                               the pointer to the GUID which must match\r
                               the Guid field of\r
                               EFI_HII_PACKAGE_GUID_HEADER. Otherwise, it\r
                               must be NULL.\r

-  \r
+\r

   @param HandleBufferLength   On input, a pointer to the length\r
                               of the handle buffer. On output,\r
                               the length of the handle buffer\r
   @param HandleBufferLength   On input, a pointer to the length\r
                               of the handle buffer. On output,\r
                               the length of the handle buffer\r


@@ -258,7 +258,7 @@ EFI_STATUS
   @param Handle       An EFI_HII_HANDLE  that corresponds to the\r
                       desired package list in the HII database to\r
                       export or NULL to indicate all package lists\r
   @param Handle       An EFI_HII_HANDLE  that corresponds to the\r
                       desired package list in the HII database to\r
                       export or NULL to indicate all package lists\r

-                      should be exported. \r
+                      should be exported.\r

 \r
   @param BufferSize   On input, a pointer to the length of the\r
                       buffer. On output, the length of the\r
 \r
   @param BufferSize   On input, a pointer to the length of the\r
                       buffer. On output, the length of the\r


@@ -267,18 +267,18 @@ EFI_STATUS
 \r
   @param Buffer       A pointer to a buffer that will contain the\r
                       results of the export function.\r
 \r
   @param Buffer       A pointer to a buffer that will contain the\r
                       results of the export function.\r

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

   @retval EFI_SUCCESS           Package exported.\r
   @retval EFI_SUCCESS           Package exported.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES  BufferSize is too small to hold the package.\r
 \r
   @retval EFI_NOT_FOUND         The specified Handle could not be found in the\r
                                 current database.\r
   @retval EFI_OUT_OF_RESOURCES  BufferSize is too small to hold the package.\r
 \r
   @retval EFI_NOT_FOUND         The specified Handle could not be found in the\r
                                 current database.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER BufferSize was NULL.\r
   @retval EFI_INVALID_PARAMETER BufferSize was NULL.\r

-  \r
-  @retval EFI_INVALID_PARAMETER The value referenced by BufferSize was not zero \r
+\r
+  @retval EFI_INVALID_PARAMETER The value referenced by BufferSize was not zero\r

                                 and Buffer was NULL.\r
 **/\r
 typedef\r
                                 and Buffer was NULL.\r
 **/\r
 typedef\r


@@ -292,8 +292,8 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

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

   This function registers a function which will be called when\r
   specified actions related to packages of the specified type\r
   occur in the HII database. By registering a function, other\r
   This function registers a function which will be called when\r
   specified actions related to packages of the specified type\r
   occur in the HII database. By registering a function, other\r


@@ -302,12 +302,12 @@ EFI_STATUS
   or application which registers a notification should use\r
   EFI_HII_DATABASE_PROTOCOL.UnregisterPackageNotify() before\r
   exiting.\r
   or application which registers a notification should use\r
   EFI_HII_DATABASE_PROTOCOL.UnregisterPackageNotify() before\r
   exiting.\r

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

   @param This             A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r
 \r
   @param PackageType      The package type. See\r
   @param This             A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r
 \r
   @param PackageType      The package type. See\r

-                          EFI_HII_PACKAGE_TYPE_x in EFI_HII_PACKAGE_HEADER. \r
+                          EFI_HII_PACKAGE_TYPE_x in EFI_HII_PACKAGE_HEADER.\r

 \r
   @param PackageGuid      If PackageType is\r
                           EFI_HII_PACKAGE_TYPE_GUID, then this is\r
 \r
   @param PackageGuid      If PackageType is\r
                           EFI_HII_PACKAGE_TYPE_GUID, then this is\r


@@ -355,19 +355,19 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-   \r
+\r

   Removes the specified HII database package-related notification.\r
   Removes the specified HII database package-related notification.\r

-  \r
+\r

   @param This                 A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r
 \r
   @param NotificationHandle   The handle of the notification\r
                               function being unregistered.\r
   @param This                 A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r
 \r
   @param NotificationHandle   The handle of the notification\r
                               function being unregistered.\r

-  \r
-  @retval EFI_SUCCESS   Successsfully unregistered the notification. \r
-  \r
-  @retval EFI_NOT_FOUND The incoming notification handle does not exist \r
+\r
+  @retval EFI_SUCCESS   Successsfully unregistered the notification.\r
+\r
+  @retval EFI_NOT_FOUND The incoming notification handle does not exist\r

                         in the current hii database.\r
                         in the current hii database.\r

-  \r
+\r

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


@@ -378,7 +378,7 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-   \r
+\r

   This routine retrieves an array of GUID values for each keyboard\r
   layout that was previously registered in the system.\r
 \r
   This routine retrieves an array of GUID values for each keyboard\r
   layout that was previously registered in the system.\r
 \r


@@ -388,13 +388,13 @@ EFI_STATUS
                               of the keyboard GUID buffer. On\r
                               output, the length of the handle\r
                               buffer that is required for the\r
                               of the keyboard GUID buffer. On\r
                               output, the length of the handle\r
                               buffer that is required for the\r

-                              handles found. \r
-  \r
+                              handles found.\r
+\r

   @param KeyGuidBuffer        An array of keyboard layout GUID\r
                               instances returned.\r
 \r
   @retval EFI_SUCCESS           KeyGuidBuffer was updated successfully.\r
   @param KeyGuidBuffer        An array of keyboard layout GUID\r
                               instances returned.\r
 \r
   @retval EFI_SUCCESS           KeyGuidBuffer was updated successfully.\r

-  \r
+\r

   @retval EFI_BUFFER_TOO_SMALL  The KeyGuidBufferLength\r
                                 parameter indicates that\r
                                 KeyGuidBuffer is too small to\r
   @retval EFI_BUFFER_TOO_SMALL  The KeyGuidBufferLength\r
                                 parameter indicates that\r
                                 KeyGuidBuffer is too small to\r


@@ -403,7 +403,7 @@ EFI_STATUS
                                 with a value that will enable\r
                                 the data to fit.\r
   @retval EFI_INVALID_PARAMETER The KeyGuidBufferLength is NULL.\r
                                 with a value that will enable\r
                                 the data to fit.\r
   @retval EFI_INVALID_PARAMETER The KeyGuidBufferLength is NULL.\r

-  @retval EFI_INVALID_PARAMETER The value referenced by \r
+  @retval EFI_INVALID_PARAMETER The value referenced by\r

                                 KeyGuidBufferLength is not\r
                                 zero and KeyGuidBuffer is NULL.\r
   @retval EFI_NOT_FOUND         There was no keyboard layout.\r
                                 KeyGuidBufferLength is not\r
                                 zero and KeyGuidBuffer is NULL.\r
   @retval EFI_NOT_FOUND         There was no keyboard layout.\r


@@ -419,14 +419,14 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-   \r
+\r

   This routine retrieves the requested keyboard layout. The layout\r
   is a physical description of the keys on a keyboard, and the\r
   character(s) that are associated with a particular set of key\r
   strokes.\r
 \r
   @param This                   A pointer to the EFI_HII_PROTOCOL instance.\r
   This routine retrieves the requested keyboard layout. The layout\r
   is a physical description of the keys on a keyboard, and the\r
   character(s) that are associated with a particular set of key\r
   strokes.\r
 \r
   @param This                   A pointer to the EFI_HII_PROTOCOL instance.\r

-  \r
+\r

   @param KeyGuid                A pointer to the unique ID associated with a\r
                                 given keyboard layout. If KeyGuid is NULL then\r
                                 the current layout will be retrieved.\r
   @param KeyGuid                A pointer to the unique ID associated with a\r
                                 given keyboard layout. If KeyGuid is NULL then\r
                                 the current layout will be retrieved.\r


@@ -434,13 +434,13 @@ EFI_STATUS
   @param KeyboardLayoutLength   On input, a pointer to the length of the\r
                                 KeyboardLayout buffer.  On output, the length of\r
                                 the data placed into KeyboardLayout.\r
   @param KeyboardLayoutLength   On input, a pointer to the length of the\r
                                 KeyboardLayout buffer.  On output, the length of\r
                                 the data placed into KeyboardLayout.\r

-  \r
+\r

   @param KeyboardLayout         A pointer to a buffer containing the\r
                                 retrieved keyboard layout.\r
   @param KeyboardLayout         A pointer to a buffer containing the\r
                                 retrieved keyboard layout.\r

-  \r
+\r

   @retval EFI_SUCCESS   The keyboard layout was retrieved\r
                         successfully.\r
   @retval EFI_SUCCESS   The keyboard layout was retrieved\r
                         successfully.\r

-  \r
+\r

   @retval EFI_NOT_FOUND The requested keyboard layout was not found.\r
 \r
 **/\r
   @retval EFI_NOT_FOUND The requested keyboard layout was not found.\r
 \r
 **/\r


@@ -454,7 +454,7 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-   \r
+\r

   This routine sets the default keyboard layout to the one\r
   referenced by KeyGuid. When this routine is called, an event\r
   will be signaled of the EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID\r
   This routine sets the default keyboard layout to the one\r
   referenced by KeyGuid. When this routine is called, an event\r
   will be signaled of the EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID\r


@@ -481,21 +481,21 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-   \r
+\r

   Return the EFI handle associated with a package list.\r
   Return the EFI handle associated with a package list.\r

-  \r
+\r

   @param This               A pointer to the EFI_HII_PROTOCOL instance.\r
   @param This               A pointer to the EFI_HII_PROTOCOL instance.\r

-  \r
+\r

   @param PackageListHandle  An EFI_HII_HANDLE  that corresponds\r
                             to the desired package list in the\r
                             HIIdatabase.\r
   @param PackageListHandle  An EFI_HII_HANDLE  that corresponds\r
                             to the desired package list in the\r
                             HIIdatabase.\r

-  \r
+\r

   @param DriverHandle       On return, contains the EFI_HANDLE which\r
                             was registered with the package list in\r
                             NewPackageList().\r
   @param DriverHandle       On return, contains the EFI_HANDLE which\r
                             was registered with the package list in\r
                             NewPackageList().\r

-  \r
+\r

   @retval EFI_SUCCESS            The DriverHandle was returned successfully.\r
   @retval EFI_SUCCESS            The DriverHandle was returned successfully.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER  The PackageListHandle was not valid.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER  The PackageListHandle was not valid.\r
 \r
 **/\r

diff --git a/MdePkg/Include/Protocol/HiiFont.h b/MdePkg/Include/Protocol/HiiFont.h
index 6314df8e371c266bb6a2105674f8611e110df530..de9932bc931ba6fee40b8d6c4cdc55441fc3f280 100644 (file)
--- a/MdePkg/Include/Protocol/HiiFont.h
+++ b/MdePkg/Include/Protocol/HiiFont.h
@@ -1,14 +1,14 @@
 /** @file\r
   The file provides services to retrieve font information.\r
 /** @file\r
   The file provides services to retrieve font 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
+\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
-    \r
-THE PROGRAM 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


@@ -27,7 +27,7 @@ typedef VOID    *EFI_FONT_HANDLE;
 \r
 ///\r
 /// EFI_HII_OUT_FLAGS.\r
 \r
 ///\r
 /// EFI_HII_OUT_FLAGS.\r

-/// \r
+///\r

 typedef UINT32  EFI_HII_OUT_FLAGS;\r
 \r
 #define EFI_HII_OUT_FLAG_CLIP         0x00000001\r
 typedef UINT32  EFI_HII_OUT_FLAGS;\r
 \r
 #define EFI_HII_OUT_FLAG_CLIP         0x00000001\r


@@ -49,12 +49,12 @@ typedef struct _EFI_HII_ROW_INFO {
   UINTN   StartIndex;\r
   ///\r
   /// The index of the last character in the string which is displayed on the line.\r
   UINTN   StartIndex;\r
   ///\r
   /// The index of the last character in the string which is displayed on the line.\r

-  /// If this is the same as StartIndex, then no characters are displayed.  \r
+  /// If this is the same as StartIndex, then no characters are displayed.\r

   ///\r
   UINTN   EndIndex;\r
   UINTN   LineHeight; ///< The height of the line, in pixels.\r
   UINTN   LineWidth;  ///< The width of the text on the line, in pixels.\r
   ///\r
   UINTN   EndIndex;\r
   UINTN   LineHeight; ///< The height of the line, in pixels.\r
   UINTN   LineWidth;  ///< The width of the text on the line, in pixels.\r

-  \r
+\r

   ///\r
   /// The font baseline offset in pixels from the bottom of the row, or 0 if none.\r
   ///\r
   ///\r
   /// The font baseline offset in pixels from the bottom of the row, or 0 if none.\r
   ///\r


@@ -80,7 +80,7 @@ typedef UINT32  EFI_FONT_INFO_MASK;
 \r
 //\r
 // EFI_FONT_INFO\r
 \r
 //\r
 // EFI_FONT_INFO\r

-// \r
+//\r

 typedef struct {\r
   EFI_HII_FONT_STYLE FontStyle;\r
   UINT16             FontSize;      ///< character cell height in pixels\r
 typedef struct {\r
   EFI_HII_FONT_STYLE FontStyle;\r
   UINT16             FontSize;      ///< character cell height in pixels\r


@@ -103,7 +103,7 @@ typedef struct _EFI_FONT_DISPLAY_INFO {
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL ForegroundColor;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL BackgroundColor;\r
   EFI_FONT_INFO_MASK            FontInfoMask;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL ForegroundColor;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL BackgroundColor;\r
   EFI_FONT_INFO_MASK            FontInfoMask;\r

-  EFI_FONT_INFO                 FontInfo;  \r
+  EFI_FONT_INFO                 FontInfo;\r

 } EFI_FONT_DISPLAY_INFO;\r
 \r
 /**\r
 } EFI_FONT_DISPLAY_INFO;\r
 \r
 /**\r


@@ -155,7 +155,7 @@ typedef struct _EFI_FONT_DISPLAY_INFO {
 \r
   @param Flags            Describes how the string is to be drawn.\r
 \r
 \r
   @param Flags            Describes how the string is to be drawn.\r
 \r

-  @param String           Points to the null-terminated string to be \r
+  @param String           Points to the null-terminated string to be\r

 \r
   @param StringInfo       Points to the string output information,\r
                           including the color and font. If NULL, then\r
 \r
   @param StringInfo       Points to the string output information,\r
                           including the color and font. If NULL, then\r


@@ -203,9 +203,9 @@ typedef struct _EFI_FONT_DISPLAY_INFO {
                           overlap.\r
 \r
   @retval EFI_SUCCESS           The string was successfully updated.\r
                           overlap.\r
 \r
   @retval EFI_SUCCESS           The string was successfully updated.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES  Unable to allocate an output buffer for RowInfoArray or Blt.\r
   @retval EFI_OUT_OF_RESOURCES  Unable to allocate an output buffer for RowInfoArray or Blt.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER The String or Blt was NULL.\r
 \r
   @retval EFI_INVALID_PARAMETER Flags were invalid combination.\r
   @retval EFI_INVALID_PARAMETER The String or Blt was NULL.\r
 \r
   @retval EFI_INVALID_PARAMETER Flags were invalid combination.\r


@@ -276,7 +276,7 @@ EFI_STATUS
 \r
   @param Flags      Describes how the string is to be drawn.\r
 \r
 \r
   @param Flags      Describes how the string is to be drawn.\r
 \r

-  @param PackageList  \r
+  @param PackageList\r

                     The package list in the HII database to\r
                     search for the specified string.\r
 \r
                     The package list in the HII database to\r
                     search for the specified string.\r
 \r


@@ -342,8 +342,8 @@ EFI_STATUS
                                 Width was NULL.\r
   @retval EFI_INVALID_PARAMETER The Blt or PackageList was NULL.\r
   @retval EFI_INVALID_PARAMETER Flags were invalid combination.\r
                                 Width was NULL.\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, \r
-                                or the stringid is not in the specified PackageList. \r
+  @retval EFI_NOT_FOUND         The specified PackageList is not in the Database,\r
+                                or the stringid is not in the specified PackageList.\r

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


@@ -424,26 +424,26 @@ EFI_STATUS
                         to NULL if there are no more matching fonts.\r
 \r
   @param StringInfoIn   Upon entry, points to the font to return\r
                         to NULL if there are no more matching fonts.\r
 \r
   @param StringInfoIn   Upon entry, points to the font to return\r

-                        information about. If NULL, then the information \r
+                        information about. If NULL, then the information\r

                         about the system default font will be returned.\r
 \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
                         about the system default font will be returned.\r
 \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
 \r
   @param String         Points to the string which will be tested to\r
                         determine if all characters are available. If\r
                         NULL, then any font is acceptable.\r
                         Service FreePool() when the caller no longer requires\r
                         the contents of StringInfoOut.\r
 \r
   @param String         Points to the string which will be tested to\r
                         determine if all characters are available. If\r
                         NULL, then any font is acceptable.\r

-  \r
+\r

   @retval EFI_SUCCESS            Matching font returned successfully.\r
   @retval EFI_SUCCESS            Matching font returned successfully.\r

-  \r
+\r

   @retval EFI_NOT_FOUND          No matching font was found.\r
 \r
   @retval EFI_OUT_OF_RESOURCES   There were insufficient resources to complete the request.\r
   @retval EFI_NOT_FOUND          No matching font was found.\r
 \r
   @retval EFI_OUT_OF_RESOURCES   There were insufficient resources to complete the request.\r

-  \r
+\r

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

diff --git a/MdePkg/Include/Protocol/HiiImage.h b/MdePkg/Include/Protocol/HiiImage.h
index 1d42bfa71e4c97db47583b123ba485149c0d0f57..f219ef47c79ed6cddc726ce38a545f3031f92acc 100644 (file)
--- a/MdePkg/Include/Protocol/HiiImage.h
+++ b/MdePkg/Include/Protocol/HiiImage.h
@@ -1,14 +1,14 @@
 /** @file\r
   The file provides services to access to images in the images database.\r
 /** @file\r
   The file provides services to access to images in the images database.\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


@@ -25,18 +25,18 @@ typedef struct _EFI_HII_IMAGE_PROTOCOL EFI_HII_IMAGE_PROTOCOL;
 \r
 ///\r
 /// Flags in EFI_IMAGE_INPUT\r
 \r
 ///\r
 /// Flags in EFI_IMAGE_INPUT\r

-/// \r
+///\r

 #define EFI_IMAGE_TRANSPARENT 0x00000001\r
 \r
 /**\r
 #define EFI_IMAGE_TRANSPARENT 0x00000001\r
 \r
 /**\r

-   \r
+\r

   Definition of EFI_IMAGE_INPUT.\r
   Definition of EFI_IMAGE_INPUT.\r

-   \r
+\r

   @param Flags  Describe image characteristics. If\r
                 EFI_IMAGE_TRANSPARENT is set, then the image was\r
                 designed for transparent display.\r
 \r
   @param Flags  Describe image characteristics. If\r
                 EFI_IMAGE_TRANSPARENT is set, then the image was\r
                 designed for transparent display.\r
 \r

-  @param Width  Image width, in pixels. \r
+  @param Width  Image width, in pixels.\r

 \r
   @param Height Image height, in pixels.\r
 \r
 \r
   @param Height Image height, in pixels.\r
 \r


@@ -44,7 +44,7 @@ typedef struct _EFI_HII_IMAGE_PROTOCOL EFI_HII_IMAGE_PROTOCOL;
                 top-to-bottom. The size of the bitmap is\r
                 Width*Height*sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL).\r
 \r
                 top-to-bottom. The size of the bitmap is\r
                 Width*Height*sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL).\r
 \r

-   \r
+\r

 **/\r
 typedef struct _EFI_IMAGE_INPUT {\r
   UINT32                          Flags;\r
 **/\r
 typedef struct _EFI_IMAGE_INPUT {\r
   UINT32                          Flags;\r


@@ -60,8 +60,8 @@ typedef struct _EFI_IMAGE_INPUT {
   owned by PackageList, and returns a new image identifier\r
   (ImageId).\r
 \r
   owned by PackageList, and returns a new image identifier\r
   (ImageId).\r
 \r

-  @param This        A pointer to the EFI_HII_IMAGE_PROTOCOL instance. \r
-  \r
+  @param This        A pointer to the EFI_HII_IMAGE_PROTOCOL instance.\r
+\r

   @param PackageList Handle of the package list where this image will be added.\r
 \r
   @param ImageId     On return, contains the new image id, which is\r
   @param PackageList Handle of the package list where this image will be added.\r
 \r
   @param ImageId     On return, contains the new image id, which is\r


@@ -71,9 +71,9 @@ typedef struct _EFI_IMAGE_INPUT {
 \r
   @retval EFI_SUCCESS             The new image was added\r
                                   successfully\r
 \r
   @retval EFI_SUCCESS             The new image was added\r
                                   successfully\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES    Could not add the image.\r
   @retval EFI_OUT_OF_RESOURCES    Could not add the image.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   Image is NULL or ImageId is\r
                                   NULL.\r
 \r
   @retval EFI_INVALID_PARAMETER   Image is NULL or ImageId is\r
                                   NULL.\r
 \r


@@ -100,21 +100,21 @@ EFI_STATUS
   updated to the size of buffer actually required to hold the\r
   image.\r
 \r
   updated to the size of buffer actually required to hold the\r
   image.\r
 \r

-  @param This         A pointer to the EFI_HII_IMAGE_PROTOCOL instance. \r
-  \r
+  @param This         A pointer to the EFI_HII_IMAGE_PROTOCOL instance.\r
+\r

   @param PackageList  The package list in the HII database to\r
                       search for the specified image.\r
   @param PackageList  The package list in the HII database to\r
                       search for the specified image.\r

-  \r
+\r

   @param ImageId      The image's id, which is unique within\r
                       PackageList.\r
   @param ImageId      The image's id, which is unique within\r
                       PackageList.\r

-  \r
+\r

   @param Image        Points to the new image.\r
   @param Image        Points to the new image.\r

-  \r
+\r

   @retval EFI_SUCCESS            The image was returned successfully.\r
 \r
   @retval EFI_NOT_FOUND          The image specified by ImageId is not\r
                                  available. Or The specified PackageList is not in the database.\r
   @retval EFI_SUCCESS            The image was returned successfully.\r
 \r
   @retval EFI_NOT_FOUND          The image specified by ImageId is not\r
                                  available. Or The specified PackageList is not in the database.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER  The Image or Langugae was NULL.\r
   @retval EFI_OUT_OF_RESOURCES   The bitmap could not be retrieved because there was not\r
                                  enough memory.\r
   @retval EFI_INVALID_PARAMETER  The Image or Langugae was NULL.\r
   @retval EFI_OUT_OF_RESOURCES   The bitmap could not be retrieved because there was not\r
                                  enough memory.\r


@@ -131,12 +131,12 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-   \r
+\r

   This function updates the image specified by ImageId in the\r
   specified PackageListHandle to the image specified by Image.\r
 \r
 \r
   This function updates the image specified by ImageId in the\r
   specified PackageListHandle to the image specified by Image.\r
 \r
 \r

-  @param This         A pointer to the EFI_HII_IMAGE_PROTOCOL instance. \r
+  @param This         A pointer to the EFI_HII_IMAGE_PROTOCOL instance.\r

 \r
   @param PackageList  The package list containing the images.\r
 \r
 \r
   @param PackageList  The package list containing the images.\r
 \r


@@ -145,10 +145,10 @@ EFI_STATUS
   @param Image        Points to the image.\r
 \r
   @retval EFI_SUCCESS           The image was successfully updated.\r
   @param Image        Points to the image.\r
 \r
   @retval EFI_SUCCESS           The image was successfully updated.\r

-  \r
+\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
+                                The specified PackageList is not in the database.\r
+\r

   @retval EFI_INVALID_PARAMETER The Image or Language was NULL.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER The Image or Language was NULL.\r
 \r
 **/\r


@@ -176,9 +176,9 @@ typedef UINT32  EFI_HII_DRAW_FLAGS;
 #define EFI_HII_DIRECT_TO_SCREEN        0x00000080\r
 \r
 /**\r
 #define EFI_HII_DIRECT_TO_SCREEN        0x00000080\r
 \r
 /**\r

-   \r
+\r

   Definition of EFI_IMAGE_OUTPUT.\r
   Definition of EFI_IMAGE_OUTPUT.\r

-   \r
+\r

   @param Width  Width of the output image.\r
 \r
   @param Height Height of the output image.\r
   @param Width  Width of the output image.\r
 \r
   @param Height Height of the output image.\r


@@ -201,7 +201,7 @@ typedef struct _EFI_IMAGE_OUTPUT {
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-   \r
+\r

   This function renders an image to a bitmap or the screen using\r
   the specified color and options. It draws the image on an\r
   existing bitmap, allocates a new bitmap or uses the screen. The\r
   This function renders an image to a bitmap or the screen using\r
   the specified color and options. It draws the image on an\r
   existing bitmap, allocates a new bitmap or uses the screen. The\r


@@ -216,14 +216,14 @@ typedef struct _EFI_IMAGE_OUTPUT {
   specified by Bitmap.\r
 \r
 \r
   specified by Bitmap.\r
 \r
 \r

-  @param This       A pointer to the EFI_HII_IMAGE_PROTOCOL instance. \r
- \r
+  @param This       A pointer to the EFI_HII_IMAGE_PROTOCOL instance.\r
+\r

   @param Flags      Describes how the image is to be drawn.\r
                     EFI_HII_DRAW_FLAGS is defined in Related\r
                     Definitions, below.\r
   @param Flags      Describes how the image is to be drawn.\r
                     EFI_HII_DRAW_FLAGS is defined in Related\r
                     Definitions, below.\r

-  \r
-  @param Image      Points to the image to be displayed. \r
-  \r
+\r
+  @param Image      Points to the image to be displayed.\r
+\r

   @param Blt        If this points to a non-NULL on entry, this points\r
                     to the image, which is Width pixels wide and\r
                     Height pixels high. The image will be drawn onto\r
   @param Blt        If this points to a non-NULL on entry, this points\r
                     to the image, which is Width pixels wide and\r
                     Height pixels high. The image will be drawn onto\r


@@ -259,7 +259,7 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-   \r
+\r

   This function renders an image as a bitmap or to the screen and\r
   can clip the image. The bitmap is either supplied by the caller\r
   or else is allocated by the function. The images can be drawn\r
   This function renders an image as a bitmap or to the screen and\r
   can clip the image. The bitmap is either supplied by the caller\r
   or else is allocated by the function. The images can be drawn\r


@@ -292,7 +292,7 @@ EFI_STATUS
   directly to the output device specified by Screen. Otherwise the\r
   image will be rendered to the bitmap specified by Bitmap.\r
 \r
   directly to the output device specified by Screen. Otherwise the\r
   image will be rendered to the bitmap specified by Bitmap.\r
 \r

-  @param This         A pointer to the EFI_HII_IMAGE_PROTOCOL instance. \r
+  @param This         A pointer to the EFI_HII_IMAGE_PROTOCOL instance.\r

 \r
   @param Flags        Describes how the image is to be drawn.\r
 \r
 \r
   @param Flags        Describes how the image is to be drawn.\r
 \r


@@ -315,14 +315,14 @@ EFI_STATUS
                       pixel in the image.\r
 \r
   @retval EFI_SUCCESS           The image was successfully updated.\r
                       pixel in the image.\r
 \r
   @retval EFI_SUCCESS           The image was successfully updated.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES  Unable to allocate an output\r
                                 buffer for RowInfoArray or Blt.\r
   @retval EFI_OUT_OF_RESOURCES  Unable to allocate an output\r
                                 buffer for RowInfoArray or Blt.\r

-  \r
-  @retval EFI_NOT_FOUND         The image specified by ImageId is not in the database. \r
-                                Or The specified PackageList is not in the database.                            \r
-  \r
-  @retval EFI_INVALID_PARAMETER The Blt was NULL.    \r
+\r
+  @retval EFI_NOT_FOUND         The image specified by ImageId is not in the database.\r
+                                Or The specified PackageList is not in the database.\r
+\r
+  @retval EFI_INVALID_PARAMETER The Blt was NULL.\r

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

diff --git a/MdePkg/Include/Protocol/HiiPackageList.h b/MdePkg/Include/Protocol/HiiPackageList.h
index 25fdfa4d30d0c558afaf80be7b2b9b6f3ff9f245..4122f11dddb26c0b06069930d37d0872c161d6a9 100644 (file)
--- a/MdePkg/Include/Protocol/HiiPackageList.h
+++ b/MdePkg/Include/Protocol/HiiPackageList.h
@@ -4,15 +4,15 @@
   if the image contains a custom PE/COFF resource with the type 'HII'.\r
   The protocol's interface pointer points to the HII package list, which is\r
   contained in the resource's data.\r
   if the image contains a custom PE/COFF resource with the type 'HII'.\r
   The protocol's interface pointer points to the HII package list, which is\r
   contained in the resource's data.\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

diff --git a/MdePkg/Include/Protocol/HiiString.h b/MdePkg/Include/Protocol/HiiString.h
index 6400b51d388c76089dfa6676a87682a723370f7a..41137886bd40e7a8bee7e60cc11a4268fb150ce0 100644 (file)
--- a/MdePkg/Include/Protocol/HiiString.h
+++ b/MdePkg/Include/Protocol/HiiString.h
@@ -1,14 +1,14 @@
 /** @file\r
   The file provides services to manipulate string data.\r
 /** @file\r
   The file provides services to manipulate string data.\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
+\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
-    \r
-THE PROGRAM 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,8 +25,8 @@ typedef struct _EFI_HII_STRING_PROTOCOL EFI_HII_STRING_PROTOCOL;
 /**\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
 /**\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
+  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
   @param  This                   A pointer to the EFI_HII_STRING_PROTOCOL instance.\r
   @param  PackageList            The handle of the package list where this string will\r
 \r
   @param  This                   A pointer to the EFI_HII_STRING_PROTOCOL instance.\r
   @param  PackageList            The handle of the package list where this string will\r


@@ -61,7 +61,7 @@ EFI_STATUS
   IN        EFI_HII_HANDLE            PackageList,\r
   OUT       EFI_STRING_ID             *StringId,\r
   IN CONST  CHAR8                     *Language,\r
   IN        EFI_HII_HANDLE            PackageList,\r
   OUT       EFI_STRING_ID             *StringId,\r
   IN CONST  CHAR8                     *Language,\r

-  IN  CONST CHAR16                    *LanguageName, OPTIONAL  \r
+  IN  CONST CHAR16                    *LanguageName, OPTIONAL\r

   IN CONST  EFI_STRING                String,\r
   IN CONST  EFI_FONT_INFO             *StringFontInfo OPTIONAL\r
 );\r
   IN CONST  EFI_STRING                String,\r
   IN CONST  EFI_FONT_INFO             *StringFontInfo OPTIONAL\r
 );\r


@@ -89,7 +89,7 @@ EFI_STATUS
   @retval EFI_SUCCESS            The string was returned successfully.\r
   @retval EFI_NOT_FOUND          The string specified by StringId is not available.\r
                                  The specified PackageList is not in the database.\r
   @retval EFI_SUCCESS            The string was returned successfully.\r
   @retval EFI_NOT_FOUND          The string specified by StringId is not available.\r
                                  The specified PackageList is not in the database.\r

-  @retval EFI_INVALID_LANGUAGE    The string specified by StringId is available but \r
+  @retval EFI_INVALID_LANGUAGE    The string specified by StringId is available but\r

                                   not in the specified language.\r
   @retval EFI_BUFFER_TOO_SMALL   The buffer specified by StringSize is too small to\r
                                  hold the string.\r
                                   not in the specified language.\r
   @retval EFI_BUFFER_TOO_SMALL   The buffer specified by StringSize is too small to\r
                                  hold the string.\r

diff --git a/MdePkg/Include/Protocol/Http.h b/MdePkg/Include/Protocol/Http.h
index bdcd7b1771290ff8cb603fb602eca5024122984b..fad8ce18aa0019135fac9a6a0cbba66b357a3053 100644 (file)
--- a/MdePkg/Include/Protocol/Http.h
+++ b/MdePkg/Include/Protocol/Http.h
@@ -4,7 +4,7 @@
   HTTP Service Binding Protocol (HTTPSB)\r
   HTTP Protocol (HTTP)\r
 \r
   HTTP Service Binding Protocol (HTTPSB)\r
   HTTP Protocol (HTTP)\r
 \r

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

   (C) Copyright 2015-2017 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-2017 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


@@ -305,16 +305,16 @@ typedef struct {
 \r
   @param[in]  This                Pointer to EFI_HTTP_PROTOCOL instance.\r
   @param[out] HttpConfigData      Point to buffer for operational parameters of this\r
 \r
   @param[in]  This                Pointer to EFI_HTTP_PROTOCOL instance.\r
   @param[out] HttpConfigData      Point to buffer for operational parameters of this\r

-                                  HTTP instance. It is the responsibility of the caller \r
-                                  to allocate the memory for HttpConfigData and \r
-                                  HttpConfigData->AccessPoint.IPv6Node/IPv4Node. In fact, \r
-                                  it is recommended to allocate sufficient memory to record \r
+                                  HTTP instance. It is the responsibility of the caller\r
+                                  to allocate the memory for HttpConfigData and\r
+                                  HttpConfigData->AccessPoint.IPv6Node/IPv4Node. In fact,\r
+                                  it is recommended to allocate sufficient memory to record\r

                                   IPv6Node since it is big enough for all possibilities.\r
 \r
   @retval EFI_SUCCESS             Operation succeeded.\r
   @retval EFI_INVALID_PARAMETER   This is NULL.\r
                                   HttpConfigData is NULL.\r
                                   IPv6Node since it is big enough for all possibilities.\r
 \r
   @retval EFI_SUCCESS             Operation succeeded.\r
   @retval EFI_INVALID_PARAMETER   This is NULL.\r
                                   HttpConfigData is NULL.\r

-                                  HttpConfigData->AccessPoint.IPv4Node or \r
+                                  HttpConfigData->AccessPoint.IPv4Node or\r

                                   HttpConfigData->AccessPoint.IPv6Node is NULL.\r
   @retval EFI_NOT_STARTED         This EFI HTTP Protocol instance has not been started.\r
 **/\r
                                   HttpConfigData->AccessPoint.IPv6Node is NULL.\r
   @retval EFI_NOT_STARTED         This EFI HTTP Protocol instance has not been started.\r
 **/\r


@@ -364,7 +364,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  The Request() function queues an HTTP request to this HTTP instance, \r
+  The Request() function queues an HTTP request to this HTTP instance,\r

   similar to Transmit() function in the EFI TCP driver. When the HTTP request is sent\r
   successfully, or if there is an error, Status in token will be updated and Event will\r
   be signaled.\r
   similar to Transmit() function in the EFI TCP driver. When the HTTP request is sent\r
   successfully, or if there is an error, Status in token will be updated and Event will\r
   be signaled.\r

diff --git a/MdePkg/Include/Protocol/HttpBootCallback.h b/MdePkg/Include/Protocol/HttpBootCallback.h
index 7542b30e034731d1ae2cb8a0516b663affd27ab1..4c7de56b0e3a1e2879f12a22a990342b82cc32c1 100644 (file)
--- a/MdePkg/Include/Protocol/HttpBootCallback.h
+++ b/MdePkg/Include/Protocol/HttpBootCallback.h
@@ -1,7 +1,7 @@
 /** @file\r
   This file defines the EFI HTTP Boot Callback Protocol interface.\r
 \r
 /** @file\r
   This file defines the EFI HTTP Boot Callback Protocol interface.\r
 \r

-  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\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
   This program and the accompanying materials\r
   are licensed and made available under 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 @@ typedef enum {
   ///\r
   HttpBootHttpRequest,\r
   ///\r
   ///\r
   HttpBootHttpRequest,\r
   ///\r

-  /// Data points to an EFI_HTTP_MESSAGE structure, which contians a received HTTP \r
+  /// Data points to an EFI_HTTP_MESSAGE structure, which contians a received HTTP\r

   /// response message.\r
   ///\r
   HttpBootHttpResponse,\r
   /// response message.\r
   ///\r
   HttpBootHttpResponse,\r


@@ -72,7 +72,7 @@ typedef enum {
   @param[in]  DataLength          The length in bytes of the buffer pointed to by Data.\r
   @param[in]  Data                A pointer to the buffer of data, the data type is specified by\r
                                   DataType.\r
   @param[in]  DataLength          The length in bytes of the buffer pointed to by Data.\r
   @param[in]  Data                A pointer to the buffer of data, the data type is specified by\r
                                   DataType.\r

-                                  \r
+\r

   @retval EFI_SUCCESS             Tells the HTTP Boot driver to continue the HTTP Boot process.\r
   @retval EFI_ABORTED             Tells the HTTP Boot driver to abort the current HTTP Boot process.\r
 **/\r
   @retval EFI_SUCCESS             Tells the HTTP Boot driver to continue the HTTP Boot process.\r
   @retval EFI_ABORTED             Tells the HTTP Boot driver to abort the current HTTP Boot process.\r
 **/\r


@@ -87,7 +87,7 @@ EFI_STATUS
  );\r
 \r
 ///\r
  );\r
 \r
 ///\r

-/// EFI HTTP Boot Callback Protocol is invoked when the HTTP Boot driver is about to transmit or \r
+/// EFI HTTP Boot Callback Protocol is invoked when the HTTP Boot driver is about to transmit or\r

 /// has received a packet. The EFI HTTP Boot Callback Protocol must be installed on the same handle\r
 /// as the Load File Protocol for the HTTP Boot.\r
 ///\r
 /// has received a packet. The EFI HTTP Boot Callback Protocol must be installed on the same handle\r
 /// as the Load File Protocol for the HTTP Boot.\r
 ///\r

diff --git a/MdePkg/Include/Protocol/I2cBusConfigurationManagement.h b/MdePkg/Include/Protocol/I2cBusConfigurationManagement.h
index 68000cf47601f3be966e8d5a81633399776492e7..6d10f412ea584d2b5ce8877fd8cb9cb88acf18e5 100644 (file)
--- a/MdePkg/Include/Protocol/I2cBusConfigurationManagement.h
+++ b/MdePkg/Include/Protocol/I2cBusConfigurationManagement.h
@@ -1,19 +1,19 @@
 /** @file\r
   I2C Bus Configuration Management Protocol as defined in the PI 1.3 specification.\r
 \r
 /** @file\r
   I2C Bus Configuration Management Protocol as defined in the PI 1.3 specification.\r
 \r

-  The EFI I2C bus configuration management protocol provides platform specific \r
-  services that allow the I2C host protocol to reconfigure the switches and multiplexers \r
-  and set the clock frequency for the I2C bus. This protocol also enables the I2C host protocol \r
+  The EFI I2C bus configuration management protocol provides platform specific\r
+  services that allow the I2C host protocol to reconfigure the switches and multiplexers\r
+  and set the clock frequency for the I2C bus. This protocol also enables the I2C host protocol\r

   to reset an I2C device which may be locking up the I2C bus by holding the clock or data line low.\r
 \r
   to reset an I2C device which may be locking up the I2C bus by holding the clock or data line low.\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
   @par Revision Reference:\r
   This protocol is from PI Version 1.3.\r
 \r
   @par Revision Reference:\r
   This protocol is from PI Version 1.3.\r

diff --git a/MdePkg/Include/Protocol/I2cEnumerate.h b/MdePkg/Include/Protocol/I2cEnumerate.h
index 45e6a26c6947ba0050b8cd7e26be60eb137ccc32..5e2a0fa478b20fb2546393a4e3e42a52efd4284d 100644 (file)
--- a/MdePkg/Include/Protocol/I2cEnumerate.h
+++ b/MdePkg/Include/Protocol/I2cEnumerate.h
@@ -3,14 +3,14 @@
 \r
   This protocol supports the enumerations of device on the I2C bus.\r
 \r
 \r
   This protocol supports the enumerations of device on the I2C bus.\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
   @par Revision Reference:\r
   This protocol is from PI Version 1.3.\r
 \r
   @par Revision Reference:\r
   This protocol is from PI Version 1.3.\r

diff --git a/MdePkg/Include/Protocol/I2cHost.h b/MdePkg/Include/Protocol/I2cHost.h
index df04aeb7984cb91b96ad8f3c575783feccafa357..8739d68393cee1d849689f1c0ab21c33549bb0ab 100644 (file)
--- a/MdePkg/Include/Protocol/I2cHost.h
+++ b/MdePkg/Include/Protocol/I2cHost.h
@@ -1,17 +1,17 @@
 /** @file\r
   I2C Host Protocol as defined in the PI 1.3 specification.\r
 \r
 /** @file\r
   I2C Host Protocol as defined in the PI 1.3 specification.\r
 \r

-  This protocol provides callers with the ability to do I/O transactions \r
+  This protocol provides callers with the ability to do I/O transactions\r

   to all of the devices on the I2C bus.\r
 \r
   to all of the devices on the I2C bus.\r
 \r

-  Copyright (c) 2013 - 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) 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
   @par Revision Reference:\r
   This protocol is from PI Version 1.3.\r
 \r
   @par Revision Reference:\r
   This protocol is from PI Version 1.3.\r


@@ -50,7 +50,7 @@ typedef struct _EFI_I2C_HOST_PROTOCOL EFI_I2C_HOST_PROTOCOL;
   This routine must be called at or below TPL_NOTIFY.  For\r
   synchronous requests this routine must be called at or below\r
   TPL_CALLBACK.\r
   This routine must be called at or below TPL_NOTIFY.  For\r
   synchronous requests this routine must be called at or below\r
   TPL_CALLBACK.\r

-  \r
+\r

   The I2C host protocol uses the concept of I2C bus configurations\r
   to describe the I2C bus.  An I2C bus configuration is defined as\r
   a unique setting of the multiplexers and switches in the I2C bus\r
   The I2C host protocol uses the concept of I2C bus configurations\r
   to describe the I2C bus.  An I2C bus configuration is defined as\r
   a unique setting of the multiplexers and switches in the I2C bus\r

diff --git a/MdePkg/Include/Protocol/I2cIo.h b/MdePkg/Include/Protocol/I2cIo.h
index 1e01d7ce877ccc1479b69db009418ab60b6e754a..339b296da5a9648f27d9f7496026e52565af6413 100644 (file)
--- a/MdePkg/Include/Protocol/I2cIo.h
+++ b/MdePkg/Include/Protocol/I2cIo.h
@@ -1,17 +1,17 @@
 /** @file\r
   I2C I/O Protocol as defined in the PI 1.3 specification.\r
 \r
 /** @file\r
   I2C I/O Protocol as defined in the PI 1.3 specification.\r
 \r

-  The EFI I2C I/O protocol enables the user to manipulate a single \r
+  The EFI I2C I/O protocol 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
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \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
   @par Revision Reference:\r
   This protocol is from PI Version 1.3.\r
 \r
   @par Revision Reference:\r
   This protocol is from PI Version 1.3.\r


@@ -66,7 +66,7 @@ typedef struct _EFI_I2C_IO_PROTOCOL  EFI_I2C_IO_PROTOCOL;
 \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

diff --git a/MdePkg/Include/Protocol/I2cMaster.h b/MdePkg/Include/Protocol/I2cMaster.h
index 26137344af02bc95ce1c6b178db94537e3a2c5b0..8b6884754c0cdbb5913d3a9970f354a74da368a4 100644 (file)
--- a/MdePkg/Include/Protocol/I2cMaster.h
+++ b/MdePkg/Include/Protocol/I2cMaster.h
@@ -1,17 +1,17 @@
 /** @file\r
   I2C Master Protocol as defined in the PI 1.3 specification.\r
 \r
 /** @file\r
   I2C Master Protocol as defined in the PI 1.3 specification.\r
 \r

-  This protocol manipulates the I2C host controller to perform transactions as a master \r
+  This protocol manipulates the I2C host controller to perform transactions as a master\r

   on the I2C bus using the current state of any switches or multiplexers in the I2C bus.\r
 \r
   on the I2C bus using the current state of any switches or multiplexers in the I2C bus.\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
   @par Revision Reference:\r
   This protocol is from PI Version 1.3.\r
 \r
   @par Revision Reference:\r
   This protocol is from PI Version 1.3.\r


@@ -72,7 +72,7 @@ EFI_STATUS
   @retval EFI_SUCCESS         The reset completed successfully.\r
   @retval EFI_ALREADY_STARTED The controller is busy with another transaction.\r
   @retval EFI_DEVICE_ERROR    The reset operation failed.\r
   @retval EFI_SUCCESS         The reset completed successfully.\r
   @retval EFI_ALREADY_STARTED The controller is busy with another transaction.\r
   @retval EFI_DEVICE_ERROR    The reset operation failed.\r

-  \r
+\r

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

diff --git a/MdePkg/Include/Protocol/IScsiInitiatorName.h b/MdePkg/Include/Protocol/IScsiInitiatorName.h
index e55c51b7c62ea336741bba6040058a633d418cde..a172f54269c3e2051a20406e45e3a2c16a466012 100644 (file)
--- a/MdePkg/Include/Protocol/IScsiInitiatorName.h
+++ b/MdePkg/Include/Protocol/IScsiInitiatorName.h
@@ -1,15 +1,15 @@
 /** @file\r
   EFI_ISCSI_INITIATOR_NAME_PROTOCOL as defined in UEFI 2.0.\r
 /** @file\r
   EFI_ISCSI_INITIATOR_NAME_PROTOCOL as defined in UEFI 2.0.\r

-  It provides the ability to get and set the iSCSI Initiator Name.                                                  \r
+  It provides the ability to get and set the iSCSI Initiator Name.\r

 \r
 \r

-  Copyright (c) 2006 - 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
+  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,7 +39,7 @@ typedef struct _EFI_ISCSI_INITIATOR_NAME_PROTOCOL EFI_ISCSI_INITIATOR_NAME_PROTO
   @retval EFI_DEVICE_ERROR      The iSCSI initiator name could not be retrieved due to a hardware error.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR      The iSCSI initiator name could not be retrieved due to a hardware error.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_ISCSI_INITIATOR_NAME_GET)(\r
   IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_ISCSI_INITIATOR_NAME_GET)(\r
   IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This,\r


@@ -47,7 +47,7 @@ EFI_STATUS
   OUT VOID                             *Buffer\r
   );\r
 \r
   OUT VOID                             *Buffer\r
   );\r
 \r

-  \r
+\r

 \r
 /**\r
   Sets the iSCSI Initiator Name.\r
 \r
 /**\r
   Sets the iSCSI Initiator Name.\r


@@ -71,10 +71,10 @@ typedef EFI_STATUS
   IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This,\r
   IN OUT UINTN                         *BufferSize,\r
   IN VOID                              *Buffer\r
   IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This,\r
   IN OUT UINTN                         *BufferSize,\r
   IN VOID                              *Buffer\r

-  );  \r
+  );\r

 \r
 ///\r
 \r
 ///\r

-/// iSCSI Initiator Name Protocol for setting and obtaining the iSCSI Initiator Name. \r
+/// iSCSI Initiator Name Protocol for setting and obtaining the iSCSI Initiator Name.\r

 ///\r
 struct _EFI_ISCSI_INITIATOR_NAME_PROTOCOL {\r
   EFI_ISCSI_INITIATOR_NAME_GET         Get;\r
 ///\r
 struct _EFI_ISCSI_INITIATOR_NAME_PROTOCOL {\r
   EFI_ISCSI_INITIATOR_NAME_GET         Get;\r

diff --git a/MdePkg/Include/Protocol/IdeControllerInit.h b/MdePkg/Include/Protocol/IdeControllerInit.h
index 023090c07122dac834a3befe0f553c3569d0d60e..be0e079c902197838a4441c1c0e1710e627dde0a 100644 (file)
--- a/MdePkg/Include/Protocol/IdeControllerInit.h
+++ b/MdePkg/Include/Protocol/IdeControllerInit.h
@@ -1,31 +1,31 @@
 /** @file\r
   This file declares EFI IDE Controller Init Protocol\r
 /** @file\r
   This file declares EFI IDE Controller Init Protocol\r

-  \r
+\r

   The EFI_IDE_CONTROLLER_INIT_PROTOCOL provides the chipset-specific information\r
   to the driver entity. This protocol is mandatory for IDE controllers if the\r
   IDE devices behind the controller are to be enumerated by a driver entity.\r
   The EFI_IDE_CONTROLLER_INIT_PROTOCOL provides the chipset-specific information\r
   to the driver entity. This protocol is mandatory for IDE controllers if the\r
   IDE devices behind the controller are to be enumerated by a driver entity.\r

-  \r
+\r

   There can only be one instance of EFI_IDE_CONTROLLER_INIT_PROTOCOL for each IDE\r
   controller in a system. It is installed on the handle that corresponds to the\r
   IDE controller. A driver entity that wishes to manage an IDE bus and possibly\r
   IDE devices in a system will have to retrieve the EFI_IDE_CONTROLLER_INIT_PROTOCOL\r
   instance that is associated with the controller to be managed.\r
   There can only be one instance of EFI_IDE_CONTROLLER_INIT_PROTOCOL for each IDE\r
   controller in a system. It is installed on the handle that corresponds to the\r
   IDE controller. A driver entity that wishes to manage an IDE bus and possibly\r
   IDE devices in a system will have to retrieve the EFI_IDE_CONTROLLER_INIT_PROTOCOL\r
   instance that is associated with the controller to be managed.\r

-  \r
+\r

   A device handle for an IDE controller must contain an EFI_DEVICE_PATH_PROTOCOL.\r
 \r
   A device handle for an IDE controller must contain an EFI_DEVICE_PATH_PROTOCOL.\r
 \r

-Copyright (c) 2007 - 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) 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
-    \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
   @par Revision Reference:\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  This Protocol is defined in UEFI Platform Initialization Specification 1.2 \r
+  This Protocol is defined in UEFI Platform Initialization Specification 1.2\r

   Volume 5: Standards.\r
   Volume 5: Standards.\r

-  \r
+\r

 **/\r
 \r
 #ifndef _EFI_IDE_CONTROLLER_INIT_PROTOCOL_H_\r
 **/\r
 \r
 #ifndef _EFI_IDE_CONTROLLER_INIT_PROTOCOL_H_\r


@@ -71,7 +71,7 @@ typedef enum {
   ///\r
   /// The driver entity has completed resetting the devices behind\r
   /// the specified channel. This notification can be used to perform\r
   ///\r
   /// The driver entity has completed resetting the devices behind\r
   /// the specified channel. This notification can be used to perform\r

-  /// any chipset-specific programming.  \r
+  /// any chipset-specific programming.\r

   ///\r
   EfiIdeAfterChannelReset,\r
   ///\r
   ///\r
   EfiIdeAfterChannelReset,\r
   ///\r


@@ -84,13 +84,13 @@ typedef enum {
   ///\r
   /// The driver entity is done with detecting the presence of\r
   /// devices behind the specified channel. This notification can be\r
   ///\r
   /// The driver entity is done with detecting the presence of\r
   /// devices behind the specified channel. This notification can be\r

-  /// used to perform any chipset-specific programming.  \r
+  /// used to perform any chipset-specific programming.\r

   ///\r
   EfiIdeBusAfterDevicePresenceDetection,\r
   ///\r
   /// The IDE bus is requesting the IDE controller driver to\r
   /// reprogram the IDE controller hardware and thereby reset all\r
   ///\r
   EfiIdeBusAfterDevicePresenceDetection,\r
   ///\r
   /// The IDE bus is requesting the IDE controller driver to\r
   /// reprogram the IDE controller hardware and thereby reset all\r

-  /// the mode and timing settings to default settings.  \r
+  /// the mode and timing settings to default settings.\r

   ///\r
   EfiIdeResetMode,\r
   EfiIdeBusPhaseMaximum\r
   ///\r
   EfiIdeResetMode,\r
   EfiIdeBusPhaseMaximum\r


@@ -135,11 +135,11 @@ typedef struct {
 typedef struct {\r
   ///\r
   /// An enumeration defining various transfer protocols other than the protocols\r
 typedef struct {\r
   ///\r
   /// An enumeration defining various transfer protocols other than the protocols\r

-  /// that exist at the time this specification was developed (i.e., PIO, single \r
-  /// word DMA, multiword DMA, and UDMA). Each transfer protocol is associated \r
-  /// with a mode. The various transfer protocols are defined by the ATA/ATAPI \r
-  /// specification. This enumeration makes the interface extensible because we \r
-  /// can support new transport protocols beyond UDMA. Type EFI_ATA_EXT_TRANSFER_PROTOCOL \r
+  /// that exist at the time this specification was developed (i.e., PIO, single\r
+  /// word DMA, multiword DMA, and UDMA). Each transfer protocol is associated\r
+  /// with a mode. The various transfer protocols are defined by the ATA/ATAPI\r
+  /// specification. This enumeration makes the interface extensible because we\r
+  /// can support new transport protocols beyond UDMA. Type EFI_ATA_EXT_TRANSFER_PROTOCOL\r

   /// is defined below.\r
   ///\r
   EFI_ATA_EXT_TRANSFER_PROTOCOL  TransferProtocol;\r
   /// is defined below.\r
   ///\r
   EFI_ATA_EXT_TRANSFER_PROTOCOL  TransferProtocol;\r


@@ -155,7 +155,7 @@ typedef struct {
 typedef struct {\r
   ///\r
   /// This field specifies the PIO mode. PIO modes are defined in the ATA/ATAPI\r
 typedef struct {\r
   ///\r
   /// This field specifies the PIO mode. PIO modes are defined in the ATA/ATAPI\r

-  /// specification. The ATA/ATAPI specification defines the enumeration.  In \r
+  /// specification. The ATA/ATAPI specification defines the enumeration.  In\r

   /// other words, a value of 1 in this field means PIO mode 1. The actual meaning\r
   /// of PIO mode 1 is governed by the ATA/ATAPI specification. Type EFI_ATA_MODE\r
   /// is defined below.\r
   /// other words, a value of 1 in this field means PIO mode 1. The actual meaning\r
   /// of PIO mode 1 is governed by the ATA/ATAPI specification. Type EFI_ATA_MODE\r
   /// is defined below.\r


@@ -168,26 +168,26 @@ typedef struct {
   /// controllers will not support this transfer mode. The ATA/ATAPI specification defines\r
   /// the enumeration. In other words, a value of 1 in this field means single word DMA\r
   /// mode 1. The actual meaning of single word DMA mode 1 is governed by the ATA/\r
   /// controllers will not support this transfer mode. The ATA/ATAPI specification defines\r
   /// the enumeration. In other words, a value of 1 in this field means single word DMA\r
   /// mode 1. The actual meaning of single word DMA mode 1 is governed by the ATA/\r

-  /// ATAPI specification.  \r
+  /// ATAPI specification.\r

   ///\r
   EFI_ATA_MODE           SingleWordDmaMode;\r
   ///\r
   /// This field specifies the multiword DMA mode. Various multiword DMA modes are\r
   /// defined in the ATA/ATAPI specification. A value of 1 in this field means multiword\r
   /// DMA mode 1. The actual meaning of multiword DMA mode 1 is governed by the\r
   ///\r
   EFI_ATA_MODE           SingleWordDmaMode;\r
   ///\r
   /// This field specifies the multiword DMA mode. Various multiword DMA modes are\r
   /// defined in the ATA/ATAPI specification. A value of 1 in this field means multiword\r
   /// DMA mode 1. The actual meaning of multiword DMA mode 1 is governed by the\r

-  /// ATA/ATAPI specification.  \r
+  /// ATA/ATAPI specification.\r

   ///\r
   EFI_ATA_MODE           MultiWordDmaMode;\r
   ///\r
   /// This field specifies the ultra DMA (UDMA) mode. UDMA modes are defined in the\r
   /// ATA/ATAPI specification. A value of 1 in this field means UDMA mode 1. The\r
   ///\r
   EFI_ATA_MODE           MultiWordDmaMode;\r
   ///\r
   /// This field specifies the ultra DMA (UDMA) mode. UDMA modes are defined in the\r
   /// ATA/ATAPI specification. A value of 1 in this field means UDMA mode 1. The\r

-  /// actual meaning of UDMA mode 1 is governed by the ATA/ATAPI specification.  \r
+  /// actual meaning of UDMA mode 1 is governed by the ATA/ATAPI specification.\r

   ///\r
   EFI_ATA_MODE           UdmaMode;\r
   ///\r
   /// The number of extended-mode bitmap entries. Extended modes describe transfer\r
   /// protocols beyond PIO, single word DMA, multiword DMA, and UDMA. This field\r
   ///\r
   EFI_ATA_MODE           UdmaMode;\r
   ///\r
   /// The number of extended-mode bitmap entries. Extended modes describe transfer\r
   /// protocols beyond PIO, single word DMA, multiword DMA, and UDMA. This field\r

-  /// can be zero and provides extensibility.  \r
+  /// can be zero and provides extensibility.\r

   ///\r
   UINT32                 ExtModeCount;\r
   ///\r
   ///\r
   UINT32                 ExtModeCount;\r
   ///\r


@@ -195,7 +195,7 @@ typedef struct {
   /// than the ones defined above (i.e., PIO, single word DMA, multiword DMA, and\r
   /// UDMA). This field is defined for extensibility. At this time, only one extended\r
   /// transfer protocol is defined to cover SATA transfers. Type\r
   /// than the ones defined above (i.e., PIO, single word DMA, multiword DMA, and\r
   /// UDMA). This field is defined for extensibility. At this time, only one extended\r
   /// transfer protocol is defined to cover SATA transfers. Type\r

-  /// EFI_ATA_EXTENDED_MODE is defined below.  \r
+  /// EFI_ATA_EXTENDED_MODE is defined below.\r

   ///\r
   EFI_ATA_EXTENDED_MODE  ExtMode[1];\r
 } EFI_ATA_COLLECTIVE_MODE;\r
   ///\r
   EFI_ATA_EXTENDED_MODE  ExtMode[1];\r
 } EFI_ATA_COLLECTIVE_MODE;\r


@@ -206,16 +206,16 @@ typedef struct {
 /// The definition of these two structures is not part of the protocol\r
 /// definition because the ATA/ATAPI Specification controls the definition\r
 /// of all the fields. The ATA/ATAPI Specification can obsolete old fields\r
 /// The definition of these two structures is not part of the protocol\r
 /// definition because the ATA/ATAPI Specification controls the definition\r
 /// of all the fields. The ATA/ATAPI Specification can obsolete old fields\r

-/// or redefine existing fields. \r
+/// or redefine existing fields.\r

 typedef ATA_IDENTIFY_DATA   EFI_ATA_IDENTIFY_DATA;\r
 typedef ATAPI_IDENTIFY_DATA EFI_ATAPI_IDENTIFY_DATA;\r
 \r
 ///\r
 /// This flag indicates whether the IDENTIFY data is a response from an ATA device\r
 typedef ATA_IDENTIFY_DATA   EFI_ATA_IDENTIFY_DATA;\r
 typedef ATAPI_IDENTIFY_DATA EFI_ATAPI_IDENTIFY_DATA;\r
 \r
 ///\r
 /// This flag indicates whether the IDENTIFY data is a response from an ATA device\r

-/// (EFI_ATA_IDENTIFY_DATA) or response from an ATAPI device \r
+/// (EFI_ATA_IDENTIFY_DATA) or response from an ATAPI device\r

 /// (EFI_ATAPI_IDENTIFY_DATA).  According to the ATA/ATAPI specification,\r
 /// (EFI_ATAPI_IDENTIFY_DATA).  According to the ATA/ATAPI specification,\r

-/// EFI_IDENTIFY_DATA is for an ATA device if bit 15 of the Config field is zero. \r
-/// The Config field is common to both EFI_ATA_IDENTIFY_DATA and \r
+/// EFI_IDENTIFY_DATA is for an ATA device if bit 15 of the Config field is zero.\r
+/// The Config field is common to both EFI_ATA_IDENTIFY_DATA and\r

 /// EFI_ATAPI_IDENTIFY_DATA.\r
 ///\r
 #define   EFI_ATAPI_DEVICE_IDENTIFY_DATA  0x8000\r
 /// EFI_ATAPI_IDENTIFY_DATA.\r
 ///\r
 #define   EFI_ATAPI_DEVICE_IDENTIFY_DATA  0x8000\r


@@ -225,8 +225,8 @@ typedef ATAPI_IDENTIFY_DATA EFI_ATAPI_IDENTIFY_DATA;
 ///\r
 typedef union {\r
   ///\r
 ///\r
 typedef union {\r
   ///\r

-  /// The data that is returned by an ATA device upon successful completion \r
-  /// of the ATA IDENTIFY_DEVICE command. \r
+  /// The data that is returned by an ATA device upon successful completion\r
+  /// of the ATA IDENTIFY_DEVICE command.\r

   ///\r
   EFI_ATA_IDENTIFY_DATA       AtaData;\r
   ///\r
   ///\r
   EFI_ATA_IDENTIFY_DATA       AtaData;\r
   ///\r


@@ -238,34 +238,34 @@ typedef union {
 \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


@@ -284,13 +284,13 @@ EFI_STATUS
 /**\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 instance.\r
   @param[in] Phase     The phase during enumeration.\r
 \r
   @param[in] This      The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in] Phase     The phase during enumeration.\r


@@ -299,9 +299,9 @@ EFI_STATUS
   @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


@@ -316,32 +316,32 @@ EFI_STATUS
 /**\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


@@ -364,31 +364,31 @@ EFI_STATUS
 /**\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


@@ -399,7 +399,7 @@ EFI_STATUS
   @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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -414,39 +414,39 @@ EFI_STATUS
   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


@@ -454,13 +454,13 @@ EFI_STATUS
 \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


@@ -477,9 +477,9 @@ EFI_STATUS
   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


@@ -513,48 +513,48 @@ struct _EFI_IDE_CONTROLLER_INIT_PROTOCOL {
   /// Returns the information about a specific channel.\r
   ///\r
   EFI_IDE_CONTROLLER_GET_CHANNEL_INFO    GetChannelInfo;\r
   /// Returns the information about a specific channel.\r
   ///\r
   EFI_IDE_CONTROLLER_GET_CHANNEL_INFO    GetChannelInfo;\r

-  \r
+\r

   ///\r
   /// The notification that the driver entity is about to enter the\r
   ///\r
   /// The notification that the driver entity is about to enter the\r

-  /// specified phase during the enumeration process.  \r
+  /// specified phase during the enumeration process.\r

   ///\r
   EFI_IDE_CONTROLLER_NOTIFY_PHASE        NotifyPhase;\r
   ///\r
   EFI_IDE_CONTROLLER_NOTIFY_PHASE        NotifyPhase;\r

-  \r
+\r

   ///\r
   /// Submits the Drive Identify data that was returned by the device.\r
   ///\r
   EFI_IDE_CONTROLLER_SUBMIT_DATA         SubmitData;\r
   ///\r
   /// Submits the Drive Identify data that was returned by the device.\r
   ///\r
   EFI_IDE_CONTROLLER_SUBMIT_DATA         SubmitData;\r

-  \r
+\r

   ///\r
   ///\r

-  /// Submits information about modes that should be disqualified.  The specified \r
-  /// IDE device does not support these modes and these modes should not be \r
+  /// Submits information about modes that should be disqualified.  The specified\r
+  /// IDE device does not support these modes and these modes should not be\r

   /// returned by EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode()\r
   ///\r
   EFI_IDE_CONTROLLER_DISQUALIFY_MODE     DisqualifyMode;\r
   /// returned by EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode()\r
   ///\r
   EFI_IDE_CONTROLLER_DISQUALIFY_MODE     DisqualifyMode;\r

-  \r
+\r

   ///\r
   /// Calculates and returns the optimum mode for a particular IDE device.\r
   ///\r
   EFI_IDE_CONTROLLER_CALCULATE_MODE      CalculateMode;\r
   ///\r
   /// Calculates and returns the optimum mode for a particular IDE device.\r
   ///\r
   EFI_IDE_CONTROLLER_CALCULATE_MODE      CalculateMode;\r

-  \r
+\r

   ///\r
   /// Programs the IDE controller hardware to the default timing or per the modes\r
   ///\r
   /// Programs the IDE controller hardware to the default timing or per the modes\r

-  /// that were returned by the last call to EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode().  \r
+  /// that were returned by the last call to EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode().\r

   ///\r
   EFI_IDE_CONTROLLER_SET_TIMING          SetTiming;\r
   ///\r
   EFI_IDE_CONTROLLER_SET_TIMING          SetTiming;\r

-  \r
+\r

   ///\r
   /// Set to TRUE if the enumeration group includes all the channels that are\r
   /// produced by this controller. Set to FALSE if an enumeration group consists of\r
   ///\r
   /// Set to TRUE if the enumeration group includes all the channels that are\r
   /// produced by this controller. Set to FALSE if an enumeration group consists of\r

-  /// only one channel.  \r
+  /// only one channel.\r

   ///\r
   BOOLEAN                                EnumAll;\r
   ///\r
   BOOLEAN                                EnumAll;\r

-  \r
+\r

   ///\r
   /// The number of channels that are produced by this controller. Parallel ATA\r
   ///\r
   /// The number of channels that are produced by this controller. Parallel ATA\r

-  /// (PATA) controllers can support up to two channels. Advanced Host Controller \r
+  /// (PATA) controllers can support up to two channels. Advanced Host Controller\r

   /// Interface (AHCI) Serial ATA (SATA) controllers can support up to 32 channels,\r
   /// Interface (AHCI) Serial ATA (SATA) controllers can support up to 32 channels,\r

-  /// each of which can have up to one device. In the presence of a multiplier, \r
+  /// each of which can have up to one device. In the presence of a multiplier,\r

   /// each channel can have fifteen devices.\r
   ///\r
   UINT8                                  ChannelCount;\r
   /// each channel can have fifteen devices.\r
   ///\r
   UINT8                                  ChannelCount;\r

diff --git a/MdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h b/MdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h
index f0f883bcaae58486bad41f7dc7ad6aabc0daee45..7c23b35d7d949a5f7b1fe35d98e961c9932ecba0 100644 (file)
--- a/MdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h
+++ b/MdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h
@@ -1,64 +1,64 @@
 /** @file\r
   This file declares Incompatible PCI Device Support Protocol\r
 /** @file\r
   This file declares Incompatible PCI Device Support Protocol\r

-  \r
-  Allows the PCI bus driver to support resource allocation for some PCI devices \r
+\r
+  Allows the PCI bus driver to support resource allocation for some PCI devices\r

   that do not comply with the PCI Specification.\r
   that do not comply with the PCI Specification.\r

-  \r
-  @par Note: \r
-    This protocol is optional. Only those platforms that implement this protocol \r
-    will have the capability to support incompatible PCI devices. The absence of \r
-    this protocol can cause the PCI bus driver to configure these incompatible \r
-    PCI devices incorrectly. As a result, these devices may not work properly.  \r
-  \r
+\r
+  @par Note:\r
+    This protocol is optional. Only those platforms that implement this protocol\r
+    will have the capability to support incompatible PCI devices. The absence of\r
+    this protocol can cause the PCI bus driver to configure these incompatible\r
+    PCI devices incorrectly. As a result, these devices may not work properly.\r
+\r

   The EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL is used by the PCI bus driver\r
   The EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL is used by the PCI bus driver\r

-  to support resource allocation for some PCI devices that do not comply with the \r
-  PCI Specification.  This protocol can find some incompatible PCI devices and \r
-  report their special resource requirements to the PCI bus driver. The generic \r
-  PCI bus driver does not have prior knowledge of any incompatible PCI devices. \r
-  It interfaces with the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL to find out \r
-  if a device is incompatible and to obtain the special configuration requirements \r
+  to support resource allocation for some PCI devices that do not comply with the\r
+  PCI Specification.  This protocol can find some incompatible PCI devices and\r
+  report their special resource requirements to the PCI bus driver. The generic\r
+  PCI bus driver does not have prior knowledge of any incompatible PCI devices.\r
+  It interfaces with the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL to find out\r
+  if a device is incompatible and to obtain the special configuration requirements\r

   for a specific incompatible PCI device.\r
 \r
   This protocol is optional, and only one instance of this protocol can be present\r
   for a specific incompatible PCI device.\r
 \r
   This protocol is optional, and only one instance of this protocol can be present\r

-  in the system. If a platform supports this protocol, this protocol is produced \r
-  by a Driver Execution Environment (DXE) driver and must be made available before \r
-  the Boot Device Selection (BDS) phase. The PCI bus driver will look for the \r
-  presence of this protocol before it begins PCI enumeration.  If this protocol \r
+  in the system. If a platform supports this protocol, this protocol is produced\r
+  by a Driver Execution Environment (DXE) driver and must be made available before\r
+  the Boot Device Selection (BDS) phase. The PCI bus driver will look for the\r
+  presence of this protocol before it begins PCI enumeration.  If this protocol\r

   exists in a platform, it indicates that the platform has the capability to support\r
   exists in a platform, it indicates that the platform has the capability to support\r

-  those incompatible PCI devices. However, final support for incompatible PCI \r
-  devices still depends on the implementation of the PCI bus driver. The PCI bus \r
-  driver may fully, partially, or not even support these incompatible devices.  \r
-\r
-  During PCI bus enumeration, the PCI bus driver will probe the PCI Base Address \r
-  Registers (BARs) for each PCI device regardless of whether the PCI device is \r
-  incompatible or not to determine the resource requirements so that the PCI bus \r
-  driver can invoke the proper PCI resources for them.  Generally, this resource \r
+  those incompatible PCI devices. However, final support for incompatible PCI\r
+  devices still depends on the implementation of the PCI bus driver. The PCI bus\r
+  driver may fully, partially, or not even support these incompatible devices.\r
+\r
+  During PCI bus enumeration, the PCI bus driver will probe the PCI Base Address\r
+  Registers (BARs) for each PCI device regardless of whether the PCI device is\r
+  incompatible or not to determine the resource requirements so that the PCI bus\r
+  driver can invoke the proper PCI resources for them.  Generally, this resource\r

   information includes the following:\r
     - Resource type\r
     - Resource length\r
     - Alignment\r
   information includes the following:\r
     - Resource type\r
     - Resource length\r
     - Alignment\r

-    \r
+\r

   However, some incompatible PCI devices may have special requirements. As a result,\r
   However, some incompatible PCI devices may have special requirements. As a result,\r

-  the length or the alignment that is derived through BAR probing may not be exactly \r
-  the same as the actual resource requirement of the device. For example, there \r
+  the length or the alignment that is derived through BAR probing may not be exactly\r
+  the same as the actual resource requirement of the device. For example, there\r

   are some devices that request I/O resources at a length of 0x100 from their I/O\r
   are some devices that request I/O resources at a length of 0x100 from their I/O\r

-  BAR, but these incompatible devices will never work correctly if an odd I/O base \r
-  address, such as 0x100, 0x300, or 0x500, is assigned to the BAR. Instead, these \r
-  devices request an even base address, such as 0x200 or 0x400. The Incompatible \r
-  PCI Device Support Protocol can then be used to obtain these special resource \r
-  requirements for these incompatible PCI devices. In this way, the PCI bus driver \r
-  will take special consideration for these devices during PCI resource allocation \r
+  BAR, but these incompatible devices will never work correctly if an odd I/O base\r
+  address, such as 0x100, 0x300, or 0x500, is assigned to the BAR. Instead, these\r
+  devices request an even base address, such as 0x200 or 0x400. The Incompatible\r
+  PCI Device Support Protocol can then be used to obtain these special resource\r
+  requirements for these incompatible PCI devices. In this way, the PCI bus driver\r
+  will take special consideration for these devices during PCI resource allocation\r

   to ensure that they can work correctly.\r
   to ensure that they can work correctly.\r

-  \r
+\r

   This protocol may support the following incompatible PCI BAR types:\r
     - I/O or memory length that is different from what the BAR reports\r
     - I/O or memory alignment that is different from what the BAR reports\r
     - Fixed I/O or memory base address\r
   This protocol may support the following incompatible PCI BAR types:\r
     - I/O or memory length that is different from what the BAR reports\r
     - I/O or memory alignment that is different from what the BAR reports\r
     - Fixed I/O or memory base address\r

-    \r
-  See the Conventional PCI Specification 3.0 for the details of how a PCI BAR \r
+\r
+  See the Conventional PCI Specification 3.0 for the details of how a PCI BAR\r

   reports the resource length and the alignment that it requires.\r
 \r
   reports the resource length and the alignment that it requires.\r
 \r

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


@@ -68,7 +68,7 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  This Protocol is defined in UEFI Platform Initialization Specification 1.2 \r
+  This Protocol is defined in UEFI Platform Initialization Specification 1.2\r

   Volume 5: Standards\r
 \r
 **/\r
   Volume 5: Standards\r
 \r
 **/\r


@@ -92,51 +92,51 @@ typedef struct _EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL EFI_INCOMPATIBLE_PC
 /**\r
   Returns a list of ACPI resource descriptors that detail the special resource\r
   configuration requirements for an incompatible PCI device.\r
 /**\r
   Returns a list of ACPI resource descriptors that detail the special resource\r
   configuration requirements for an incompatible PCI device.\r

-  \r
-  This function returns a list of ACPI resource descriptors that detail the \r
-  special resource configuration requirements for an incompatible PCI device.  \r
-  \r
+\r
+  This function returns a list of ACPI resource descriptors that detail the\r
+  special resource configuration requirements for an incompatible PCI device.\r
+\r

   Prior to bus enumeration, the PCI bus driver will look for the presence\r
   of the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL. Only one instance of this\r
   Prior to bus enumeration, the PCI bus driver will look for the presence\r
   of the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL. Only one instance of this\r

-  protocol can be present in the system. For each PCI device that the PCI bus \r
+  protocol can be present in the system. For each PCI device that the PCI bus\r

   driver discovers, the PCI bus driver calls this function with the device's vendor\r
   ID, device ID, revision ID, subsystem vendor ID, and subsystem device ID. If the\r
   VendorId, DeviceId, RevisionId, SubsystemVendorId, or SubsystemDeviceId value is\r
   set to (UINTN)-1, that field will be ignored. The ID values that are not (UINTN)-1\r
   driver discovers, the PCI bus driver calls this function with the device's vendor\r
   ID, device ID, revision ID, subsystem vendor ID, and subsystem device ID. If the\r
   VendorId, DeviceId, RevisionId, SubsystemVendorId, or SubsystemDeviceId value is\r
   set to (UINTN)-1, that field will be ignored. The ID values that are not (UINTN)-1\r

-  will be used to identify the current device.  \r
-  \r
-  This function will only return EFI_SUCCESS. However, if the device is an \r
-  incompatible PCI device, a list of ACPI resource descriptors will be returned \r
-  in Configuration. Otherwise, NULL will be returned in Configuration instead. \r
-  The PCI bus driver does not need to allocate memory for Configuration. However, \r
-  it is the PCI bus driver's responsibility to free it. The PCI bus driver then \r
-  can configure this device with the information that is derived from this list \r
+  will be used to identify the current device.\r
+\r
+  This function will only return EFI_SUCCESS. However, if the device is an\r
+  incompatible PCI device, a list of ACPI resource descriptors will be returned\r
+  in Configuration. Otherwise, NULL will be returned in Configuration instead.\r
+  The PCI bus driver does not need to allocate memory for Configuration. However,\r
+  it is the PCI bus driver's responsibility to free it. The PCI bus driver then\r
+  can configure this device with the information that is derived from this list\r

   of resource nodes, rather than the result of BAR probing.\r
 \r
   of resource nodes, rather than the result of BAR probing.\r
 \r

-  Only the following two resource descriptor types from the ACPI Specification \r
+  Only the following two resource descriptor types from the ACPI Specification\r

   may be used to describe the incompatible PCI device resource requirements:\r
     - QWORD Address Space Descriptor (ACPI 2.0, section 6.4.3.5.1; also ACPI 3.0)\r
     - End Tag (ACPI 2.0, section 6.4.2.8; also ACPI 3.0)\r
 \r
   may be used to describe the incompatible PCI device resource requirements:\r
     - QWORD Address Space Descriptor (ACPI 2.0, section 6.4.3.5.1; also ACPI 3.0)\r
     - End Tag (ACPI 2.0, section 6.4.2.8; also ACPI 3.0)\r
 \r

-  The QWORD Address Space Descriptor can describe memory, I/O, and bus number \r
-  ranges for dynamic or fixed resources.  The configuration of a PCI root bridge \r
-  is described with one or more QWORD Address Space Descriptors, followed by an \r
+  The QWORD Address Space Descriptor can describe memory, I/O, and bus number\r
+  ranges for dynamic or fixed resources.  The configuration of a PCI root bridge\r
+  is described with one or more QWORD Address Space Descriptors, followed by an\r

   End Tag. See the ACPI Specification for details on the field values.\r
   End Tag. See the ACPI Specification for details on the field values.\r

-  \r
-  @param[in]  This                Pointer to the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL \r
+\r
+  @param[in]  This                Pointer to the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL\r

                                   instance.\r
                                   instance.\r

-  @param[in]  VendorId            A unique ID to identify the manufacturer of \r
+  @param[in]  VendorId            A unique ID to identify the manufacturer of\r

                                   the PCI device.  See the Conventional PCI\r
                                   Specification 3.0 for details.\r
                                   the PCI device.  See the Conventional PCI\r
                                   Specification 3.0 for details.\r

-  @param[in]  DeviceId            A unique ID to identify the particular PCI \r
-                                  device. See the Conventional PCI Specification \r
+  @param[in]  DeviceId            A unique ID to identify the particular PCI\r
+                                  device. See the Conventional PCI Specification\r

                                   3.0 for details.\r
                                   3.0 for details.\r

-  @param[in]  RevisionId          A PCI device-specific revision identifier. \r
+  @param[in]  RevisionId          A PCI device-specific revision identifier.\r

                                   See the Conventional PCI Specification 3.0\r
                                   for details.\r
                                   See the Conventional PCI Specification 3.0\r
                                   for details.\r

-  @param[in]  SubsystemVendorId   Specifies the subsystem vendor ID. See the \r
+  @param[in]  SubsystemVendorId   Specifies the subsystem vendor ID. See the\r

                                   Conventional PCI Specification 3.0 for details.\r
                                   Conventional PCI Specification 3.0 for details.\r

-  @param[in]  SubsystemDeviceId   Specifies the subsystem device ID. See the \r
+  @param[in]  SubsystemDeviceId   Specifies the subsystem device ID. See the\r

                                   Conventional PCI Specification 3.0 for details.\r
   @param[out] Configuration       A list of ACPI resource descriptors that detail\r
                                   the configuration requirement.\r
                                   Conventional PCI Specification 3.0 for details.\r
   @param[out] Configuration       A list of ACPI resource descriptors that detail\r
                                   the configuration requirement.\r

diff --git a/MdePkg/Include/Protocol/Ip4.h b/MdePkg/Include/Protocol/Ip4.h
index 79a9bcacb05383b27cfe58a3edd0ca2d669d5105..4cb107407c35b005268e4ee6b9dc7ab5851ff238 100644 (file)
--- a/MdePkg/Include/Protocol/Ip4.h
+++ b/MdePkg/Include/Protocol/Ip4.h
@@ -6,21 +6,21 @@
   - EFI IPv4 Variable (deprecated in UEFI 2.4B)\r
   - EFI IPv4 Protocol.\r
   The EFI IPv4 Protocol provides basic network IPv4 packet I/O services,\r
   - EFI IPv4 Variable (deprecated in UEFI 2.4B)\r
   - EFI IPv4 Protocol.\r
   The EFI IPv4 Protocol provides basic network IPv4 packet I/O services,\r

-  which includes support foR a subset of the Internet Control Message \r
+  which includes support foR a subset of the Internet Control Message\r

   Protocol (ICMP) and may include support for the Internet Group Management\r
   Protocol (IGMP).\r
   Protocol (ICMP) and may include support for the Internet Group Management\r
   Protocol (IGMP).\r

-  \r
-Copyright (c) 2006 - 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
+\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
-    \r
-THE PROGRAM 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

-  @par Revision Reference:          \r
-  This Protocol is introduced in UEFI Specification 2.0.        \r
+  @par Revision Reference:\r
+  This Protocol is introduced in UEFI Specification 2.0.\r

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


@@ -49,7 +49,7 @@ typedef struct {
   EFI_HANDLE              InstanceHandle;\r
   EFI_IPv4_ADDRESS        Ip4Address;\r
   EFI_IPv4_ADDRESS        SubnetMask;\r
   EFI_HANDLE              InstanceHandle;\r
   EFI_IPv4_ADDRESS        Ip4Address;\r
   EFI_IPv4_ADDRESS        SubnetMask;\r

-} EFI_IP4_ADDRESS_PAIR; \r
+} EFI_IP4_ADDRESS_PAIR;\r

 \r
 ///\r
 /// EFI_IP4_VARIABLE_DATA is deprecated in the UEFI 2.4B and should not be used any more.\r
 \r
 ///\r
 /// EFI_IP4_VARIABLE_DATA is deprecated in the UEFI 2.4B and should not be used any more.\r


@@ -271,7 +271,7 @@ typedef struct {
 \r
 /**\r
   Gets the current operational settings for this instance of the EFI IPv4 Protocol driver.\r
 \r
 /**\r
   Gets the current operational settings for this instance of the EFI IPv4 Protocol driver.\r

-  \r
+\r

   The GetModeData() function returns the current operational mode data for this\r
   driver instance. The data fields in EFI_IP4_MODE_DATA are read only. This\r
   function is used optionally to retrieve the operational mode data of underlying\r
   The GetModeData() function returns the current operational mode data for this\r
   driver instance. The data fields in EFI_IP4_MODE_DATA are read only. This\r
   function is used optionally to retrieve the operational mode data of underlying\r


@@ -294,11 +294,11 @@ EFI_STATUS
   OUT       EFI_IP4_MODE_DATA               *Ip4ModeData     OPTIONAL,\r
   OUT       EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData   OPTIONAL,\r
   OUT       EFI_SIMPLE_NETWORK_MODE         *SnpModeData     OPTIONAL\r
   OUT       EFI_IP4_MODE_DATA               *Ip4ModeData     OPTIONAL,\r
   OUT       EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData   OPTIONAL,\r
   OUT       EFI_SIMPLE_NETWORK_MODE         *SnpModeData     OPTIONAL\r

-  );  \r
+  );\r

 \r
 /**\r
   Assigns an IPv4 address and subnet mask to this EFI IPv4 Protocol driver instance.\r
 \r
 /**\r
   Assigns an IPv4 address and subnet mask to this EFI IPv4 Protocol driver instance.\r

-  \r
+\r

   The Configure() function is used to set, change, or reset the operational\r
   parameters and filter settings for this EFI IPv4 Protocol instance. Until these\r
   parameters have been set, no network traffic can be sent or received by this\r
   The Configure() function is used to set, change, or reset the operational\r
   parameters and filter settings for this EFI IPv4 Protocol instance. Until these\r
   parameters have been set, no network traffic can be sent or received by this\r


@@ -307,14 +307,14 @@ EFI_STATUS
   parameters have been set again. Each EFI IPv4 Protocol instance can be started\r
   and stopped independently of each other by enabling or disabling their receive\r
   filter settings with the Configure() function.\r
   parameters have been set again. Each EFI IPv4 Protocol instance can be started\r
   and stopped independently of each other by enabling or disabling their receive\r
   filter settings with the Configure() function.\r

-  \r
+\r

   When IpConfigData.UseDefaultAddress is set to FALSE, the new station address will\r
   be appended as an alias address into the addresses list in the EFI IPv4 Protocol\r
   driver. While set to TRUE, Configure() will trigger the EFI_IP4_CONFIG_PROTOCOL\r
   to retrieve the default IPv4 address if it is not available yet. Clients could\r
   frequently call GetModeData() to check the status to ensure that the default IPv4\r
   address is ready.\r
   When IpConfigData.UseDefaultAddress is set to FALSE, the new station address will\r
   be appended as an alias address into the addresses list in the EFI IPv4 Protocol\r
   driver. While set to TRUE, Configure() will trigger the EFI_IP4_CONFIG_PROTOCOL\r
   to retrieve the default IPv4 address if it is not available yet. Clients could\r
   frequently call GetModeData() to check the status to ensure that the default IPv4\r
   address is ready.\r

-  \r
+\r

   If operational parameters are reset or changed, any pending transmit and receive\r
   requests will be cancelled. Their completion token status will be set to EFI_ABORTED\r
   and their events will be signaled.\r
   If operational parameters are reset or changed, any pending transmit and receive\r
   requests will be cancelled. Their completion token status will be set to EFI_ABORTED\r
   and their events will be signaled.\r


@@ -328,7 +328,7 @@ EFI_STATUS
   @retval EFI_INVALID_PARAMETER One or more of the following conditions is TRUE:\r
                                 This is NULL.\r
                                 IpConfigData.StationAddress is not a unicast IPv4 address.\r
   @retval EFI_INVALID_PARAMETER One or more of the following conditions is TRUE:\r
                                 This is NULL.\r
                                 IpConfigData.StationAddress is not a unicast IPv4 address.\r

-                                IpConfigData.SubnetMask is not a valid IPv4 subnet \r
+                                IpConfigData.SubnetMask is not a valid IPv4 subnet\r

   @retval EFI_UNSUPPORTED       One or more of the following conditions is TRUE:\r
                                 A configuration protocol (DHCP, BOOTP, RARP, etc.) could\r
                                 not be located when clients choose to use the default IPv4\r
   @retval EFI_UNSUPPORTED       One or more of the following conditions is TRUE:\r
                                 A configuration protocol (DHCP, BOOTP, RARP, etc.) could\r
                                 not be located when clients choose to use the default IPv4\r


@@ -342,20 +342,20 @@ EFI_STATUS
                                 Protocol driver instance is not opened.\r
 \r
 **/\r
                                 Protocol driver instance is not opened.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_IP4_CONFIGURE)(\r
   IN EFI_IP4_PROTOCOL    *This,\r
   IN EFI_IP4_CONFIG_DATA *IpConfigData     OPTIONAL\r
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_CONFIGURE)(\r
   IN EFI_IP4_PROTOCOL    *This,\r
   IN EFI_IP4_CONFIG_DATA *IpConfigData     OPTIONAL\r

-  );  \r
+  );\r

 \r
 /**\r
   Joins and leaves multicast groups.\r
 \r
 /**\r
   Joins and leaves multicast groups.\r

-  \r
+\r

   The Groups() function is used to join and leave multicast group sessions. Joining\r
   a group will enable reception of matching multicast packets. Leaving a group will\r
   disable the multicast packet reception.\r
   The Groups() function is used to join and leave multicast group sessions. Joining\r
   a group will enable reception of matching multicast packets. Leaving a group will\r
   disable the multicast packet reception.\r

-  \r
+\r

   If JoinFlag is FALSE and GroupAddress is NULL, all joined groups will be left.\r
 \r
   @param  This                  The pointer to the EFI_IP4_PROTOCOL instance.\r
   If JoinFlag is FALSE and GroupAddress is NULL, all joined groups will be left.\r
 \r
   @param  This                  The pointer to the EFI_IP4_PROTOCOL instance.\r


@@ -379,32 +379,32 @@ EFI_STATUS
   @retval EFI_DEVICE_ERROR      An unexpected system or network error occurred.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR      An unexpected system or network error occurred.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_IP4_GROUPS)(\r
   IN EFI_IP4_PROTOCOL    *This,\r
   IN BOOLEAN             JoinFlag,\r
   IN EFI_IPv4_ADDRESS    *GroupAddress  OPTIONAL\r
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_GROUPS)(\r
   IN EFI_IP4_PROTOCOL    *This,\r
   IN BOOLEAN             JoinFlag,\r
   IN EFI_IPv4_ADDRESS    *GroupAddress  OPTIONAL\r

-  );    \r
+  );\r

 \r
 /**\r
   Adds and deletes routing table entries.\r
 \r
   The Routes() function adds a route to or deletes a route from the routing table.\r
 \r
 /**\r
   Adds and deletes routing table entries.\r
 \r
   The Routes() function adds a route to or deletes a route from the routing table.\r

-  \r
+\r

   Routes are determined by comparing the SubnetAddress with the destination IPv4\r
   address arithmetically AND-ed with the SubnetMask. The gateway address must be\r
   on the same subnet as the configured station address.\r
   Routes are determined by comparing the SubnetAddress with the destination IPv4\r
   address arithmetically AND-ed with the SubnetMask. The gateway address must be\r
   on the same subnet as the configured station address.\r

-  \r
+\r

   The default route is added with SubnetAddress and SubnetMask both set to 0.0.0.0.\r
   The default route matches all destination IPv4 addresses that do not match any\r
   other routes.\r
   The default route is added with SubnetAddress and SubnetMask both set to 0.0.0.0.\r
   The default route matches all destination IPv4 addresses that do not match any\r
   other routes.\r

-  \r
+\r

   A GatewayAddress that is zero is a nonroute. Packets are sent to the destination\r
   IP address if it can be found in the ARP cache or on the local subnet. One automatic\r
   nonroute entry will be inserted into the routing table for outgoing packets that\r
   are addressed to a local subnet (gateway address of 0.0.0.0).\r
   A GatewayAddress that is zero is a nonroute. Packets are sent to the destination\r
   IP address if it can be found in the ARP cache or on the local subnet. One automatic\r
   nonroute entry will be inserted into the routing table for outgoing packets that\r
   are addressed to a local subnet (gateway address of 0.0.0.0).\r

-  \r
+\r

   Each EFI IPv4 Protocol instance has its own independent routing table. Those EFI\r
   IPv4 Protocol instances that use the default IPv4 address will also have copies\r
   of the routing table that was provided by the EFI_IP4_CONFIG_PROTOCOL, and these\r
   Each EFI IPv4 Protocol instance has its own independent routing table. Those EFI\r
   IPv4 Protocol instances that use the default IPv4 address will also have copies\r
   of the routing table that was provided by the EFI_IP4_CONFIG_PROTOCOL, and these\r


@@ -435,17 +435,17 @@ EFI_STATUS
   @retval EFI_NOT_FOUND          This route is not in the routing table (when DeleteRoute is TRUE).\r
   @retval EFI_ACCESS_DENIED      The route is already defined in the routing table (when\r
                                  DeleteRoute is FALSE).\r
   @retval EFI_NOT_FOUND          This route is not in the routing table (when DeleteRoute is TRUE).\r
   @retval EFI_ACCESS_DENIED      The route is already defined in the routing table (when\r
                                  DeleteRoute is FALSE).\r

-                                 \r
+\r

 **/\r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_IP4_ROUTES)(\r
   IN EFI_IP4_PROTOCOL    *This,\r
   IN BOOLEAN             DeleteRoute,\r
   IN EFI_IPv4_ADDRESS    *SubnetAddress,\r
   IN EFI_IPv4_ADDRESS    *SubnetMask,\r
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_ROUTES)(\r
   IN EFI_IP4_PROTOCOL    *This,\r
   IN BOOLEAN             DeleteRoute,\r
   IN EFI_IPv4_ADDRESS    *SubnetAddress,\r
   IN EFI_IPv4_ADDRESS    *SubnetMask,\r

-  IN EFI_IPv4_ADDRESS    *GatewayAddress  \r
-  );  \r
+  IN EFI_IPv4_ADDRESS    *GatewayAddress\r
+  );\r

 \r
 /**\r
   Places outgoing data packets into the transmit queue.\r
 \r
 /**\r
   Places outgoing data packets into the transmit queue.\r


@@ -465,7 +465,7 @@ EFI_STATUS
   @retval  EFI_ACCESS_DENIED     The transmit completion token with the same Token.Event\r
                                  was already in the transmit queue.\r
   @retval  EFI_NOT_READY         The completion token could not be queued because the transmit\r
   @retval  EFI_ACCESS_DENIED     The transmit completion token with the same Token.Event\r
                                  was already in the transmit queue.\r
   @retval  EFI_NOT_READY         The completion token could not be queued because the transmit\r

-                                 queue is full. \r
+                                 queue is full.\r

   @retval  EFI_NOT_FOUND         Not route is found to destination address.\r
   @retval  EFI_OUT_OF_RESOURCES  Could not queue the transmit data.\r
   @retval  EFI_BUFFER_TOO_SMALL  Token.Packet.TxData.TotalDataLength is too\r
   @retval  EFI_NOT_FOUND         Not route is found to destination address.\r
   @retval  EFI_OUT_OF_RESOURCES  Could not queue the transmit data.\r
   @retval  EFI_BUFFER_TOO_SMALL  Token.Packet.TxData.TotalDataLength is too\r


@@ -476,19 +476,19 @@ EFI_STATUS
                                  DoNotFragment is TRUE.)\r
 \r
 **/\r
                                  DoNotFragment is TRUE.)\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_IP4_TRANSMIT)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token\r
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_TRANSMIT)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token\r

-  );    \r
+  );\r

 \r
 /**\r
   Places a receiving request into the receiving queue.\r
 \r
 /**\r
   Places a receiving 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 Receive() function places a completion token into the receive packet queue.\r
   This function is always asynchronous.\r

-  \r
+\r

   The Token.Event field in the completion token must be filled in by the caller\r
   and cannot be NULL. When the receive operation completes, the EFI IPv4 Protocol\r
   driver updates the Token.Status and Token.Packet.RxData fields and the Token.Event\r
   The Token.Event field in the completion token must be filled in by the caller\r
   and cannot be NULL. When the receive operation completes, the EFI IPv4 Protocol\r
   driver updates the Token.Status and Token.Packet.RxData fields and the Token.Event\r


@@ -515,16 +515,16 @@ EFI_STATUS
   @retval EFI_ICMP_ERROR        An ICMP error packet was received.\r
 \r
 **/\r
   @retval EFI_ICMP_ERROR        An ICMP error packet was received.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_IP4_RECEIVE)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token\r
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_RECEIVE)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token\r

-  );      \r
+  );\r

 \r
 /**\r
   Abort an asynchronous transmit or receive request.\r
 \r
 /**\r
   Abort 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\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\r


@@ -556,16 +556,16 @@ EFI_STATUS
 (EFIAPI *EFI_IP4_CANCEL)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token OPTIONAL\r
 (EFIAPI *EFI_IP4_CANCEL)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token OPTIONAL\r

-  );      \r
-  \r
+  );\r
+\r

 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r

-  \r
+\r

   The Poll() function polls for incoming data packets and processes outgoing data\r
   packets. Network drivers and applications can call the EFI_IP4_PROTOCOL.Poll()\r
   function to increase the rate that data packets are moved between the communications\r
   device and the transmit and receive queues.\r
   The Poll() function polls for incoming data packets and processes outgoing data\r
   packets. Network drivers and applications can call the EFI_IP4_PROTOCOL.Poll()\r
   function to increase the rate that data packets are moved between the communications\r
   device and the transmit and receive queues.\r

-  \r
+\r

   In some systems the periodic timer event may not poll the underlying communications\r
   device fast enough to transmit and/or receive all data packets without missing\r
   incoming packets or dropping outgoing packets. Drivers and applications that are\r
   In some systems the periodic timer event may not poll the underlying communications\r
   device fast enough to transmit and/or receive all data packets without missing\r
   incoming packets or dropping outgoing packets. Drivers and applications that are\r


@@ -585,14 +585,14 @@ EFI_STATUS
                                  Consider increasing the polling rate.\r
 \r
 **/\r
                                  Consider increasing the polling rate.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_IP4_POLL)(\r
   IN EFI_IP4_PROTOCOL          *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_POLL)(\r
   IN EFI_IP4_PROTOCOL          *This\r

-  );  \r
+  );\r

 \r
 ///\r
 \r
 ///\r

-/// The EFI IPv4 Protocol implements a simple packet-oriented interface that can be \r
+/// The EFI IPv4 Protocol implements a simple packet-oriented interface that can be\r

 /// used by drivers, daemons, and applications to transmit and receive network packets.\r
 ///\r
 struct _EFI_IP4_PROTOCOL {\r
 /// used by drivers, daemons, and applications to transmit and receive network packets.\r
 ///\r
 struct _EFI_IP4_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Ip4Config.h b/MdePkg/Include/Protocol/Ip4Config.h
index 1c91d2f702cefee755b9df2fd81faf68ca0a9e26..b64c48e2d88971b8cf1990ab450d6ee1084ee8f2 100644 (file)
--- a/MdePkg/Include/Protocol/Ip4Config.h
+++ b/MdePkg/Include/Protocol/Ip4Config.h
@@ -2,16 +2,16 @@
   This file provides a definition of the EFI IPv4 Configuration\r
   Protocol.\r
 \r
   This file provides a definition of the EFI IPv4 Configuration\r
   Protocol.\r
 \r

-Copyright (c) 2006 - 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) 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
-    \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
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-  \r
-  @par Revision Reference:          \r
+\r
+  @par Revision Reference:\r

   This Protocol is introduced in UEFI Specification 2.0.\r
 \r
 **/\r
   This Protocol is introduced in UEFI Specification 2.0.\r
 \r
 **/\r


@@ -31,11 +31,11 @@ typedef struct _EFI_IP4_CONFIG_PROTOCOL EFI_IP4_CONFIG_PROTOCOL;
         (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS)\r
 \r
 ///\r
         (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS)\r
 \r
 ///\r

-/// EFI_IP4_IPCONFIG_DATA contains the minimum IPv4 configuration data \r
-/// that is needed to start basic network communication. The StationAddress \r
+/// EFI_IP4_IPCONFIG_DATA contains the minimum IPv4 configuration data\r
+/// that is needed to start basic network communication. The StationAddress\r

 /// and SubnetMask must be a valid unicast IP address and subnet mask.\r
 /// and SubnetMask must be a valid unicast IP address and subnet mask.\r

-/// If RouteTableSize is not zero, then RouteTable contains a properly \r
-/// formatted routing table for the StationAddress/SubnetMask, with the \r
+/// If RouteTableSize is not zero, then RouteTable contains a properly\r
+/// formatted routing table for the StationAddress/SubnetMask, with the\r

 /// last entry in the table being the default route.\r
 ///\r
 typedef struct {\r
 /// last entry in the table being the default route.\r
 ///\r
 typedef struct {\r


@@ -61,47 +61,47 @@ typedef struct {
 \r
 /**\r
   Starts running the configuration policy for the EFI IPv4 Protocol driver.\r
 \r
 /**\r
   Starts running the configuration policy for the EFI IPv4 Protocol driver.\r

-  \r
-  The Start() function is called to determine and to begin the platform \r
-  configuration policy by the EFI IPv4 Protocol driver. This determination may \r
-  be as simple as returning EFI_UNSUPPORTED if there is no EFI IPv4 Protocol \r
-  driver configuration policy. It may be as involved as loading some defaults \r
-  from nonvolatile storage, downloading dynamic data from a DHCP server, and \r
+\r
+  The Start() function is called to determine and to begin the platform\r
+  configuration policy by the EFI IPv4 Protocol driver. This determination may\r
+  be as simple as returning EFI_UNSUPPORTED if there is no EFI IPv4 Protocol\r
+  driver configuration policy. It may be as involved as loading some defaults\r
+  from nonvolatile storage, downloading dynamic data from a DHCP server, and\r

   checking permissions with a site policy server.\r
   checking permissions with a site policy server.\r

-  Starting the configuration policy is just the beginning. It may finish almost \r
-  instantly or it may take several minutes before it fails to retrieve configuration \r
-  information from one or more servers. Once the policy is started, drivers \r
-  should use the DoneEvent parameter to determine when the configuration policy \r
-  has completed. EFI_IP4_CONFIG_PROTOCOL.GetData() must then be called to \r
+  Starting the configuration policy is just the beginning. It may finish almost\r
+  instantly or it may take several minutes before it fails to retrieve configuration\r
+  information from one or more servers. Once the policy is started, drivers\r
+  should use the DoneEvent parameter to determine when the configuration policy\r
+  has completed. EFI_IP4_CONFIG_PROTOCOL.GetData() must then be called to\r

   determine if the configuration succeeded or failed.\r
   determine if the configuration succeeded or failed.\r

-  Until the configuration completes successfully, EFI IPv4 Protocol driver instances \r
+  Until the configuration completes successfully, EFI IPv4 Protocol driver instances\r

   that are attempting to use default configurations must return EFI_NO_MAPPING.\r
   that are attempting to use default configurations must return EFI_NO_MAPPING.\r

-  Once the configuration is complete, the EFI IPv4 Configuration Protocol driver \r
-  signals DoneEvent. The configuration may need to be updated in the future. \r
-  Note that in this case the EFI IPv4 Configuration Protocol driver must signal \r
-  ReconfigEvent, and all EFI IPv4 Protocol driver instances that are using default \r
-  configurations must return EFI_NO_MAPPING until the configuration policy has \r
+  Once the configuration is complete, the EFI IPv4 Configuration Protocol driver\r
+  signals DoneEvent. The configuration may need to be updated in the future.\r
+  Note that in this case the EFI IPv4 Configuration Protocol driver must signal\r
+  ReconfigEvent, and all EFI IPv4 Protocol driver instances that are using default\r
+  configurations must return EFI_NO_MAPPING until the configuration policy has\r

   been rerun.\r
 \r
   @param  This                   The pointer to the EFI_IP4_CONFIG_PROTOCOL instance.\r
   been rerun.\r
 \r
   @param  This                   The pointer to the EFI_IP4_CONFIG_PROTOCOL instance.\r

-  @param  DoneEvent              Event that will be signaled when the EFI IPv4 \r
-                                 Protocol driver configuration policy completes \r
+  @param  DoneEvent              Event that will be signaled when the EFI IPv4\r
+                                 Protocol driver configuration policy completes\r

                                  execution. This event must be of type EVT_NOTIFY_SIGNAL.\r
                                  execution. This event must be of type EVT_NOTIFY_SIGNAL.\r

-  @param  ReconfigEvent          Event that will be signaled when the EFI IPv4 \r
-                                 Protocol driver configuration needs to be updated. \r
+  @param  ReconfigEvent          Event that will be signaled when the EFI IPv4\r
+                                 Protocol driver configuration needs to be updated.\r

                                  This event must be of type EVT_NOTIFY_SIGNAL.\r
                                  This event must be of type EVT_NOTIFY_SIGNAL.\r

-  \r
-  @retval EFI_SUCCESS            The configuration policy for the EFI IPv4 Protocol \r
+\r
+  @retval EFI_SUCCESS            The configuration policy for the EFI IPv4 Protocol\r

                                  driver is now running.\r
   @retval EFI_INVALID_PARAMETER  One or more of the following parameters is NULL:\r
                                   This\r
                                   DoneEvent\r
                                   ReconfigEvent\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
                                  driver is now running.\r
   @retval EFI_INVALID_PARAMETER  One or more of the following parameters is NULL:\r
                                   This\r
                                   DoneEvent\r
                                   ReconfigEvent\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r

-  @retval EFI_ALREADY_STARTED    The configuration policy for the EFI IPv4 Protocol \r
+  @retval EFI_ALREADY_STARTED    The configuration policy for the EFI IPv4 Protocol\r

                                  driver was already started.\r
   @retval EFI_DEVICE_ERROR       An unexpected system error or network error occurred.\r
                                  driver was already started.\r
   @retval EFI_DEVICE_ERROR       An unexpected system error or network error occurred.\r

-  @retval EFI_UNSUPPORTED        This interface does not support the EFI IPv4 Protocol \r
+  @retval EFI_UNSUPPORTED        This interface does not support the EFI IPv4 Protocol\r

                                  driver configuration.\r
 \r
 **/\r
                                  driver configuration.\r
 \r
 **/\r


@@ -115,18 +115,18 @@ EFI_STATUS
 \r
 /**\r
   Stops running the configuration policy for the EFI IPv4 Protocol driver.\r
 \r
 /**\r
   Stops running the configuration policy for the EFI IPv4 Protocol driver.\r

-  \r
-  The Stop() function stops the configuration policy for the EFI IPv4 Protocol driver. \r
+\r
+  The Stop() function stops the configuration policy for the EFI IPv4 Protocol driver.\r

   All configuration data will be lost after calling Stop().\r
 \r
   @param  This                   The pointer to the EFI_IP4_CONFIG_PROTOCOL instance.\r
 \r
   All configuration data will be lost after calling Stop().\r
 \r
   @param  This                   The pointer to the EFI_IP4_CONFIG_PROTOCOL instance.\r
 \r

-  @retval EFI_SUCCESS            The configuration policy for the EFI IPv4 Protocol \r
+  @retval EFI_SUCCESS            The configuration policy for the EFI IPv4 Protocol\r

                                  driver has been stopped.\r
   @retval EFI_INVALID_PARAMETER  This is NULL.\r
                                  driver has been stopped.\r
   @retval EFI_INVALID_PARAMETER  This is NULL.\r

-  @retval EFI_NOT_STARTED        The configuration policy for the EFI IPv4 Protocol \r
+  @retval EFI_NOT_STARTED        The configuration policy for the EFI IPv4 Protocol\r

                                  driver was not started.\r
                                  driver was not started.\r

-  \r
+\r

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


@@ -137,25 +137,25 @@ EFI_STATUS
 /**\r
   Returns the default configuration data (if any) for the EFI IPv4 Protocol driver.\r
 \r
 /**\r
   Returns the default configuration data (if any) for the EFI IPv4 Protocol driver.\r
 \r

-  The GetData() function returns the current configuration data for the EFI IPv4 \r
+  The GetData() function returns the current configuration data for the EFI IPv4\r

   Protocol driver after the configuration policy has completed.\r
   Protocol driver after the configuration policy has completed.\r

-  \r
+\r

   @param  This                   The pointer to the EFI_IP4_CONFIG_PROTOCOL instance.\r
   @param  This                   The pointer to the EFI_IP4_CONFIG_PROTOCOL instance.\r

-  @param  IpConfigDataSize       On input, the size of the IpConfigData buffer. \r
-                                 On output, the count of bytes that were written \r
+  @param  IpConfigDataSize       On input, the size of the IpConfigData buffer.\r
+                                 On output, the count of bytes that were written\r

                                  into the IpConfigData buffer.\r
                                  into the IpConfigData buffer.\r

-  @param  IpConfigData           The pointer to the EFI IPv4 Configuration Protocol \r
-                                 driver configuration data structure. \r
-                                 Type EFI_IP4_IPCONFIG_DATA is defined in \r
+  @param  IpConfigData           The pointer to the EFI IPv4 Configuration Protocol\r
+                                 driver configuration data structure.\r
+                                 Type EFI_IP4_IPCONFIG_DATA is defined in\r

                                  "Related Definitions" below.\r
 \r
   @retval EFI_SUCCESS            The EFI IPv4 Protocol driver configuration has been returned.\r
   @retval EFI_INVALID_PARAMETER  This is NULL.\r
                                  "Related Definitions" below.\r
 \r
   @retval EFI_SUCCESS            The EFI IPv4 Protocol driver configuration has been returned.\r
   @retval EFI_INVALID_PARAMETER  This is NULL.\r

-  @retval EFI_NOT_STARTED        The configuration policy for the EFI IPv4 Protocol \r
+  @retval EFI_NOT_STARTED        The configuration policy for the EFI IPv4 Protocol\r

                                  driver is not running.\r
   @retval EFI_NOT_READY EFI      IPv4 Protocol driver configuration is still running.\r
   @retval EFI_ABORTED EFI        IPv4 Protocol driver configuration could not complete.\r
                                  driver is not running.\r
   @retval EFI_NOT_READY EFI      IPv4 Protocol driver configuration is still running.\r
   @retval EFI_ABORTED EFI        IPv4 Protocol driver configuration could not complete.\r

-  @retval EFI_BUFFER_TOO_SMALL   *IpConfigDataSize is smaller than the configuration \r
+  @retval EFI_BUFFER_TOO_SMALL   *IpConfigDataSize is smaller than the configuration\r

                                  data buffer or IpConfigData is NULL.\r
 \r
 **/\r
                                  data buffer or IpConfigData is NULL.\r
 \r
 **/\r


@@ -168,8 +168,8 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The EFI_IP4_CONFIG_PROTOCOL driver performs platform-dependent and policy-dependent \r
-/// configurations for the EFI IPv4 Protocol driver. \r
+/// The EFI_IP4_CONFIG_PROTOCOL driver performs platform-dependent and policy-dependent\r
+/// configurations for the EFI IPv4 Protocol driver.\r

 ///\r
 struct _EFI_IP4_CONFIG_PROTOCOL {\r
   EFI_IP4_CONFIG_START         Start;\r
 ///\r
 struct _EFI_IP4_CONFIG_PROTOCOL {\r
   EFI_IP4_CONFIG_START         Start;\r

diff --git a/MdePkg/Include/Protocol/Ip4Config2.h b/MdePkg/Include/Protocol/Ip4Config2.h
index ced63cbcbf7768c4ab3d66e74d673b1dc05784fb..d255bc367a9100ce8550029cb16e4f0ec96f132c 100644 (file)
--- a/MdePkg/Include/Protocol/Ip4Config2.h
+++ b/MdePkg/Include/Protocol/Ip4Config2.h
@@ -2,7 +2,7 @@
   This file provides a definition of the EFI IPv4 Configuration II\r
   Protocol.\r
 \r
   This file provides a definition of the EFI IPv4 Configuration II\r
   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<BR>\r
 This program and the accompanying materials\r
 are licensed and made available 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


@@ -33,48 +33,48 @@ typedef struct _EFI_IP4_CONFIG2_PROTOCOL EFI_IP4_CONFIG2_PROTOCOL;
 ///\r
 typedef enum {\r
   ///\r
 ///\r
 typedef enum {\r
   ///\r

-  /// The interface information of the communication device this EFI \r
-  /// IPv4 Configuration II Protocol instance manages. This type of \r
-  /// data is read only. The corresponding Data is of type \r
+  /// The interface information of the communication device this EFI\r
+  /// IPv4 Configuration II Protocol instance manages. This type of\r
+  /// data is read only. The corresponding Data is of type\r

   /// EFI_IP4_CONFIG2_INTERFACE_INFO.\r
   ///\r
   Ip4Config2DataTypeInterfaceInfo,\r
   ///\r
   /// EFI_IP4_CONFIG2_INTERFACE_INFO.\r
   ///\r
   Ip4Config2DataTypeInterfaceInfo,\r
   ///\r

-  /// The general configuration policy for the EFI IPv4 network stack \r
-  /// running on the communication device this EFI IPv4 \r
-  /// Configuration II Protocol instance manages. The policy will \r
-  /// affect other configuration settings. The corresponding Data is of \r
+  /// The general configuration policy for the EFI IPv4 network stack\r
+  /// running on the communication device this EFI IPv4\r
+  /// Configuration II Protocol instance manages. The policy will\r
+  /// affect other configuration settings. The corresponding Data is of\r

   /// type EFI_IP4_CONFIG2_POLICY.\r
   ///\r
   Ip4Config2DataTypePolicy,\r
   ///\r
   /// type EFI_IP4_CONFIG2_POLICY.\r
   ///\r
   Ip4Config2DataTypePolicy,\r
   ///\r

-  /// The station addresses set manually for the EFI IPv4 network \r
-  /// stack. It is only configurable when the policy is \r
-  /// Ip4Config2PolicyStatic. The corresponding Data is of \r
-  /// type EFI_IP4_CONFIG2_MANUAL_ADDRESS. When DataSize \r
-  /// is 0 and Data is NULL, the existing configuration is cleared \r
+  /// The station addresses set manually for the EFI IPv4 network\r
+  /// stack. It is only configurable when the policy is\r
+  /// Ip4Config2PolicyStatic. The corresponding Data is of\r
+  /// type EFI_IP4_CONFIG2_MANUAL_ADDRESS. When DataSize\r
+  /// is 0 and Data is NULL, the existing configuration is cleared\r

   /// from the EFI IPv4 Configuration II Protocol instance.\r
   ///\r
   Ip4Config2DataTypeManualAddress,\r
   ///\r
   /// from the EFI IPv4 Configuration II Protocol instance.\r
   ///\r
   Ip4Config2DataTypeManualAddress,\r
   ///\r

-  /// The gateway addresses set manually for the EFI IPv4 network \r
-  /// stack running on the communication device this EFI IPv4 \r
-  /// Configuration II Protocol manages. It is not configurable when \r
-  /// the policy is Ip4Config2PolicyDhcp. The gateway \r
-  /// addresses must be unicast IPv4 addresses. The corresponding \r
+  /// The gateway addresses set manually for the EFI IPv4 network\r
+  /// stack running on the communication device this EFI IPv4\r
+  /// Configuration II Protocol manages. It is not configurable when\r
+  /// the policy is Ip4Config2PolicyDhcp. The gateway\r
+  /// addresses must be unicast IPv4 addresses. The corresponding\r

   /// Data is a pointer to an array of EFI_IPv4_ADDRESS instances.\r
   /// Data is a pointer to an array of EFI_IPv4_ADDRESS instances.\r

-  /// When DataSize is 0 and Data is NULL, the existing configuration \r
+  /// When DataSize is 0 and Data is NULL, the existing configuration\r

   /// is cleared from the EFI IPv4 Configuration II Protocol instance.\r
   ///\r
   Ip4Config2DataTypeGateway,\r
   ///\r
   /// is cleared from the EFI IPv4 Configuration II Protocol instance.\r
   ///\r
   Ip4Config2DataTypeGateway,\r
   ///\r

-  /// The DNS server list for the EFI IPv4 network stack running on \r
-  /// the communication device this EFI IPv4 Configuration II \r
-  /// Protocol manages. It is not configurable when the policy is \r
-  /// Ip4Config2PolicyDhcp. The DNS server addresses must be \r
-  /// unicast IPv4 addresses. The corresponding Data is a pointer to \r
-  /// an array of EFI_IPv4_ADDRESS instances. When DataSize \r
-  /// is 0 and Data is NULL, the existing configuration is cleared \r
+  /// The DNS server list for the EFI IPv4 network stack running on\r
+  /// the communication device this EFI IPv4 Configuration II\r
+  /// Protocol manages. It is not configurable when the policy is\r
+  /// Ip4Config2PolicyDhcp. The DNS server addresses must be\r
+  /// unicast IPv4 addresses. The corresponding Data is a pointer to\r
+  /// an array of EFI_IPv4_ADDRESS instances. When DataSize\r
+  /// is 0 and Data is NULL, the existing configuration is cleared\r

   /// from the EFI IPv4 Configuration II Protocol instance.\r
   ///\r
   Ip4Config2DataTypeDnsServer,\r
   /// from the EFI IPv4 Configuration II Protocol instance.\r
   ///\r
   Ip4Config2DataTypeDnsServer,\r


@@ -95,7 +95,7 @@ typedef struct {
   ///\r
   CHAR16                Name[EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_SIZE];\r
   ///\r
   ///\r
   CHAR16                Name[EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_SIZE];\r
   ///\r

-  /// The interface type of the network interface. See RFC 1700, \r
+  /// The interface type of the network interface. See RFC 1700,\r

   /// section "Number Hardware Type".\r
   ///\r
   UINT8                 IfType;\r
   /// section "Number Hardware Type".\r
   ///\r
   UINT8                 IfType;\r


@@ -120,8 +120,8 @@ typedef struct {
   ///\r
   UINT32                RouteTableSize;\r
   ///\r
   ///\r
   UINT32                RouteTableSize;\r
   ///\r

-  /// The route table of the IPv4 network stack runs on this interface. \r
-  /// Set to NULL if RouteTableSize is zero. Type EFI_IP4_ROUTE_TABLE is defined in \r
+  /// The route table of the IPv4 network stack runs on this interface.\r
+  /// Set to NULL if RouteTableSize is zero. Type EFI_IP4_ROUTE_TABLE is defined in\r

   /// EFI_IP4_PROTOCOL.GetModeData().\r
   ///\r
   EFI_IP4_ROUTE_TABLE   *RouteTable     OPTIONAL;\r
   /// EFI_IP4_PROTOCOL.GetModeData().\r
   ///\r
   EFI_IP4_ROUTE_TABLE   *RouteTable     OPTIONAL;\r


@@ -132,17 +132,17 @@ typedef struct {
 ///\r
 typedef enum {\r
   ///\r
 ///\r
 typedef enum {\r
   ///\r

-  /// Under this policy, the Ip4Config2DataTypeManualAddress, \r
-  /// Ip4Config2DataTypeGateway and Ip4Config2DataTypeDnsServer configuration \r
-  /// data are required to be set manually. The EFI IPv4 Protocol will get all \r
-  /// required configuration such as IPv4 address, subnet mask and \r
+  /// Under this policy, the Ip4Config2DataTypeManualAddress,\r
+  /// Ip4Config2DataTypeGateway and Ip4Config2DataTypeDnsServer configuration\r
+  /// data are required to be set manually. The EFI IPv4 Protocol will get all\r
+  /// required configuration such as IPv4 address, subnet mask and\r

   /// gateway settings from the EFI IPv4 Configuration II protocol.\r
   ///\r
   Ip4Config2PolicyStatic,\r
   ///\r
   /// gateway settings from the EFI IPv4 Configuration II protocol.\r
   ///\r
   Ip4Config2PolicyStatic,\r
   ///\r

-  /// Under this policy, the Ip4Config2DataTypeManualAddress, \r
-  /// Ip4Config2DataTypeGateway and Ip4Config2DataTypeDnsServer configuration data are \r
-  /// not allowed to set via SetData(). All of these configurations are retrieved from DHCP \r
+  /// Under this policy, the Ip4Config2DataTypeManualAddress,\r
+  /// Ip4Config2DataTypeGateway and Ip4Config2DataTypeDnsServer configuration data are\r
+  /// not allowed to set via SetData(). All of these configurations are retrieved from DHCP\r

   /// server or other auto-configuration mechanism.\r
   ///\r
   Ip4Config2PolicyDhcp,\r
   /// server or other auto-configuration mechanism.\r
   ///\r
   Ip4Config2PolicyDhcp,\r


@@ -153,58 +153,58 @@ typedef enum {
 /// EFI_IP4_CONFIG2_MANUAL_ADDRESS\r
 ///\r
 typedef struct {\r
 /// EFI_IP4_CONFIG2_MANUAL_ADDRESS\r
 ///\r
 typedef struct {\r

-  ///  \r
+  ///\r

   /// The IPv4 unicast address.\r
   ///\r
   EFI_IPv4_ADDRESS        Address;\r
   ///\r
   /// The IPv4 unicast address.\r
   ///\r
   EFI_IPv4_ADDRESS        Address;\r
   ///\r

-  /// The subnet mask. \r
+  /// The subnet mask.\r

   ///\r
   EFI_IPv4_ADDRESS        SubnetMask;\r
 } EFI_IP4_CONFIG2_MANUAL_ADDRESS;\r
 \r
 /**\r
   ///\r
   EFI_IPv4_ADDRESS        SubnetMask;\r
 } EFI_IP4_CONFIG2_MANUAL_ADDRESS;\r
 \r
 /**\r

-  Set the configuration for the EFI IPv4 network stack running on the communication device this EFI \r
+  Set the configuration for the EFI IPv4 network stack running on the communication device this EFI\r

   IPv4 Configuration II Protocol instance manages.\r
 \r
   IPv4 Configuration II Protocol instance manages.\r
 \r

-  This function is used to set the configuration data of type DataType for the EFI IPv4 network stack \r
+  This function is used to set the configuration data of type DataType for the EFI IPv4 network stack\r

   running on the communication device this EFI IPv4 Configuration II Protocol instance manages.\r
   The successfully configured data is valid after system reset or power-off.\r
   running on the communication device this EFI IPv4 Configuration II Protocol instance manages.\r
   The successfully configured data is valid after system reset or power-off.\r

-  The DataSize is used to calculate the count of structure instances in the Data for some \r
+  The DataSize is used to calculate the count of structure instances in the Data for some\r

   DataType that multiple structure instances are allowed.\r
   DataType that multiple structure instances are allowed.\r

-  This function is always non-blocking. When setting some typeof configuration data, an \r
-  asynchronous process is invoked to check the correctness of the data, such as doing address conflict \r
-  detection on the manually set local IPv4 address. EFI_NOT_READY is returned immediately to \r
-  indicate that such an asynchronous process is invoked and the process is not finished yet. The caller \r
+  This function is always non-blocking. When setting some typeof configuration data, an\r
+  asynchronous process is invoked to check the correctness of the data, such as doing address conflict\r
+  detection on the manually set local IPv4 address. EFI_NOT_READY is returned immediately to\r
+  indicate that such an asynchronous process is invoked and the process is not finished yet. The caller\r

   willing to get the result of the asynchronous process is required to call RegisterDataNotify()\r
   willing to get the result of the asynchronous process is required to call RegisterDataNotify()\r

-  to register an event on the specified configuration data. Once the event is signaled, the caller can call \r
-  GetData()to get back the configuration data in order to know the result. For other types of \r
-  configuration data that do not require an asynchronous configuration process, the result of the \r
-  operation is immediately returned. \r
+  to register an event on the specified configuration data. Once the event is signaled, the caller can call\r
+  GetData()to get back the configuration data in order to know the result. For other types of\r
+  configuration data that do not require an asynchronous configuration process, the result of the\r
+  operation is immediately returned.\r

 \r
 \r

-  @param[in]   This               Pointer to the EFI_IP4_CONFIG2_PROTOCOL instance.       \r
+  @param[in]   This               Pointer to the EFI_IP4_CONFIG2_PROTOCOL instance.\r

   @param[in]   DataType           The type of data to set.\r
   @param[in]   DataSize           Size of the buffer pointed to by Data in bytes.\r
   @param[in]   DataType           The type of data to set.\r
   @param[in]   DataSize           Size of the buffer pointed to by Data in bytes.\r

-  @param[in]   Data               The data buffer to set. The type ofthe data buffer is associated \r
-                                  with the DataType. \r
+  @param[in]   Data               The data buffer to set. The type ofthe data buffer is associated\r
+                                  with the DataType.\r

 \r
 \r

-  @retval EFI_SUCCESS             The specified configuration data for the EFI IPv4 network stack is set \r
+  @retval EFI_SUCCESS             The specified configuration data for the EFI IPv4 network stack is set\r

                                   successfully.\r
   @retval EFI_INVALID_PARAMETER   One or more of the following are TRUE:\r
                                   This is NULL.\r
                                   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
                                   requirement of the data type indicated by DataType.\r

-  @retval EFI_WRITE_PROTECTED     The specified configuration data is read-only or the specified configuration \r
+  @retval EFI_WRITE_PROTECTED     The specified configuration data is read-only or the specified configuration\r

                                   data can not be set under the current policy.\r
   @retval EFI_ACCESS_DENIED       Another set operation on the specified configuration data is already in process.\r
                                   data can not be set under the current policy.\r
   @retval EFI_ACCESS_DENIED       Another set operation on the specified configuration data is already in process.\r

-  @retval EFI_NOT_READY           An asynchronous process is invoked to set the specified configuration data and \r
+  @retval EFI_NOT_READY           An asynchronous process is invoked to set the specified configuration data and\r

                                   the process is not finished yet.\r
                                   the process is not finished yet.\r

-  @retval EFI_BAD_BUFFER_SIZE     The DataSize does not match the size of the type indicated by DataType.                                 \r
+  @retval EFI_BAD_BUFFER_SIZE     The DataSize does not match the size of the type indicated by DataType.\r

   @retval EFI_UNSUPPORTED         This DataType is not supported.\r
   @retval EFI_OUT_OF_RESOURCES    Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR        An unexpected system error or network error occurred.\r
 **/\r
   @retval EFI_UNSUPPORTED         This DataType is not supported.\r
   @retval EFI_OUT_OF_RESOURCES    Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR        An unexpected system error or network error occurred.\r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_IP4_CONFIG2_SET_DATA) (\r
   IN EFI_IP4_CONFIG2_PROTOCOL   *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_CONFIG2_SET_DATA) (\r
   IN EFI_IP4_CONFIG2_PROTOCOL   *This,\r


@@ -214,35 +214,35 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Get the configuration data for the EFI IPv4 network stack running on the communication device this \r
+  Get the configuration data for the EFI IPv4 network stack running on the communication device this\r

   EFI IPv4 Configuration II Protocol instance manages.\r
 \r
   EFI IPv4 Configuration II Protocol instance manages.\r
 \r

-  This function returns the configuration data of type DataType for the EFI IPv4 network stack \r
+  This function returns the configuration data of type DataType for the EFI IPv4 network stack\r

   running on the communication device this EFI IPv4 Configuration II Protocol instance manages.\r
   running on the communication device this EFI IPv4 Configuration II Protocol instance manages.\r

-  The caller is responsible for allocating the buffer usedto return the specified configuration data and \r
+  The caller is responsible for allocating the buffer usedto return the specified configuration data and\r

   the required size will be returned to the caller if the size of the buffer is too small.\r
   the required size will be returned to the caller if the size of the buffer is too small.\r

-  EFI_NOT_READY is returned if the specified configuration data is not ready due to an already in \r
-  progress asynchronous configuration process. The caller can call RegisterDataNotify() to \r
-  register an event on the specified configuration data. Once the asynchronous configuration process is \r
-  finished, the event will be signaled and a subsequent GetData() call will return the specified \r
+  EFI_NOT_READY is returned if the specified configuration data is not ready due to an already in\r
+  progress asynchronous configuration process. The caller can call RegisterDataNotify() to\r
+  register an event on the specified configuration data. Once the asynchronous configuration process is\r
+  finished, the event will be signaled and a subsequent GetData() call will return the specified\r

   configuration data.\r
 \r
   configuration data.\r
 \r

-  @param[in]   This               Pointer to the EFI_IP4_CONFIG2_PROTOCOL instance.       \r
+  @param[in]   This               Pointer to the EFI_IP4_CONFIG2_PROTOCOL instance.\r

   @param[in]   DataType           The type of data to get.\r
   @param[in]   DataType           The type of data to get.\r

-  @param[out]  DataSize           On input, in bytes, the size of Data. On output, in bytes, the size \r
-                                  of buffer required to store the specified configuration data. \r
-  @param[in]   Data               The data buffer in which the configuration data is returned. The \r
-                                  type of the data buffer is associated with the DataType. Ignored \r
-                                  if DataSize is 0.  \r
+  @param[out]  DataSize           On input, in bytes, the size of Data. On output, in bytes, the size\r
+                                  of buffer required to store the specified configuration data.\r
+  @param[in]   Data               The data buffer in which the configuration data is returned. The\r
+                                  type of the data buffer is associated with the DataType. Ignored\r
+                                  if DataSize is 0.\r

 \r
   @retval EFI_SUCCESS             The specified configuration data is got successfully.\r
   @retval EFI_INVALID_PARAMETER   One or more of the followings are TRUE:\r
                                   This is NULL.\r
                                   DataSize is NULL.\r
                                   Data is NULL if *DataSizeis not zero.\r
 \r
   @retval EFI_SUCCESS             The specified configuration data is got successfully.\r
   @retval EFI_INVALID_PARAMETER   One or more of the followings are TRUE:\r
                                   This is NULL.\r
                                   DataSize is NULL.\r
                                   Data is NULL if *DataSizeis not zero.\r

-  @retval EFI_BUFFER_TOO_SMALL    The size of Data is too small for the specified configuration data \r
+  @retval EFI_BUFFER_TOO_SMALL    The size of Data is too small for the specified configuration data\r

                                   and the required size is returned in DataSize.\r
                                   and the required size is returned in DataSize.\r

-  @retval EFI_NOT_READY           The specified configuration data is not ready due to an already in \r
+  @retval EFI_NOT_READY           The specified configuration data is not ready due to an already in\r

                                   progress asynchronous configuration process.\r
   @retval EFI_NOT_FOUND           The specified configuration data is not found.\r
 **/\r
                                   progress asynchronous configuration process.\r
   @retval EFI_NOT_FOUND           The specified configuration data is not found.\r
 **/\r


@@ -256,19 +256,19 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Register an event that is to be signaled whenever a configuration process on the specified \r
+  Register an event that is to be signaled whenever a configuration process on the specified\r

   configuration data is done.\r
 \r
   configuration data is done.\r
 \r

-  This function registers an event that is to be signaled whenever a configuration process on the \r
+  This function registers an event that is to be signaled whenever a configuration process on the\r

   specified configuration data is done. An event can be registered for different DataType\r
   specified configuration data is done. An event can be registered for different DataType\r

-  simultaneously and the caller is responsible for determining which type of configuration data causes \r
+  simultaneously and the caller is responsible for determining which type of configuration data causes\r

   the signaling of the event in such case.\r
 \r
   the signaling of the event in such case.\r
 \r

-  @param[in]   This               Pointer to the EFI_IP4_CONFIG2_PROTOCOL instance.       \r
+  @param[in]   This               Pointer to the EFI_IP4_CONFIG2_PROTOCOL instance.\r

   @param[in]   DataType           The type of data to unregister the event for.\r
   @param[in]   Event              The event to register.\r
 \r
   @param[in]   DataType           The type of data to unregister the event for.\r
   @param[in]   Event              The event to register.\r
 \r

-  @retval EFI_SUCCESS             The notification event for the specified configuration data is \r
+  @retval EFI_SUCCESS             The notification event for the specified configuration data is\r

                                   registered.\r
   @retval EFI_INVALID_PARAMETER   This is NULL or Event is NULL.\r
   @retval EFI_UNSUPPORTED         The configuration data type specified by DataType is not supported.\r
                                   registered.\r
   @retval EFI_INVALID_PARAMETER   This is NULL or Event is NULL.\r
   @retval EFI_UNSUPPORTED         The configuration data type specified by DataType is not supported.\r


@@ -288,7 +288,7 @@ EFI_STATUS
 \r
   This function removes a previously registeredevent for the specified configuration data.\r
 \r
 \r
   This function removes a previously registeredevent for the specified configuration data.\r
 \r

-  @param[in]   This               Pointer to the EFI_IP4_CONFIG2_PROTOCOL instance.       \r
+  @param[in]   This               Pointer to the EFI_IP4_CONFIG2_PROTOCOL instance.\r

   @param[in]   DataType           The type of data to remove the previously registered event for.\r
   @param[in]   Event              The event to unregister.\r
 \r
   @param[in]   DataType           The type of data to remove the previously registered event for.\r
   @param[in]   Event              The event to unregister.\r
 \r


@@ -305,9 +305,9 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The EFI_IP4_CONFIG2_PROTOCOL is designed to be the central repository for the common \r
+/// The EFI_IP4_CONFIG2_PROTOCOL is designed to be the central repository for the common\r

 /// configurations and the administrator configurable settings for the EFI IPv4 network stack.\r
 /// configurations and the administrator configurable settings for the EFI IPv4 network stack.\r

-/// An EFI IPv4 Configuration II Protocol instance will be installed on each communication device that \r
+/// An EFI IPv4 Configuration II Protocol instance will be installed on each communication device that\r

 /// the EFI IPv4 network stack runs on.\r
 ///\r
 struct _EFI_IP4_CONFIG2_PROTOCOL {\r
 /// the EFI IPv4 network stack runs on.\r
 ///\r
 struct _EFI_IP4_CONFIG2_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Ip6Config.h b/MdePkg/Include/Protocol/Ip6Config.h
index bcb8ba2c6ffc39d994fbe55e0a75eab061b9c71b..333b0fb2c8c2f41983cb4dfaa804c0eee1e8596f 100644 (file)
--- a/MdePkg/Include/Protocol/Ip6Config.h
+++ b/MdePkg/Include/Protocol/Ip6Config.h
@@ -2,7 +2,7 @@
   This file provides a definition of the EFI IPv6 Configuration\r
   Protocol.\r
 \r
   This file provides a definition of the EFI IPv6 Configuration\r
   Protocol.\r
 \r

-Copyright (c) 2008 - 2017, 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<BR>\r
 This program and the accompanying materials\r
 are licensed and made available 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


@@ -27,71 +27,71 @@ typedef struct _EFI_IP6_CONFIG_PROTOCOL EFI_IP6_CONFIG_PROTOCOL;
 ///\r
 /// EFI_IP6_CONFIG_DATA_TYPE\r
 ///\r
 ///\r
 /// EFI_IP6_CONFIG_DATA_TYPE\r
 ///\r

-typedef enum {         \r
-  /// \r
-  /// The interface information of the communication \r
-  /// device this EFI IPv6 Configuration Protocol instance manages. \r
-  /// This type of data is read only.The corresponding Data is of type \r
+typedef enum {\r
+  ///\r
+  /// The interface information of the communication\r
+  /// device this EFI IPv6 Configuration Protocol instance manages.\r
+  /// This type of data is read only.The corresponding Data is of type\r

   /// EFI_IP6_CONFIG_INTERFACE_INFO.\r
   /// EFI_IP6_CONFIG_INTERFACE_INFO.\r

-  /// \r
+  ///\r

   Ip6ConfigDataTypeInterfaceInfo,\r
   Ip6ConfigDataTypeInterfaceInfo,\r

-  /// \r
-  /// The alternative interface ID for the \r
-  /// communication device this EFI IPv6 Configuration Protocol \r
-  /// instance manages if the link local IPv6 address generated from \r
-  /// the interfaced ID based on the default source the EFI IPv6 \r
-  /// Protocol uses is a duplicate address. The length of the interface \r
-  /// ID is 64 bit. The corresponding Data is of type \r
+  ///\r
+  /// The alternative interface ID for the\r
+  /// communication device this EFI IPv6 Configuration Protocol\r
+  /// instance manages if the link local IPv6 address generated from\r
+  /// the interfaced ID based on the default source the EFI IPv6\r
+  /// Protocol uses is a duplicate address. The length of the interface\r
+  /// ID is 64 bit. The corresponding Data is of type\r

   /// EFI_IP6_CONFIG_INTERFACE_ID.\r
   /// EFI_IP6_CONFIG_INTERFACE_ID.\r

-  /// \r
+  ///\r

   Ip6ConfigDataTypeAltInterfaceId,\r
   Ip6ConfigDataTypeAltInterfaceId,\r

-  /// \r
-  /// The general configuration policy for the EFI IPv6 network \r
-  /// stack running on the communication device this EFI IPv6 \r
-  /// Configuration Protocol instance manages. The policy will affect \r
-  /// other configuration settings. The corresponding Data is of type \r
+  ///\r
+  /// The general configuration policy for the EFI IPv6 network\r
+  /// stack running on the communication device this EFI IPv6\r
+  /// Configuration Protocol instance manages. The policy will affect\r
+  /// other configuration settings. The corresponding Data is of type\r

   /// EFI_IP6_CONFIG_POLICY.\r
   ///\r
   Ip6ConfigDataTypePolicy,\r
   /// EFI_IP6_CONFIG_POLICY.\r
   ///\r
   Ip6ConfigDataTypePolicy,\r

-  /// \r
-  /// The number of consecutive \r
-  /// Neighbor Solicitation messages sent while performing Duplicate \r
-  /// Address Detection on a tentative address. A value of zero \r
-  /// indicates that Duplicate Address Detection will not be performed \r
-  /// on tentative addresses. The corresponding Data is of type \r
+  ///\r
+  /// The number of consecutive\r
+  /// Neighbor Solicitation messages sent while performing Duplicate\r
+  /// Address Detection on a tentative address. A value of zero\r
+  /// indicates that Duplicate Address Detection will not be performed\r
+  /// on tentative addresses. The corresponding Data is of type\r

   /// EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS.\r
   /// EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS.\r

-  /// \r
+  ///\r

   Ip6ConfigDataTypeDupAddrDetectTransmits,\r
   Ip6ConfigDataTypeDupAddrDetectTransmits,\r

-  /// \r
-  /// The station addresses set manually for the EFI \r
-  /// IPv6 network stack. It is only configurable when the policy is \r
-  /// Ip6ConfigPolicyManual. The corresponding Data is a \r
-  /// pointer to an array of EFI_IPv6_ADDRESS instances. When \r
-  /// DataSize is 0 and Data is NULL, the existing configuration \r
+  ///\r
+  /// The station addresses set manually for the EFI\r
+  /// IPv6 network stack. It is only configurable when the policy is\r
+  /// Ip6ConfigPolicyManual. The corresponding Data is a\r
+  /// pointer to an array of EFI_IPv6_ADDRESS instances. When\r
+  /// DataSize is 0 and Data is NULL, the existing configuration\r

   /// is cleared from the EFI IPv6 Configuration Protocol instance.\r
   /// is cleared from the EFI IPv6 Configuration Protocol instance.\r

-  /// \r
+  ///\r

   Ip6ConfigDataTypeManualAddress,\r
   Ip6ConfigDataTypeManualAddress,\r

-  /// \r
-  /// The gateway addresses set manually for the EFI IPv6 \r
-  /// network stack running on the communication device this EFI \r
-  /// IPv6 Configuration Protocol manages. It is not configurable when \r
-  /// the policy is Ip6ConfigPolicyAutomatic. The gateway \r
-  /// addresses must be unicast IPv6 addresses. The corresponding \r
+  ///\r
+  /// The gateway addresses set manually for the EFI IPv6\r
+  /// network stack running on the communication device this EFI\r
+  /// IPv6 Configuration Protocol manages. It is not configurable when\r
+  /// the policy is Ip6ConfigPolicyAutomatic. The gateway\r
+  /// addresses must be unicast IPv6 addresses. The corresponding\r

   /// Data is a pointer to an array of EFI_IPv6_ADDRESS instances.\r
   /// Data is a pointer to an array of EFI_IPv6_ADDRESS instances.\r

-  /// When DataSize is 0 and Data is NULL, the existing configuration \r
+  /// When DataSize is 0 and Data is NULL, the existing configuration\r

   /// is cleared from the EFI IPv6 Configuration Protocol instance.\r
   /// is cleared from the EFI IPv6 Configuration Protocol instance.\r

-  /// \r
+  ///\r

   Ip6ConfigDataTypeGateway,\r
   Ip6ConfigDataTypeGateway,\r

-  /// \r
-  /// The DNS server list for the EFI IPv6 network stack \r
-  /// running on the communication device this EFI IPv6 \r
-  /// Configuration Protocol manages. It is not configurable when the \r
-  /// policy is Ip6ConfigPolicyAutomatic.The DNS server \r
-  /// addresses must be unicast IPv6 addresses. The corresponding \r
+  ///\r
+  /// The DNS server list for the EFI IPv6 network stack\r
+  /// running on the communication device this EFI IPv6\r
+  /// Configuration Protocol manages. It is not configurable when the\r
+  /// policy is Ip6ConfigPolicyAutomatic.The DNS server\r
+  /// addresses must be unicast IPv6 addresses. The corresponding\r

   /// Data is a pointer to an array of EFI_IPv6_ADDRESS instances.\r
   /// Data is a pointer to an array of EFI_IPv6_ADDRESS instances.\r

-  /// When DataSize is 0 and Data is NULL, the existing configuration \r
+  /// When DataSize is 0 and Data is NULL, the existing configuration\r

   /// is cleared from the EFI IPv6 Configuration Protocol instance.\r
   /// is cleared from the EFI IPv6 Configuration Protocol instance.\r

-  /// \r
+  ///\r

   Ip6ConfigDataTypeDnsServer,\r
   ///\r
   /// The number of this enumeration memebers.\r
   Ip6ConfigDataTypeDnsServer,\r
   ///\r
   /// The number of this enumeration memebers.\r


@@ -101,7 +101,7 @@ typedef enum {
 \r
 ///\r
 /// EFI_IP6_CONFIG_INTERFACE_INFO\r
 \r
 ///\r
 /// EFI_IP6_CONFIG_INTERFACE_INFO\r

-/// describes the operational state of the interface this \r
+/// describes the operational state of the interface this\r

 /// EFI IPv6 Configuration Protocol instance manages.\r
 ///\r
 typedef struct {\r
 /// EFI IPv6 Configuration Protocol instance manages.\r
 ///\r
 typedef struct {\r


@@ -109,37 +109,37 @@ typedef struct {
   /// The name of the interface. It is a NULL-terminated string.\r
   ///\r
   CHAR16                Name[32];\r
   /// The name of the interface. It is a NULL-terminated string.\r
   ///\r
   CHAR16                Name[32];\r

-  /// \r
+  ///\r

   /// The interface type of the network interface.\r
   /// The interface type of the network interface.\r

-  /// \r
+  ///\r

   UINT8                 IfType;\r
   UINT8                 IfType;\r

-  /// \r
+  ///\r

   /// The size, in bytes, of the network interface's hardware address.\r
   /// The size, in bytes, of the network interface's hardware address.\r

-  /// \r
+  ///\r

   UINT32                HwAddressSize;\r
   UINT32                HwAddressSize;\r

-  /// \r
+  ///\r

   /// The hardware address for the network interface.\r
   /// The hardware address for the network interface.\r

-  /// \r
+  ///\r

   EFI_MAC_ADDRESS       HwAddress;\r
   EFI_MAC_ADDRESS       HwAddress;\r

-  /// \r
+  ///\r

   /// Number of EFI_IP6_ADDRESS_INFO structures pointed to by AddressInfo.\r
   /// Number of EFI_IP6_ADDRESS_INFO structures pointed to by AddressInfo.\r

-  /// \r
+  ///\r

   UINT32                AddressInfoCount;\r
   UINT32                AddressInfoCount;\r

-  /// \r
-  /// Pointer to an array of EFI_IP6_ADDRESS_INFO instances \r
-  /// which contain the local IPv6 addresses and the corresponding \r
-  /// prefix length information. Set to NULL if AddressInfoCount \r
+  ///\r
+  /// Pointer to an array of EFI_IP6_ADDRESS_INFO instances\r
+  /// which contain the local IPv6 addresses and the corresponding\r
+  /// prefix length information. Set to NULL if AddressInfoCount\r

   /// is zero.\r
   /// is zero.\r

-  /// \r
+  ///\r

   EFI_IP6_ADDRESS_INFO  *AddressInfo;\r
   EFI_IP6_ADDRESS_INFO  *AddressInfo;\r

-  /// \r
+  ///\r

   /// Number of route table entries in the following RouteTable.\r
   /// Number of route table entries in the following RouteTable.\r

-  /// \r
+  ///\r

   UINT32                RouteCount;\r
   UINT32                RouteCount;\r

-  /// \r
-  /// The route table of the IPv6 network stack runs on this interface. \r
-  /// Set to NULL if RouteCount is zero. \r
-  /// \r
+  ///\r
+  /// The route table of the IPv6 network stack runs on this interface.\r
+  /// Set to NULL if RouteCount is zero.\r
+  ///\r

   EFI_IP6_ROUTE_TABLE   *RouteTable;\r
 } EFI_IP6_CONFIG_INTERFACE_INFO;\r
 \r
   EFI_IP6_ROUTE_TABLE   *RouteTable;\r
 } EFI_IP6_CONFIG_INTERFACE_INFO;\r
 \r


@@ -153,42 +153,42 @@ typedef struct {
 \r
 ///\r
 /// EFI_IP6_CONFIG_POLICY\r
 \r
 ///\r
 /// EFI_IP6_CONFIG_POLICY\r

-/// defines the general configuration policy the EFI IPv6 \r
+/// defines the general configuration policy the EFI IPv6\r

 /// Configuration Protocol supports.\r
 ///\r
 typedef enum {\r
   ///\r
 /// Configuration Protocol supports.\r
 ///\r
 typedef enum {\r
   ///\r

-  /// Under this policy, the IpI6ConfigDataTypeManualAddress, \r
+  /// Under this policy, the IpI6ConfigDataTypeManualAddress,\r

   /// Ip6ConfigDataTypeGateway and Ip6ConfigDataTypeDnsServer\r
   /// Ip6ConfigDataTypeGateway and Ip6ConfigDataTypeDnsServer\r

-  /// configuration data are required to be set manually. \r
+  /// configuration data are required to be set manually.\r

   /// The EFI IPv6 Protocol will get all required configuration\r
   /// such as address, prefix and gateway settings from the EFI\r
   /// IPv6 Configuration protocol.\r
   ///\r
   /// The EFI IPv6 Protocol will get all required configuration\r
   /// such as address, prefix and gateway settings from the EFI\r
   /// IPv6 Configuration protocol.\r
   ///\r

-  Ip6ConfigPolicyManual,      \r
-  /// \r
-  /// Under this policy, the IpI6ConfigDataTypeManualAddress, \r
+  Ip6ConfigPolicyManual,\r
+  ///\r
+  /// Under this policy, the IpI6ConfigDataTypeManualAddress,\r

   /// Ip6ConfigDataTypeGateway and Ip6ConfigDataTypeDnsServer\r
   /// configuration data are not allowed to set via SetData().\r
   /// All of these configurations are retrieved from some auto\r
   /// Ip6ConfigDataTypeGateway and Ip6ConfigDataTypeDnsServer\r
   /// configuration data are not allowed to set via SetData().\r
   /// All of these configurations are retrieved from some auto\r

-  /// configuration mechanism. \r
-  /// The EFI IPv6 Protocol will use the IPv6 stateless address \r
-  /// autoconfiguration mechanism and/or the IPv6 stateful address \r
-  /// autoconfiguration mechanism described in the related RFCs to \r
+  /// configuration mechanism.\r
+  /// The EFI IPv6 Protocol will use the IPv6 stateless address\r
+  /// autoconfiguration mechanism and/or the IPv6 stateful address\r
+  /// autoconfiguration mechanism described in the related RFCs to\r

   /// get address and other configuration information\r
   /// get address and other configuration information\r

-  /// \r
+  ///\r

   Ip6ConfigPolicyAutomatic\r
 } EFI_IP6_CONFIG_POLICY;\r
 \r
 ///\r
 /// EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS\r
 /// describes the number of consecutive Neighbor Solicitation messages sent\r
   Ip6ConfigPolicyAutomatic\r
 } EFI_IP6_CONFIG_POLICY;\r
 \r
 ///\r
 /// EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS\r
 /// describes the number of consecutive Neighbor Solicitation messages sent\r

-/// while performing Duplicate Address Detection on a tentative address. \r
+/// while performing Duplicate Address Detection on a tentative address.\r

 /// The default value for a newly detected communication device is 1.\r
 ///\r
 typedef struct {\r
   UINT32    DupAddrDetectTransmits;  ///< The number of consecutive Neighbor Solicitation messages sent.\r
 /// The default value for a newly detected communication device is 1.\r
 ///\r
 typedef struct {\r
   UINT32    DupAddrDetectTransmits;  ///< The number of consecutive Neighbor Solicitation messages sent.\r

-} EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS;           \r
+} EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS;\r

 \r
 ///\r
 /// EFI_IP6_CONFIG_MANUAL_ADDRESS\r
 \r
 ///\r
 /// EFI_IP6_CONFIG_MANUAL_ADDRESS\r


@@ -205,49 +205,49 @@ typedef struct {
 /**\r
   Set the configuration for the EFI IPv6 network stack running on the communication\r
   device this EFI IPv6 Configuration Protocol instance manages.\r
 /**\r
   Set the configuration for the EFI IPv6 network stack running on the communication\r
   device this EFI IPv6 Configuration Protocol instance manages.\r

-  \r
-  This function is used to set the configuration data of type DataType for the EFI \r
+\r
+  This function is used to set the configuration data of type DataType for the EFI\r

   IPv6 network stack running on the communication device this EFI IPv6 Configuration\r
   Protocol instance manages.\r
 \r
   IPv6 network stack running on the communication device this EFI IPv6 Configuration\r
   Protocol instance manages.\r
 \r

-  The DataSize is used to calculate the count of structure instances in the Data for \r
+  The DataSize is used to calculate the count of structure instances in the Data for\r

   some DataType that multiple structure instances are allowed.\r
   some DataType that multiple structure instances are allowed.\r

-  \r
+\r

   This function is always non-blocking. When setting some type of configuration data,\r
   This function is always non-blocking. When setting some type of configuration data,\r

-  an asynchronous process is invoked to check the correctness of the data, such as \r
-  doing Duplicate Address Detection on the manually set local IPv6 addresses. \r
+  an asynchronous process is invoked to check the correctness of the data, such as\r
+  doing Duplicate Address Detection on the manually set local IPv6 addresses.\r

   EFI_NOT_READY is returned immediately to indicate that such an asynchronous process\r
   is invoked and the process is not finished yet. The caller willing to get the result\r
   of the asynchronous process is required to call RegisterDataNotify() to register an\r
   EFI_NOT_READY is returned immediately to indicate that such an asynchronous process\r
   is invoked and the process is not finished yet. The caller willing to get the result\r
   of the asynchronous process is required to call RegisterDataNotify() to register an\r

-  event on the specified configuration data. Once the event is signaled, the caller \r
+  event on the specified configuration data. Once the event is signaled, the caller\r

   can call GetData() to get back the configuration data in order to know the result.\r
   can call GetData() to get back the configuration data in order to know the result.\r

-  For other types of configuration data that do not require an asynchronous configuration \r
+  For other types of configuration data that do not require an asynchronous configuration\r

   process, the result of the operation is immediately returned.\r
 \r
   @param[in]     This           Pointer to the EFI_IP6_CONFIG_PROTOCOL instance.\r
   process, the result of the operation is immediately returned.\r
 \r
   @param[in]     This           Pointer to the EFI_IP6_CONFIG_PROTOCOL instance.\r

-  @param[in]     DataType       The type of data to set.  \r
+  @param[in]     DataType       The type of data to set.\r

   @param[in]     DataSize       Size of the buffer pointed to by Data in bytes.\r
   @param[in]     Data           The data buffer to set. The type of the data buffer is\r
                                 associated with the DataType.\r
   @param[in]     DataSize       Size of the buffer pointed to by Data in bytes.\r
   @param[in]     Data           The data buffer to set. The type of the data buffer is\r
                                 associated with the DataType.\r

-  \r
-  @retval EFI_SUCCESS           The specified configuration data for the EFI IPv6 \r
+\r
+  @retval EFI_SUCCESS           The specified configuration data for the EFI IPv6\r

                                 network stack is set successfully.\r
   @retval EFI_INVALID_PARAMETER One or more of the following are TRUE:\r
                                 - This is NULL.\r
                                 network stack is 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
-                                  requirement of the data type indicated by DataType. \r
-  @retval EFI_WRITE_PROTECTED   The specified configuration data is read-only or the specified \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 can not be set under the current policy\r
                                 configuration data can not be set under the current policy\r

-  @retval EFI_ACCESS_DENIED     Another set operation on the specified configuration \r
+  @retval EFI_ACCESS_DENIED     Another set operation on the specified configuration\r

                                 data is already in process.\r
   @retval EFI_NOT_READY         An asynchronous process is invoked to set the specified\r
                                 configuration data and the process is not finished yet.\r
                                 data is already in process.\r
   @retval EFI_NOT_READY         An asynchronous process is invoked to set the specified\r
                                 configuration data and the process is not finished yet.\r

-  @retval EFI_BAD_BUFFER_SIZE   The DataSize does not match the size of the type \r
+  @retval EFI_BAD_BUFFER_SIZE   The DataSize does not match the size of the type\r

                                 indicated by DataType.\r
   @retval EFI_UNSUPPORTED       This DataType is not supported.\r
   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR      An unexpected system error or network error occurred.\r
                                 indicated by DataType.\r
   @retval EFI_UNSUPPORTED       This DataType is not supported.\r
   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.\r
   @retval EFI_DEVICE_ERROR      An unexpected system error or network error occurred.\r

-  \r
+\r

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


@@ -261,39 +261,39 @@ EFI_STATUS
 /**\r
   Get the configuration data for the EFI IPv6 network stack running on the communication\r
   device this EFI IPv6 Configuration Protocol instance manages.\r
 /**\r
   Get the configuration data for the EFI IPv6 network stack running on the communication\r
   device this EFI IPv6 Configuration Protocol instance manages.\r

-  \r
+\r

   This function returns the configuration data of type DataType for the EFI IPv6 network\r
   stack running on the communication device this EFI IPv6 Configuration Protocol instance\r
   manages.\r
 \r
   The caller is responsible for allocating the buffer used to return the specified\r
   configuration data and the required size will be returned to the caller if the size of\r
   This function returns the configuration data of type DataType for the EFI IPv6 network\r
   stack running on the communication device this EFI IPv6 Configuration Protocol instance\r
   manages.\r
 \r
   The caller is responsible for allocating the buffer used to return the specified\r
   configuration data and the required size will be returned to the caller if the size of\r

-  the buffer is too small. \r
-  \r
-  EFI_NOT_READY is returned if the specified configuration data is not ready due to an \r
+  the buffer is too small.\r
+\r
+  EFI_NOT_READY is returned if the specified configuration data is not ready due to an\r

   already in progress asynchronous configuration process. The caller can call RegisterDataNotify()\r
   to register an event on the specified configuration data. Once the asynchronous configuration\r
   already in progress asynchronous configuration process. The caller can call RegisterDataNotify()\r
   to register an event on the specified configuration data. Once the asynchronous configuration\r

-  process is finished, the event will be signaled and a subsequent GetData() call will return \r
+  process is finished, the event will be signaled and a subsequent GetData() call will return\r

   the specified configuration data.\r
 \r
   @param[in]     This           Pointer to the EFI_IP6_CONFIG_PROTOCOL instance.\r
   the specified configuration data.\r
 \r
   @param[in]     This           Pointer to the EFI_IP6_CONFIG_PROTOCOL instance.\r

-  @param[in]     DataType       The type of data to get.  \r
-  @param[in,out] DataSize       On input, in bytes, the size of Data. On output, in bytes, the \r
+  @param[in]     DataType       The type of data to get.\r
+  @param[in,out] DataSize       On input, in bytes, the size of Data. On output, in bytes, the\r

                                 size of buffer required to store the specified configuration data.\r
                                 size of buffer required to store the specified configuration data.\r

-  @param[in]     Data           The data buffer in which the configuration data is returned. The \r
+  @param[in]     Data           The data buffer in which the configuration data is returned. The\r

                                 type of the data buffer is associated with the DataType.\r
                                 type of the data buffer is associated with the DataType.\r

-  \r
+\r

   @retval EFI_SUCCESS           The specified configuration data is got successfully.\r
   @retval EFI_INVALID_PARAMETER One or more of the followings are TRUE:\r
                                 - This is NULL.\r
                                 - DataSize is NULL.\r
                                 - Data is NULL if *DataSize is not zero.\r
   @retval EFI_SUCCESS           The specified configuration data is got successfully.\r
   @retval EFI_INVALID_PARAMETER One or more of the followings are TRUE:\r
                                 - This is NULL.\r
                                 - DataSize is NULL.\r
                                 - Data is NULL if *DataSize is not zero.\r

-  @retval EFI_BUFFER_TOO_SMALL  The size of Data is too small for the specified configuration data \r
+  @retval EFI_BUFFER_TOO_SMALL  The size of Data is too small for the specified configuration data\r

                                 and the required size is returned in DataSize.\r
                                 and the required size is returned in DataSize.\r

-  @retval EFI_NOT_READY         The specified configuration data is not ready due to an already in \r
+  @retval EFI_NOT_READY         The specified configuration data is not ready due to an already in\r

                                 progress asynchronous configuration process.\r
   @retval EFI_NOT_FOUND         The specified configuration data is not found.\r
                                 progress asynchronous configuration process.\r
   @retval EFI_NOT_FOUND         The specified configuration data is not found.\r

-  \r
+\r

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


@@ -307,24 +307,24 @@ EFI_STATUS
 /**\r
   Register an event that is to be signaled whenever a configuration process on the specified\r
   configuration data is done.\r
 /**\r
   Register an event that is to be signaled whenever a configuration process on the specified\r
   configuration data is done.\r

-  \r
+\r

   This function registers an event that is to be signaled whenever a configuration process\r
   on the specified configuration data is done. An event can be registered for different DataType\r
   simultaneously and the caller is responsible for determining which type of configuration data\r
   causes the signaling of the event in such case.\r
 \r
   @param[in]     This           Pointer to the EFI_IP6_CONFIG_PROTOCOL instance.\r
   This function registers an event that is to be signaled whenever a configuration process\r
   on the specified configuration data is done. An event can be registered for different DataType\r
   simultaneously and the caller is responsible for determining which type of configuration data\r
   causes the signaling of the event in such case.\r
 \r
   @param[in]     This           Pointer to the EFI_IP6_CONFIG_PROTOCOL instance.\r

-  @param[in]     DataType       The type of data to unregister the event for.  \r
-  @param[in]     Event          The event to register. \r
-  \r
-  @retval EFI_SUCCESS           The notification event for the specified configuration data is \r
+  @param[in]     DataType       The type of data to unregister the event for.\r
+  @param[in]     Event          The event to register.\r
+\r
+  @retval EFI_SUCCESS           The notification event for the specified configuration data is\r

                                 registered.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r
                                 registered.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r

-  @retval EFI_UNSUPPORTED       The configuration data type specified by DataType is not \r
+  @retval EFI_UNSUPPORTED       The configuration data type specified by DataType is not\r

                                 supported.\r
   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.\r
   @retval EFI_ACCESS_DENIED     The Event is already registered for the DataType.\r
                                 supported.\r
   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.\r
   @retval EFI_ACCESS_DENIED     The Event is already registered for the DataType.\r

-  \r
+\r

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


@@ -336,18 +336,18 @@ EFI_STATUS
 \r
 /**\r
   Remove a previously registered event for the specified configuration data.\r
 \r
 /**\r
   Remove a previously registered event for the specified configuration data.\r

-  \r
+\r

   This function removes a previously registered event for the specified configuration data.\r
 \r
   @param[in]     This           Pointer to the EFI_IP6_CONFIG_PROTOCOL instance.\r
   This function removes a previously registered event for the specified configuration data.\r
 \r
   @param[in]     This           Pointer to the EFI_IP6_CONFIG_PROTOCOL instance.\r

-  @param[in]     DataType       The type of data to remove the previously registered event for.  \r
+  @param[in]     DataType       The type of data to remove the previously registered event for.\r

   @param[in]     Event          The event to unregister.\r
   @param[in]     Event          The event to unregister.\r

-  \r
+\r

   @retval EFI_SUCCESS           The event registered for the specified configuration data is removed.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r
   @retval EFI_SUCCESS           The event registered for the specified configuration data is removed.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r

-  @retval EFI_NOT_FOUND         The Event has not been registered for the specified \r
+  @retval EFI_NOT_FOUND         The Event has not been registered for the specified\r

                                 DataType.\r
                                 DataType.\r

-  \r
+\r

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

diff --git a/MdePkg/Include/Protocol/IpSec.h b/MdePkg/Include/Protocol/IpSec.h
index 24147e262e245ad106cd7405d13a70540a069a03..66e857c9d48861972b00df69b1eaf4c8b6fef912 100644 (file)
--- a/MdePkg/Include/Protocol/IpSec.h
+++ b/MdePkg/Include/Protocol/IpSec.h
@@ -1,16 +1,16 @@
 /** @file\r
   EFI IPSEC Protocol Definition\r
   The EFI_IPSEC_PROTOCOL is used to abstract the ability to deal with the individual\r
 /** @file\r
   EFI IPSEC Protocol Definition\r
   The EFI_IPSEC_PROTOCOL is used to abstract the ability to deal with the individual\r

-  packets sent and received by the host and provide packet-level security for IP \r
+  packets sent and received by the host and provide packet-level security for IP\r

   datagram.\r
   The EFI_IPSEC2_PROTOCOL is used to abstract the ability to deal with the individual\r
   datagram.\r
   The EFI_IPSEC2_PROTOCOL is used to abstract the ability to deal with the individual\r

-  packets sent and received by the host and provide packet-level security for IP \r
-  datagram. In addition, it supports the Option (extension header) processing in \r
-  IPsec which doesn't support in EFI_IPSEC_PROTOCOL. It is also recommended to \r
-  use EFI_IPSEC2_PROTOCOL instead of EFI_IPSEC_PROTOCOL especially for IPsec Tunnel \r
+  packets sent and received by the host and provide packet-level security for IP\r
+  datagram. In addition, it supports the Option (extension header) processing in\r
+  IPsec which doesn't support in EFI_IPSEC_PROTOCOL. It is also recommended to\r
+  use EFI_IPSEC2_PROTOCOL instead of EFI_IPSEC_PROTOCOL especially for IPsec Tunnel\r

   Mode.\r
 \r
   Mode.\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


@@ -19,7 +19,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

-  @par Revision Reference:          \r
+  @par Revision Reference:\r

   The EFI_IPSEC2_PROTOCOL is introduced in UEFI Specification 2.3D.\r
 \r
 **/\r
   The EFI_IPSEC2_PROTOCOL is introduced in UEFI Specification 2.3D.\r
 \r
 **/\r


@@ -43,34 +43,34 @@ typedef struct _EFI_IPSEC_PROTOCOL  EFI_IPSEC_PROTOCOL;
 typedef struct _EFI_IPSEC2_PROTOCOL EFI_IPSEC2_PROTOCOL;\r
 \r
 ///\r
 typedef struct _EFI_IPSEC2_PROTOCOL EFI_IPSEC2_PROTOCOL;\r
 \r
 ///\r

-/// EFI_IPSEC_FRAGMENT_DATA \r
+/// EFI_IPSEC_FRAGMENT_DATA\r

 /// defines the instances of packet fragments.\r
 ///\r
 /// defines the instances of packet fragments.\r
 ///\r

-typedef struct _EFI_IPSEC_FRAGMENT_DATA { \r
+typedef struct _EFI_IPSEC_FRAGMENT_DATA {\r

   UINT32  FragmentLength;\r
   VOID    *FragmentBuffer;\r
   UINT32  FragmentLength;\r
   VOID    *FragmentBuffer;\r

-} EFI_IPSEC_FRAGMENT_DATA; \r
+} EFI_IPSEC_FRAGMENT_DATA;\r

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

-  Handles IPsec packet processing for inbound and outbound IP packets. \r
+  Handles IPsec packet processing for inbound and outbound IP packets.\r

 \r
   The EFI_IPSEC_PROCESS process routine handles each inbound or outbound packet.\r
 \r
   The EFI_IPSEC_PROCESS process routine handles each inbound or outbound packet.\r

-  The behavior is that it can perform one of the following actions: \r
-  bypass the packet, discard the packet, or protect the packet.       \r
+  The behavior is that it can perform one of the following actions:\r
+  bypass the packet, discard the packet, or protect the packet.\r

 \r
   @param[in]      This             Pointer to the EFI_IPSEC_PROTOCOL instance.\r
   @param[in]      NicHandle        Instance of the network interface.\r
   @param[in]      IpVer            IPV4 or IPV6.\r
   @param[in, out] IpHead           Pointer to the IP Header.\r
   @param[in]      LastHead         The protocol of the next layer to be processed by IPsec.\r
 \r
   @param[in]      This             Pointer to the EFI_IPSEC_PROTOCOL instance.\r
   @param[in]      NicHandle        Instance of the network interface.\r
   @param[in]      IpVer            IPV4 or IPV6.\r
   @param[in, out] IpHead           Pointer to the IP Header.\r
   @param[in]      LastHead         The protocol of the next layer to be processed by IPsec.\r

-  @param[in]      OptionsBuffer    Pointer to the options buffer. \r
+  @param[in]      OptionsBuffer    Pointer to the options buffer.\r

   @param[in]      OptionsLength    Length of the options buffer.\r
   @param[in]      OptionsLength    Length of the options buffer.\r

-  @param[in, out] FragmentTable    Pointer to a list of fragments. \r
+  @param[in, out] FragmentTable    Pointer to a list of fragments.\r

   @param[in]      FragmentCount    Number of fragments.\r
   @param[in]      TrafficDirection Traffic direction.\r
   @param[out]     RecycleSignal    Event for recycling of resources.\r
   @param[in]      FragmentCount    Number of fragments.\r
   @param[in]      TrafficDirection Traffic direction.\r
   @param[out]     RecycleSignal    Event for recycling of resources.\r

- \r
+\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_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


@@ -93,9 +93,9 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// EFI_IPSEC_PROTOCOL \r
+/// EFI_IPSEC_PROTOCOL\r

 /// provides the ability for  securing IP communications by authenticating\r
 /// provides the ability for  securing IP communications by authenticating\r

-/// and/or encrypting each IP packet in a data stream. \r
+/// and/or encrypting each IP packet in a data stream.\r

 //  EFI_IPSEC_PROTOCOL can be consumed by both the IPv4 and IPv6 stack.\r
 //  A user can employ this protocol for IPsec package handling in both IPv4\r
 //  and IPv6 environment.\r
 //  EFI_IPSEC_PROTOCOL can be consumed by both the IPv4 and IPv6 stack.\r
 //  A user can employ this protocol for IPsec package handling in both IPv4\r
 //  and IPv6 environment.\r


@@ -107,72 +107,72 @@ struct _EFI_IPSEC_PROTOCOL {
 };\r
 \r
 /**\r
 };\r
 \r
 /**\r

-  Handles IPsec processing for both inbound and outbound IP packets. Compare with \r
-  Process() in EFI_IPSEC_PROTOCOL, this interface has the capability to process \r
-  Option(Extension Header). \r
+  Handles IPsec processing for both inbound and outbound IP packets. Compare with\r
+  Process() in EFI_IPSEC_PROTOCOL, this interface has the capability to process\r
+  Option(Extension Header).\r

 \r
   The EFI_IPSEC2_PROCESS process routine handles each inbound or outbound packet.\r
 \r
   The EFI_IPSEC2_PROCESS process routine handles each inbound or outbound packet.\r

-  The behavior is that it can perform one of the following actions: \r
-  bypass the packet, discard the packet, or protect the packet.  \r
+  The behavior is that it can perform one of the following actions:\r
+  bypass the packet, discard the packet, or protect the packet.\r

 \r
   @param[in]       This               Pointer to the EFI_IPSEC2_PROTOCOL instance.\r
 \r
   @param[in]       This               Pointer to the EFI_IPSEC2_PROTOCOL instance.\r

-  @param[in]       NicHandle          Instance of the network interface. \r
+  @param[in]       NicHandle          Instance of the network interface.\r

   @param[in]       IpVer              IP version.IPv4 or IPv6.\r
   @param[in]       IpVer              IP version.IPv4 or IPv6.\r

-  @param[in, out]  IpHead             Pointer to the IP Header it is either \r
+  @param[in, out]  IpHead             Pointer to the IP Header it is either\r

                                       the EFI_IP4_HEADER or EFI_IP6_HEADER.\r
                                       the EFI_IP4_HEADER or EFI_IP6_HEADER.\r

-                                      On input, it contains the IP header. \r
-                                      On output, 1) in tunnel mode and the \r
-                                      traffic direction is inbound, the buffer \r
-                                      will be reset to zero by IPsec; 2) in \r
-                                      tunnel mode and the traffic direction \r
-                                      is outbound, the buffer will reset to \r
-                                      be the tunnel IP header.3) in transport \r
-                                      mode, the related fielders (like payload \r
-                                      length, Next header) in IP header will \r
+                                      On input, it contains the IP header.\r
+                                      On output, 1) in tunnel mode and the\r
+                                      traffic direction is inbound, the buffer\r
+                                      will be reset to zero by IPsec; 2) in\r
+                                      tunnel mode and the traffic direction\r
+                                      is outbound, the buffer will reset to\r
+                                      be the tunnel IP header.3) in transport\r
+                                      mode, the related fielders (like payload\r
+                                      length, Next header) in IP header will\r

                                       be modified according to the condition.\r
   @param[in, out]  LastHead           For IP4, it is the next protocol in IP\r
                                       be modified according to the condition.\r
   @param[in, out]  LastHead           For IP4, it is the next protocol in IP\r

-                                      header. For IP6 it is the Next Header \r
+                                      header. For IP6 it is the Next Header\r

                                       of the last extension header.\r
                                       of the last extension header.\r

-  @param[in, out]  OptionsBuffer      On input, it contains the options \r
-                                      (extensions header) to be processed by \r
+  @param[in, out]  OptionsBuffer      On input, it contains the options\r
+                                      (extensions header) to be processed by\r

                                       IPsec. On output, 1) in tunnel mode and\r
                                       IPsec. On output, 1) in tunnel mode and\r

-                                      the traffic direction is outbound, it \r
-                                      will be set to NULL, and that means this \r
-                                      contents was wrapped after inner header \r
-                                      and should not be concatenated after \r
-                                      tunnel header again; 2) in transport \r
-                                      mode and the traffic direction is inbound, \r
-                                      if there are IP options (extension headers) \r
-                                      protected by IPsec, IPsec will concatenate \r
-                                      the those options after the input options \r
-                                      (extension headers); 3) on other situations, \r
-                                      the output of contents of OptionsBuffer \r
-                                      might be same with input's. The caller \r
-                                      should take the responsibility to free \r
+                                      the traffic direction is outbound, it\r
+                                      will be set to NULL, and that means this\r
+                                      contents was wrapped after inner header\r
+                                      and should not be concatenated after\r
+                                      tunnel header again; 2) in transport\r
+                                      mode and the traffic direction is inbound,\r
+                                      if there are IP options (extension headers)\r
+                                      protected by IPsec, IPsec will concatenate\r
+                                      the those options after the input options\r
+                                      (extension headers); 3) on other situations,\r
+                                      the output of contents of OptionsBuffer\r
+                                      might be same with input's. The caller\r
+                                      should take the responsibility to free\r

                                       the buffer both on input and on output.\r
                                       the buffer both on input and on output.\r

-  @param[in, out]  OptionsLength      On input, the input length of the options \r
-                                      buffer. On output, the output length of \r
+  @param[in, out]  OptionsLength      On input, the input length of the options\r
+                                      buffer. On output, the output length of\r

                                       the options buffer.\r
                                       the options buffer.\r

-  @param[in, out]  FragmentTable      Pointer to a list of fragments. On input, \r
-                                      these fragments contain the IP payload. \r
-                                      On output, 1) in tunnel mode and the traffic \r
-                                      direction is inbound, the fragments contain \r
-                                      the whole IP payload which is from the \r
-                                      IP inner header to the last byte of the \r
-                                      packet; 2) in tunnel mode and the traffic \r
-                                      direction is the outbound, the fragments \r
-                                      contains the whole encapsulated payload \r
-                                      which encapsulates the whole IP payload \r
-                                      between the encapsulated header and \r
-                                      encapsulated trailer fields. 3) in transport \r
-                                      mode and the traffic direction is inbound, \r
-                                      the fragments contains the IP payload \r
-                                      which is from the next layer protocol to \r
-                                      the last byte of the packet; 4) in transport \r
-                                      mode and the traffic direction is outbound, \r
-                                      the fragments contains the whole encapsulated \r
-                                      payload which encapsulates the next layer \r
-                                      protocol information between the encapsulated \r
+  @param[in, out]  FragmentTable      Pointer to a list of fragments. On input,\r
+                                      these fragments contain the IP payload.\r
+                                      On output, 1) in tunnel mode and the traffic\r
+                                      direction is inbound, the fragments contain\r
+                                      the whole IP payload which is from the\r
+                                      IP inner header to the last byte of the\r
+                                      packet; 2) in tunnel mode and the traffic\r
+                                      direction is the outbound, the fragments\r
+                                      contains the whole encapsulated payload\r
+                                      which encapsulates the whole IP payload\r
+                                      between the encapsulated header and\r
+                                      encapsulated trailer fields. 3) in transport\r
+                                      mode and the traffic direction is inbound,\r
+                                      the fragments contains the IP payload\r
+                                      which is from the next layer protocol to\r
+                                      the last byte of the packet; 4) in transport\r
+                                      mode and the traffic direction is outbound,\r
+                                      the fragments contains the whole encapsulated\r
+                                      payload which encapsulates the next layer\r
+                                      protocol information between the encapsulated\r

                                       header and encapsulated trailer fields.\r
   @param[in, out]  FragmentCount      Number of fragments.\r
   @param[in]       TrafficDirection   Traffic direction.\r
                                       header and encapsulated trailer fields.\r
   @param[in, out]  FragmentCount      Number of fragments.\r
   @param[in]       TrafficDirection   Traffic direction.\r


@@ -180,7 +180,7 @@ struct _EFI_IPSEC_PROTOCOL {
 \r
   @retval      EFI_SUCCESS           The packet was processed by IPsec successfully.\r
   @retval      EFI_ACCESS_DENIED     The packet was discarded.\r
 \r
   @retval      EFI_SUCCESS           The packet was processed by IPsec successfully.\r
   @retval      EFI_ACCESS_DENIED     The packet was discarded.\r

-  @retval      EFI_NOT_READY         The IKE negotiation is invoked and the packet \r
+  @retval      EFI_NOT_READY         The IKE negotiation is invoked and the packet\r

                                      was discarded.\r
   @retval      EFI_INVALID_PARAMETER One or more of following are TRUE:\r
                                      If OptionsBuffer is NULL;\r
                                      was discarded.\r
   @retval      EFI_INVALID_PARAMETER One or more of following are TRUE:\r
                                      If OptionsBuffer is NULL;\r


@@ -189,23 +189,23 @@ struct _EFI_IPSEC_PROTOCOL {
                                      If FragmentCount is NULL.\r
 \r
 **/\r
                                      If FragmentCount is NULL.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 EFI_STATUS\r

-(EFIAPI *EFI_IPSEC_PROCESSEXT) ( \r
-  IN EFI_IPSEC2_PROTOCOL         *This, \r
-  IN EFI_HANDLE                  NicHandle, \r
-  IN UINT8                       IpVer, \r
-  IN OUT VOID                    *IpHead, \r
-  IN OUT UINT8                   *LastHead, \r
-  IN OUT VOID                    **OptionsBuffer, \r
-  IN OUT UINT32                  *OptionsLength, \r
-  IN OUT EFI_IPSEC_FRAGMENT_DATA **FragmentTable, \r
-  IN OUT UINT32                  *FragmentCount, \r
-  IN EFI_IPSEC_TRAFFIC_DIR       TrafficDirection, \r
+(EFIAPI *EFI_IPSEC_PROCESSEXT) (\r
+  IN EFI_IPSEC2_PROTOCOL         *This,\r
+  IN EFI_HANDLE                  NicHandle,\r
+  IN UINT8                       IpVer,\r
+  IN OUT VOID                    *IpHead,\r
+  IN OUT UINT8                   *LastHead,\r
+  IN OUT VOID                    **OptionsBuffer,\r
+  IN OUT UINT32                  *OptionsLength,\r
+  IN OUT EFI_IPSEC_FRAGMENT_DATA **FragmentTable,\r
+  IN OUT UINT32                  *FragmentCount,\r
+  IN EFI_IPSEC_TRAFFIC_DIR       TrafficDirection,\r

      OUT EFI_EVENT               *RecycleSignal\r
   );\r
 \r
      OUT EFI_EVENT               *RecycleSignal\r
   );\r
 \r

-/// \r
+///\r

 /// EFI_IPSEC2_PROTOCOL\r
 /// supports the Option (extension header) processing in IPsec which doesn't support\r
 /// in EFI_IPSEC_PROTOCOL. It is also recommended to use EFI_IPSEC2_PROTOCOL instead\r
 /// EFI_IPSEC2_PROTOCOL\r
 /// supports the Option (extension header) processing in IPsec which doesn't support\r
 /// in EFI_IPSEC_PROTOCOL. It is also recommended to use EFI_IPSEC2_PROTOCOL instead\r


@@ -213,10 +213,10 @@ EFI_STATUS
 /// provides the ability for securing IP communications by authenticating and/or\r
 /// encrypting each IP packet in a data stream.\r
 ///\r
 /// provides the ability for securing IP communications by authenticating and/or\r
 /// encrypting each IP packet in a data stream.\r
 ///\r

-struct _EFI_IPSEC2_PROTOCOL { \r
+struct _EFI_IPSEC2_PROTOCOL {\r

 EFI_IPSEC_PROCESSEXT ProcessExt;\r
 EFI_IPSEC_PROCESSEXT ProcessExt;\r

-EFI_EVENT            DisabledEvent; \r
-BOOLEAN              DisabledFlag; \r
+EFI_EVENT            DisabledEvent;\r
+BOOLEAN              DisabledFlag;\r

 };\r
 \r
 extern EFI_GUID gEfiIpSecProtocolGuid;\r
 };\r
 \r
 extern EFI_GUID gEfiIpSecProtocolGuid;\r

diff --git a/MdePkg/Include/Protocol/IpSecConfig.h b/MdePkg/Include/Protocol/IpSecConfig.h
index c6e2b36beba0bc905e413d9da87d3c4504f5ed94..e53ad5339764e8a89a8d24f9e7fc6d03631d7403 100644 (file)
--- a/MdePkg/Include/Protocol/IpSecConfig.h
+++ b/MdePkg/Include/Protocol/IpSecConfig.h
@@ -1,9 +1,9 @@
 /** @file\r
   EFI IPsec Configuration Protocol Definition\r
 /** @file\r
   EFI IPsec Configuration Protocol Definition\r

-  The EFI_IPSEC_CONFIG_PROTOCOL provides the mechanism to set and retrieve security and \r
+  The EFI_IPSEC_CONFIG_PROTOCOL provides the mechanism to set and retrieve security and\r

   policy related information for the EFI IPsec protocol driver.\r
 \r
   policy related information for the EFI IPsec protocol driver.\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


@@ -12,7 +12,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

-  @par Revision Reference:          \r
+  @par Revision Reference:\r

   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r
   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r


@@ -32,34 +32,34 @@ typedef struct _EFI_IPSEC_CONFIG_PROTOCOL EFI_IPSEC_CONFIG_PROTOCOL;
 /// EFI_IPSEC_CONFIG_DATA_TYPE\r
 ///\r
 typedef enum {\r
 /// EFI_IPSEC_CONFIG_DATA_TYPE\r
 ///\r
 typedef enum {\r

-  /// \r
-  /// The IPsec Security Policy Database (aka SPD) setting.  In IPsec, \r
-  /// an essential element of Security Association (SA) processing is \r
-  /// underlying SPD that specifies what services are to be offered to \r
-  /// IP datagram and in what fashion. The SPD must be consulted \r
-  /// during the processing of all traffic (inbound and outbound), \r
-  /// including traffic not protected by IPsec, that traverses the IPsec \r
-  /// boundary. With this DataType, SetData() function is to set \r
-  /// the SPD entry information, which may add one new entry, delete \r
-  /// one existed entry or flush the whole database according to the \r
-  /// parameter values. The corresponding Data is of type \r
+  ///\r
+  /// The IPsec Security Policy Database (aka SPD) setting.  In IPsec,\r
+  /// an essential element of Security Association (SA) processing is\r
+  /// underlying SPD that specifies what services are to be offered to\r
+  /// IP datagram and in what fashion. The SPD must be consulted\r
+  /// during the processing of all traffic (inbound and outbound),\r
+  /// including traffic not protected by IPsec, that traverses the IPsec\r
+  /// boundary. With this DataType, SetData() function is to set\r
+  /// the SPD entry information, which may add one new entry, delete\r
+  /// one existed entry or flush the whole database according to the\r
+  /// parameter values. The corresponding Data is of type\r

   /// EFI_IPSEC_SPD_DATA\r
   /// EFI_IPSEC_SPD_DATA\r

-  /// \r
+  ///\r

   IPsecConfigDataTypeSpd,\r
   IPsecConfigDataTypeSpd,\r

-  /// \r
-  /// The IPsec Security Association Database (aka SAD) setting. A \r
-  /// SA is a simplex connection that affords security services to the \r
-  /// traffic carried by it. Security services are afforded to an SA by the \r
-  /// use of AH, or ESP, but not both. The corresponding Data is of \r
+  ///\r
+  /// The IPsec Security Association Database (aka SAD) setting. A\r
+  /// SA is a simplex connection that affords security services to the\r
+  /// traffic carried by it. Security services are afforded to an SA by the\r
+  /// use of AH, or ESP, but not both. The corresponding Data is of\r

   /// type EFI_IPSEC_SAD_DATA.\r
   /// type EFI_IPSEC_SAD_DATA.\r

-  /// \r
+  ///\r

   IPsecConfigDataTypeSad,\r
   IPsecConfigDataTypeSad,\r

-  /// \r
-  /// The IPsec Peer Authorization Database (aka PAD) setting, which \r
-  /// provides the link between the SPD and a security association \r
-  /// management protocol. The PAD entry specifies the \r
-  /// authentication protocol (e.g. IKEv1, IKEv2) method used and the \r
-  /// authentication data. The corresponding Data is of type \r
+  ///\r
+  /// The IPsec Peer Authorization Database (aka PAD) setting, which\r
+  /// provides the link between the SPD and a security association\r
+  /// management protocol. The PAD entry specifies the\r
+  /// authentication protocol (e.g. IKEv1, IKEv2) method used and the\r
+  /// authentication data. The corresponding Data is of type\r

   /// EFI_IPSEC_PAD_DATA.\r
   ///\r
   IPsecConfigDataTypePad,\r
   /// EFI_IPSEC_PAD_DATA.\r
   ///\r
   IPsecConfigDataTypePad,\r


@@ -79,70 +79,70 @@ typedef struct _EFI_IP_ADDRESS_INFO {
 /// EFI_IPSEC_SPD_SELECTOR\r
 ///\r
 typedef struct _EFI_IPSEC_SPD_SELECTOR {\r
 /// EFI_IPSEC_SPD_SELECTOR\r
 ///\r
 typedef struct _EFI_IPSEC_SPD_SELECTOR {\r

-  /// \r
+  ///\r

   /// Specifies the actual number of entries in LocalAddress.\r
   /// Specifies the actual number of entries in LocalAddress.\r

-  /// \r
+  ///\r

   UINT32                          LocalAddressCount;\r
   UINT32                          LocalAddressCount;\r

-  /// \r
-  /// A list of ranges of IPv4 or IPv6 addresses, which refers to the \r
+  ///\r
+  /// A list of ranges of IPv4 or IPv6 addresses, which refers to the\r

   /// addresses being protected by IPsec policy.\r
   /// addresses being protected by IPsec policy.\r

-  /// \r
+  ///\r

   EFI_IP_ADDRESS_INFO             *LocalAddress;\r
   EFI_IP_ADDRESS_INFO             *LocalAddress;\r

-  /// \r
+  ///\r

   /// Specifies the actual number of entries in RemoteAddress.\r
   /// Specifies the actual number of entries in RemoteAddress.\r

-  /// \r
+  ///\r

   UINT32                          RemoteAddressCount;\r
   UINT32                          RemoteAddressCount;\r

-  /// \r
-  /// A list of ranges of IPv4 or IPv6 addresses, which are peer entities \r
-  /// to LocalAddress. \r
-  /// \r
+  ///\r
+  /// A list of ranges of IPv4 or IPv6 addresses, which are peer entities\r
+  /// to LocalAddress.\r
+  ///\r

   EFI_IP_ADDRESS_INFO             *RemoteAddress;\r
   EFI_IP_ADDRESS_INFO             *RemoteAddress;\r

-  /// \r
-  /// Next layer protocol. Obtained from the IPv4 Protocol or the IPv6 \r
-  /// Next Header fields. The next layer protocol is whatever comes \r
-  /// after any IP extension headers that are present. A zero value is a \r
+  ///\r
+  /// Next layer protocol. Obtained from the IPv4 Protocol or the IPv6\r
+  /// Next Header fields. The next layer protocol is whatever comes\r
+  /// after any IP extension headers that are present. A zero value is a\r

   /// wildcard that matches any value in NextLayerProtocol field.\r
   /// wildcard that matches any value in NextLayerProtocol field.\r

-  /// \r
-  UINT16                          NextLayerProtocol; \r
-  /// \r
-  /// Local Port if the Next Layer Protocol uses two ports (as do TCP, \r
-  /// UDP, and others). A zero value is a wildcard that matches any \r
+  ///\r
+  UINT16                          NextLayerProtocol;\r
+  ///\r
+  /// Local Port if the Next Layer Protocol uses two ports (as do TCP,\r
+  /// UDP, and others). A zero value is a wildcard that matches any\r

   /// value in LocalPort field.\r
   /// value in LocalPort field.\r

-  /// \r
+  ///\r

   UINT16                          LocalPort;\r
   UINT16                          LocalPort;\r

-  /// \r
-  /// A designed port range size. The start port is LocalPort, and \r
-  /// the total number of ports is described by LocalPortRange. \r
-  /// This field is ignored if NextLayerProtocol does not use \r
-  /// ports. \r
-  /// \r
+  ///\r
+  /// A designed port range size. The start port is LocalPort, and\r
+  /// the total number of ports is described by LocalPortRange.\r
+  /// This field is ignored if NextLayerProtocol does not use\r
+  /// ports.\r
+  ///\r

   UINT16                          LocalPortRange;\r
   UINT16                          LocalPortRange;\r

-  /// \r
-  /// Remote Port if the Next Layer Protocol uses two ports. A zero \r
+  ///\r
+  /// Remote Port if the Next Layer Protocol uses two ports. A zero\r

   /// value is a wildcard that matches any value in RemotePort field.\r
   /// value is a wildcard that matches any value in RemotePort field.\r

-  /// \r
+  ///\r

   UINT16                          RemotePort;\r
   UINT16                          RemotePort;\r

-  /// \r
-  /// A designed port range size. The start port is RemotePort, and \r
-  /// the total number of ports is described by RemotePortRange. \r
+  ///\r
+  /// A designed port range size. The start port is RemotePort, and\r
+  /// the total number of ports is described by RemotePortRange.\r

   /// This field is ignored if NextLayerProtocol does not use ports.\r
   /// This field is ignored if NextLayerProtocol does not use ports.\r

-  /// \r
+  ///\r

   UINT16                          RemotePortRange;\r
 } EFI_IPSEC_SPD_SELECTOR;\r
   UINT16                          RemotePortRange;\r
 } EFI_IPSEC_SPD_SELECTOR;\r

- \r
+\r

 ///\r
 /// EFI_IPSEC_TRAFFIC_DIR\r
 /// represents the directionality in an SPD entry.\r
 ///\r
 typedef enum {\r
   ///\r
 ///\r
 /// EFI_IPSEC_TRAFFIC_DIR\r
 /// represents the directionality in an SPD entry.\r
 ///\r
 typedef enum {\r
   ///\r

-  /// The EfiIPsecInBound refers to traffic entering an IPsec implementation via \r
+  /// The EfiIPsecInBound refers to traffic entering an IPsec implementation via\r

   /// the unprotected interface or emitted by the implementation on the unprotected\r
   /// the unprotected interface or emitted by the implementation on the unprotected\r

-  /// side of the boundary and directed towards the protected interface. \r
+  /// side of the boundary and directed towards the protected interface.\r

   ///\r
   EfiIPsecInBound,\r
   ///\r
   ///\r
   EfiIPsecInBound,\r
   ///\r

-  /// The EfiIPsecOutBound refers to traffic entering the implementation via \r
+  /// The EfiIPsecOutBound refers to traffic entering the implementation via\r

   /// the protected interface, or emitted by the implementation on the protected side\r
   /// of the boundary and directed toward the unprotected interface.\r
   ///\r
   /// the protected interface, or emitted by the implementation on the protected side\r
   /// of the boundary and directed toward the unprotected interface.\r
   ///\r


@@ -154,54 +154,54 @@ typedef enum {
 /// represents three possible processing choices.\r
 ///\r
 typedef enum {\r
 /// represents three possible processing choices.\r
 ///\r
 typedef enum {\r

-  /// \r
+  ///\r

   /// Refers to traffic that is not allowed to traverse the IPsec boundary.\r
   /// Refers to traffic that is not allowed to traverse the IPsec boundary.\r

-  /// \r
+  ///\r

   EfiIPsecActionDiscard,\r
   EfiIPsecActionDiscard,\r

-  /// \r
-  /// Refers to traffic that is allowed to cross the IPsec boundary \r
+  ///\r
+  /// Refers to traffic that is allowed to cross the IPsec boundary\r

   /// without protection.\r
   /// without protection.\r

-  /// \r
+  ///\r

   EfiIPsecActionBypass,\r
   EfiIPsecActionBypass,\r

-  /// \r
-  /// Refers to traffic that is afforded IPsec protection, and for such \r
-  /// traffic the SPD must specify the security protocols to be \r
-  /// employed, their mode, security service options, and the \r
-  /// cryptographic algorithms to be used. \r
+  ///\r
+  /// Refers to traffic that is afforded IPsec protection, and for such\r
+  /// traffic the SPD must specify the security protocols to be\r
+  /// employed, their mode, security service options, and the\r
+  /// cryptographic algorithms to be used.\r

   ///\r
   EfiIPsecActionProtect\r
 } EFI_IPSEC_ACTION;\r
 \r
 ///\r
 /// EFI_IPSEC_SA_LIFETIME\r
   ///\r
   EfiIPsecActionProtect\r
 } EFI_IPSEC_ACTION;\r
 \r
 ///\r
 /// EFI_IPSEC_SA_LIFETIME\r

-/// defines the lifetime of an SA, which represents when a SA must be \r
-/// replaced or terminated. A value of all 0 for each field removes \r
+/// defines the lifetime of an SA, which represents when a SA must be\r
+/// replaced or terminated. A value of all 0 for each field removes\r

 /// the limitation of a SA lifetime.\r
 ///\r
 typedef struct _EFI_IPSEC_SA_LIFETIME {\r
 /// the limitation of a SA lifetime.\r
 ///\r
 typedef struct _EFI_IPSEC_SA_LIFETIME {\r

-  /// \r
+  ///\r

   /// The number of bytes to which the IPsec cryptographic algorithm\r
   /// can be applied. For ESP, this is the encryption algorithm and for\r
   /// The number of bytes to which the IPsec cryptographic algorithm\r
   /// can be applied. For ESP, this is the encryption algorithm and for\r

-  /// AH, this is the authentication algorithm. The ByteCount \r
+  /// AH, this is the authentication algorithm. The ByteCount\r

   /// includes pad bytes for cryptographic operations.\r
   /// includes pad bytes for cryptographic operations.\r

-  /// \r
+  ///\r

   UINT64        ByteCount;\r
   UINT64        ByteCount;\r

-  /// \r
-  /// A time interval in second that warns the implementation to \r
+  ///\r
+  /// A time interval in second that warns the implementation to\r

   /// initiate action such as setting up a replacement SA.\r
   /// initiate action such as setting up a replacement SA.\r

-  /// \r
+  ///\r

   UINT64        SoftLifetime;\r
   UINT64        SoftLifetime;\r

-  /// \r
-  /// A time interval in second when the current SA ends and is \r
+  ///\r
+  /// A time interval in second when the current SA ends and is\r

   /// destroyed.\r
   /// destroyed.\r

-  /// \r
+  ///\r

   UINT64        HardLifetime;\r
 } EFI_IPSEC_SA_LIFETIME;\r
 \r
 ///\r
 /// EFI_IPSEC_MODE\r
   UINT64        HardLifetime;\r
 } EFI_IPSEC_SA_LIFETIME;\r
 \r
 ///\r
 /// EFI_IPSEC_MODE\r

-/// There are two modes of IPsec operation: transport mode and tunnel mode. In \r
-/// EfiIPsecTransport mode, AH and ESP provide protection primarily for next layer protocols; \r
+/// There are two modes of IPsec operation: transport mode and tunnel mode. In\r
+/// EfiIPsecTransport mode, AH and ESP provide protection primarily for next layer protocols;\r

 /// In EfiIPsecTunnel mode, AH and ESP are applied to tunneled IP packets.\r
 ///\r
 typedef enum {\r
 /// In EfiIPsecTunnel mode, AH and ESP are applied to tunneled IP packets.\r
 ///\r
 typedef enum {\r


@@ -226,19 +226,19 @@ typedef enum {
 /// EFI_IPSEC_TUNNEL_OPTION\r
 ///\r
 typedef struct _EFI_IPSEC_TUNNEL_OPTION {\r
 /// EFI_IPSEC_TUNNEL_OPTION\r
 ///\r
 typedef struct _EFI_IPSEC_TUNNEL_OPTION {\r

-  /// \r
+  ///\r

   /// Local tunnel address when IPsec mode is EfiIPsecTunnel.\r
   /// Local tunnel address when IPsec mode is EfiIPsecTunnel.\r

-  /// \r
+  ///\r

   EFI_IP_ADDRESS              LocalTunnelAddress;\r
   EFI_IP_ADDRESS              LocalTunnelAddress;\r

-  /// \r
+  ///\r

   /// Remote tunnel address when IPsec mode is EfiIPsecTunnel.\r
   /// Remote tunnel address when IPsec mode is EfiIPsecTunnel.\r

-  /// \r
+  ///\r

   EFI_IP_ADDRESS              RemoteTunnelAddress;\r
   EFI_IP_ADDRESS              RemoteTunnelAddress;\r

-  /// \r
+  ///\r

   /// The option of copying the DF bit from an outbound package\r
   /// The option of copying the DF bit from an outbound package\r

-  /// to the tunnel mode header that it emits, when traffic is \r
-  /// carried via a tunnel mode SA. \r
-  /// \r
+  /// to the tunnel mode header that it emits, when traffic is\r
+  /// carried via a tunnel mode SA.\r
+  ///\r

   EFI_IPSEC_TUNNEL_DF_OPTION  DF;\r
 } EFI_IPSEC_TUNNEL_OPTION;\r
 \r
   EFI_IPSEC_TUNNEL_DF_OPTION  DF;\r
 } EFI_IPSEC_TUNNEL_OPTION;\r
 \r


@@ -247,7 +247,7 @@ typedef struct _EFI_IPSEC_TUNNEL_OPTION {
 ///\r
 typedef enum {\r
   EfiIPsecAH,  ///< IP Authentication Header protocol which is specified in RFC 4302.\r
 ///\r
 typedef enum {\r
   EfiIPsecAH,  ///< IP Authentication Header protocol which is specified in RFC 4302.\r

-  EfiIPsecESP  ///< IP Encapsulating Security Payload which is specified in RFC 4303. \r
+  EfiIPsecESP  ///< IP Encapsulating Security Payload which is specified in RFC 4303.\r

 } EFI_IPSEC_PROTOCOL_TYPE;\r
 \r
 ///\r
 } EFI_IPSEC_PROTOCOL_TYPE;\r
 \r
 ///\r


@@ -255,48 +255,48 @@ typedef enum {
 /// describes a policy list for traffic processing.\r
 ///\r
 typedef struct _EFI_IPSEC_PROCESS_POLICY {\r
 /// describes a policy list for traffic processing.\r
 ///\r
 typedef struct _EFI_IPSEC_PROCESS_POLICY {\r

-  /// \r
-  /// Extended Sequence Number. Is this SA using extended sequence \r
+  ///\r
+  /// Extended Sequence Number. Is this SA using extended sequence\r

   /// numbers. 64 bit counter is used if TRUE.\r
   /// numbers. 64 bit counter is used if TRUE.\r

-  /// \r
+  ///\r

   BOOLEAN                 ExtSeqNum;\r
   BOOLEAN                 ExtSeqNum;\r

-  /// \r
-  /// A flag indicating whether overflow of the sequence number \r
-  /// counter should generate an auditable event and prevent \r
-  /// transmission of additional packets on the SA, or whether rollover \r
+  ///\r
+  /// A flag indicating whether overflow of the sequence number\r
+  /// counter should generate an auditable event and prevent\r
+  /// transmission of additional packets on the SA, or whether rollover\r

   /// is permitted.\r
   /// is permitted.\r

-  /// \r
+  ///\r

   BOOLEAN                 SeqOverflow;\r
   BOOLEAN                 SeqOverflow;\r

-  /// \r
-  /// Is this SA using stateful fragment checking. TRUE represents \r
+  ///\r
+  /// Is this SA using stateful fragment checking. TRUE represents\r

   /// stateful fragment checking.\r
   /// stateful fragment checking.\r

-  /// \r
+  ///\r

   BOOLEAN                 FragCheck;\r
   BOOLEAN                 FragCheck;\r

-  /// \r
-  /// A time interval after which a SA must be replaced with a new SA \r
-  /// (and new SPI) or terminated. \r
-  /// \r
+  ///\r
+  /// A time interval after which a SA must be replaced with a new SA\r
+  /// (and new SPI) or terminated.\r
+  ///\r

   EFI_IPSEC_SA_LIFETIME   SaLifetime;\r
   EFI_IPSEC_SA_LIFETIME   SaLifetime;\r

-  /// \r
+  ///\r

   /// IPsec mode: tunnel or transport.\r
   /// IPsec mode: tunnel or transport.\r

-  /// \r
+  ///\r

   EFI_IPSEC_MODE          Mode;\r
   EFI_IPSEC_MODE          Mode;\r

-  /// \r
+  ///\r

   /// Tunnel Option. TunnelOption is ignored if Mode is EfiIPsecTransport.\r
   /// Tunnel Option. TunnelOption is ignored if Mode is EfiIPsecTransport.\r

-  /// \r
+  ///\r

   EFI_IPSEC_TUNNEL_OPTION *TunnelOption;\r
   EFI_IPSEC_TUNNEL_OPTION *TunnelOption;\r

-  /// \r
+  ///\r

   /// IPsec protocol: AH or ESP\r
   /// IPsec protocol: AH or ESP\r

-  /// \r
+  ///\r

   EFI_IPSEC_PROTOCOL_TYPE Proto;\r
   EFI_IPSEC_PROTOCOL_TYPE Proto;\r

-  ///  \r
+  ///\r

   /// Cryptographic algorithm type used for authentication.\r
   /// Cryptographic algorithm type used for authentication.\r

-  /// \r
+  ///\r

   UINT8                   AuthAlgoId;\r
   UINT8                   AuthAlgoId;\r

-  /// \r
-  /// Cryptographic algorithm type used for encryption. EncAlgo is \r
-  /// NULL when IPsec protocol is AH. For ESP protocol, EncAlgo \r
-  /// can also be used to describe the algorithm if a combined mode \r
+  ///\r
+  /// Cryptographic algorithm type used for encryption. EncAlgo is\r
+  /// NULL when IPsec protocol is AH. For ESP protocol, EncAlgo\r
+  /// can also be used to describe the algorithm if a combined mode\r

   /// algorithm is used.\r
   ///\r
   UINT8                   EncAlgoId;\r
   /// algorithm is used.\r
   ///\r
   UINT8                   EncAlgoId;\r


@@ -307,19 +307,19 @@ typedef struct _EFI_IPSEC_PROCESS_POLICY {
 /// A triplet to identify an SA, consisting of the following members.\r
 ///\r
 typedef struct _EFI_IPSEC_SA_ID {\r
 /// A triplet to identify an SA, consisting of the following members.\r
 ///\r
 typedef struct _EFI_IPSEC_SA_ID {\r

-  /// \r
-  /// Security Parameter Index (aka SPI).  An arbitrary 32-bit value \r
-  /// that is used by a receiver to identity the SA to which an incoming \r
+  ///\r
+  /// Security Parameter Index (aka SPI).  An arbitrary 32-bit value\r
+  /// that is used by a receiver to identity the SA to which an incoming\r

   /// package should be bound.\r
   /// package should be bound.\r

-  /// \r
+  ///\r

   UINT32                          Spi;\r
   UINT32                          Spi;\r

-  /// \r
+  ///\r

   /// IPsec protocol: AH or ESP\r
   /// IPsec protocol: AH or ESP\r

-  /// \r
+  ///\r

   EFI_IPSEC_PROTOCOL_TYPE         Proto;\r
   EFI_IPSEC_PROTOCOL_TYPE         Proto;\r

-  /// \r
-  /// Destination IP address. \r
-  /// \r
+  ///\r
+  /// Destination IP address.\r
+  ///\r

   EFI_IP_ADDRESS                  DestAddress;\r
 } EFI_IPSEC_SA_ID;\r
 \r
   EFI_IP_ADDRESS                  DestAddress;\r
 } EFI_IPSEC_SA_ID;\r
 \r


@@ -330,48 +330,48 @@ typedef struct _EFI_IPSEC_SA_ID {
 /// EFI_IPSEC_SPD_DATA\r
 ///\r
 typedef struct _EFI_IPSEC_SPD_DATA {\r
 /// EFI_IPSEC_SPD_DATA\r
 ///\r
 typedef struct _EFI_IPSEC_SPD_DATA {\r

-  /// \r
-  /// A null-terminated ASCII name string which is used as a symbolic \r
+  ///\r
+  /// A null-terminated ASCII name string which is used as a symbolic\r

   /// identifier for an IPsec Local or Remote address.\r
   /// identifier for an IPsec Local or Remote address.\r

-  /// \r
+  ///\r

   UINT8                           Name[MAX_PEERID_LEN];\r
   UINT8                           Name[MAX_PEERID_LEN];\r

-  /// \r
-  /// Bit-mapped list describing Populate from Packet flags. When \r
-  /// creating a SA, if PackageFlag bit is set to TRUE, instantiate \r
-  /// the selector from the corresponding field in the package that \r
-  /// triggered the creation of the SA, else from the value(s) in the \r
-  /// corresponding SPD entry. The PackageFlag bit setting for \r
+  ///\r
+  /// Bit-mapped list describing Populate from Packet flags. When\r
+  /// creating a SA, if PackageFlag bit is set to TRUE, instantiate\r
+  /// the selector from the corresponding field in the package that\r
+  /// triggered the creation of the SA, else from the value(s) in the\r
+  /// corresponding SPD entry. The PackageFlag bit setting for\r

   /// corresponding selector field of EFI_IPSEC_SPD_SELECTOR:\r
   /// corresponding selector field of EFI_IPSEC_SPD_SELECTOR:\r

-  ///     Bit 0: EFI_IPSEC_SPD_SELECTOR.LocalAddress \r
-  ///     Bit 1: EFI_IPSEC_SPD_SELECTOR.RemoteAddress \r
-  ///     Bit 2: \r
-  /// EFI_IPSEC_SPD_SELECTOR.NextLayerProtocol \r
-  ///     Bit 3: EFI_IPSEC_SPD_SELECTOR.LocalPort \r
-  ///     Bit 4: EFI_IPSEC_SPD_SELECTOR.RemotePort \r
+  ///     Bit 0: EFI_IPSEC_SPD_SELECTOR.LocalAddress\r
+  ///     Bit 1: EFI_IPSEC_SPD_SELECTOR.RemoteAddress\r
+  ///     Bit 2:\r
+  /// EFI_IPSEC_SPD_SELECTOR.NextLayerProtocol\r
+  ///     Bit 3: EFI_IPSEC_SPD_SELECTOR.LocalPort\r
+  ///     Bit 4: EFI_IPSEC_SPD_SELECTOR.RemotePort\r

   ///     Others: Reserved.\r
   ///\r
   UINT32                          PackageFlag;\r
   ///     Others: Reserved.\r
   ///\r
   UINT32                          PackageFlag;\r

-  /// \r
+  ///\r

   /// The traffic direction of data gram.\r
   /// The traffic direction of data gram.\r

-  /// \r
+  ///\r

   EFI_IPSEC_TRAFFIC_DIR           TrafficDirection;\r
   EFI_IPSEC_TRAFFIC_DIR           TrafficDirection;\r

-  /// \r
-  /// Processing choices to indicate which action is required by this \r
-  /// policy. \r
-  /// \r
+  ///\r
+  /// Processing choices to indicate which action is required by this\r
+  /// policy.\r
+  ///\r

   EFI_IPSEC_ACTION                Action;\r
   EFI_IPSEC_ACTION                Action;\r

-  /// \r
+  ///\r

   /// The policy and rule information for a SPD entry.\r
   /// The policy and rule information for a SPD entry.\r

-  /// \r
+  ///\r

   EFI_IPSEC_PROCESS_POLICY        *ProcessingPolicy;\r
   EFI_IPSEC_PROCESS_POLICY        *ProcessingPolicy;\r

-  /// \r
+  ///\r

   /// Specifies the actual number of entries in SaId list.\r
   /// Specifies the actual number of entries in SaId list.\r

-  /// \r
+  ///\r

   UINTN                           SaIdCount;\r
   UINTN                           SaIdCount;\r

-  /// \r
-  /// The SAD entry used for the traffic processing. The \r
+  ///\r
+  /// The SAD entry used for the traffic processing. The\r

   /// existed SAD entry links indicate this is the manual key case.\r
   /// existed SAD entry links indicate this is the manual key case.\r

-  /// \r
+  ///\r

   EFI_IPSEC_SA_ID                 SaId[1];\r
 } EFI_IPSEC_SPD_DATA;\r
 \r
   EFI_IPSEC_SA_ID                 SaId[1];\r
 } EFI_IPSEC_SPD_DATA;\r
 \r


@@ -389,9 +389,9 @@ typedef struct _EFI_IPSEC_AH_ALGO_INFO {
 ///\r
 /// EFI_IPSEC_ESP_ALGO_INFO\r
 /// The security algorithm selection for IPsec ESP encryption and authentication.\r
 ///\r
 /// EFI_IPSEC_ESP_ALGO_INFO\r
 /// The security algorithm selection for IPsec ESP encryption and authentication.\r

-/// The required authentication algorithm is specified in RFC 4305. \r
-/// EncAlgoId fields can also specify an ESP combined mode algorithm \r
-/// (e.g. AES with CCM mode, specified in RFC 4309), which provides both \r
+/// The required authentication algorithm is specified in RFC 4305.\r
+/// EncAlgoId fields can also specify an ESP combined mode algorithm\r
+/// (e.g. AES with CCM mode, specified in RFC 4309), which provides both\r

 /// confidentiality and authentication services.\r
 ///\r
 typedef struct _EFI_IPSEC_ESP_ALGO_INFO {\r
 /// confidentiality and authentication services.\r
 ///\r
 typedef struct _EFI_IPSEC_ESP_ALGO_INFO {\r


@@ -415,40 +415,40 @@ typedef union {
 /// EFI_IPSEC_SA_DATA\r
 ///\r
 typedef struct _EFI_IPSEC_SA_DATA {\r
 /// EFI_IPSEC_SA_DATA\r
 ///\r
 typedef struct _EFI_IPSEC_SA_DATA {\r

-  /// \r
+  ///\r

   /// IPsec mode: tunnel or transport.\r
   /// IPsec mode: tunnel or transport.\r

-  /// \r
+  ///\r

   EFI_IPSEC_MODE                  Mode;\r
   EFI_IPSEC_MODE                  Mode;\r

-  /// \r
-  /// Sequence Number Counter. A 64-bit counter used to generate the \r
+  ///\r
+  /// Sequence Number Counter. A 64-bit counter used to generate the\r

   /// sequence number field in AH or ESP headers.\r
   /// sequence number field in AH or ESP headers.\r

-  /// \r
+  ///\r

   UINT64                          SNCount;\r
   UINT64                          SNCount;\r

-  /// \r
-  /// Anti-Replay Window. A 64-bit counter and a bit-map used to \r
+  ///\r
+  /// Anti-Replay Window. A 64-bit counter and a bit-map used to\r

   /// determine whether an inbound AH or ESP packet is a replay.\r
   /// determine whether an inbound AH or ESP packet is a replay.\r

-  /// \r
+  ///\r

   UINT8                           AntiReplayWindows;\r
   UINT8                           AntiReplayWindows;\r

-  /// \r
-  /// AH/ESP cryptographic algorithm, key and parameters. \r
-  /// \r
+  ///\r
+  /// AH/ESP cryptographic algorithm, key and parameters.\r
+  ///\r

   EFI_IPSEC_ALGO_INFO             AlgoInfo;\r
   EFI_IPSEC_ALGO_INFO             AlgoInfo;\r

-  /// \r
-  /// Lifetime of this SA. \r
-  /// \r
+  ///\r
+  /// Lifetime of this SA.\r
+  ///\r

   EFI_IPSEC_SA_LIFETIME           SaLifetime;\r
   EFI_IPSEC_SA_LIFETIME           SaLifetime;\r

-  /// \r
-  /// Any observed path MTU and aging variables. The Path MTU \r
+  ///\r
+  /// Any observed path MTU and aging variables. The Path MTU\r

   /// processing is defined in section 8 of RFC 4301.\r
   /// processing is defined in section 8 of RFC 4301.\r

-  /// \r
+  ///\r

   UINT32                          PathMTU;\r
   UINT32                          PathMTU;\r

-  /// \r
+  ///\r

   /// Link to one SPD entry.\r
   /// Link to one SPD entry.\r

-  /// \r
+  ///\r

   EFI_IPSEC_SPD_SELECTOR          *SpdSelector;\r
   EFI_IPSEC_SPD_SELECTOR          *SpdSelector;\r

-  /// \r
-  /// Indication of whether it's manually set or negotiated automatically. \r
-  /// If ManualSet is FALSE, the corresponding SA entry is inserted through \r
+  ///\r
+  /// Indication of whether it's manually set or negotiated automatically.\r
+  /// If ManualSet is FALSE, the corresponding SA entry is inserted through\r

   /// IKE protocol negotiation.\r
   ///\r
   BOOLEAN                         ManualSet;\r
   /// IKE protocol negotiation.\r
   ///\r
   BOOLEAN                         ManualSet;\r


@@ -457,41 +457,41 @@ typedef struct _EFI_IPSEC_SA_DATA {
 ///\r
 /// EFI_IPSEC_SA_DATA2\r
 ///\r
 ///\r
 /// EFI_IPSEC_SA_DATA2\r
 ///\r

-typedef struct _EFI_IPSEC_SA_DATA2 { \r
+typedef struct _EFI_IPSEC_SA_DATA2 {\r

   ///\r
   /// IPsec mode: tunnel or transport\r
   ///\r
   ///\r
   /// IPsec mode: tunnel or transport\r
   ///\r

-  EFI_IPSEC_MODE             Mode; \r
+  EFI_IPSEC_MODE             Mode;\r

   ///\r
   ///\r

-  /// Sequence Number Counter. A 64-bit counter used to generate the sequence \r
-  /// number field in AH or ESP headers. \r
+  /// Sequence Number Counter. A 64-bit counter used to generate the sequence\r
+  /// number field in AH or ESP headers.\r

   ///\r
   ///\r

-  UINT64                     SNCount; \r
+  UINT64                     SNCount;\r

   ///\r
   ///\r

-  /// Anti-Replay Window. A 64-bit counter and a bit-map used to determine \r
+  /// Anti-Replay Window. A 64-bit counter and a bit-map used to determine\r

   /// whether an inbound AH or ESP packet is a replay.\r
   ///\r
   /// whether an inbound AH or ESP packet is a replay.\r
   ///\r

-  UINT8                      AntiReplayWindows; \r
+  UINT8                      AntiReplayWindows;\r

   ///\r
   /// AH/ESP cryptographic algorithm, key and parameters.\r
   ///\r
   ///\r
   /// AH/ESP cryptographic algorithm, key and parameters.\r
   ///\r

-  EFI_IPSEC_ALGO_INFO        AlgoInfo; \r
+  EFI_IPSEC_ALGO_INFO        AlgoInfo;\r

   ///\r
   /// Lifetime of this SA.\r
   ///\r
   ///\r
   /// Lifetime of this SA.\r
   ///\r

-  EFI_IPSEC_SA_LIFETIME      SaLifetime; \r
+  EFI_IPSEC_SA_LIFETIME      SaLifetime;\r

   ///\r
   ///\r

-  /// Any observed path MTU and aging variables. The Path MTU processing is \r
+  /// Any observed path MTU and aging variables. The Path MTU processing is\r

   /// defined in section 8 of RFC 4301.\r
   ///\r
   /// defined in section 8 of RFC 4301.\r
   ///\r

-  UINT32                     PathMTU; \r
+  UINT32                     PathMTU;\r

   ///\r
   /// Link to one SPD entry\r
   ///\r
   ///\r
   /// Link to one SPD entry\r
   ///\r

-  EFI_IPSEC_SPD_SELECTOR     *SpdSelector; \r
+  EFI_IPSEC_SPD_SELECTOR     *SpdSelector;\r

   ///\r
   ///\r

-  /// Indication of whether it's manually set or negotiated automatically. \r
-  /// If ManualSet is FALSE, the corresponding SA entry is inserted through IKE \r
+  /// Indication of whether it's manually set or negotiated automatically.\r
+  /// If ManualSet is FALSE, the corresponding SA entry is inserted through IKE\r

   /// protocol negotiation\r
   ///\r
   BOOLEAN                    ManualSet;\r
   /// protocol negotiation\r
   ///\r
   BOOLEAN                    ManualSet;\r


@@ -503,7 +503,7 @@ typedef struct _EFI_IPSEC_SA_DATA2 {
   /// The tunnel header IP destination address.\r
   ///\r
   EFI_IP_ADDRESS             TunnelDestinationAddress;\r
   /// The tunnel header IP destination address.\r
   ///\r
   EFI_IP_ADDRESS             TunnelDestinationAddress;\r

-} EFI_IPSEC_SA_DATA2; \r
+} EFI_IPSEC_SA_DATA2;\r

 \r
 \r
 ///\r
 \r
 \r
 ///\r


@@ -514,8 +514,8 @@ typedef struct _EFI_IPSEC_SA_DATA2 {
 typedef struct _EFI_IPSEC_PAD_ID {\r
   ///\r
   /// Flag to identify which type of PAD Id is used.\r
 typedef struct _EFI_IPSEC_PAD_ID {\r
   ///\r
   /// Flag to identify which type of PAD Id is used.\r

-  /// \r
-  BOOLEAN               PeerIdValid;    \r
+  ///\r
+  BOOLEAN               PeerIdValid;\r

   union {\r
     ///\r
     /// Pointer to the IPv4 or IPv6 address range.\r
   union {\r
     ///\r
     /// Pointer to the IPv4 or IPv6 address range.\r


@@ -523,8 +523,8 @@ typedef struct _EFI_IPSEC_PAD_ID {
     EFI_IP_ADDRESS_INFO   IpAddress;\r
     ///\r
     /// Pointer to a null terminated ASCII string\r
     EFI_IP_ADDRESS_INFO   IpAddress;\r
     ///\r
     /// Pointer to a null terminated ASCII string\r

-    /// representing the symbolic names. A PeerId can be a DNS \r
-    /// name, Distinguished Name, RFC 822 email address or Key ID \r
+    /// representing the symbolic names. A PeerId can be a DNS\r
+    /// name, Distinguished Name, RFC 822 email address or Key ID\r

     /// (specified in section 4.4.3.1 of RFC 4301)\r
     ///\r
     UINT8                 PeerId[MAX_PEERID_LEN];\r
     /// (specified in section 4.4.3.1 of RFC 4301)\r
     ///\r
     UINT8                 PeerId[MAX_PEERID_LEN];\r


@@ -533,7 +533,7 @@ typedef struct _EFI_IPSEC_PAD_ID {
 \r
 ///\r
 /// EFI_IPSEC_CONFIG_SELECTOR\r
 \r
 ///\r
 /// EFI_IPSEC_CONFIG_SELECTOR\r

-/// describes the expected IPsec configuration data selector \r
+/// describes the expected IPsec configuration data selector\r

 /// of type EFI_IPSEC_CONFIG_DATA_TYPE.\r
 ///\r
 typedef union {\r
 /// of type EFI_IPSEC_CONFIG_DATA_TYPE.\r
 ///\r
 typedef union {\r


@@ -544,7 +544,7 @@ typedef union {
 \r
 ///\r
 /// EFI_IPSEC_AUTH_PROTOCOL_TYPE\r
 \r
 ///\r
 /// EFI_IPSEC_AUTH_PROTOCOL_TYPE\r

-/// defines the possible authentication protocol for IPsec \r
+/// defines the possible authentication protocol for IPsec\r

 /// security association management.\r
 ///\r
 typedef enum {\r
 /// security association management.\r
 ///\r
 typedef enum {\r


@@ -572,64 +572,64 @@ typedef enum {
 /// EFI_IPSEC_PAD_DATA\r
 ///\r
 typedef struct _EFI_IPSEC_PAD_DATA {\r
 /// EFI_IPSEC_PAD_DATA\r
 ///\r
 typedef struct _EFI_IPSEC_PAD_DATA {\r

-  /// \r
+  ///\r

   /// Authentication Protocol for IPsec security association  management.\r
   /// Authentication Protocol for IPsec security association  management.\r

-  /// \r
+  ///\r

   EFI_IPSEC_AUTH_PROTOCOL_TYPE  AuthProtocol;\r
   EFI_IPSEC_AUTH_PROTOCOL_TYPE  AuthProtocol;\r

-  /// \r
+  ///\r

   /// Authentication method used.\r
   /// Authentication method used.\r

-  /// \r
+  ///\r

   EFI_IPSEC_AUTH_METHOD         AuthMethod;\r
   EFI_IPSEC_AUTH_METHOD         AuthMethod;\r

-  /// \r
-  /// The IKE ID payload will be used as a symbolic name for SPD \r
-  /// lookup if IkeIdFlag is TRUE. Otherwise, the remote IP \r
+  ///\r
+  /// The IKE ID payload will be used as a symbolic name for SPD\r
+  /// lookup if IkeIdFlag is TRUE. Otherwise, the remote IP\r

   /// address provided in traffic selector playloads will be used.\r
   /// address provided in traffic selector playloads will be used.\r

-  /// \r
+  ///\r

   BOOLEAN                       IkeIdFlag;\r
   BOOLEAN                       IkeIdFlag;\r

-  /// \r
+  ///\r

   /// The size of Authentication data buffer, in bytes.\r
   /// The size of Authentication data buffer, in bytes.\r

-  /// \r
+  ///\r

   UINTN                         AuthDataSize;\r
   UINTN                         AuthDataSize;\r

-  /// \r
-  /// Buffer for Authentication data, (e.g., the pre-shared secret or the \r
-  /// trust anchor relative to which the peer's certificate will be \r
+  ///\r
+  /// Buffer for Authentication data, (e.g., the pre-shared secret or the\r
+  /// trust anchor relative to which the peer's certificate will be\r

   /// validated).\r
   /// validated).\r

-  /// \r
+  ///\r

   VOID                          *AuthData;\r
   VOID                          *AuthData;\r

-  /// \r
+  ///\r

   /// The size of RevocationData, in bytes\r
   /// The size of RevocationData, in bytes\r

-  /// \r
+  ///\r

   UINTN                         RevocationDataSize;\r
   UINTN                         RevocationDataSize;\r

-  /// \r
-  /// Pointer to CRL or OCSP data, if certificates are used for \r
+  ///\r
+  /// Pointer to CRL or OCSP data, if certificates are used for\r

   /// authentication method.\r
   /// authentication method.\r

-  /// \r
+  ///\r

   VOID                          *RevocationData;\r
 } EFI_IPSEC_PAD_DATA;\r
 \r
 \r
 /**\r
   Set the security association, security policy and peer authorization configuration\r
   VOID                          *RevocationData;\r
 } EFI_IPSEC_PAD_DATA;\r
 \r
 \r
 /**\r
   Set the security association, security policy and peer authorization configuration\r

-  information for the EFI IPsec driver. \r
+  information for the EFI IPsec driver.\r

 \r
   This function is used to set the IPsec configuration information of type DataType for\r
   the EFI IPsec driver.\r
   The IPsec configuration data has a unique selector/identifier separately to identify\r
   a data entry. The selector structure depends on DataType's definition.\r
   Using SetData() with a Data of NULL causes the IPsec configuration data entry identified\r
 \r
   This function is used to set the IPsec configuration information of type DataType for\r
   the EFI IPsec driver.\r
   The IPsec configuration data has a unique selector/identifier separately to identify\r
   a data entry. The selector structure depends on DataType's definition.\r
   Using SetData() with a Data of NULL causes the IPsec configuration data entry identified\r

-  by DataType and Selector to be deleted.        \r
+  by DataType and Selector to be deleted.\r

 \r
   @param[in] This               Pointer to the EFI_IPSEC_CONFIG_PROTOCOL instance.\r
   @param[in] DataType           The type of data to be set.\r
 \r
   @param[in] This               Pointer to the EFI_IPSEC_CONFIG_PROTOCOL instance.\r
   @param[in] DataType           The type of data to be set.\r

-  @param[in] Selector           Pointer to an entry selector on operated configuration data \r
-                                specified by DataType. A NULL Selector causes the entire \r
+  @param[in] Selector           Pointer to an entry selector on operated configuration data\r
+                                specified by DataType. A NULL Selector causes the entire\r

                                 specified-type configuration information to be flushed.\r
                                 specified-type configuration information to be flushed.\r

-  @param[in] Data               The data buffer to be set. The structure of the data buffer is \r
+  @param[in] Data               The data buffer to be set. The structure of the data buffer is\r

                                 associated with the DataType.\r
   @param[in] InsertBefore       Pointer to one entry selector which describes the expected\r
                                 position the new data entry will be added. If InsertBefore is NULL,\r
                                 the new entry will be appended the end of database.\r
                                 associated with the DataType.\r
   @param[in] InsertBefore       Pointer to one entry selector which describes the expected\r
                                 position the new data entry will be added. If InsertBefore is NULL,\r
                                 the new entry will be appended the end of database.\r

- \r
+\r

   @retval EFI_SUCCESS           The specified configuration entry data is set successfully.\r
   @retval EFI_INVALID_PARAMETER One or more of the following are TRUE:\r
                                 - This is NULL.\r
   @retval EFI_SUCCESS           The specified configuration entry data is set successfully.\r
   @retval EFI_INVALID_PARAMETER One or more of the following are TRUE:\r
                                 - This is NULL.\r


@@ -648,20 +648,20 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Return the configuration value for the EFI IPsec driver. \r
+  Return the configuration value for the EFI IPsec driver.\r

 \r
   This function lookup the data entry from IPsec database or IKEv2 configuration\r
   information. The expected data type and unique identification are described in\r
 \r
   This function lookup the data entry from IPsec database or IKEv2 configuration\r
   information. The expected data type and unique identification are described in\r

-  DataType and Selector parameters.        \r
+  DataType and Selector parameters.\r

 \r
   @param[in]      This          Pointer to the EFI_IPSEC_CONFIG_PROTOCOL instance.\r
   @param[in]      DataType      The type of data to retrieve.\r
 \r
   @param[in]      This          Pointer to the EFI_IPSEC_CONFIG_PROTOCOL instance.\r
   @param[in]      DataType      The type of data to retrieve.\r

-  @param[in]      Selector      Pointer to an entry selector which is an identifier of the IPsec \r
+  @param[in]      Selector      Pointer to an entry selector which is an identifier of the IPsec\r

                                 configuration data entry.\r
   @param[in, out] DataSize      On output the size of data returned in Data.\r
                                 configuration data entry.\r
   @param[in, out] DataSize      On output the size of data returned in Data.\r

-  @param[out]     Data          The buffer to return the contents of the IPsec configuration data. \r
-                                The type of the data buffer is associated with the DataType. \r
- \r
+  @param[out]     Data          The buffer to return the contents of the IPsec configuration data.\r
+                                The type of the data buffer is associated with the DataType.\r
+\r

   @retval EFI_SUCCESS           The specified configuration data is got successfully.\r
   @retval EFI_INVALID_PARAMETER One or more of the followings are TRUE:\r
                                 - This is NULL.\r
   @retval EFI_SUCCESS           The specified configuration data is got successfully.\r
   @retval EFI_INVALID_PARAMETER One or more of the followings are TRUE:\r
                                 - This is NULL.\r


@@ -685,30 +685,30 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Enumerates the current selector for IPsec configuration data entry. \r
+  Enumerates the current selector for IPsec configuration data entry.\r

 \r
   This function is called multiple times to retrieve the entry Selector in IPsec\r
 \r
   This function is called multiple times to retrieve the entry Selector in IPsec\r

-  configuration database. On each call to GetNextSelector(), the next entry \r
+  configuration database. On each call to GetNextSelector(), the next entry\r

   Selector are retrieved into the output interface.\r
   Selector are retrieved into the output interface.\r

- \r
-  If the entire IPsec configuration database has been iterated, the error \r
+\r
+  If the entire IPsec configuration database has been iterated, the error\r

   EFI_NOT_FOUND is returned.\r
   EFI_NOT_FOUND is returned.\r

-  If the Selector buffer is too small for the next Selector copy, an \r
-  EFI_BUFFER_TOO_SMALL error is returned, and SelectorSize is updated to reflect \r
+  If the Selector buffer is too small for the next Selector copy, an\r
+  EFI_BUFFER_TOO_SMALL error is returned, and SelectorSize is updated to reflect\r

   the size of buffer needed.\r
 \r
   On the initial call to GetNextSelector() to start the IPsec configuration database\r
   the size of buffer needed.\r
 \r
   On the initial call to GetNextSelector() to start the IPsec configuration database\r

-  search, a pointer to the buffer with all zero value is passed in Selector. Calls \r
-  to SetData() between calls to GetNextSelector may produce unpredictable results.         \r
+  search, a pointer to the buffer with all zero value is passed in Selector. Calls\r
+  to SetData() between calls to GetNextSelector may produce unpredictable results.\r

 \r
   @param[in]      This          Pointer to the EFI_IPSEC_CONFIG_PROTOCOL instance.\r
   @param[in]      DataType      The type of IPsec configuration data to retrieve.\r
   @param[in, out] SelectorSize  The size of the Selector buffer.\r
 \r
   @param[in]      This          Pointer to the EFI_IPSEC_CONFIG_PROTOCOL instance.\r
   @param[in]      DataType      The type of IPsec configuration data to retrieve.\r
   @param[in, out] SelectorSize  The size of the Selector buffer.\r

-  @param[in, out] Selector      On input, supplies the pointer to last Selector that was \r
+  @param[in, out] Selector      On input, supplies the pointer to last Selector that was\r

                                 returned by GetNextSelector().\r
                                 On output, returns one copy of the current entry Selector\r
                                 returned by GetNextSelector().\r
                                 On output, returns one copy of the current entry Selector\r

-                                of a given DataType. \r
- \r
+                                of a given DataType.\r
+\r

   @retval EFI_SUCCESS           The specified configuration data is got successfully.\r
   @retval EFI_INVALID_PARAMETER One or more of the followings are TRUE:\r
                                 - This is NULL.\r
   @retval EFI_SUCCESS           The specified configuration data is got successfully.\r
   @retval EFI_INVALID_PARAMETER One or more of the followings are TRUE:\r
                                 - This is NULL.\r


@@ -717,7 +717,7 @@ EFI_STATUS
   @retval EFI_NOT_FOUND         The next configuration data entry was not found.\r
   @retval EFI_UNSUPPORTED       The specified DataType is not supported.\r
   @retval EFI_BUFFER_TOO_SMALL  The SelectorSize is too small for the result. This parameter\r
   @retval EFI_NOT_FOUND         The next configuration data entry was not found.\r
   @retval EFI_UNSUPPORTED       The specified DataType is not supported.\r
   @retval EFI_BUFFER_TOO_SMALL  The SelectorSize is too small for the result. This parameter\r

-                                has been updated with the size needed to complete the search \r
+                                has been updated with the size needed to complete the search\r

                                 request.\r
 \r
 **/\r
                                 request.\r
 \r
 **/\r


@@ -732,18 +732,18 @@ EFI_STATUS
 \r
 /**\r
   Register an event that is to be signaled whenever a configuration process on the\r
 \r
 /**\r
   Register an event that is to be signaled whenever a configuration process on the\r

-  specified IPsec configuration information is done. \r
+  specified IPsec configuration information is done.\r

 \r
   This function registers an event that is to be signaled whenever a configuration\r
 \r
   This function registers an event that is to be signaled whenever a configuration\r

-  process on the specified IPsec configuration data is done (e.g. IPsec security \r
+  process on the specified IPsec configuration data is done (e.g. IPsec security\r

   policy database configuration is ready). An event can be registered for different\r
   policy database configuration is ready). An event can be registered for different\r

-  DataType simultaneously and the caller is responsible for determining which type \r
-  of configuration data causes the signaling of the event in such case.        \r
+  DataType simultaneously and the caller is responsible for determining which type\r
+  of configuration data causes the signaling of the event in such case.\r

 \r
   @param[in] This               Pointer to the EFI_IPSEC_CONFIG_PROTOCOL instance.\r
   @param[in] DataType           The type of data to be registered the event for.\r
   @param[in] Event              The event to be registered.\r
 \r
   @param[in] This               Pointer to the EFI_IPSEC_CONFIG_PROTOCOL instance.\r
   @param[in] DataType           The type of data to be registered the event for.\r
   @param[in] Event              The event to be registered.\r

- \r
+\r

   @retval EFI_SUCCESS           The event is registered successfully.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r
   @retval EFI_ACCESS_DENIED     The Event is already registered for the DataType.\r
   @retval EFI_SUCCESS           The event is registered successfully.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r
   @retval EFI_ACCESS_DENIED     The Event is already registered for the DataType.\r


@@ -761,16 +761,16 @@ EFI_STATUS
 \r
 /**\r
   Remove the specified event that is previously registered on the specified IPsec\r
 \r
 /**\r
   Remove the specified event that is previously registered on the specified IPsec\r

-  configuration data. \r
+  configuration data.\r

 \r
 \r

-  This function removes a previously registered event for the specified configuration data.        \r
+  This function removes a previously registered event for the specified configuration data.\r

 \r
   @param[in] This               Pointer to the EFI_IPSEC_CONFIG_PROTOCOL instance.\r
   @param[in] DataType           The configuration data type to remove the registered event for.\r
   @param[in] Event              The event to be unregistered.\r
 \r
   @param[in] This               Pointer to the EFI_IPSEC_CONFIG_PROTOCOL instance.\r
   @param[in] DataType           The configuration data type to remove the registered event for.\r
   @param[in] Event              The event to be unregistered.\r

- \r
+\r

   @retval EFI_SUCCESS           The event is removed successfully.\r
   @retval EFI_SUCCESS           The event is removed successfully.\r

-  @retval EFI_NOT_FOUND         The Event specified by DataType could not be found in the \r
+  @retval EFI_NOT_FOUND         The Event specified by DataType could not be found in the\r

                                 database.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r
   @retval EFI_UNSUPPORTED       The notify registration unsupported or the specified\r
                                 database.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r
   @retval EFI_UNSUPPORTED       The notify registration unsupported or the specified\r


@@ -788,12 +788,12 @@ EFI_STATUS
 ///\r
 /// EFI_IPSEC_CONFIG_PROTOCOL\r
 /// provides the ability to set and lookup the IPsec SAD (Security Association Database),\r
 ///\r
 /// EFI_IPSEC_CONFIG_PROTOCOL\r
 /// provides the ability to set and lookup the IPsec SAD (Security Association Database),\r

-/// SPD (Security Policy Database) data entry and configure the security association \r
-/// management protocol such as IKEv2. This protocol is used as the central \r
+/// SPD (Security Policy Database) data entry and configure the security association\r
+/// management protocol such as IKEv2. This protocol is used as the central\r

 /// repository of any policy-specific configuration for EFI IPsec driver.\r
 /// repository of any policy-specific configuration for EFI IPsec driver.\r

-/// EFI_IPSEC_CONFIG_PROTOCOL can be bound to both IPv4 and IPv6 stack. User can use this \r
+/// EFI_IPSEC_CONFIG_PROTOCOL can be bound to both IPv4 and IPv6 stack. User can use this\r

 /// protocol for IPsec configuration in both IPv4 and IPv6 environment.\r
 /// protocol for IPsec configuration in both IPv4 and IPv6 environment.\r

-/// \r
+///\r

 struct _EFI_IPSEC_CONFIG_PROTOCOL {\r
   EFI_IPSEC_CONFIG_SET_DATA           SetData;\r
   EFI_IPSEC_CONFIG_GET_DATA           GetData;\r
 struct _EFI_IPSEC_CONFIG_PROTOCOL {\r
   EFI_IPSEC_CONFIG_SET_DATA           SetData;\r
   EFI_IPSEC_CONFIG_GET_DATA           GetData;\r

diff --git a/MdePkg/Include/Protocol/IsaHc.h b/MdePkg/Include/Protocol/IsaHc.h
index 4677c7ec66457e79ca2420e61bdcc216ad47caea..f035108e1654382b55d2b36867c31f5aad1fef00 100644 (file)
--- a/MdePkg/Include/Protocol/IsaHc.h
+++ b/MdePkg/Include/Protocol/IsaHc.h
@@ -5,14 +5,14 @@
   subtractive-decode ISA bus. It allows devices to be registered and also\r
   handles opening and closing the apertures which are positively-decoded.\r
 \r
   subtractive-decode ISA bus. It allows devices to be registered and also\r
   handles opening and closing the apertures which are positively-decoded.\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
+  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
 \r

-  THE PROGRAM 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
   @par Revision Reference:\r
   This protocol is from PI Version 1.2.1.\r
 \r
   @par Revision Reference:\r
   This protocol is from PI Version 1.2.1.\r


@@ -76,7 +76,7 @@ EFI_STATUS
   hardware aperture (via CloseIoAperture()) until there are no more references to it.\r
 \r
   @param This             A pointer to this instance of the EFI_ISA_HC_PROTOCOL.\r
   hardware aperture (via CloseIoAperture()) until there are no more references to it.\r
 \r
   @param This             A pointer to this instance of the EFI_ISA_HC_PROTOCOL.\r

-  @param IoApertureHandle The I/O aperture handle previously returned from a \r
+  @param IoApertureHandle The I/O aperture handle previously returned from a\r

                           call to OpenIoAperture().\r
 \r
   @retval EFI_SUCCESS     The IO aperture was closed successfully.\r
                           call to OpenIoAperture().\r
 \r
   @retval EFI_SUCCESS     The IO aperture was closed successfully.\r

diff --git a/MdePkg/Include/Protocol/Kms.h b/MdePkg/Include/Protocol/Kms.h
index 1d2dcc64f8ed75136c72b04ee0490b0db65288b4..57b006e10d4a51d79f302d762b224b75e7189e0c 100644 (file)
--- a/MdePkg/Include/Protocol/Kms.h
+++ b/MdePkg/Include/Protocol/Kms.h
@@ -8,7 +8,7 @@
   server over the network, or to a Hardware Security Module (HSM) attached to the system it\r
   runs on, or anything else that is capable of providing the key management service.\r
 \r
   server over the network, or to a Hardware Security Module (HSM) attached to the system it\r
   runs on, or anything else that is capable of providing the key management service.\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
   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


@@ -373,7 +373,7 @@ EFI_STATUS
 \r
   @param[in]      This              Pointer to the EFI_KMS_PROTOCOL instance.\r
   @param[in]      Client            Pointer to a valid EFI_KMS_CLIENT_INFO structure.\r
 \r
   @param[in]      This              Pointer to the EFI_KMS_PROTOCOL instance.\r
   @param[in]      Client            Pointer to a valid EFI_KMS_CLIENT_INFO structure.\r

-  @param[in, out] ClientDataSize    Pointer to the size, in bytes, of an arbitrary block of \r
+  @param[in, out] ClientDataSize    Pointer to the size, in bytes, of an arbitrary block of\r

                                     data specified by the ClientData parameter. This\r
                                     parameter may be NULL, in which case the ClientData\r
                                     parameter will be ignored and no data will be\r
                                     data specified by the ClientData parameter. This\r
                                     parameter may be NULL, in which case the ClientData\r
                                     parameter will be ignored and no data will be\r


@@ -388,11 +388,11 @@ EFI_STATUS
                                     which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData        Pointer to a pointer to an arbitrary block of data of\r
                                     *ClientDataSize that is to be passed directly to the\r
                                     which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData        Pointer to a pointer to an arbitrary block of data of\r
                                     *ClientDataSize that is to be passed directly to the\r

-                                    KMS if it supports the use of client data. This \r
-                                    parameter may be NULL if and only if the \r
+                                    KMS if it supports the use of client data. This\r
+                                    parameter may be NULL if and only if the\r

                                     ClientDataSize parameter is also NULL. Upon return to\r
                                     ClientDataSize parameter is also NULL. Upon return to\r

-                                    the caller, *ClientData points to a block of data of \r
-                                    *ClientDataSize that was returned from the KMS. \r
+                                    the caller, *ClientData points to a block of data of\r
+                                    *ClientDataSize that was returned from the KMS.\r

                                     If the returned value for *ClientDataSize is zero,\r
                                     then the returned value for *ClientData must be NULL\r
                                     and should be ignored by the caller. The KMS protocol\r
                                     If the returned value for *ClientDataSize is zero,\r
                                     then the returned value for *ClientData must be NULL\r
                                     and should be ignored by the caller. The KMS protocol\r


@@ -418,7 +418,7 @@ EFI_STATUS
   IN EFI_KMS_CLIENT_INFO        *Client,\r
   IN OUT UINTN                  *ClientDataSize OPTIONAL,\r
   IN OUT VOID                   **ClientData OPTIONAL\r
   IN EFI_KMS_CLIENT_INFO        *Client,\r
   IN OUT UINTN                  *ClientDataSize OPTIONAL,\r
   IN OUT VOID                   **ClientData OPTIONAL\r

-  ); \r
+  );\r

 \r
 /**\r
   Request that the KMS generate one or more new keys and associate them with key identifiers.\r
 \r
 /**\r
   Request that the KMS generate one or more new keys and associate them with key identifiers.\r


@@ -454,7 +454,7 @@ EFI_STATUS
                                      type and must be freed by the caller when it is no longer\r
                                      needed. Also, the KeyStatus field must reflect the result\r
                                      of the request relative to that key.\r
                                      type and must be freed by the caller when it is no longer\r
                                      needed. Also, the KeyStatus field must reflect the result\r
                                      of the request relative to that key.\r

-  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of \r
+  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of\r

                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r
                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r


@@ -469,11 +469,11 @@ EFI_STATUS
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r

-                                     KMS if it supports the use of client data. This \r
-                                     parameter may be NULL if and only if the \r
+                                     KMS if it supports the use of client data. This\r
+                                     parameter may be NULL if and only if the\r

                                      ClientDataSize parameter is also NULL. Upon return to\r
                                      ClientDataSize parameter is also NULL. Upon return to\r

-                                     the caller, *ClientData points to a block of data of \r
-                                     *ClientDataSize that was returned from the KMS. \r
+                                     the caller, *ClientData points to a block of data of\r
+                                     *ClientDataSize that was returned from the KMS.\r

                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r
                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r


@@ -535,12 +535,12 @@ EFI_STATUS
                                      On output, the KeyIdentifierSize and KeyIdentifier fields\r
                                      will be unchanged, while the KeyFormat and KeyValue\r
                                      fields will be updated values associated with this key\r
                                      On output, the KeyIdentifierSize and KeyIdentifier fields\r
                                      will be unchanged, while the KeyFormat and KeyValue\r
                                      fields will be updated values associated with this key\r

-                                     identifier. Memory for the KeyValue field will be \r
+                                     identifier. Memory for the KeyValue field will be\r

                                      allocated with the BOOT_SERVICES_DATA type and\r
                                      must be freed by the caller when it is no longer needed.\r
                                      Also, the KeyStatus field will reflect the result of the\r
                                      request relative to the individual key descriptor.\r
                                      allocated with the BOOT_SERVICES_DATA type and\r
                                      must be freed by the caller when it is no longer needed.\r
                                      Also, the KeyStatus field will reflect the result of the\r
                                      request relative to the individual key descriptor.\r

-  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of \r
+  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of\r

                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r
                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r


@@ -555,11 +555,11 @@ EFI_STATUS
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r

-                                     KMS if it supports the use of client data. This \r
-                                     parameter may be NULL if and only if the \r
+                                     KMS if it supports the use of client data. This\r
+                                     parameter may be NULL if and only if the\r

                                      ClientDataSize parameter is also NULL. Upon return to\r
                                      ClientDataSize parameter is also NULL. Upon return to\r

-                                     the caller, *ClientData points to a block of data of \r
-                                     *ClientDataSize that was returned from the KMS. \r
+                                     the caller, *ClientData points to a block of data of\r
+                                     *ClientDataSize that was returned from the KMS.\r

                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r
                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r


@@ -626,7 +626,7 @@ EFI_STATUS
                                      consistent values to be associated with the given KeyId.\r
                                      On return, the KeyStatus field will reflect the result\r
                                      of the operation for each key request.\r
                                      consistent values to be associated with the given KeyId.\r
                                      On return, the KeyStatus field will reflect the result\r
                                      of the operation for each key request.\r

-  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of \r
+  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of\r

                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r
                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r


@@ -641,11 +641,11 @@ EFI_STATUS
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r

-                                     KMS if it supports the use of client data. This \r
-                                     parameter may be NULL if and only if the \r
+                                     KMS if it supports the use of client data. This\r
+                                     parameter may be NULL if and only if the\r

                                      ClientDataSize parameter is also NULL. Upon return to\r
                                      ClientDataSize parameter is also NULL. Upon return to\r

-                                     the caller, *ClientData points to a block of data of \r
-                                     *ClientDataSize that was returned from the KMS. \r
+                                     the caller, *ClientData points to a block of data of\r
+                                     *ClientDataSize that was returned from the KMS.\r

                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r
                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r


@@ -711,7 +711,7 @@ EFI_STATUS
                                      KeyValue fields are ignored, but should be 0.\r
                                      On return, the KeyStatus field will reflect the result\r
                                      of the operation for each key request.\r
                                      KeyValue fields are ignored, but should be 0.\r
                                      On return, the KeyStatus field will reflect the result\r
                                      of the operation for each key request.\r

-  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of \r
+  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of\r

                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r
                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r


@@ -726,11 +726,11 @@ EFI_STATUS
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r

-                                     KMS if it supports the use of client data. This \r
-                                     parameter may be NULL if and only if the \r
+                                     KMS if it supports the use of client data. This\r
+                                     parameter may be NULL if and only if the\r

                                      ClientDataSize parameter is also NULL. Upon return to\r
                                      ClientDataSize parameter is also NULL. Upon return to\r

-                                     the caller, *ClientData points to a block of data of \r
-                                     *ClientDataSize that was returned from the KMS. \r
+                                     the caller, *ClientData points to a block of data of\r
+                                     *ClientDataSize that was returned from the KMS.\r

                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r
                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r


@@ -789,7 +789,7 @@ EFI_STATUS
                                      On input, the fields in the structure should be NULL.\r
                                      On output, the attribute fields will have updated values\r
                                      for attributes associated with this key identifier.\r
                                      On input, the fields in the structure should be NULL.\r
                                      On output, the attribute fields will have updated values\r
                                      for attributes associated with this key identifier.\r

-  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of \r
+  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of\r

                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r
                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r


@@ -804,11 +804,11 @@ EFI_STATUS
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r

-                                     KMS if it supports the use of client data. This \r
-                                     parameter may be NULL if and only if the \r
+                                     KMS if it supports the use of client data. This\r
+                                     parameter may be NULL if and only if the\r

                                      ClientDataSize parameter is also NULL. Upon return to\r
                                      ClientDataSize parameter is also NULL. Upon return to\r

-                                     the caller, *ClientData points to a block of data of \r
-                                     *ClientDataSize that was returned from the KMS. \r
+                                     the caller, *ClientData points to a block of data of\r
+                                     *ClientDataSize that was returned from the KMS.\r

                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r
                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r


@@ -876,7 +876,7 @@ EFI_STATUS
                                      are completely filled in.\r
                                      On return the KeyAttributeStatus field will reflect the\r
                                      result of the operation for each key attribute request.\r
                                      are completely filled in.\r
                                      On return the KeyAttributeStatus field will reflect the\r
                                      result of the operation for each key attribute request.\r

-  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of \r
+  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of\r

                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r
                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r


@@ -891,11 +891,11 @@ EFI_STATUS
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r

-                                     KMS if it supports the use of client data. This \r
-                                     parameter may be NULL if and only if the \r
+                                     KMS if it supports the use of client data. This\r
+                                     parameter may be NULL if and only if the\r

                                      ClientDataSize parameter is also NULL. Upon return to\r
                                      ClientDataSize parameter is also NULL. Upon return to\r

-                                     the caller, *ClientData points to a block of data of \r
-                                     *ClientDataSize that was returned from the KMS. \r
+                                     the caller, *ClientData points to a block of data of\r
+                                     *ClientDataSize that was returned from the KMS.\r

                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r
                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r


@@ -967,7 +967,7 @@ EFI_STATUS
                                      are completely filled in.\r
                                      On return the KeyAttributeStatus field will reflect the\r
                                      result of the operation for each key attribute request.\r
                                      are completely filled in.\r
                                      On return the KeyAttributeStatus field will reflect the\r
                                      result of the operation for each key attribute request.\r

-  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of \r
+  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of\r

                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r
                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r


@@ -982,11 +982,11 @@ EFI_STATUS
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r

-                                     KMS if it supports the use of client data. This \r
-                                     parameter may be NULL if and only if the \r
+                                     KMS if it supports the use of client data. This\r
+                                     parameter may be NULL if and only if the\r

                                      ClientDataSize parameter is also NULL. Upon return to\r
                                      ClientDataSize parameter is also NULL. Upon return to\r

-                                     the caller, *ClientData points to a block of data of \r
-                                     *ClientDataSize that was returned from the KMS. \r
+                                     the caller, *ClientData points to a block of data of\r
+                                     *ClientDataSize that was returned from the KMS.\r

                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r
                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r


@@ -1064,7 +1064,7 @@ EFI_STATUS
                                      caller when it is no longer needed. Also, the KeyStatus\r
                                      field of each descriptor will reflect the result of the\r
                                      request relative to that key descriptor.\r
                                      caller when it is no longer needed. Also, the KeyStatus\r
                                      field of each descriptor will reflect the result of the\r
                                      request relative to that key descriptor.\r

-  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of \r
+  @param[in, out] ClientDataSize     Pointer to the size, in bytes, of an arbitrary block of\r

                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r
                                      data specified by the ClientData parameter. This\r
                                      parameter may be NULL, in which case the ClientData\r
                                      parameter will be ignored and no data will be\r


@@ -1079,11 +1079,11 @@ EFI_STATUS
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r
                                      which will be zero if no data is returned from the KMS.\r
   @param[in, out] ClientData         Pointer to a pointer to an arbitrary block of data of\r
                                      *ClientDataSize that is to be passed directly to the\r

-                                     KMS if it supports the use of client data. This \r
-                                     parameter may be NULL if and only if the \r
+                                     KMS if it supports the use of client data. This\r
+                                     parameter may be NULL if and only if the\r

                                      ClientDataSize parameter is also NULL. Upon return to\r
                                      ClientDataSize parameter is also NULL. Upon return to\r

-                                     the caller, *ClientData points to a block of data of \r
-                                     *ClientDataSize that was returned from the KMS. \r
+                                     the caller, *ClientData points to a block of data of\r
+                                     *ClientDataSize that was returned from the KMS.\r

                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r
                                      If the returned value for *ClientDataSize is zero,\r
                                      then the returned value for *ClientData must be NULL\r
                                      and should be ignored by the caller. The KMS protocol\r

diff --git a/MdePkg/Include/Protocol/LegacyRegion2.h b/MdePkg/Include/Protocol/LegacyRegion2.h
index be71831b2e37f86242b675e22239d2b7b4e68663..7fef8c4511914fdd86c4515e4da0723405746e2e 100644 (file)
--- a/MdePkg/Include/Protocol/LegacyRegion2.h
+++ b/MdePkg/Include/Protocol/LegacyRegion2.h
@@ -2,7 +2,7 @@
   The Legacy Region Protocol controls the read, write and boot-lock attributes for\r
   the region 0xC0000 to 0xFFFFF.\r
 \r
   The Legacy Region Protocol controls the read, write and boot-lock attributes for\r
   the region 0xC0000 to 0xFFFFF.\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


@@ -12,7 +12,7 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  This Protocol is defined in UEFI Platform Initialization Specification 1.2 \r
+  This Protocol is defined in UEFI Platform Initialization Specification 1.2\r

   Volume 5: Standards\r
 \r
 **/\r
   Volume 5: Standards\r
 \r
 **/\r


@@ -31,9 +31,9 @@ typedef struct _EFI_LEGACY_REGION2_PROTOCOL EFI_LEGACY_REGION2_PROTOCOL;
 /**\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_REGION2_PROTOCOL instance.\r
   Start to (Start + Length - 1).\r
 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION2_PROTOCOL instance.\r


@@ -96,7 +96,7 @@ EFI_STATUS
 /**\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


@@ -131,7 +131,7 @@ EFI_STATUS
 /**\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_REGION2_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_REGION2_PROTOCOL instance.\r
   @param  Start[in]             The beginning of the physical address of the region whose\r


@@ -195,9 +195,9 @@ typedef struct {
 /**\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


@@ -220,8 +220,8 @@ EFI_STATUS
   );\r
 \r
 \r
   );\r
 \r
 \r

-/// \r
-/// The EFI_LEGACY_REGION2_PROTOCOL is used to abstract the hardware control of the memory \r
+///\r
+/// The EFI_LEGACY_REGION2_PROTOCOL is used to abstract the hardware control of the memory\r

 /// attributes of the Option ROM shadowing region, 0xC0000 to 0xFFFFF.\r
 /// There are three memory attributes that can be modified through this protocol: read, write and\r
 /// boot-lock. These protocols may be set in any combination.\r
 /// attributes of the Option ROM shadowing region, 0xC0000 to 0xFFFFF.\r
 /// There are three memory attributes that can be modified through this protocol: read, write and\r
 /// boot-lock. These protocols may be set in any combination.\r

diff --git a/MdePkg/Include/Protocol/LoadFile.h b/MdePkg/Include/Protocol/LoadFile.h
index eb03b325999cebbce2f4fe97dadd6446ed99028e..45395d8579c829881af1bcfb1e24b089820ec763 100644 (file)
--- a/MdePkg/Include/Protocol/LoadFile.h
+++ b/MdePkg/Include/Protocol/LoadFile.h
@@ -1,20 +1,20 @@
 /** @file\r
   Load File protocol as defined in the UEFI 2.0 specification.\r
 \r
 /** @file\r
   Load File protocol as defined in the UEFI 2.0 specification.\r
 \r

-  The load file protocol exists to supports the addition of new boot devices, \r
-  and to support booting from devices that do not map well to file system. \r
+  The load file protocol exists to supports the addition of new boot devices,\r
+  and to support booting from devices that do not map well to file system.\r

   Network boot is done via a LoadFile protocol.\r
 \r
   UEFI 2.0 can boot from any device that produces a LoadFile protocol.\r
 \r
   Network boot is done via a LoadFile protocol.\r
 \r
   UEFI 2.0 can boot from any device that produces a LoadFile protocol.\r
 \r

-Copyright (c) 2006 - 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) 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
-    \r
-THE PROGRAM 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


@@ -35,7 +35,7 @@ typedef struct _EFI_LOAD_FILE_PROTOCOL EFI_LOAD_FILE_PROTOCOL;
 \r
 ///\r
 /// Backward-compatible with EFI1.1\r
 \r
 ///\r
 /// Backward-compatible with EFI1.1\r

-/// \r
+///\r

 typedef EFI_LOAD_FILE_PROTOCOL  EFI_LOAD_FILE_INTERFACE;\r
 \r
 /**\r
 typedef EFI_LOAD_FILE_PROTOCOL  EFI_LOAD_FILE_INTERFACE;\r
 \r
 /**\r

diff --git a/MdePkg/Include/Protocol/LoadFile2.h b/MdePkg/Include/Protocol/LoadFile2.h
index 4fe46744ddb8e58c5d9c2d5f210f6b4666e4fa41..1d16bab952472cb46aa80f739780251acdeaccdd 100644 (file)
--- a/MdePkg/Include/Protocol/LoadFile2.h
+++ b/MdePkg/Include/Protocol/LoadFile2.h
@@ -1,20 +1,20 @@
 /** @file\r
   Load File protocol as defined in the UEFI 2.0 specification.\r
 \r
 /** @file\r
   Load File protocol as defined in the UEFI 2.0 specification.\r
 \r

-  Load file protocol exists to supports the addition of new boot devices, \r
-  and to support booting from devices that do not map well to file system. \r
+  Load file protocol exists to supports the addition of new boot devices,\r
+  and to support booting from devices that do not map well to file system.\r

   Network boot is done via a LoadFile protocol.\r
 \r
   UEFI 2.0 can boot from any device that produces a LoadFile protocol.\r
 \r
   Network boot is done via a LoadFile protocol.\r
 \r
   UEFI 2.0 can boot from any device that produces a LoadFile protocol.\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
+  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


@@ -57,7 +57,7 @@ typedef struct _EFI_LOAD_FILE2_PROTOCOL EFI_LOAD_FILE2_PROTOCOL;
   @retval EFI_NO_RESPONSE       The remote system did not respond.\r
   @retval EFI_NOT_FOUND         The file was not found\r
   @retval EFI_ABORTED           The file load process was manually canceled.\r
   @retval EFI_NO_RESPONSE       The remote system did not respond.\r
   @retval EFI_NOT_FOUND         The file was not found\r
   @retval EFI_ABORTED           The file load process was manually canceled.\r

-  @retval EFI_BUFFER_TOO_SMALL  The BufferSize is too small to read the current \r
+  @retval EFI_BUFFER_TOO_SMALL  The BufferSize is too small to read the current\r

                                 directory entry. BufferSize has been updated with\r
                                 the size needed to complete the request.\r
 \r
                                 directory entry. BufferSize has been updated with\r
                                 the size needed to complete the request.\r
 \r

diff --git a/MdePkg/Include/Protocol/LoadedImage.h b/MdePkg/Include/Protocol/LoadedImage.h
index bad20ad16648eafc5f3cde1c13f32a5c29ddc00d..74ed06c2654db6a9afb753e9b2bc3d3f4c64b703 100644 (file)
--- a/MdePkg/Include/Protocol/LoadedImage.h
+++ b/MdePkg/Include/Protocol/LoadedImage.h
@@ -4,14 +4,14 @@
   Every EFI driver and application is passed an image handle when it is loaded.\r
   This image handle will contain a Loaded Image Protocol.\r
 \r
   Every EFI driver and application is passed an image handle when it is loaded.\r
   This image handle will contain a Loaded Image Protocol.\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
+  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


@@ -30,7 +30,7 @@
 \r
 ///\r
 /// Protocol GUID defined in EFI1.1.\r
 \r
 ///\r
 /// Protocol GUID defined in EFI1.1.\r

-/// \r
+///\r

 #define LOADED_IMAGE_PROTOCOL   EFI_LOADED_IMAGE_PROTOCOL_GUID\r
 \r
 ///\r
 #define LOADED_IMAGE_PROTOCOL   EFI_LOADED_IMAGE_PROTOCOL_GUID\r
 \r
 ///\r


@@ -40,25 +40,25 @@
 \r
 ///\r
 /// Revision defined in EFI1.1.\r
 \r
 ///\r
 /// Revision defined in EFI1.1.\r

-/// \r
+///\r

 #define EFI_LOADED_IMAGE_INFORMATION_REVISION    EFI_LOADED_IMAGE_PROTOCOL_REVISION\r
 \r
 ///\r
 /// Can be used on any image handle to obtain information about the loaded image.\r
 ///\r
 typedef struct {\r
 #define EFI_LOADED_IMAGE_INFORMATION_REVISION    EFI_LOADED_IMAGE_PROTOCOL_REVISION\r
 \r
 ///\r
 /// Can be used on any image handle to obtain information about the loaded image.\r
 ///\r
 typedef struct {\r

-  UINT32            Revision;       ///< Defines the revision of the EFI_LOADED_IMAGE_PROTOCOL structure. \r
+  UINT32            Revision;       ///< Defines the revision of the EFI_LOADED_IMAGE_PROTOCOL structure.\r

                                     ///< All future revisions will be backward compatible to the current revision.\r
                                     ///< All future revisions will be backward compatible to the current revision.\r

-  EFI_HANDLE        ParentHandle;   ///< Parent image's image handle. NULL if the image is loaded directly from \r
-                                    ///< the firmware's boot manager. \r
+  EFI_HANDLE        ParentHandle;   ///< Parent image's image handle. NULL if the image is loaded directly from\r
+                                    ///< the firmware's boot manager.\r

   EFI_SYSTEM_TABLE  *SystemTable;   ///< the image's EFI system table pointer.\r
 \r
   //\r
   // Source location of image\r
   //\r
   EFI_SYSTEM_TABLE  *SystemTable;   ///< the image's EFI system table pointer.\r
 \r
   //\r
   // Source location of image\r
   //\r

-  EFI_HANDLE        DeviceHandle;   ///< The device handle that the EFI Image was loaded from. \r
-  EFI_DEVICE_PATH_PROTOCOL  *FilePath;  ///< A pointer to the file path portion specific to DeviceHandle \r
-                                        ///< that the EFI Image was loaded from. \r
+  EFI_HANDLE        DeviceHandle;   ///< The device handle that the EFI Image was loaded from.\r
+  EFI_DEVICE_PATH_PROTOCOL  *FilePath;  ///< A pointer to the file path portion specific to DeviceHandle\r
+                                        ///< that the EFI Image was loaded from.\r

   VOID              *Reserved;      ///< Reserved. DO NOT USE.\r
 \r
   //\r
   VOID              *Reserved;      ///< Reserved. DO NOT USE.\r
 \r
   //\r


@@ -79,7 +79,7 @@ typedef struct {
 \r
 //\r
 // For backward-compatible with EFI1.1.\r
 \r
 //\r
 // For backward-compatible with EFI1.1.\r

-// \r
+//\r

 typedef EFI_LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE;\r
 \r
 extern EFI_GUID gEfiLoadedImageProtocolGuid;\r
 typedef EFI_LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE;\r
 \r
 extern EFI_GUID gEfiLoadedImageProtocolGuid;\r

diff --git a/MdePkg/Include/Protocol/ManagedNetwork.h b/MdePkg/Include/Protocol/ManagedNetwork.h
index 52c9f08bb1103aa587987e5646b26408d4095141..14007ec2b4b44e7b7f55b0889138f5242ead385e 100644 (file)
--- a/MdePkg/Include/Protocol/ManagedNetwork.h
+++ b/MdePkg/Include/Protocol/ManagedNetwork.h
@@ -2,16 +2,16 @@
   EFI_MANAGED_NETWORK_SERVICE_BINDING_PROTOCOL as defined in UEFI 2.0.\r
   EFI_MANAGED_NETWORK_PROTOCOL as defined in UEFI 2.0.\r
 \r
   EFI_MANAGED_NETWORK_SERVICE_BINDING_PROTOCOL as defined in UEFI 2.0.\r
   EFI_MANAGED_NETWORK_PROTOCOL as defined in UEFI 2.0.\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
-    \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
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r

-  @par Revision Reference:          \r
+  @par Revision Reference:\r

   This Protocol is introduced in UEFI Specification 2.0\r
 \r
 **/\r
   This Protocol is introduced in UEFI Specification 2.0\r
 \r
 **/\r


@@ -352,7 +352,7 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The MNP is used by network applications (and drivers) to \r
+/// The MNP is used by network applications (and drivers) to\r

 /// perform raw (unformatted) asynchronous network packet I/O.\r
 ///\r
 struct _EFI_MANAGED_NETWORK_PROTOCOL {\r
 /// perform raw (unformatted) asynchronous network packet I/O.\r
 ///\r
 struct _EFI_MANAGED_NETWORK_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/McaInitPmi.h b/MdePkg/Include/Protocol/McaInitPmi.h
index 330683011b5235f56bab172a5d74ab205c5b45b7..a753ae142cd81d2821103484284872b3de0e5734 100644 (file)
--- a/MdePkg/Include/Protocol/McaInitPmi.h
+++ b/MdePkg/Include/Protocol/McaInitPmi.h
@@ -5,13 +5,13 @@
   Initialization (INIT) events, and Platform Management Interrupt (PMI) events\r
   on an Intel Itanium Processor Family based system.\r
 \r
   Initialization (INIT) events, and Platform Management Interrupt (PMI) events\r
   on an Intel Itanium Processor Family based system.\r
 \r

-  Copyright (c) 2009 - 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) 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
 \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/MdePkg/Include/Protocol/Metronome.h b/MdePkg/Include/Protocol/Metronome.h
index c71cd40043da3f7a444252f064c24b96399059c1..6226dab86353e93682612513568c253e45317d1c 100644 (file)
--- a/MdePkg/Include/Protocol/Metronome.h
+++ b/MdePkg/Include/Protocol/Metronome.h
@@ -3,14 +3,14 @@
 \r
   This code abstracts the DXE core to provide delay services.\r
 \r
 \r
   This code abstracts the DXE core to provide delay services.\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
+  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


@@ -29,17 +29,17 @@
 typedef struct _EFI_METRONOME_ARCH_PROTOCOL   EFI_METRONOME_ARCH_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_METRONOME_ARCH_PROTOCOL   EFI_METRONOME_ARCH_PROTOCOL;\r
 \r
 /**\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


@@ -50,7 +50,7 @@ typedef struct _EFI_METRONOME_ARCH_PROTOCOL   EFI_METRONOME_ARCH_PROTOCOL;
   @retval EFI_TIMEOUT           A timeout occurred waiting for the specified number of ticks.\r
 \r
 **/\r
   @retval EFI_TIMEOUT           A timeout occurred waiting for the specified number of ticks.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_METRONOME_WAIT_FOR_TICK)(\r
    IN EFI_METRONOME_ARCH_PROTOCOL   *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_METRONOME_WAIT_FOR_TICK)(\r
    IN EFI_METRONOME_ARCH_PROTOCOL   *This,\r


@@ -59,18 +59,18 @@ EFI_STATUS
 \r
 ///\r
 /// This protocol provides access to a known time source in the platform to the\r
 \r
 ///\r
 /// This protocol provides access to a known time source in the platform to the\r

-/// core.  The core uses this known time source to produce core services that \r
-/// require calibrated delays.  \r
+/// core.  The core uses this known time source to produce core services that\r
+/// require calibrated delays.\r

 ///\r
 struct _EFI_METRONOME_ARCH_PROTOCOL {\r
   EFI_METRONOME_WAIT_FOR_TICK  WaitForTick;\r
 ///\r
 struct _EFI_METRONOME_ARCH_PROTOCOL {\r
   EFI_METRONOME_WAIT_FOR_TICK  WaitForTick;\r

-  \r
+\r

   ///\r
   ///\r

-  /// The period of platform's known time source in 100 nS units.  \r
-  /// This value on any platform must be at least 10 uS, and must not \r
-  /// exceed 200 uS.  The value in this field is a constant that must \r
-  /// not be modified after the Metronome architectural protocol is \r
-  /// installed.  All consumers must treat this as a read-only field.  \r
+  /// The period of platform's known time source in 100 nS units.\r
+  /// This value on any platform must be at least 10 uS, and must not\r
+  /// exceed 200 uS.  The value in this field is a constant that must\r
+  /// not be modified after the Metronome architectural protocol is\r
+  /// installed.  All consumers must treat this as a read-only field.\r

   ///\r
   UINT32                       TickPeriod;\r
 };\r
   ///\r
   UINT32                       TickPeriod;\r
 };\r

diff --git a/MdePkg/Include/Protocol/MonotonicCounter.h b/MdePkg/Include/Protocol/MonotonicCounter.h
index a83d985dc065933b10307de8845e57029e1030fb..583efec119ecb84e43d8ba186d5c27d2c2a4764a 100644 (file)
--- a/MdePkg/Include/Protocol/MonotonicCounter.h
+++ b/MdePkg/Include/Protocol/MonotonicCounter.h
@@ -3,14 +3,14 @@
 \r
   This code provides the services required to access the system's monotonic counter\r
 \r
 \r
   This code provides the services required to access the system's monotonic counter\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
-    \r
-THE PROGRAM 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


@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///\r
 #define EFI_MONOTONIC_COUNTER_ARCH_PROTOCOL_GUID \\r
   {0x1da97072, 0xbddc, 0x4b30, {0x99, 0xf1, 0x72, 0xa0, 0xb5, 0x6f, 0xff, 0x2a} }\r
 ///\r
 #define EFI_MONOTONIC_COUNTER_ARCH_PROTOCOL_GUID \\r
   {0x1da97072, 0xbddc, 0x4b30, {0x99, 0xf1, 0x72, 0xa0, 0xb5, 0x6f, 0xff, 0x2a} }\r

-  \r
+\r

 extern EFI_GUID gEfiMonotonicCounterArchProtocolGuid;\r
 \r
 #endif\r
 extern EFI_GUID gEfiMonotonicCounterArchProtocolGuid;\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Protocol/Mtftp4.h b/MdePkg/Include/Protocol/Mtftp4.h
index ae2dc27b2f85a8f166e4ab6f34aba184a22f16f8..d1ca02d9c9913b25bbfdab226660ab4452cfb02f 100644 (file)
--- a/MdePkg/Include/Protocol/Mtftp4.h
+++ b/MdePkg/Include/Protocol/Mtftp4.h
@@ -1,13 +1,13 @@
 /** @file\r
   EFI Multicast Trivial File Transfer Protocol Definition\r
 \r
 /** @file\r
   EFI Multicast Trivial File Transfer Protocol Definition\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
-    \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
   @par Revision Reference:\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

diff --git a/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h b/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
index 88a1c428467c7cea72a5e213b9d72f40761ca9b0..c973fcdb5252e086f32e078302069aa031d94b21 100644 (file)
--- a/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
+++ b/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
@@ -1,7 +1,7 @@
 /** @file\r
   EFI Network Interface Identifier Protocol.\r
 \r
 /** @file\r
   EFI Network Interface Identifier Protocol.\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 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


@@ -74,8 +74,8 @@ struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL {
   UINT8     MajorVer;   ///< Major version number.\r
   UINT8     MinorVer;   ///< Minor version number.\r
   BOOLEAN   Ipv6Supported; ///< TRUE if the network interface supports IPv6; otherwise FALSE.\r
   UINT8     MajorVer;   ///< Major version number.\r
   UINT8     MinorVer;   ///< Minor version number.\r
   BOOLEAN   Ipv6Supported; ///< TRUE if the network interface supports IPv6; otherwise FALSE.\r

-  UINT16    IfNum;      ///< The network interface number that is being identified by this Network \r
-                        ///< Interface Identifier Protocol. This field must be less than or \r
+  UINT16    IfNum;      ///< The network interface number that is being identified by this Network\r
+                        ///< Interface Identifier Protocol. This field must be less than or\r

                         ///< equal to the (IFcnt | IFcntExt <<8 ) fields in the !PXE structure.\r
 \r
 };\r
                         ///< equal to the (IFcnt | IFcntExt <<8 ) fields in the !PXE structure.\r
 \r
 };\r


@@ -109,7 +109,7 @@ struct undiconfig_table {
   struct {\r
     VOID             *NII_InterfacePointer; ///< Pointer to the NII interface structure.\r
     VOID             *DevicePathPointer;    ///< Pointer to the device path for this NIC.\r
   struct {\r
     VOID             *NII_InterfacePointer; ///< Pointer to the NII interface structure.\r
     VOID             *DevicePathPointer;    ///< Pointer to the device path for this NIC.\r

-  } NII_entry[1]; \r
+  } NII_entry[1];\r

 };\r
 \r
 extern EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid;\r
 };\r
 \r
 extern EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid;\r

diff --git a/MdePkg/Include/Protocol/NvmExpressPassthru.h b/MdePkg/Include/Protocol/NvmExpressPassthru.h
index 7a90c633ec7ea89012907bc187470bee1384168a..79fa9329b5b21d07f256c57d335991409fd35b86 100644 (file)
--- a/MdePkg/Include/Protocol/NvmExpressPassthru.h
+++ b/MdePkg/Include/Protocol/NvmExpressPassthru.h
@@ -3,7 +3,7 @@
   NVM Express controller or to a specific namespace in a NVM Express controller.\r
   This protocol interface is optimized for storage.\r
 \r
   NVM Express controller or to a specific namespace in a NVM Express controller.\r
   This protocol interface is optimized for storage.\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


@@ -132,7 +132,7 @@ typedef struct {
   @param[in]     Event               If non-blocking I/O is not supported then Event is ignored, and blocking I/O is performed.\r
                                      If Event is NULL, then blocking I/O is performed. If Event is not NULL and non-blocking I/O\r
                                      is supported, then non-blocking I/O is performed, and Event will be signaled when the NVM\r
   @param[in]     Event               If non-blocking I/O is not supported then Event is ignored, and blocking I/O is performed.\r
                                      If Event is NULL, then blocking I/O is performed. If Event is not NULL and non-blocking I/O\r
                                      is supported, then non-blocking I/O is performed, and Event will be signaled when the NVM\r

-                                     Express Command Packet completes. \r
+                                     Express Command Packet completes.\r

 \r
   @retval EFI_SUCCESS                The NVM Express Command Packet was sent by the host. TransferLength bytes were transferred\r
                                      to, or from DataBuffer.\r
 \r
   @retval EFI_SUCCESS                The NVM Express Command Packet was sent by the host. TransferLength bytes were transferred\r
                                      to, or from DataBuffer.\r


@@ -162,7 +162,7 @@ EFI_STATUS
   Used to retrieve the next namespace ID for this NVM Express controller.\r
 \r
   The EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL.GetNextNamespace() function retrieves the next valid\r
   Used to retrieve the next namespace ID for this NVM Express controller.\r
 \r
   The EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL.GetNextNamespace() function retrieves the next valid\r

-  namespace ID on this NVM Express controller. \r
+  namespace ID on this NVM Express controller.\r

 \r
   If on input the value pointed to by NamespaceId is 0xFFFFFFFF, then the first valid namespace\r
   ID defined on the NVM Express controller is returned in the location pointed to by NamespaceId\r
 \r
   If on input the value pointed to by NamespaceId is 0xFFFFFFFF, then the first valid namespace\r
   ID defined on the NVM Express controller is returned in the location pointed to by NamespaceId\r


@@ -206,7 +206,7 @@ EFI_STATUS
 \r
   If the NamespaceId is not valid, then EFI_NOT_FOUND is returned.\r
 \r
 \r
   If the NamespaceId is not valid, then EFI_NOT_FOUND is returned.\r
 \r

-  If DevicePath is NULL, then EFI_INVALID_PARAMETER is returned. \r
+  If DevicePath is NULL, then EFI_INVALID_PARAMETER is returned.\r

 \r
   If there are not enough resources to allocate the device path node, then EFI_OUT_OF_RESOURCES is returned.\r
 \r
 \r
   If there are not enough resources to allocate the device path node, then EFI_OUT_OF_RESOURCES is returned.\r
 \r

diff --git a/MdePkg/Include/Protocol/Pcd.h b/MdePkg/Include/Protocol/Pcd.h
index 03b02fd936ebb2b3b08fa932260c798df8c61425..e33bc55a12f72d7ca4459878a1cd4dc13aa2f890 100644 (file)
--- a/MdePkg/Include/Protocol/Pcd.h
+++ b/MdePkg/Include/Protocol/Pcd.h
@@ -2,18 +2,18 @@
   Native Platform Configuration Database (PCD) Protocol\r
 \r
   Different with the EFI_PCD_PROTOCOL defined in PI 1.2 specification, the native\r
   Native Platform Configuration Database (PCD) Protocol\r
 \r
   Different with the EFI_PCD_PROTOCOL defined in PI 1.2 specification, the native\r

-  PCD protocol provide interfaces for dynamic and dynamic-ex type PCD. \r
+  PCD protocol provide interfaces for dynamic and dynamic-ex type PCD.\r

   The interfaces in dynamic type PCD do not require the token space guid as parameter,\r
   but interfaces in dynamic-ex type PCD require token space guid as parameter.\r
   The interfaces in dynamic type PCD do not require the token space guid as parameter,\r
   but interfaces in dynamic-ex type PCD require token space guid as parameter.\r

-  \r
-Copyright (c) 2006 - 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
+\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
-    \r
-THE PROGRAM 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


@@ -31,26 +31,26 @@ extern EFI_GUID gPcdProtocolGuid;
 /**\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
 **/\r
                     set values associated with a PCD token.\r
 \r
 \r
 **/\r

-typedef \r
+typedef\r

 VOID\r
 (EFIAPI *PCD_PROTOCOL_SET_SKU)(\r
   IN  UINTN                  SkuId\r
 VOID\r
 (EFIAPI *PCD_PROTOCOL_SET_SKU)(\r
   IN  UINTN                  SkuId\r


@@ -61,13 +61,13 @@ VOID
 /**\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
 typedef\r
 UINT8\r
 **/\r
 typedef\r
 UINT8\r


@@ -80,13 +80,13 @@ UINT8
 /**\r
   Retrieves a 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves a 16-bit value for a given PCD token.\r
 \r

-  Retrieves the current 16-bit value for a PCD token number.  \r
+  Retrieves the current 16-bit 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
 typedef\r
 UINT16\r
 **/\r
 typedef\r
 UINT16\r


@@ -99,13 +99,13 @@ UINT16
 /**\r
   Retrieves a 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves a 32-bit value for a given PCD token.\r
 \r

-  Retrieves the current 32-bit value for a PCD token number.  \r
+  Retrieves the current 32-bit 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
 typedef\r
 UINT32\r
 **/\r
 typedef\r
 UINT32\r


@@ -118,13 +118,13 @@ UINT32
 /**\r
   Retrieves a 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves a 64-bit value for a given PCD token.\r
 \r

-  Retrieves the current 64-bit value for a PCD token number.  \r
+  Retrieves the current 64-bit 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
 typedef\r
 UINT64\r
 **/\r
 typedef\r
 UINT64\r


@@ -137,15 +137,15 @@ UINT64
 /**\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
 typedef\r
 VOID *\r
 **/\r
 typedef\r
 VOID *\r


@@ -158,15 +158,15 @@ VOID *
 /**\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
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r


@@ -179,13 +179,13 @@ BOOLEAN
 /**\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
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r


@@ -198,16 +198,16 @@ UINTN
 /**\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
 typedef\r
 UINT8\r
 **/\r
 typedef\r
 UINT8\r


@@ -221,16 +221,16 @@ UINT8
 /**\r
   Retrieves a 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves a 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
 typedef\r
 UINT16\r
 **/\r
 typedef\r
 UINT16\r


@@ -244,16 +244,16 @@ UINT16
 /**\r
   Retrieves a 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves a 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
 typedef\r
 UINT32\r
 **/\r
 typedef\r
 UINT32\r


@@ -267,16 +267,16 @@ UINT32
 /**\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
 typedef\r
 UINT64\r
 **/\r
 typedef\r
 UINT64\r


@@ -290,16 +290,16 @@ UINT64
 /**\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
 typedef\r
 VOID *\r
 **/\r
 typedef\r
 VOID *\r


@@ -313,16 +313,16 @@ VOID *
 /**\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 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
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r


@@ -336,14 +336,14 @@ BOOLEAN
 /**\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
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r


@@ -357,19 +357,19 @@ UINTN
 /**\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  The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -383,19 +383,19 @@ EFI_STATUS
 /**\r
   Sets a 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets a 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  The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -409,19 +409,19 @@ EFI_STATUS
 /**\r
   Sets a 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets a 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  The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -435,19 +435,19 @@ EFI_STATUS
 /**\r
   Sets a 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets a 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  The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -461,23 +461,23 @@ EFI_STATUS
 /**\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  The 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  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -492,19 +492,19 @@ EFI_STATUS
 /**\r
   Sets a Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets a 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  The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -518,20 +518,20 @@ EFI_STATUS
 /**\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  The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -546,20 +546,20 @@ EFI_STATUS
 /**\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  The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -574,20 +574,20 @@ EFI_STATUS
 /**\r
   Sets a 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets a 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  The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -602,20 +602,20 @@ EFI_STATUS
 /**\r
   Sets a 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets a 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  The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -630,24 +630,24 @@ EFI_STATUS
 /**\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  The 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  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -663,20 +663,20 @@ EFI_STATUS
 /**\r
   Sets a Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets a 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  The procedure returned successfully.\r
   @param[in]  Value       The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  The 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
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -685,18 +685,18 @@ EFI_STATUS
   IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r
   );\r
   IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r
   );\r

-  \r
+\r

 \r
 \r
 /**\r
   Callback on SET function prototype definition.\r
 \r
 \r
 \r
 /**\r
   Callback on SET function prototype definition.\r
 \r

-  This notification function serves two purposes. \r
-  Firstly, it notifies the module which did the registration that the value \r
-  of this PCD token has been set. Secondly, it provides a mechanism for the \r
-  module that did the registration to intercept the set operation and override \r
-  the value that has been set, if necessary. After the invocation of the callback function, \r
-  TokenData will be used by PCD service DXE driver to modify the internal data in \r
+  This notification function serves two purposes.\r
+  Firstly, it notifies the module which did the registration that the value\r
+  of this PCD token has been set. Secondly, it provides a mechanism for the\r
+  module that did the registration to intercept the set operation and override\r
+  the value that has been set, if necessary. After the invocation of the callback function,\r
+  TokenData will be used by PCD service DXE driver to modify the internal data in\r

   PCD database.\r
 \r
   @param[in]  CallBackGuid    The PCD token GUID being set.\r
   PCD database.\r
 \r
   @param[in]  CallBackGuid    The PCD token GUID being set.\r


@@ -721,11 +721,11 @@ VOID
 /**\r
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
 /**\r
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r

-  @param[in]  TokenNumber       The PCD token number. \r
+  @param[in]  TokenNumber       The PCD token number.\r

   @param[in]  Guid              The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]  Guid              The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  CallBackFunction  The function prototype called when the value associated with the CallBackToken is set.  \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


@@ -743,11 +743,11 @@ EFI_STATUS
 /**\r
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
 /**\r
   Cancels a previously set callback function for a particular PCD token number.\r
 \r

-  @param[in]  TokenNumber      The PCD token number. \r
+  @param[in]  TokenNumber      The PCD token number.\r

   @param[in]  Guid             The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]  Guid             The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.  \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


@@ -763,32 +763,32 @@ EFI_STATUS
 \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
+  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
   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
+\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
 **/\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
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_GET_NEXT_TOKEN)(\r
   IN      CONST EFI_GUID      *Guid, OPTIONAL\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_GET_NEXT_TOKEN)(\r
   IN      CONST EFI_GUID      *Guid, OPTIONAL\r


@@ -813,7 +813,7 @@ EFI_STATUS
   @retval   EFI_NOT_FOUND The PCD service could not find the next valid token namespace.\r
 \r
 **/\r
   @retval   EFI_NOT_FOUND The PCD service could not find the next valid token namespace.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_GET_NEXT_TOKENSPACE)(\r
   IN  OUT    CONST EFI_GUID      **Guid\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_GET_NEXT_TOKENSPACE)(\r
   IN  OUT    CONST EFI_GUID      **Guid\r

diff --git a/MdePkg/Include/Protocol/PcdInfo.h b/MdePkg/Include/Protocol/PcdInfo.h
index 00edd1b50c72c22e3ff3dc53348fbf85c97a01a4..a39c6cde7995212840000f95d6c4f3ac2a22a140 100644 (file)
--- a/MdePkg/Include/Protocol/PcdInfo.h
+++ b/MdePkg/Include/Protocol/PcdInfo.h
@@ -4,11 +4,11 @@
   The protocol that provides additional information about items that reside in the PCD database.\r
 \r
   Different with the EFI_GET_PCD_INFO_PROTOCOL defined in PI 1.2.1 specification,\r
   The protocol that provides additional information about items that reside in the PCD database.\r
 \r
   Different with the EFI_GET_PCD_INFO_PROTOCOL defined in PI 1.2.1 specification,\r

-  the native PCD INFO PROTOCOL provide interfaces for dynamic and dynamic-ex type PCD. \r
+  the native PCD INFO PROTOCOL provide interfaces for dynamic and dynamic-ex type PCD.\r

   The interfaces for dynamic type PCD do not require the token space guid as parameter,\r
   but interfaces for dynamic-ex type PCD require token space guid as parameter.\r
 \r
   The interfaces for dynamic type PCD do not require the token space guid as parameter,\r
   but interfaces for dynamic-ex type PCD require token space guid as parameter.\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

diff --git a/MdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h b/MdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h
index e3200de442b5dd65914a8a770637f2e460a7e7aa..c8776ab194f6d989a8102908186d19388f8328d2 100644 (file)
--- a/MdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h
+++ b/MdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h
@@ -1,21 +1,21 @@
 /** @file\r
 /** @file\r

-  This file declares PCI Host Bridge Resource Allocation Protocol which \r
-  provides the basic interfaces to abstract a PCI host bridge resource allocation. \r
+  This file declares PCI Host Bridge Resource Allocation Protocol which\r
+  provides the basic interfaces to abstract a PCI host bridge resource allocation.\r

   This protocol is mandatory if the system includes PCI devices.\r
   This protocol is mandatory if the system includes PCI devices.\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
-    \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
   @par Revision Reference:\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  This Protocol is defined in UEFI Platform Initialization Specification 1.2 \r
+  This Protocol is defined in UEFI Platform Initialization Specification 1.2\r

   Volume 5: Standards.\r
   Volume 5: Standards.\r

-  \r
+\r

 **/\r
 \r
 #ifndef _PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_H_\r
 **/\r
 \r
 #ifndef _PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_H_\r


@@ -56,14 +56,14 @@ typedef struct _EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL EFI_PCI_HOST_BR
 #define EFI_PCI_HOST_BRIDGE_MEM64_DECODE   2\r
 \r
 ///\r
 #define EFI_PCI_HOST_BRIDGE_MEM64_DECODE   2\r
 \r
 ///\r

-/// A UINT64 value that contains the status of a PCI resource requested \r
+/// A UINT64 value that contains the status of a PCI resource requested\r

 /// in the Configuration parameter returned by GetProposedResources()\r
 /// The legal values are EFI_RESOURCE_SATISFIED and EFI_RESOURCE_NOT_SATISFIED\r
 ///\r
 typedef UINT64 EFI_RESOURCE_ALLOCATION_STATUS;\r
 \r
 ///\r
 /// in the Configuration parameter returned by GetProposedResources()\r
 /// The legal values are EFI_RESOURCE_SATISFIED and EFI_RESOURCE_NOT_SATISFIED\r
 ///\r
 typedef UINT64 EFI_RESOURCE_ALLOCATION_STATUS;\r
 \r
 ///\r

-/// The request of this resource type could be fulfilled.  Used in the \r
+/// The request of this resource type could be fulfilled.  Used in the\r

 /// Configuration parameter returned by GetProposedResources() to identify\r
 /// a PCI resources request that can be satisfied.\r
 ///\r
 /// Configuration parameter returned by GetProposedResources() to identify\r
 /// a PCI resources request that can be satisfied.\r
 ///\r


@@ -71,7 +71,7 @@ typedef UINT64 EFI_RESOURCE_ALLOCATION_STATUS;
 \r
 ///\r
 /// The request of this resource type could not be fulfilled for its\r
 \r
 ///\r
 /// The request of this resource type could not be fulfilled for its\r

-/// absence in the host bridge resource pool.  Used in the Configuration parameter \r
+/// absence in the host bridge resource pool.  Used in the Configuration parameter\r

 /// returned by GetProposedResources() to identify a PCI resources request that\r
 /// can not be satisfied.\r
 ///\r
 /// returned by GetProposedResources() to identify a PCI resources request that\r
 /// can not be satisfied.\r
 ///\r


@@ -92,45 +92,45 @@ typedef enum {
   ///\r
   /// The bus allocation phase is about to begin. No specific action\r
   /// is required here. This notification can be used to perform any\r
   ///\r
   /// The bus allocation phase is about to begin. No specific action\r
   /// is required here. This notification can be used to perform any\r

-  /// chipset specific programming.  \r
+  /// chipset specific programming.\r

   ///\r
   EfiPciHostBridgeBeginBusAllocation,\r
 \r
   ///\r
   /// The bus allocation and bus programming phase is complete. No specific\r
   /// action is required here. This notification can be used to perform any\r
   ///\r
   EfiPciHostBridgeBeginBusAllocation,\r
 \r
   ///\r
   /// The bus allocation and bus programming phase is complete. No specific\r
   /// action is required here. This notification can be used to perform any\r

-  /// chipset specific programming.  \r
+  /// chipset specific programming.\r

   ///\r
   EfiPciHostBridgeEndBusAllocation,\r
   ///\r
   EfiPciHostBridgeEndBusAllocation,\r

-  \r
+\r

   ///\r
   /// The resource allocation phase is about to begin.No specific action is\r
   ///\r
   /// The resource allocation phase is about to begin.No specific action is\r

-  /// required here. This notification can be used to perform any chipset specific programming.  \r
+  /// required here. This notification can be used to perform any chipset specific programming.\r

   ///\r
   EfiPciHostBridgeBeginResourceAllocation,\r
   ///\r
   EfiPciHostBridgeBeginResourceAllocation,\r

-  \r
+\r

   ///\r
   /// Allocate resources per previously submitted requests for all the PCI Root\r
   /// Bridges. These resource settings are returned on the next call to\r
   ///\r
   /// Allocate resources per previously submitted requests for all the PCI Root\r
   /// Bridges. These resource settings are returned on the next call to\r

-  /// GetProposedResources().  \r
+  /// GetProposedResources().\r

   ///\r
   EfiPciHostBridgeAllocateResources,\r
   ///\r
   EfiPciHostBridgeAllocateResources,\r

-  \r
+\r

   ///\r
   /// Program the Host Bridge hardware to decode previously allocated resources\r
   /// (proposed resources) for all the PCI Root Bridges.\r
   ///\r
   EfiPciHostBridgeSetResources,\r
   ///\r
   /// Program the Host Bridge hardware to decode previously allocated resources\r
   /// (proposed resources) for all the PCI Root Bridges.\r
   ///\r
   EfiPciHostBridgeSetResources,\r

-  \r
+\r

   ///\r
   /// De-allocate previously allocated resources previously for all the PCI\r
   ///\r
   /// De-allocate previously allocated resources previously for all the PCI\r

-  /// Root Bridges and reset the I/O and memory apertures to initial state.  \r
+  /// Root Bridges and reset the I/O and memory apertures to initial state.\r

   ///\r
   EfiPciHostBridgeFreeResources,\r
   ///\r
   EfiPciHostBridgeFreeResources,\r

-  \r
+\r

   ///\r
   /// The resource allocation phase is completed.  No specific action is required\r
   ///\r
   /// The resource allocation phase is completed.  No specific action is required\r

-  /// here. This notification can be used to perform any chipset specific programming.  \r
+  /// here. This notification can be used to perform any chipset specific programming.\r

   ///\r
   EfiPciHostBridgeEndResourceAllocation,\r
 \r
   ///\r
   EfiPciHostBridgeEndResourceAllocation,\r
 \r


@@ -158,30 +158,30 @@ typedef enum {
 \r
   ///\r
   /// This notification is sent before the PCI enumerator probes BAR registers\r
 \r
   ///\r
   /// This notification is sent before the PCI enumerator probes BAR registers\r

-  /// for every valid PCI function.  \r
+  /// for every valid PCI function.\r

   ///\r
   EfiPciBeforeResourceCollection\r
 } EFI_PCI_CONTROLLER_RESOURCE_ALLOCATION_PHASE;\r
 \r
 /**\r
   ///\r
   EfiPciBeforeResourceCollection\r
 } EFI_PCI_CONTROLLER_RESOURCE_ALLOCATION_PHASE;\r
 \r
 /**\r

-  These are the notifications from the PCI bus driver that it is about to enter a certain phase of the PCI \r
+  These are the notifications from the PCI bus driver that it is about to enter a certain phase of the PCI\r

   enumeration process.\r
 \r
   enumeration process.\r
 \r

-  @param[in] This    The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL \r
+  @param[in] This    The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL\r

                      instance.\r
   @param[in] Phase   The phase during enumeration.\r
 \r
   @retval EFI_SUCCESS             The notification was accepted without any errors.\r
   @retval EFI_INVALID_PARAMETER   The Phase is invalid.\r
                      instance.\r
   @param[in] Phase   The phase during enumeration.\r
 \r
   @retval EFI_SUCCESS             The notification was accepted without any errors.\r
   @retval EFI_INVALID_PARAMETER   The Phase is invalid.\r

-  @retval EFI_NOT_READY           This phase cannot be entered at this time. For example, this error \r
-                                  is valid for a Phase of EfiPciHostBridgeAllocateResources if \r
-                                  SubmitResources() has not been called for one or more \r
+  @retval EFI_NOT_READY           This phase cannot be entered at this time. For example, this error\r
+                                  is valid for a Phase of EfiPciHostBridgeAllocateResources if\r
+                                  SubmitResources() has not been called for one or more\r

                                   PCI root bridges before this call.\r
                                   PCI root bridges before this call.\r

-  @retval EFI_DEVICE_ERROR        Programming failed due to a hardware error. This error is valid for \r
+  @retval EFI_DEVICE_ERROR        Programming failed due to a hardware error. This error is valid for\r

                                   a Phase of EfiPciHostBridgeSetResources.\r
                                   a Phase of EfiPciHostBridgeSetResources.\r

-  @retval EFI_OUT_OF_RESOURCES    The request could not be completed due to a lack of resources. \r
+  @retval EFI_OUT_OF_RESOURCES    The request could not be completed due to a lack of resources.\r

                                   This error is valid for a Phase of EfiPciHostBridgeAllocateResources\r
                                   This error is valid for a Phase of EfiPciHostBridgeAllocateResources\r

-                                  if the previously submitted resource requests cannot be fulfilled or were only \r
+                                  if the previously submitted resource requests cannot be fulfilled or were only\r

                                   partially fulfilled\r
 \r
 **/\r
                                   partially fulfilled\r
 \r
 **/\r


@@ -195,15 +195,15 @@ EFI_STATUS
 /**\r
   Returns the device handle of the next PCI root bridge that is associated with this host bridge.\r
 \r
 /**\r
   Returns the device handle of the next PCI root bridge that is associated with this host bridge.\r
 \r

-  @param[in]     This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL \r
+  @param[in]     This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL\r

                                     instance.\r
                                     instance.\r

-  @param[in,out] RootBridgeHandle   Returns the device handle of the next PCI root bridge. On input, it holds the \r
-                                    RootBridgeHandle that was returned by the most recent call to \r
-                                    GetNextRootBridge(). If RootBridgeHandle is NULL on input, the handle \r
+  @param[in,out] RootBridgeHandle   Returns the device handle of the next PCI root bridge. On input, it holds the\r
+                                    RootBridgeHandle that was returned by the most recent call to\r
+                                    GetNextRootBridge(). If RootBridgeHandle is NULL on input, the handle\r

                                     for the first PCI root bridge is returned.\r
 \r
   @retval EFI_SUCCESS             The requested attribute information was returned.\r
                                     for the first PCI root bridge is returned.\r
 \r
   @retval EFI_SUCCESS             The requested attribute information was returned.\r

-  @retval EFI_INVALID_PARAMETER   RootBridgeHandle is not an EFI_HANDLE that was returned \r
+  @retval EFI_INVALID_PARAMETER   RootBridgeHandle is not an EFI_HANDLE that was returned\r

                                   on a previous call to GetNextRootBridge().\r
   @retval EFI_NOT_FOUND           There are no more PCI root bridge device handles.\r
 \r
                                   on a previous call to GetNextRootBridge().\r
   @retval EFI_NOT_FOUND           There are no more PCI root bridge device handles.\r
 \r


@@ -218,7 +218,7 @@ EFI_STATUS
 /**\r
   Returns the allocation attributes of a PCI root bridge.\r
 \r
 /**\r
   Returns the allocation attributes of a PCI root bridge.\r
 \r

-  @param[in]  This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL \r
+  @param[in]  This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL\r

                                  instance.\r
   @param[in]  RootBridgeHandle   The device handle of the PCI root bridge in which the caller is interested.\r
   @param[out] Attribute          The pointer to attributes of the PCI root bridge.\r
                                  instance.\r
   @param[in]  RootBridgeHandle   The device handle of the PCI root bridge in which the caller is interested.\r
   @param[out] Attribute          The pointer to attributes of the PCI root bridge.\r


@@ -239,12 +239,12 @@ EFI_STATUS
 /**\r
   Sets up the specified PCI root bridge for the bus enumeration process.\r
 \r
 /**\r
   Sets up the specified PCI root bridge for the bus enumeration process.\r
 \r

-  @param[in]  This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL \r
+  @param[in]  This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL\r

                                  instance.\r
   @param[in]  RootBridgeHandle   The PCI root bridge to be set up.\r
   @param[out] Configuration      The pointer to the pointer to the PCI bus resource descriptor.\r
 \r
                                  instance.\r
   @param[in]  RootBridgeHandle   The PCI root bridge to be set up.\r
   @param[out] Configuration      The pointer to the pointer to the PCI bus resource descriptor.\r
 \r

-  @retval EFI_SUCCESS             The PCI root bridge was set up and the bus range was returned in \r
+  @retval EFI_SUCCESS             The PCI root bridge was set up and the bus range was returned in\r

                                   Configuration.\r
   @retval EFI_INVALID_PARAMETER   RootBridgeHandle is not a valid root bridge handle.\r
   @retval EFI_DEVICE_ERROR        Programming failed due to a hardware error.\r
                                   Configuration.\r
   @retval EFI_INVALID_PARAMETER   RootBridgeHandle is not a valid root bridge handle.\r
   @retval EFI_DEVICE_ERROR        Programming failed due to a hardware error.\r


@@ -263,20 +263,20 @@ EFI_STATUS
   Programs the PCI root bridge hardware so that it decodes the specified PCI bus range.\r
 \r
   @param[in] This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL\r
   Programs the PCI root bridge hardware so that it decodes the specified PCI bus range.\r
 \r
   @param[in] This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL\r

-                                instance.  \r
+                                instance.\r

   @param[in] RootBridgeHandle   The PCI root bridge whose bus range is to be programmed.\r
   @param[in] Configuration      The pointer to the PCI bus resource descriptor.\r
 \r
   @retval EFI_SUCCESS             The bus range for the PCI root bridge was programmed.\r
   @retval EFI_INVALID_PARAMETER   RootBridgeHandle is not a valid root bridge handle.\r
   @retval EFI_INVALID_PARAMETER   Configuration is NULL\r
   @param[in] RootBridgeHandle   The PCI root bridge whose bus range is to be programmed.\r
   @param[in] Configuration      The pointer to the PCI bus resource descriptor.\r
 \r
   @retval EFI_SUCCESS             The bus range for the PCI root bridge was programmed.\r
   @retval EFI_INVALID_PARAMETER   RootBridgeHandle is not a valid root bridge handle.\r
   @retval EFI_INVALID_PARAMETER   Configuration is NULL\r

-  @retval EFI_INVALID_PARAMETER   Configuration does not point to a valid ACPI (2.0 & 3.0) \r
+  @retval EFI_INVALID_PARAMETER   Configuration does not point to a valid ACPI (2.0 & 3.0)\r

                                   resource descriptor.\r
   @retval EFI_INVALID_PARAMETER   Configuration does not include a valid ACPI 2.0 bus resource\r
                                   descriptor.\r
                                   resource descriptor.\r
   @retval EFI_INVALID_PARAMETER   Configuration does not include a valid ACPI 2.0 bus resource\r
                                   descriptor.\r

-  @retval EFI_INVALID_PARAMETER   Configuration includes valid ACPI (2.0 & 3.0) resource \r
+  @retval EFI_INVALID_PARAMETER   Configuration includes valid ACPI (2.0 & 3.0) resource\r

                                   descriptors other than bus descriptors.\r
                                   descriptors other than bus descriptors.\r

-  @retval EFI_INVALID_PARAMETER   Configuration contains one or more invalid ACPI resource \r
+  @retval EFI_INVALID_PARAMETER   Configuration contains one or more invalid ACPI resource\r

                                   descriptors.\r
   @retval EFI_INVALID_PARAMETER   "Address Range Minimum" is invalid for this root bridge.\r
   @retval EFI_INVALID_PARAMETER   "Address Range Length" is invalid for this root bridge.\r
                                   descriptors.\r
   @retval EFI_INVALID_PARAMETER   "Address Range Minimum" is invalid for this root bridge.\r
   @retval EFI_INVALID_PARAMETER   "Address Range Length" is invalid for this root bridge.\r


@@ -294,26 +294,26 @@ EFI_STATUS
 /**\r
   Submits the I/O and memory resource requirements for the specified PCI root bridge.\r
 \r
 /**\r
   Submits the I/O and memory resource requirements for the specified PCI root bridge.\r
 \r

-  @param[in] This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL \r
+  @param[in] This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL\r

                                 instance.\r
                                 instance.\r

-  @param[in] RootBridgeHandle   The PCI root bridge whose I/O and memory resource requirements are being \r
+  @param[in] RootBridgeHandle   The PCI root bridge whose I/O and memory resource requirements are being\r

                                 submitted.\r
   @param[in] Configuration      The pointer to the PCI I/O and PCI memory resource descriptor.\r
 \r
                                 submitted.\r
   @param[in] Configuration      The pointer to the PCI I/O and PCI memory resource descriptor.\r
 \r

-  @retval EFI_SUCCESS             The I/O and memory resource requests for a PCI root bridge were \r
+  @retval EFI_SUCCESS             The I/O and memory resource requests for a PCI root bridge were\r

                                   accepted.\r
   @retval EFI_INVALID_PARAMETER   RootBridgeHandle is not a valid root bridge handle.\r
   @retval EFI_INVALID_PARAMETER   Configuration is NULL.\r
                                   accepted.\r
   @retval EFI_INVALID_PARAMETER   RootBridgeHandle is not a valid root bridge handle.\r
   @retval EFI_INVALID_PARAMETER   Configuration is NULL.\r

-  @retval EFI_INVALID_PARAMETER   Configuration does not point to a valid ACPI (2.0 & 3.0) \r
+  @retval EFI_INVALID_PARAMETER   Configuration does not point to a valid ACPI (2.0 & 3.0)\r

                                   resource descriptor.\r
                                   resource descriptor.\r

-  @retval EFI_INVALID_PARAMETER   Configuration includes requests for one or more resource \r
-                                  types that are not supported by this PCI root bridge. This error will \r
-                                  happen if the caller did not combine resources according to \r
+  @retval EFI_INVALID_PARAMETER   Configuration includes requests for one or more resource\r
+                                  types that are not supported by this PCI root bridge. This error will\r
+                                  happen if the caller did not combine resources according to\r

                                   Attributes that were returned by GetAllocAttributes().\r
   @retval EFI_INVALID_PARAMETER   "Address Range Maximum" is invalid.\r
   @retval EFI_INVALID_PARAMETER   "Address Range Length" is invalid for this PCI root bridge.\r
   @retval EFI_INVALID_PARAMETER   "Address Space Granularity" is invalid for this PCI root bridge.\r
                                   Attributes that were returned by GetAllocAttributes().\r
   @retval EFI_INVALID_PARAMETER   "Address Range Maximum" is invalid.\r
   @retval EFI_INVALID_PARAMETER   "Address Range Length" is invalid for this PCI root bridge.\r
   @retval EFI_INVALID_PARAMETER   "Address Space Granularity" is invalid for this PCI root bridge.\r

-  \r
+\r

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


@@ -326,7 +326,7 @@ EFI_STATUS
 /**\r
   Returns the proposed resource settings for the specified PCI root bridge.\r
 \r
 /**\r
   Returns the proposed resource settings for the specified PCI root bridge.\r
 \r

-  @param[in]  This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL \r
+  @param[in]  This               The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL\r

                                  instance.\r
   @param[in]  RootBridgeHandle   The PCI root bridge handle.\r
   @param[out] Configuration      The pointer to the pointer to the PCI I/O and memory resource descriptor.\r
                                  instance.\r
   @param[in]  RootBridgeHandle   The PCI root bridge handle.\r
   @param[out] Configuration      The pointer to the pointer to the PCI I/O and memory resource descriptor.\r


@@ -346,8 +346,8 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Provides the hooks from the PCI bus driver to every PCI controller (device/function) at various \r
-  stages of the PCI enumeration process that allow the host bridge driver to preinitialize individual \r
+  Provides the hooks from the PCI bus driver to every PCI controller (device/function) at various\r
+  stages of the PCI enumeration process that allow the host bridge driver to preinitialize individual\r

   PCI controllers before enumeration.\r
 \r
   @param[in]  This                  The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL instance.\r
   PCI controllers before enumeration.\r
 \r
   @param[in]  This                  The pointer to the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL instance.\r


@@ -357,10 +357,10 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS             The requested parameters were returned.\r
   @retval EFI_INVALID_PARAMETER   RootBridgeHandle is not a valid root bridge handle.\r
 \r
   @retval EFI_SUCCESS             The requested parameters were returned.\r
   @retval EFI_INVALID_PARAMETER   RootBridgeHandle is not a valid root bridge handle.\r

-  @retval EFI_INVALID_PARAMETER   Phase is not a valid phase that is defined in \r
+  @retval EFI_INVALID_PARAMETER   Phase is not a valid phase that is defined in\r

                                   EFI_PCI_CONTROLLER_RESOURCE_ALLOCATION_PHASE.\r
                                   EFI_PCI_CONTROLLER_RESOURCE_ALLOCATION_PHASE.\r

-  @retval EFI_DEVICE_ERROR        Programming failed due to a hardware error. The PCI enumerator \r
-                                  should not enumerate this device, including its child devices if it is \r
+  @retval EFI_DEVICE_ERROR        Programming failed due to a hardware error. The PCI enumerator\r
+                                  should not enumerate this device, including its child devices if it is\r

                                   a PCI-to-PCI bridge.\r
 \r
 **/\r
                                   a PCI-to-PCI bridge.\r
 \r
 **/\r


@@ -382,43 +382,43 @@ struct _EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL {
   /// a certain phase during the enumeration process.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_NOTIFY_PHASE           NotifyPhase;\r
   /// a certain phase during the enumeration process.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_NOTIFY_PHASE           NotifyPhase;\r

-  \r
+\r

   ///\r
   /// Retrieves the device handle for the next PCI root bridge that is produced by the\r
   ///\r
   /// Retrieves the device handle for the next PCI root bridge that is produced by the\r

-  /// host bridge to which this instance of the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL is attached.  \r
+  /// host bridge to which this instance of the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL is attached.\r

   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_NEXT_ROOT_BRIDGE   GetNextRootBridge;\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_NEXT_ROOT_BRIDGE   GetNextRootBridge;\r

-  \r
+\r

   ///\r
   /// Retrieves the allocation-related attributes of a PCI root bridge.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_ATTRIBUTES         GetAllocAttributes;\r
   ///\r
   /// Retrieves the allocation-related attributes of a PCI root bridge.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_ATTRIBUTES         GetAllocAttributes;\r

-  \r
+\r

   ///\r
   /// Sets up a PCI root bridge for bus enumeration.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_START_BUS_ENUMERATION  StartBusEnumeration;\r
   ///\r
   /// Sets up a PCI root bridge for bus enumeration.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_START_BUS_ENUMERATION  StartBusEnumeration;\r

-  \r
+\r

   ///\r
   /// Sets up the PCI root bridge so that it decodes a specific range of bus numbers.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_SET_BUS_NUMBERS        SetBusNumbers;\r
   ///\r
   /// Sets up the PCI root bridge so that it decodes a specific range of bus numbers.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_SET_BUS_NUMBERS        SetBusNumbers;\r

-  \r
+\r

   ///\r
   /// Submits the resource requirements for the specified PCI root bridge.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_SUBMIT_RESOURCES       SubmitResources;\r
   ///\r
   /// Submits the resource requirements for the specified PCI root bridge.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_SUBMIT_RESOURCES       SubmitResources;\r

-  \r
+\r

   ///\r
   /// Returns the proposed resource assignment for the specified PCI root bridges.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_PROPOSED_RESOURCES GetProposedResources;\r
   ///\r
   /// Returns the proposed resource assignment for the specified PCI root bridges.\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_PROPOSED_RESOURCES GetProposedResources;\r

-  \r
+\r

   ///\r
   /// Provides hooks from the PCI bus driver to every PCI controller\r
   /// (device/function) at various stages of the PCI enumeration process that\r
   /// allow the host bridge driver to preinitialize individual PCI controllers\r
   ///\r
   /// Provides hooks from the PCI bus driver to every PCI controller\r
   /// (device/function) at various stages of the PCI enumeration process that\r
   /// allow the host bridge driver to preinitialize individual PCI controllers\r

-  /// before enumeration.  \r
+  /// before enumeration.\r

   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_PREPROCESS_CONTROLLER  PreprocessController;\r
 };\r
   ///\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_PREPROCESS_CONTROLLER  PreprocessController;\r
 };\r

diff --git a/MdePkg/Include/Protocol/PciHotPlugInit.h b/MdePkg/Include/Protocol/PciHotPlugInit.h
index 0d95462abdc9b88c3db71a82f113da9be4e22ea6..c33629e2d6a7927cc57e9be2f7fe0deffe4cfe50 100644 (file)
--- a/MdePkg/Include/Protocol/PciHotPlugInit.h
+++ b/MdePkg/Include/Protocol/PciHotPlugInit.h
@@ -1,46 +1,46 @@
 /** @file\r
   This file declares EFI PCI Hot Plug Init Protocol.\r
 /** @file\r
   This file declares EFI PCI Hot Plug Init Protocol.\r

-  \r
-  This protocol provides the necessary functionality to initialize the Hot Plug \r
-  Controllers (HPCs) and the buses that they control. This protocol also provides \r
+\r
+  This protocol provides the necessary functionality to initialize the Hot Plug\r
+  Controllers (HPCs) and the buses that they control. This protocol also provides\r

   information regarding resource padding.\r
   information regarding resource padding.\r

-  \r
-  @par Note: \r
+\r
+  @par Note:\r

     This protocol is required only on platforms that support one or more PCI Hot\r
     This protocol is required only on platforms that support one or more PCI Hot\r

-    Plug* slots or CardBus sockets.  \r
+    Plug* slots or CardBus sockets.\r

 \r
   The EFI_PCI_HOT_PLUG_INIT_PROTOCOL provides a mechanism for the PCI bus enumerator\r
 \r
   The EFI_PCI_HOT_PLUG_INIT_PROTOCOL provides a mechanism for the PCI bus enumerator\r

-  to properly initialize the HPCs and CardBus sockets that require initialization. \r
-  The HPC initialization takes place before the PCI enumeration process is complete. \r
-  There cannot be more than one instance of this protocol in a system. This protocol \r
-  is installed on its own separate handle.  \r
-  \r
-  Because the system may include multiple HPCs, one instance of this protocol \r
-  should represent all of them. The protocol functions use the device path of \r
-  the HPC to identify the HPC. When the PCI bus enumerator finds a root HPC, it \r
+  to properly initialize the HPCs and CardBus sockets that require initialization.\r
+  The HPC initialization takes place before the PCI enumeration process is complete.\r
+  There cannot be more than one instance of this protocol in a system. This protocol\r
+  is installed on its own separate handle.\r
+\r
+  Because the system may include multiple HPCs, one instance of this protocol\r
+  should represent all of them. The protocol functions use the device path of\r
+  the HPC to identify the HPC. When the PCI bus enumerator finds a root HPC, it\r

   will call EFI_PCI_HOT_PLUG_INIT_PROTOCOL.InitializeRootHpc(). If InitializeRootHpc()\r
   will call EFI_PCI_HOT_PLUG_INIT_PROTOCOL.InitializeRootHpc(). If InitializeRootHpc()\r

-  is unable to initialize a root HPC, the PCI enumerator will ignore that root HPC \r
-  and continue the enumeration process. If the HPC is not initialized, the devices \r
+  is unable to initialize a root HPC, the PCI enumerator will ignore that root HPC\r
+  and continue the enumeration process. If the HPC is not initialized, the devices\r

   that it controls may not be initialized, and no resource padding will be provided.\r
 \r
   that it controls may not be initialized, and no resource padding will be provided.\r
 \r

-  From the standpoint of the PCI bus enumerator, HPCs are divided into the following \r
+  From the standpoint of the PCI bus enumerator, HPCs are divided into the following\r

   two classes:\r
 \r
     - Root HPC:\r
   two classes:\r
 \r
     - Root HPC:\r

-        These HPCs must be initialized by calling InitializeRootHpc() during the \r
-        enumeration process. These HPCs will also require resource padding. The \r
-        platform code must have a priori knowledge of these devices and must know \r
-        how to initialize them. There may not be any way to access their PCI \r
+        These HPCs must be initialized by calling InitializeRootHpc() during the\r
+        enumeration process. These HPCs will also require resource padding. The\r
+        platform code must have a priori knowledge of these devices and must know\r
+        how to initialize them. There may not be any way to access their PCI\r

         configuration space before the PCI enumerator programs all the upstream\r
         configuration space before the PCI enumerator programs all the upstream\r

-        bridges and thus enables the path to these devices. The PCI bus enumerator \r
-        is responsible for determining the PCI bus address of the HPC before it \r
+        bridges and thus enables the path to these devices. The PCI bus enumerator\r
+        is responsible for determining the PCI bus address of the HPC before it\r

         calls InitializeRootHpc().\r
     - Nonroot HPC:\r
         calls InitializeRootHpc().\r
     - Nonroot HPC:\r

-        These HPCs will not need explicit initialization during enumeration process. \r
-        These HPCs will require resource padding. The platform code does not have \r
+        These HPCs will not need explicit initialization during enumeration process.\r
+        These HPCs will require resource padding. The platform code does not have\r

         to have a priori knowledge of these devices.\r
 \r
         to have a priori knowledge of these devices.\r
 \r

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


@@ -50,7 +50,7 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  This Protocol is defined in UEFI Platform Initialization Specification 1.2 \r
+  This Protocol is defined in UEFI Platform Initialization Specification 1.2\r

   Volume 5: Standards\r
 \r
 **/\r
   Volume 5: Standards\r
 \r
 **/\r


@@ -77,15 +77,15 @@ typedef struct _EFI_PCI_HOT_PLUG_INIT_PROTOCOL EFI_PCI_HOT_PLUG_INIT_PROTOCOL;
 typedef UINT16 EFI_HPC_STATE;\r
 \r
 ///\r
 typedef UINT16 EFI_HPC_STATE;\r
 \r
 ///\r

-/// The HPC initialization function was called and the HPC completed \r
-/// initialization, but it was not enabled for some reason. The HPC may be \r
-/// disabled in hardware, or it may be disabled due to user preferences, \r
+/// The HPC initialization function was called and the HPC completed\r
+/// initialization, but it was not enabled for some reason. The HPC may be\r
+/// disabled in hardware, or it may be disabled due to user preferences,\r

 /// hardware failure, or other reasons. No resource padding is required.\r
 ///\r
 #define  EFI_HPC_STATE_INITIALIZED    0x01\r
 \r
 ///\r
 /// hardware failure, or other reasons. No resource padding is required.\r
 ///\r
 #define  EFI_HPC_STATE_INITIALIZED    0x01\r
 \r
 ///\r

-/// The HPC initialization function was called, the HPC completed \r
+/// The HPC initialization function was called, the HPC completed\r

 /// initialization, and it was enabled. Resource padding is required.\r
 ///\r
 #define  EFI_HPC_STATE_ENABLED        0x02\r
 /// initialization, and it was enabled. Resource padding is required.\r
 ///\r
 #define  EFI_HPC_STATE_ENABLED        0x02\r


@@ -95,18 +95,18 @@ typedef UINT16 EFI_HPC_STATE;
 ///\r
 typedef struct{\r
   ///\r
 ///\r
 typedef struct{\r
   ///\r

-  /// \r
+  ///\r

   /// The device path to the root HPC. An HPC cannot control its parent buses.\r
   /// The device path to the root HPC. An HPC cannot control its parent buses.\r

-  /// The PCI bus driver requires this information so that it can pass the \r
-  /// correct HpcPciAddress to the InitializeRootHpc() and GetResourcePadding() \r
-  /// functions. \r
+  /// The PCI bus driver requires this information so that it can pass the\r
+  /// correct HpcPciAddress to the InitializeRootHpc() and GetResourcePadding()\r
+  /// functions.\r

   ///\r
   EFI_DEVICE_PATH_PROTOCOL  *HpcDevicePath;\r
   ///\r
   ///\r
   EFI_DEVICE_PATH_PROTOCOL  *HpcDevicePath;\r
   ///\r

-  /// The device path to the Hot Plug Bus (HPB) that is controlled by the root \r
-  /// HPC. The PCI bus driver uses this information to check if a particular PCI \r
-  /// bus has hot-plug slots.  The device path of a PCI bus is the same as the \r
-  /// device path of its parent. For Standard(PCI) Hot Plug Controllers (SHPCs) \r
+  /// The device path to the Hot Plug Bus (HPB) that is controlled by the root\r
+  /// HPC. The PCI bus driver uses this information to check if a particular PCI\r
+  /// bus has hot-plug slots.  The device path of a PCI bus is the same as the\r
+  /// device path of its parent. For Standard(PCI) Hot Plug Controllers (SHPCs)\r

   /// and PCI Express*, HpbDevicePath is the same as HpcDevicePath.\r
   ///\r
   EFI_DEVICE_PATH_PROTOCOL  *HpbDevicePath;\r
   /// and PCI Express*, HpbDevicePath is the same as HpcDevicePath.\r
   ///\r
   EFI_DEVICE_PATH_PROTOCOL  *HpbDevicePath;\r


@@ -131,7 +131,7 @@ typedef enum {
   /// strategy may reduce the total amount of padding, but requires\r
   /// reprogramming of PCI-to-PCI bridges in a hot-add event. If the hotplug\r
   /// bus is behind a PCI-to-PCI bridge, the PCI-to-PCI bridge\r
   /// strategy may reduce the total amount of padding, but requires\r
   /// reprogramming of PCI-to-PCI bridges in a hot-add event. If the hotplug\r
   /// bus is behind a PCI-to-PCI bridge, the PCI-to-PCI bridge\r

-  /// apertures do not indicate the padding for that bus.  \r
+  /// apertures do not indicate the padding for that bus.\r

   ///\r
   EfiPaddingPciRootBridge\r
 } EFI_HPC_PADDING_ATTRIBUTES;\r
   ///\r
   EfiPaddingPciRootBridge\r
 } EFI_HPC_PADDING_ATTRIBUTES;\r


@@ -140,14 +140,14 @@ typedef enum {
   Returns a list of root Hot Plug Controllers (HPCs) that require initialization\r
   during the boot process.\r
 \r
   Returns a list of root Hot Plug Controllers (HPCs) that require initialization\r
   during the boot process.\r
 \r

-  This procedure returns a list of root HPCs. The PCI bus driver must initialize \r
-  these controllers during the boot process. The PCI bus driver may or may not be \r
-  able to detect these HPCs. If the platform includes a PCI-to-CardBus bridge, it \r
-  can be included in this list if it requires initialization.  The HpcList must be \r
-  self consistent. An HPC cannot control any of its parent buses. Only one HPC can \r
-  control a PCI bus. Because this list includes only root HPCs, no HPC in the list \r
-  can be a child of another HPC. This policy must be enforced by the \r
-  EFI_PCI_HOT_PLUG_INIT_PROTOCOL.   The PCI bus driver may not check for such \r
+  This procedure returns a list of root HPCs. The PCI bus driver must initialize\r
+  these controllers during the boot process. The PCI bus driver may or may not be\r
+  able to detect these HPCs. If the platform includes a PCI-to-CardBus bridge, it\r
+  can be included in this list if it requires initialization.  The HpcList must be\r
+  self consistent. An HPC cannot control any of its parent buses. Only one HPC can\r
+  control a PCI bus. Because this list includes only root HPCs, no HPC in the list\r
+  can be a child of another HPC. This policy must be enforced by the\r
+  EFI_PCI_HOT_PLUG_INIT_PROTOCOL.   The PCI bus driver may not check for such\r

   invalid conditions.  The callee allocates the buffer HpcList\r
 \r
   @param[in]  This       Pointer to the EFI_PCI_HOT_PLUG_INIT_PROTOCOL instance.\r
   invalid conditions.  The callee allocates the buffer HpcList\r
 \r
   @param[in]  This       Pointer to the EFI_PCI_HOT_PLUG_INIT_PROTOCOL instance.\r


@@ -156,7 +156,7 @@ typedef enum {
                          elements in this list.\r
 \r
   @retval EFI_SUCCESS             HpcList was returned.\r
                          elements in this list.\r
 \r
   @retval EFI_SUCCESS             HpcList was returned.\r

-  @retval EFI_OUT_OF_RESOURCES    HpcList was not returned due to insufficient \r
+  @retval EFI_OUT_OF_RESOURCES    HpcList was not returned due to insufficient\r

                                   resources.\r
   @retval EFI_INVALID_PARAMETER   HpcCount is NULL or HpcList is NULL.\r
 \r
                                   resources.\r
   @retval EFI_INVALID_PARAMETER   HpcCount is NULL or HpcList is NULL.\r
 \r


@@ -172,26 +172,26 @@ EFI_STATUS
 /**\r
   Initializes one root Hot Plug Controller (HPC). This process may causes\r
   initialization of its subordinate buses.\r
 /**\r
   Initializes one root Hot Plug Controller (HPC). This process may causes\r
   initialization of its subordinate buses.\r

-  \r
-  This function initializes the specified HPC. At the end of initialization, \r
-  the hot-plug slots or sockets (controlled by this HPC) are powered and are \r
-  connected to the bus. All the necessary registers in the HPC are set up. For \r
-  a Standard (PCI) Hot Plug Controller (SHPC), the registers that must be set \r
-  up are defined in the PCI Standard Hot Plug Controller and Subsystem \r
-  Specification.  \r
+\r
+  This function initializes the specified HPC. At the end of initialization,\r
+  the hot-plug slots or sockets (controlled by this HPC) are powered and are\r
+  connected to the bus. All the necessary registers in the HPC are set up. For\r
+  a Standard (PCI) Hot Plug Controller (SHPC), the registers that must be set\r
+  up are defined in the PCI Standard Hot Plug Controller and Subsystem\r
+  Specification.\r

 \r
   @param[in]  This            Pointer to the EFI_PCI_HOT_PLUG_INIT_PROTOCOL instance.\r
   @param[in]  HpcDevicePath   The device path to the HPC that is being initialized.\r
   @param[in]  HpcPciAddress   The address of the HPC function on the PCI bus.\r
 \r
   @param[in]  This            Pointer to the EFI_PCI_HOT_PLUG_INIT_PROTOCOL instance.\r
   @param[in]  HpcDevicePath   The device path to the HPC that is being initialized.\r
   @param[in]  HpcPciAddress   The address of the HPC function on the PCI bus.\r

-  @param[in]  Event           The event that should be signaled when the HPC \r
-                              initialization is complete.  Set to NULL if the \r
-                              caller wants to wait until the entire initialization \r
+  @param[in]  Event           The event that should be signaled when the HPC\r
+                              initialization is complete.  Set to NULL if the\r
+                              caller wants to wait until the entire initialization\r

                               process is complete.\r
                               process is complete.\r

-  @param[out] HpcState        The state of the HPC hardware. The state is \r
+  @param[out] HpcState        The state of the HPC hardware. The state is\r

                               EFI_HPC_STATE_INITIALIZED or EFI_HPC_STATE_ENABLED.\r
 \r
   @retval EFI_SUCCESS             If Event is NULL, the specific HPC was successfully\r
                               EFI_HPC_STATE_INITIALIZED or EFI_HPC_STATE_ENABLED.\r
 \r
   @retval EFI_SUCCESS             If Event is NULL, the specific HPC was successfully\r

-                                  initialized. If Event is not NULL, Event will be \r
+                                  initialized. If Event is not NULL, Event will be\r

                                   signaled at a later time when initialization is complete.\r
   @retval EFI_UNSUPPORTED         This instance of EFI_PCI_HOT_PLUG_INIT_PROTOCOL\r
                                   does not support the specified HPC.\r
                                   signaled at a later time when initialization is complete.\r
   @retval EFI_UNSUPPORTED         This instance of EFI_PCI_HOT_PLUG_INIT_PROTOCOL\r
                                   does not support the specified HPC.\r


@@ -215,10 +215,10 @@ EFI_STATUS
   by the specified Hot Plug Controller (HPC).\r
 \r
   This function returns the resource padding that is required by the PCI bus that\r
   by the specified Hot Plug Controller (HPC).\r
 \r
   This function returns the resource padding that is required by the PCI bus that\r

-  is controlled by the specified HPC. This member function is called for all the \r
-  root HPCs and nonroot HPCs that are detected by the PCI bus enumerator. This \r
-  function will be called before PCI resource allocation is completed. This function \r
-  must be called after all the root HPCs, with the possible exception of a \r
+  is controlled by the specified HPC. This member function is called for all the\r
+  root HPCs and nonroot HPCs that are detected by the PCI bus enumerator. This\r
+  function will be called before PCI resource allocation is completed. This function\r
+  must be called after all the root HPCs, with the possible exception of a\r

   PCI-to-CardBus bridge, have completed initialization.\r
 \r
   @param[in]  This            Pointer to the EFI_PCI_HOT_PLUG_INIT_PROTOCOL instance.\r
   PCI-to-CardBus bridge, have completed initialization.\r
 \r
   @param[in]  This            Pointer to the EFI_PCI_HOT_PLUG_INIT_PROTOCOL instance.\r


@@ -261,12 +261,12 @@ struct _EFI_PCI_HOT_PLUG_INIT_PROTOCOL {
   /// Returns a list of root HPCs and the buses that they control.\r
   ///\r
   EFI_GET_ROOT_HPC_LIST     GetRootHpcList;\r
   /// Returns a list of root HPCs and the buses that they control.\r
   ///\r
   EFI_GET_ROOT_HPC_LIST     GetRootHpcList;\r

-  \r
+\r

   ///\r
   /// Initializes the specified root HPC.\r
   ///\r
   EFI_INITIALIZE_ROOT_HPC   InitializeRootHpc;\r
   ///\r
   /// Initializes the specified root HPC.\r
   ///\r
   EFI_INITIALIZE_ROOT_HPC   InitializeRootHpc;\r

-  \r
+\r

   ///\r
   /// Returns the resource padding that is required by the HPC.\r
   ///\r
   ///\r
   /// Returns the resource padding that is required by the HPC.\r
   ///\r

diff --git a/MdePkg/Include/Protocol/PciHotPlugRequest.h b/MdePkg/Include/Protocol/PciHotPlugRequest.h
index f2f9861e2163d2f295c6ca30d42b648d9881c1ae..81217904e64bf9a9c968b7aaae829fd53b0741a9 100644 (file)
--- a/MdePkg/Include/Protocol/PciHotPlugRequest.h
+++ b/MdePkg/Include/Protocol/PciHotPlugRequest.h
@@ -1,46 +1,46 @@
 /** @file\r
 /** @file\r

-  Provides services to notify the PCI bus driver that some events have happened \r
-  in a hot-plug controller (such as a PC Card socket, or PHPC), and to ask the \r
+  Provides services to notify the PCI bus driver that some events have happened\r
+  in a hot-plug controller (such as a PC Card socket, or PHPC), and to ask the\r

   PCI bus driver to create or destroy handles for PCI-like devices.\r
 \r
   PCI bus driver to create or destroy handles for PCI-like devices.\r
 \r

-  A hot-plug capable PCI bus driver should produce the EFI PCI Hot Plug Request \r
+  A hot-plug capable PCI bus driver should produce the EFI PCI Hot Plug Request\r

   protocol. When a PCI device or a PCI-like device (for example, 32-bit PC Card)\r
   protocol. When a PCI device or a PCI-like device (for example, 32-bit PC Card)\r

-  is installed after PCI bus does the enumeration, the PCI bus driver can be \r
+  is installed after PCI bus does the enumeration, the PCI bus driver can be\r

   notified through this protocol. For example, when a 32-bit PC Card is inserted\r
   into the PC Card socket, the PC Card bus driver can call interface of this\r
   protocol to notify PCI bus driver to allocate resource and create handles for\r
   this PC Card.\r
   notified through this protocol. For example, when a 32-bit PC Card is inserted\r
   into the PC Card socket, the PC Card bus driver can call interface of this\r
   protocol to notify PCI bus driver to allocate resource and create handles for\r
   this PC Card.\r

-  \r
-  The EFI_PCI_HOTPLUG_REQUEST_PROTOCOL is installed by the PCI bus driver on a \r
-  separate handle when PCI bus driver starts up. There is only one instance in \r
+\r
+  The EFI_PCI_HOTPLUG_REQUEST_PROTOCOL is installed by the PCI bus driver on a\r
+  separate handle when PCI bus driver starts up. There is only one instance in\r

   the system.  Any driver that wants to use this protocol must locate it globally.\r
   the system.  Any driver that wants to use this protocol must locate it globally.\r

-  The EFI_PCI_HOTPLUG_REQUEST_PROTOCOL allows the driver of hot-plug controller, \r
-  for example, PC Card Bus driver, to notify PCI bus driver that an event has \r
-  happened in the hot-plug controller, and the PCI bus driver is requested to \r
-  create (add) or destroy (remove) handles for the specified PCI-like devices. \r
-  For example, when a 32-bit PC Card is inserted, this protocol interface will \r
-  be called with an add operation, and the PCI bus driver will enumerate and \r
-  start the devices inserted; when a 32-bit PC Card is removed, this protocol \r
-  interface will be called with a remove operation, and the PCI bus driver will \r
-  stop the devices and destroy their handles.  The existence of this protocol \r
+  The EFI_PCI_HOTPLUG_REQUEST_PROTOCOL allows the driver of hot-plug controller,\r
+  for example, PC Card Bus driver, to notify PCI bus driver that an event has\r
+  happened in the hot-plug controller, and the PCI bus driver is requested to\r
+  create (add) or destroy (remove) handles for the specified PCI-like devices.\r
+  For example, when a 32-bit PC Card is inserted, this protocol interface will\r
+  be called with an add operation, and the PCI bus driver will enumerate and\r
+  start the devices inserted; when a 32-bit PC Card is removed, this protocol\r
+  interface will be called with a remove operation, and the PCI bus driver will\r
+  stop the devices and destroy their handles.  The existence of this protocol\r

   represents the capability of the PCI bus driver. If this protocol exists in\r
   represents the capability of the PCI bus driver. If this protocol exists in\r

-  system, it means PCI bus driver is hot-plug capable, thus together with the \r
+  system, it means PCI bus driver is hot-plug capable, thus together with the\r

   effort of PC Card bus driver, hot-plug of PC Card can be supported. Otherwise,\r
   effort of PC Card bus driver, hot-plug of PC Card can be supported. Otherwise,\r

-  the hot-plug capability is not provided.  \r
-  \r
-  Copyright (c) 2006 - 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
+  the hot-plug capability is not provided.\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
   @par Revision Reference:\r
 \r
   @par Revision Reference:\r

-  This Protocol is defined in UEFI Platform Initialization Specification 1.2 \r
+  This Protocol is defined in UEFI Platform Initialization Specification 1.2\r

   Volume 5: Standards\r
   Volume 5: Standards\r

-  \r
+\r

 **/\r
 \r
 #ifndef __PCI_HOTPLUG_REQUEST_H_\r
 **/\r
 \r
 #ifndef __PCI_HOTPLUG_REQUEST_H_\r


@@ -61,7 +61,7 @@ typedef struct _EFI_PCI_HOTPLUG_REQUEST_PROTOCOL  EFI_PCI_HOTPLUG_REQUEST_PROTOC
 \r
 ///\r
 /// Enumeration of PCI hot plug operations\r
 \r
 ///\r
 /// Enumeration of PCI hot plug operations\r

-/// \r
+///\r

 typedef enum {\r
   ///\r
   /// The PCI bus driver is requested to create handles for the specified devices.\r
 typedef enum {\r
   ///\r
   /// The PCI bus driver is requested to create handles for the specified devices.\r


@@ -78,65 +78,65 @@ typedef enum {
 \r
 /**\r
   This function is used to notify PCI bus driver that some events happened in a\r
 \r
 /**\r
   This function is used to notify PCI bus driver that some events happened in a\r

-  hot-plug controller, and the PCI bus driver is requested to start or stop \r
+  hot-plug controller, and the PCI bus driver is requested to start or stop\r

   specified PCI-like devices.\r
   specified PCI-like devices.\r

-  \r
+\r

   This function allows the PCI bus driver to be notified to act as requested when\r
   This function allows the PCI bus driver to be notified to act as requested when\r

-  a hot-plug event has happened on the hot-plug controller. Currently, the \r
+  a hot-plug event has happened on the hot-plug controller. Currently, the\r

   operations include add operation and remove operation.  If it is a add operation,\r
   operations include add operation and remove operation.  If it is a add operation,\r

-  the PCI bus driver will enumerate, allocate resources for devices behind the \r
+  the PCI bus driver will enumerate, allocate resources for devices behind the\r

   hot-plug controller, and create handle for the device specified by RemainingDevicePath.\r
   hot-plug controller, and create handle for the device specified by RemainingDevicePath.\r

-  The RemainingDevicePath is an optional parameter. If it is not NULL, only the \r
-  specified device is started; if it is NULL, all devices behind the hot-plug \r
-  controller are started.  The newly created handles of PC Card functions are \r
+  The RemainingDevicePath is an optional parameter. If it is not NULL, only the\r
+  specified device is started; if it is NULL, all devices behind the hot-plug\r
+  controller are started.  The newly created handles of PC Card functions are\r

   returned in the ChildHandleBuffer, together with the number of child handle in\r
   NumberOfChildren.  If it is a remove operation, when NumberOfChildren contains\r
   a non-zero value, child handles specified in ChildHandleBuffer are stopped and\r
   destroyed; otherwise, PCI bus driver is notified to stop managing the controller\r
   returned in the ChildHandleBuffer, together with the number of child handle in\r
   NumberOfChildren.  If it is a remove operation, when NumberOfChildren contains\r
   a non-zero value, child handles specified in ChildHandleBuffer are stopped and\r
   destroyed; otherwise, PCI bus driver is notified to stop managing the controller\r

-  handle.  \r
-    \r
-    @param[in] This                    A pointer to the EFI_PCI_HOTPLUG_REQUEST_PROTOCOL \r
+  handle.\r
+\r
+    @param[in] This                    A pointer to the EFI_PCI_HOTPLUG_REQUEST_PROTOCOL\r

                                        instance.\r
                                        instance.\r

-    @param[in] Operation               The operation the PCI bus driver is requested \r
-                                       to make. \r
+    @param[in] Operation               The operation the PCI bus driver is requested\r
+                                       to make.\r

     @param[in] Controller              The handle of the hot-plug controller.\r
     @param[in] RemainingDevicePath     The remaining device path for the PCI-like\r
                                        hot-plug device.  It only contains device\r
     @param[in] Controller              The handle of the hot-plug controller.\r
     @param[in] RemainingDevicePath     The remaining device path for the PCI-like\r
                                        hot-plug device.  It only contains device\r

-                                       path nodes behind the hot-plug controller. \r
+                                       path nodes behind the hot-plug controller.\r

                                        It is an optional parameter and only valid\r
                                        It is an optional parameter and only valid\r

-                                       when the Operation is a add operation. If \r
-                                       it is NULL, all devices behind the PC Card \r
+                                       when the Operation is a add operation. If\r
+                                       it is NULL, all devices behind the PC Card\r

                                        socket are started.\r
                                        socket are started.\r

-    @param[in,out] NumberOfChildren    The number of child handles. For an add \r
+    @param[in,out] NumberOfChildren    The number of child handles. For an add\r

                                        operation, it is an output parameter.  For\r
                                        a remove operation, it's an input parameter.\r
                                        When it contains a non-zero value, children\r
                                        handles specified in ChildHandleBuffer are\r
                                        operation, it is an output parameter.  For\r
                                        a remove operation, it's an input parameter.\r
                                        When it contains a non-zero value, children\r
                                        handles specified in ChildHandleBuffer are\r

-                                       destroyed.  Otherwise, PCI bus driver is \r
-                                       notified to stop managing the controller \r
+                                       destroyed.  Otherwise, PCI bus driver is\r
+                                       notified to stop managing the controller\r

                                        handle.\r
                                        handle.\r

-    @param[in,out] ChildHandleBuffer   The buffer which contains the child handles. \r
-                                       For an add operation, it is an output \r
-                                       parameter and contains all newly created \r
+    @param[in,out] ChildHandleBuffer   The buffer which contains the child handles.\r
+                                       For an add operation, it is an output\r
+                                       parameter and contains all newly created\r

                                        child handles.  For a remove operation, it\r
                                        contains child handles to be destroyed when\r
                                        NumberOfChildren contains a non-zero value.\r
                                        It can be NULL when NumberOfChildren is 0.\r
                                        It's the caller's responsibility to allocate\r
                                        and free memory for this buffer.\r
                                        child handles.  For a remove operation, it\r
                                        contains child handles to be destroyed when\r
                                        NumberOfChildren contains a non-zero value.\r
                                        It can be NULL when NumberOfChildren is 0.\r
                                        It's the caller's responsibility to allocate\r
                                        and free memory for this buffer.\r

-  \r
-  @retval EFI_SUCCESS             The handles for the specified device have been \r
-                                  created or destroyed as requested, and for an \r
-                                  add operation, the new handles are returned in \r
+\r
+  @retval EFI_SUCCESS             The handles for the specified device have been\r
+                                  created or destroyed as requested, and for an\r
+                                  add operation, the new handles are returned in\r

                                   ChildHandleBuffer.\r
   @retval EFI_INVALID_PARAMETER   Operation is not a legal value.\r
   @retval EFI_INVALID_PARAMETER   Controller is NULL or not a valid handle.\r
   @retval EFI_INVALID_PARAMETER   NumberOfChildren is NULL.\r
                                   ChildHandleBuffer.\r
   @retval EFI_INVALID_PARAMETER   Operation is not a legal value.\r
   @retval EFI_INVALID_PARAMETER   Controller is NULL or not a valid handle.\r
   @retval EFI_INVALID_PARAMETER   NumberOfChildren is NULL.\r

-  @retval EFI_INVALID_PARAMETER   ChildHandleBuffer is NULL while Operation is \r
-                                  remove and NumberOfChildren contains a non-zero \r
+  @retval EFI_INVALID_PARAMETER   ChildHandleBuffer is NULL while Operation is\r
+                                  remove and NumberOfChildren contains a non-zero\r

                                   value.\r
   @retval EFI_INVALID_PARAMETER   ChildHandleBuffer is NULL while Operation is add.\r
                                   value.\r
   @retval EFI_INVALID_PARAMETER   ChildHandleBuffer is NULL while Operation is add.\r

-  @retval EFI_OUT_OF_RESOURCES    There are no enough resources to start the \r
+  @retval EFI_OUT_OF_RESOURCES    There are no enough resources to start the\r

                                   devices.\r
 **/\r
 typedef\r
                                   devices.\r
 **/\r
 typedef\r


@@ -151,15 +151,15 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// Provides services to notify PCI bus driver that some events have happened in \r
-/// a hot-plug controller (for example, PC Card socket, or PHPC), and ask PCI bus \r
+/// Provides services to notify PCI bus driver that some events have happened in\r
+/// a hot-plug controller (for example, PC Card socket, or PHPC), and ask PCI bus\r

 /// driver to create or destroy handles for the PCI-like devices.\r
 ///\r
 struct _EFI_PCI_HOTPLUG_REQUEST_PROTOCOL {\r
   ///\r
 /// driver to create or destroy handles for the PCI-like devices.\r
 ///\r
 struct _EFI_PCI_HOTPLUG_REQUEST_PROTOCOL {\r
   ///\r

-  /// Notify the PCI bus driver that some events have happened in a hot-plug \r
-  /// controller (for example, PC Card socket, or PHPC), and ask PCI bus driver \r
-  /// to create or destroy handles for the PCI-like devices. See Section 0 for \r
+  /// Notify the PCI bus driver that some events have happened in a hot-plug\r
+  /// controller (for example, PC Card socket, or PHPC), and ask PCI bus driver\r
+  /// to create or destroy handles for the PCI-like devices. See Section 0 for\r

   /// a detailed description.\r
   ///\r
   EFI_PCI_HOTPLUG_REQUEST_NOTIFY  Notify;\r
   /// a detailed description.\r
   ///\r
   EFI_PCI_HOTPLUG_REQUEST_NOTIFY  Notify;\r

diff --git a/MdePkg/Include/Protocol/PciIo.h b/MdePkg/Include/Protocol/PciIo.h
index d6492fcf04364ce090f07eb8dd511a97c1654ae6..feb2a54ce71ede85f5ab8b7a5187b723754d71c7 100644 (file)
--- a/MdePkg/Include/Protocol/PciIo.h
+++ b/MdePkg/Include/Protocol/PciIo.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  EFI PCI I/O Protocol provides the basic Memory, I/O, PCI configuration, \r
+  EFI PCI I/O Protocol provides the basic Memory, I/O, PCI configuration,\r

   and DMA interfaces that a driver uses to access its PCI controller.\r
 \r
   and DMA interfaces that a driver uses to access its PCI controller.\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


@@ -126,27 +126,27 @@ typedef enum {
   EfiPciIoAttributeOperationMaximum\r
 } EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION;\r
 \r
   EfiPciIoAttributeOperationMaximum\r
 } EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION;\r
 \r

-/**                                                                 \r
+/**\r

   Reads from the memory space of a PCI controller. Returns either when the polling exit criteria is\r
   Reads from the memory space of a PCI controller. Returns either when the polling exit criteria is\r

-  satisfied or after a defined duration.                                                           \r
-          \r
+  satisfied or after a defined duration.\r
+\r

   @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r
   @param  Width                 Signifies the width of the memory or I/O operations.\r
   @param  BarIndex              The BAR index of the standard PCI Configuration header to use as the\r
   @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r
   @param  Width                 Signifies the width of the memory or I/O operations.\r
   @param  BarIndex              The BAR index of the standard PCI Configuration header to use as the\r

-                                base address for the memory operation to perform.                   \r
+                                base address for the memory operation to perform.\r

   @param  Offset                The offset within the selected BAR to start the memory operation.\r
   @param  Mask                  Mask used for the polling criteria.\r
   @param  Value                 The comparison value used for the polling exit criteria.\r
   @param  Delay                 The number of 100 ns units to poll.\r
   @param  Result                Pointer to the last value read from the memory location.\r
   @param  Offset                The offset within the selected BAR to start the memory operation.\r
   @param  Mask                  Mask used for the polling criteria.\r
   @param  Value                 The comparison value used for the polling exit criteria.\r
   @param  Delay                 The number of 100 ns units to poll.\r
   @param  Result                Pointer to the last value read from the memory location.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The last data returned from the access matched the poll exit criteria.\r
   @retval EFI_UNSUPPORTED       BarIndex not valid for this PCI controller.\r
   @retval EFI_UNSUPPORTED       Offset is not valid for the BarIndex of this PCI controller.\r
   @retval EFI_TIMEOUT           Delay expired before a match occurred.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_SUCCESS           The last data returned from the access matched the poll exit criteria.\r
   @retval EFI_UNSUPPORTED       BarIndex not valid for this PCI controller.\r
   @retval EFI_UNSUPPORTED       Offset is not valid for the BarIndex of this PCI controller.\r
   @retval EFI_TIMEOUT           Delay expired before a match occurred.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r

-                                   \r
+\r

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


@@ -161,25 +161,25 @@ EFI_STATUS
   OUT UINT64                       *Result\r
   );\r
 \r
   OUT UINT64                       *Result\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Enable a PCI driver to access PCI controller registers in the PCI memory or I/O space.\r
   Enable a PCI driver to access PCI controller registers in the PCI memory or I/O space.\r

-          \r
+\r

   @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r
   @param  Width                 Signifies the width of the memory or I/O operations.\r
   @param  BarIndex              The BAR index of the standard PCI Configuration header to use as the\r
   @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r
   @param  Width                 Signifies the width of the memory or I/O operations.\r
   @param  BarIndex              The BAR index of the standard PCI Configuration header to use as the\r

-                                base address for the memory or I/O operation to perform.                    \r
-  @param  Offset                The offset within the selected BAR to start the memory or I/O operation.                                \r
+                                base address for the memory or I/O operation to perform.\r
+  @param  Offset                The offset within the selected BAR to start the memory or I/O operation.\r

   @param  Count                 The number of memory or I/O operations to perform.\r
   @param  Buffer                For read operations, the destination buffer to store the results. For write\r
   @param  Count                 The number of memory or I/O operations to perform.\r
   @param  Buffer                For read operations, the destination buffer to store the results. For write\r

-                                operations, the source buffer to write data from.                          \r
-  \r
+                                operations, the source buffer to write data from.\r
+\r

   @retval EFI_SUCCESS           The data was read from or written to the PCI controller.\r
   @retval EFI_UNSUPPORTED       BarIndex not valid for this PCI controller.\r
   @retval EFI_UNSUPPORTED       The address range specified by Offset, Width, and Count is not\r
   @retval EFI_SUCCESS           The data was read from or written to the PCI controller.\r
   @retval EFI_UNSUPPORTED       BarIndex not valid for this PCI controller.\r
   @retval EFI_UNSUPPORTED       The address range specified by Offset, Width, and Count is not\r

-                                valid for the PCI BAR specified by BarIndex.                  \r
+                                valid for the PCI BAR specified by BarIndex.\r

   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\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_INVALID_PARAMETER One or more parameters are invalid.\r

-                                   \r
+\r

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


@@ -203,23 +203,23 @@ typedef struct {
   EFI_PCI_IO_PROTOCOL_IO_MEM  Write;\r
 } EFI_PCI_IO_PROTOCOL_ACCESS;\r
 \r
   EFI_PCI_IO_PROTOCOL_IO_MEM  Write;\r
 } EFI_PCI_IO_PROTOCOL_ACCESS;\r
 \r

-/**                                                                 \r
+/**\r

   Enable a PCI driver to access PCI controller registers in PCI configuration space.\r
   Enable a PCI driver to access PCI controller registers in PCI configuration space.\r

-            \r
-  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.  \r
+\r
+  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r

   @param  Width                 Signifies the width of the memory operations.\r
   @param  Offset                The offset within the PCI configuration space for the PCI controller.\r
   @param  Count                 The number of PCI configuration operations to perform.\r
   @param  Buffer                For read operations, the destination buffer to store the results. For write\r
                                 operations, the source buffer to write data from.\r
   @param  Width                 Signifies the width of the memory operations.\r
   @param  Offset                The offset within the PCI configuration space for the PCI controller.\r
   @param  Count                 The number of PCI configuration operations to perform.\r
   @param  Buffer                For read operations, the destination buffer to store the results. For write\r
                                 operations, the source buffer to write data from.\r

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

   @retval EFI_SUCCESS           The data was read from or written to the PCI controller.\r
   @retval EFI_UNSUPPORTED       The address range specified by Offset, Width, and Count is not\r
                                 valid for the PCI configuration header of the PCI controller.\r
   @retval EFI_SUCCESS           The data was read from or written to the PCI controller.\r
   @retval EFI_UNSUPPORTED       The address range specified by Offset, Width, and Count is not\r
                                 valid for the PCI configuration header of the PCI controller.\r

-  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.                                 \r
-  @retval EFI_INVALID_PARAMETER Buffer is NULL or Width is invalid.                                \r
-                                     \r
+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
+  @retval EFI_INVALID_PARAMETER Buffer is NULL or Width is invalid.\r
+\r

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


@@ -242,33 +242,33 @@ typedef struct {
   EFI_PCI_IO_PROTOCOL_CONFIG  Write;\r
 } EFI_PCI_IO_PROTOCOL_CONFIG_ACCESS;\r
 \r
   EFI_PCI_IO_PROTOCOL_CONFIG  Write;\r
 } EFI_PCI_IO_PROTOCOL_CONFIG_ACCESS;\r
 \r

-/**                                                                 \r
+/**\r

   Enables a PCI driver to copy one region of PCI memory space to another region of PCI\r
   memory space.\r
   Enables a PCI driver to copy one region of PCI memory space to another region of PCI\r
   memory space.\r

-            \r
+\r

   @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r
   @param  Width                 Signifies the width of the memory operations.\r
   @param  DestBarIndex          The BAR index in the standard PCI Configuration header to use as the\r
   @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r
   @param  Width                 Signifies the width of the memory operations.\r
   @param  DestBarIndex          The BAR index in the standard PCI Configuration header to use as the\r

-                                base address for the memory operation to perform.                   \r
+                                base address for the memory operation to perform.\r

   @param  DestOffset            The destination offset within the BAR specified by DestBarIndex to\r
   @param  DestOffset            The destination offset within the BAR specified by DestBarIndex to\r

-                                start the memory writes for the copy operation.                   \r
+                                start the memory writes for the copy operation.\r

   @param  SrcBarIndex           The BAR index in the standard PCI Configuration header to use as the\r
   @param  SrcBarIndex           The BAR index in the standard PCI Configuration header to use as the\r

-                                base address for the memory operation to perform.                   \r
+                                base address for the memory operation to perform.\r

   @param  SrcOffset             The source offset within the BAR specified by SrcBarIndex to start\r
   @param  SrcOffset             The source offset within the BAR specified by SrcBarIndex to start\r

-                                the memory reads for the copy operation.                          \r
+                                the memory reads for the copy operation.\r

   @param  Count                 The number of memory operations to perform. Bytes moved is Width\r
   @param  Count                 The number of memory operations to perform. Bytes moved is Width\r

-                                size * Count, starting at DestOffset and SrcOffset.             \r
-                                \r
+                                size * Count, starting at DestOffset and SrcOffset.\r
+\r

   @retval EFI_SUCCESS           The data was copied from one memory region to another memory region.\r
   @retval EFI_UNSUPPORTED       DestBarIndex not valid for this PCI controller.\r
   @retval EFI_UNSUPPORTED       SrcBarIndex not valid for this PCI controller.\r
   @retval EFI_UNSUPPORTED       The address range specified by DestOffset, Width, and Count\r
   @retval EFI_SUCCESS           The data was copied from one memory region to another memory region.\r
   @retval EFI_UNSUPPORTED       DestBarIndex not valid for this PCI controller.\r
   @retval EFI_UNSUPPORTED       SrcBarIndex not valid for this PCI controller.\r
   @retval EFI_UNSUPPORTED       The address range specified by DestOffset, Width, and Count\r

-                                is not valid for the PCI BAR specified by DestBarIndex.    \r
+                                is not valid for the PCI BAR specified by DestBarIndex.\r

   @retval EFI_UNSUPPORTED       The address range specified by SrcOffset, Width, and Count is\r
   @retval EFI_UNSUPPORTED       The address range specified by SrcOffset, Width, and Count is\r

-                                not valid for the PCI BAR specified by SrcBarIndex.          \r
+                                not valid for the PCI BAR specified by SrcBarIndex.\r

   @retval EFI_INVALID_PARAMETER Width is invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_INVALID_PARAMETER Width is invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r

-                                   \r
+\r

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


@@ -282,24 +282,24 @@ EFI_STATUS
   IN     UINTN                        Count\r
   );\r
 \r
   IN     UINTN                        Count\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Provides the PCI controller-specific addresses needed to access system memory.\r
   Provides the PCI controller-specific addresses needed to access system memory.\r

-            \r
+\r

   @param  This                  A pointer to the EFI_PCI_IO_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 PCI 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_PCI_IO_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 PCI 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 PCI controller to use to\r
   @param  DeviceAddress         The resulting map address for the bus master PCI 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


@@ -312,15 +312,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_PCI_IO_PROTOCOL instance.                                      \r
+\r
+  @param  This                  A pointer to the EFI_PCI_IO_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


@@ -329,25 +329,25 @@ EFI_STATUS
   IN  VOID                         *Mapping\r
   );\r
 \r
   IN  VOID                         *Mapping\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Allocates pages that are suitable for an EfiPciIoOperationBusMasterCommonBuffer\r
   or EfiPciOperationBusMasterCommonBuffer64 mapping.\r
   Allocates pages that are suitable for an EfiPciIoOperationBusMasterCommonBuffer\r
   or EfiPciOperationBusMasterCommonBuffer64 mapping.\r

-            \r
+\r

   @param  This                  A pointer to the EFI_PCI_IO_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_PCI_IO_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
                                 MEMORY_WRITE_COMBINE, MEMORY_CACHED and DUAL_ADDRESS_CYCLE.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\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, MEMORY_CACHED and DUAL_ADDRESS_CYCLE.\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


@@ -360,17 +360,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_PCI_IO_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_PCI_IO_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


@@ -380,16 +380,16 @@ EFI_STATUS
   IN  VOID                         *HostAddress\r
   );\r
 \r
   IN  VOID                         *HostAddress\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Flushes all PCI posted write transactions from a PCI host bridge to system memory.\r
   Flushes all PCI posted write transactions from a PCI host bridge to system memory.\r

-            \r
-  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.  \r
-                                  \r
+\r
+  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r
+\r

   @retval EFI_SUCCESS           The PCI posted write transactions were flushed from the PCI host\r
   @retval EFI_SUCCESS           The PCI posted write transactions were flushed from the PCI host\r

-                                bridge to system memory.                                        \r
+                                bridge to system memory.\r

   @retval EFI_DEVICE_ERROR      The PCI posted write transactions were not flushed from the PCI\r
   @retval EFI_DEVICE_ERROR      The PCI posted write transactions were not flushed from the PCI\r

-                                host bridge due to a hardware error.                           \r
-                                     \r
+                                host bridge due to a hardware error.\r
+\r

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


@@ -397,18 +397,18 @@ EFI_STATUS
   IN EFI_PCI_IO_PROTOCOL  *This\r
   );\r
 \r
   IN EFI_PCI_IO_PROTOCOL  *This\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves this PCI controller's current PCI bus number, device number, and function number.\r
   Retrieves this PCI controller's current PCI bus number, device number, and function number.\r

-            \r
-  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.  \r
+\r
+  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r

   @param  SegmentNumber         The PCI controller's current PCI segment number.\r
   @param  BusNumber             The PCI controller's current PCI bus number.\r
   @param  DeviceNumber          The PCI controller's current PCI device number.\r
   @param  FunctionNumber        The PCI controller's current PCI function number.\r
   @param  SegmentNumber         The PCI controller's current PCI segment number.\r
   @param  BusNumber             The PCI controller's current PCI bus number.\r
   @param  DeviceNumber          The PCI controller's current PCI device number.\r
   @param  FunctionNumber        The PCI controller's current PCI function number.\r

-                                  \r
-  @retval EFI_SUCCESS           The PCI controller location was returned.                                                       \r
-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.                              \r
-                                     \r
+\r
+  @retval EFI_SUCCESS           The PCI controller location was returned.\r
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
+\r

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


@@ -420,24 +420,24 @@ EFI_STATUS
   OUT UINTN                       *FunctionNumber\r
   );\r
 \r
   OUT UINTN                       *FunctionNumber\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Performs an operation on the attributes that this PCI controller supports. The operations include\r
   Performs an operation on the attributes that this PCI controller supports. The operations include\r

-  getting the set of supported attributes, retrieving the current attributes, setting the current  \r
-  attributes, enabling attributes, and disabling attributes.                                       \r
-            \r
-  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.  \r
+  getting the set of supported attributes, retrieving the current attributes, setting the current\r
+  attributes, enabling attributes, and disabling attributes.\r
+\r
+  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r

   @param  Operation             The operation to perform on the attributes for this PCI controller.\r
   @param  Attributes            The mask of attributes that are used for Set, Enable, and Disable\r
   @param  Operation             The operation to perform on the attributes for this PCI controller.\r
   @param  Attributes            The mask of attributes that are used for Set, Enable, and Disable\r

-                                operations.                                                      \r
+                                operations.\r

   @param  Result                A pointer to the result mask of attributes that are returned for the Get\r
   @param  Result                A pointer to the result mask of attributes that are returned for the Get\r

-                                and Supported operations.                                               \r
-                                  \r
+                                and Supported operations.\r
+\r

   @retval EFI_SUCCESS           The operation on the PCI controller's attributes was completed.\r
   @retval EFI_SUCCESS           The operation on the PCI controller's attributes was completed.\r

-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.                              \r
-  @retval EFI_UNSUPPORTED       one or more of the bits set in                               \r
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
+  @retval EFI_UNSUPPORTED       one or more of the bits set in\r

                                 Attributes are not supported by this PCI controller or one of\r
                                 its parent bridges when Operation is Set, Enable or Disable.\r
                                 Attributes are not supported by this PCI controller or one of\r
                                 its parent bridges when Operation is Set, Enable or Disable.\r

-                                       \r
+\r

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


@@ -459,7 +459,7 @@ EFI_STATUS
                                 setting for this BAR with SetBarAttributes().\r
   @param  Resources             A pointer to the resource descriptors that describe the current\r
                                 configuration of this BAR of the PCI controller.\r
                                 setting for this BAR with SetBarAttributes().\r
   @param  Resources             A pointer to the resource descriptors that describe the current\r
                                 configuration of this BAR of the PCI controller.\r

-                                  \r
+\r

   @retval EFI_SUCCESS           If Supports is not NULL, then the attributes that the PCI\r
                                 controller supports are returned in Supports. If Resources\r
                                 is not NULL, then the resource descriptors that the PCI\r
   @retval EFI_SUCCESS           If Supports is not NULL, then the attributes that the PCI\r
                                 controller supports are returned in Supports. If Resources\r
                                 is not NULL, then the resource descriptors that the PCI\r


@@ -478,29 +478,29 @@ EFI_STATUS
   OUT VOID                           **Resources OPTIONAL\r
   );\r
 \r
   OUT VOID                           **Resources OPTIONAL\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Sets the attributes for a range of a BAR on a PCI controller.\r
   Sets the attributes for a range of a BAR on a PCI controller.\r

-            \r
-  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.  \r
+\r
+  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r

   @param  Attributes            The mask of attributes to set for the resource range specified by\r
   @param  Attributes            The mask of attributes to set for the resource range specified by\r

-                                BarIndex, Offset, and Length.                                    \r
+                                BarIndex, Offset, and Length.\r

   @param  BarIndex              The BAR index of the standard PCI Configuration header to use as the\r
                                 base address for resource range. The legal range for this field is 0..5.\r
   @param  Offset                A pointer to the BAR relative base address of the resource range to be\r
   @param  BarIndex              The BAR index of the standard PCI Configuration header to use as the\r
                                 base address for resource range. The legal range for this field is 0..5.\r
   @param  Offset                A pointer to the BAR relative base address of the resource range to be\r

-                                modified by the attributes specified by Attributes.                   \r
+                                modified by the attributes specified by Attributes.\r

   @param  Length                A pointer to the length of the resource range to be modified by the\r
   @param  Length                A pointer to the length of the resource range to be modified by the\r

-                                attributes specified by Attributes.                                \r
-                                  \r
-  @retval EFI_SUCCESS           The set of attributes specified by Attributes for the resource      \r
-                                range specified by BarIndex, Offset, and Length were                \r
+                                attributes specified by Attributes.\r
+\r
+  @retval EFI_SUCCESS           The set of attributes specified by Attributes for the resource\r
+                                range specified by BarIndex, Offset, and Length were\r

                                 set on the PCI controller, and the actual resource range is returned\r
                                 set on the PCI controller, and the actual resource range is returned\r

-                                in Offset and Length.                                               \r
+                                in Offset and Length.\r

   @retval EFI_INVALID_PARAMETER Offset or Length is NULL.\r
   @retval EFI_UNSUPPORTED       BarIndex not valid for this PCI controller.\r
   @retval EFI_OUT_OF_RESOURCES  There are not enough resources to set the attributes on the\r
   @retval EFI_INVALID_PARAMETER Offset or Length is NULL.\r
   @retval EFI_UNSUPPORTED       BarIndex not valid for this PCI controller.\r
   @retval EFI_OUT_OF_RESOURCES  There are not enough resources to set the attributes on the\r

-                                resource range specified by BarIndex, Offset, and          \r
-                                Length.                                                    \r
-                                \r
+                                resource range specified by BarIndex, Offset, and\r
+                                Length.\r
+\r

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


@@ -513,11 +513,11 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The EFI_PCI_IO_PROTOCOL provides the basic Memory, I/O, PCI configuration, \r
-/// and DMA interfaces used to abstract accesses to PCI controllers. \r
-/// There is one EFI_PCI_IO_PROTOCOL instance for each PCI controller on a PCI bus. \r
-/// A device driver that wishes to manage a PCI controller in a system will have to \r
-/// retrieve the EFI_PCI_IO_PROTOCOL instance that is associated with the PCI controller. \r
+/// The EFI_PCI_IO_PROTOCOL provides the basic Memory, I/O, PCI configuration,\r
+/// and DMA interfaces used to abstract accesses to PCI controllers.\r
+/// There is one EFI_PCI_IO_PROTOCOL instance for each PCI controller on a PCI bus.\r
+/// A device driver that wishes to manage a PCI controller in a system will have to\r
+/// retrieve the EFI_PCI_IO_PROTOCOL instance that is associated with the PCI controller.\r

 ///\r
 struct _EFI_PCI_IO_PROTOCOL {\r
   EFI_PCI_IO_PROTOCOL_POLL_IO_MEM         PollMem;\r
 ///\r
 struct _EFI_PCI_IO_PROTOCOL {\r
   EFI_PCI_IO_PROTOCOL_POLL_IO_MEM         PollMem;\r


@@ -535,20 +535,20 @@ struct _EFI_PCI_IO_PROTOCOL {
   EFI_PCI_IO_PROTOCOL_ATTRIBUTES          Attributes;\r
   EFI_PCI_IO_PROTOCOL_GET_BAR_ATTRIBUTES  GetBarAttributes;\r
   EFI_PCI_IO_PROTOCOL_SET_BAR_ATTRIBUTES  SetBarAttributes;\r
   EFI_PCI_IO_PROTOCOL_ATTRIBUTES          Attributes;\r
   EFI_PCI_IO_PROTOCOL_GET_BAR_ATTRIBUTES  GetBarAttributes;\r
   EFI_PCI_IO_PROTOCOL_SET_BAR_ATTRIBUTES  SetBarAttributes;\r

-  \r
+\r

   ///\r
   /// The size, in bytes, of the ROM image.\r
   ///\r
   UINT64                                  RomSize;\r
 \r
   ///\r
   ///\r
   /// The size, in bytes, of the ROM image.\r
   ///\r
   UINT64                                  RomSize;\r
 \r
   ///\r

-  /// A pointer to the in memory copy of the ROM image. The PCI Bus Driver is responsible \r
-  /// for allocating memory for the ROM image, and copying the contents of the ROM to memory. \r
-  /// The contents of this buffer are either from the PCI option ROM that can be accessed \r
-  /// through the ROM BAR of the PCI controller, or it is from a platform-specific location. \r
-  /// The Attributes() function can be used to determine from which of these two sources \r
+  /// A pointer to the in memory copy of the ROM image. The PCI Bus Driver is responsible\r
+  /// for allocating memory for the ROM image, and copying the contents of the ROM to memory.\r
+  /// The contents of this buffer are either from the PCI option ROM that can be accessed\r
+  /// through the ROM BAR of the PCI controller, or it is from a platform-specific location.\r
+  /// The Attributes() function can be used to determine from which of these two sources\r

   /// the RomImage buffer was initialized.\r
   /// the RomImage buffer was initialized.\r

-  /// \r
+  ///\r

   VOID                                    *RomImage;\r
 };\r
 \r
   VOID                                    *RomImage;\r
 };\r
 \r

diff --git a/MdePkg/Include/Protocol/PciPlatform.h b/MdePkg/Include/Protocol/PciPlatform.h
index 15d735e1fe7ed3b21ffeece8597544176d91b51c..11887f9c0f51310a525e19ac93183c9904626701 100644 (file)
--- a/MdePkg/Include/Protocol/PciPlatform.h
+++ b/MdePkg/Include/Protocol/PciPlatform.h
@@ -1,20 +1,20 @@
 /** @file\r
 /** @file\r

-  This file declares PlatfromOpRom protocols that provide the interface between \r
-  the PCI bus driver/PCI Host Bridge Resource Allocation driver and a platform-specific \r
-  driver to describe the unique features of a platform. \r
+  This file declares PlatfromOpRom protocols that provide the interface between\r
+  the PCI bus driver/PCI Host Bridge Resource Allocation driver and a platform-specific\r
+  driver to describe the unique features of a platform.\r

   This protocol is optional.\r
   This protocol is optional.\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
-    \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
   @par Revision Reference:\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

-  This Protocol is defined in UEFI Platform Initialization Specification 1.2 \r
+  This Protocol is defined in UEFI Platform Initialization Specification 1.2\r

   Volume 5: Standards\r
 \r
 **/\r
   Volume 5: Standards\r
 \r
 **/\r


@@ -320,16 +320,16 @@ EFI_STATUS
 ///\r
 struct _EFI_PCI_PLATFORM_PROTOCOL {\r
   ///\r
 ///\r
 struct _EFI_PCI_PLATFORM_PROTOCOL {\r
   ///\r

-  /// The notification from the PCI bus enumerator to the platform that it is about to \r
+  /// The notification from the PCI bus enumerator to the platform that it is about to\r

   /// enter a certain phase during the enumeration process.\r
   ///\r
   EFI_PCI_PLATFORM_PHASE_NOTIFY          PlatformNotify;\r
   ///\r
   /// enter a certain phase during the enumeration process.\r
   ///\r
   EFI_PCI_PLATFORM_PHASE_NOTIFY          PlatformNotify;\r
   ///\r

-  /// The notification from the PCI bus enumerator to the platform for each PCI \r
+  /// The notification from the PCI bus enumerator to the platform for each PCI\r

   /// controller at several predefined points during PCI controller initialization.\r
   /// controller at several predefined points during PCI controller initialization.\r

-  /// \r
+  ///\r

   EFI_PCI_PLATFORM_PREPROCESS_CONTROLLER PlatformPrepController;\r
   EFI_PCI_PLATFORM_PREPROCESS_CONTROLLER PlatformPrepController;\r

-  /// \r
+  ///\r

   /// Retrieves the platform policy regarding enumeration.\r
   ///\r
   EFI_PCI_PLATFORM_GET_PLATFORM_POLICY   GetPlatformPolicy;\r
   /// Retrieves the platform policy regarding enumeration.\r
   ///\r
   EFI_PCI_PLATFORM_GET_PLATFORM_POLICY   GetPlatformPolicy;\r

diff --git a/MdePkg/Include/Protocol/PciRootBridgeIo.h b/MdePkg/Include/Protocol/PciRootBridgeIo.h
index fed5385b9d6bc616f8216d4afba7de411632fbf1..c1fc6d08f7958d4825602fc9a0de7956a5977bed 100644 (file)
--- a/MdePkg/Include/Protocol/PciRootBridgeIo.h
+++ b/MdePkg/Include/Protocol/PciRootBridgeIo.h
@@ -1,18 +1,18 @@
 /** @file\r
   PCI Root Bridge I/O protocol as defined in the UEFI 2.0 specification.\r
 \r
 /** @file\r
   PCI Root Bridge I/O protocol as defined in the UEFI 2.0 specification.\r
 \r

-  PCI Root Bridge I/O protocol is used by PCI Bus Driver to perform PCI Memory, PCI I/O, \r
-  and PCI Configuration cycles on a PCI Root Bridge. It also provides services to perform \r
+  PCI Root Bridge I/O protocol is used by PCI Bus Driver to perform PCI Memory, PCI I/O,\r
+  and PCI Configuration cycles on a PCI Root Bridge. It also provides services to perform\r

   defferent types of bus mastering DMA.\r
 \r
   defferent types of bus mastering DMA.\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


@@ -122,23 +122,23 @@ typedef struct {
   UINT32  ExtendedRegister;\r
 } EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS;\r
 \r
   UINT32  ExtendedRegister;\r
 } EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS;\r
 \r

-/**                                                                 \r
+/**\r

   Reads from the I/O space of a PCI Root Bridge. Returns when either the polling exit criteria is\r
   satisfied or after a defined duration.\r
   Reads from the I/O space of a PCI Root Bridge. Returns when either the polling exit criteria is\r
   satisfied or after a defined duration.\r

-          \r
+\r

   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Width                 Signifies the width of the memory or I/O operations.\r
   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Width                 Signifies the width of the memory or I/O operations.\r

-  @param  Address               The base address of the memory or I/O operations.  \r
+  @param  Address               The base address of the memory or I/O operations.\r

   @param  Mask                  Mask used for the polling criteria.\r
   @param  Value                 The comparison value used for the polling exit criteria.\r
   @param  Delay                 The number of 100 ns units to poll.\r
   @param  Result                Pointer to the last value read from the memory location.\r
   @param  Mask                  Mask used for the polling criteria.\r
   @param  Value                 The comparison value used for the polling exit criteria.\r
   @param  Delay                 The number of 100 ns units to poll.\r
   @param  Result                Pointer to the last value read from the memory location.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The last data returned from the access matched the poll exit criteria.\r
   @retval EFI_TIMEOUT           Delay expired before a match occurred.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_SUCCESS           The last data returned from the access matched the poll exit criteria.\r
   @retval EFI_TIMEOUT           Delay expired before a match occurred.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r

-                                   \r
+\r

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


@@ -152,20 +152,20 @@ EFI_STATUS
   OUT UINT64                                   *Result\r
   );\r
 \r
   OUT UINT64                                   *Result\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Enables a PCI driver to access PCI controller registers in the PCI root bridge memory space.\r
   Enables a PCI driver to access PCI controller registers in the PCI root bridge memory space.\r

-          \r
+\r

   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Width                 Signifies the width of the memory operations.\r
   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Width                 Signifies the width of the memory operations.\r

-  @param  Address               The base address of the memory operations.                                  \r
+  @param  Address               The base address of the memory operations.\r

   @param  Count                 The number of memory operations to perform.\r
   @param  Buffer                For read operations, the destination buffer to store the results. For write\r
   @param  Count                 The number of memory operations to perform.\r
   @param  Buffer                For read operations, the destination buffer to store the results. For write\r

-                                operations, the source buffer to write data from.                          \r
-  \r
-  @retval EFI_SUCCESS           The data was read from or written to the PCI root bridge.  \r
+                                operations, the source buffer to write data from.\r
+\r
+  @retval EFI_SUCCESS           The data was read from or written to the PCI root bridge.\r

   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\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_INVALID_PARAMETER One or more parameters are invalid.\r

-                                   \r
+\r

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


@@ -188,20 +188,20 @@ typedef struct {
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_IO_MEM  Write;\r
 } EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_ACCESS;\r
 \r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_IO_MEM  Write;\r
 } EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_ACCESS;\r
 \r

-/**                                                                 \r
+/**\r

   Enables a PCI driver to copy one region of PCI root bridge memory space to another region of PCI\r
   Enables a PCI driver to copy one region of PCI root bridge memory space to another region of PCI\r

-  root bridge memory space.                                                                       \r
-            \r
+  root bridge memory space.\r
+\r

   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL instance.\r
   @param  Width                 Signifies the width of the memory operations.\r
   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL instance.\r
   @param  Width                 Signifies the width of the memory operations.\r

-  @param  DestAddress           The destination address of the memory operation.                                \r
-  @param  SrcAddress            The source address of the memory operation.                                \r
-  @param  Count                 The number of memory operations to perform.    \r
-                                \r
-  @retval EFI_SUCCESS           The data was copied from one memory region to another memory region.  \r
+  @param  DestAddress           The destination address of the memory operation.\r
+  @param  SrcAddress            The source address of the memory operation.\r
+  @param  Count                 The number of memory operations to perform.\r
+\r
+  @retval EFI_SUCCESS           The data was copied from one memory region to another memory region.\r

   @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r

-                                   \r
+\r

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


@@ -213,25 +213,25 @@ EFI_STATUS
   IN     UINTN                                    Count\r
   );\r
 \r
   IN     UINTN                                    Count\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Provides the PCI controller-specific addresses required to access system memory from a\r
   Provides the PCI controller-specific addresses required to access system memory from a\r

-  DMA bus master.                                                                        \r
-            \r
+  DMA bus master.\r
+\r

   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\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 PCI 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_PCI_ROOT_BRIDGE_IO_PROTOCOL.\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 PCI 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 PCI controller to use to\r
   @param  DeviceAddress         The resulting map address for the bus master PCI 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


@@ -244,16 +244,16 @@ 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
+\r

   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Mapping               The mapping value returned from Map().\r
   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Mapping               The mapping value returned from Map().\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The range was unmapped.\r
   @retval EFI_INVALID_PARAMETER Mapping is not a value that was returned by Map().\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_INVALID_PARAMETER Mapping is not a value that was returned by Map().\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


@@ -262,25 +262,25 @@ EFI_STATUS
   IN  VOID                                     *Mapping\r
   );\r
 \r
   IN  VOID                                     *Mapping\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Allocates pages that are suitable for an EfiPciOperationBusMasterCommonBuffer or\r
   Allocates pages that are suitable for an EfiPciOperationBusMasterCommonBuffer or\r

-  EfiPciOperationBusMasterCommonBuffer64 mapping.                                 \r
-            \r
+  EfiPciOperationBusMasterCommonBuffer64 mapping.\r
+\r

   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\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_PCI_ROOT_BRIDGE_IO_PROTOCOL.\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


@@ -293,17 +293,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
+\r

   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r

-  @param  Pages                 The number of pages to free.                                \r
-  @param  HostAddress           The base system memory address of the allocated range.                                    \r
-                                  \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


@@ -313,16 +313,16 @@ EFI_STATUS
   IN  VOID                                     *HostAddress\r
   );\r
 \r
   IN  VOID                                     *HostAddress\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Flushes all PCI posted write transactions from a PCI host bridge to system memory.\r
   Flushes all PCI posted write transactions from a PCI host bridge to system memory.\r

-            \r
+\r

   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The PCI posted write transactions were flushed from the PCI host\r
   @retval EFI_SUCCESS           The PCI posted write transactions were flushed from the PCI host\r

-                                bridge to system memory.                                        \r
+                                bridge to system memory.\r

   @retval EFI_DEVICE_ERROR      The PCI posted write transactions were not flushed from the PCI\r
   @retval EFI_DEVICE_ERROR      The PCI posted write transactions were not flushed from the PCI\r

-                                host bridge due to a hardware error.                           \r
-                                     \r
+                                host bridge due to a hardware error.\r
+\r

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


@@ -330,23 +330,23 @@ EFI_STATUS
   IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *This\r
   );\r
 \r
   IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *This\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Gets the attributes that a PCI root bridge supports setting with SetAttributes(), and the\r
   Gets the attributes that a PCI root bridge supports setting with SetAttributes(), and the\r

-  attributes that a PCI root bridge is currently using.                                    \r
-            \r
+  attributes that a PCI root bridge is currently using.\r
+\r

   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Supports              A pointer to the mask of attributes that this PCI root bridge supports\r
   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Supports              A pointer to the mask of attributes that this PCI root bridge supports\r

-                                setting with SetAttributes().                                         \r
+                                setting with SetAttributes().\r

   @param  Attributes            A pointer to the mask of attributes that this PCI root bridge is currently\r
   @param  Attributes            A pointer to the mask of attributes that this PCI root bridge is currently\r

-                                using.                                                                      \r
-                                \r
-  @retval EFI_SUCCESS           If Supports is not NULL, then the attributes that the PCI root     \r
-                                bridge supports is returned in Supports. If Attributes is          \r
+                                using.\r
+\r
+  @retval EFI_SUCCESS           If Supports is not NULL, then the attributes that the PCI root\r
+                                bridge supports is returned in Supports. If Attributes is\r

                                 not NULL, then the attributes that the PCI root bridge is currently\r
                                 not NULL, then the attributes that the PCI root bridge is currently\r

-                                using is returned in Attributes.                                   \r
+                                using is returned in Attributes.\r

   @retval EFI_INVALID_PARAMETER Both Supports and Attributes are NULL.\r
   @retval EFI_INVALID_PARAMETER Both Supports and Attributes are NULL.\r

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

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


@@ -356,26 +356,26 @@ EFI_STATUS
   OUT UINT64                                   *Attributes\r
   );\r
 \r
   OUT UINT64                                   *Attributes\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Sets attributes for a resource range on a PCI root bridge.\r
   Sets attributes for a resource range on a PCI root bridge.\r

-            \r
+\r

   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Attributes            The mask of attributes to set.\r
   @param  ResourceBase          A pointer to the base address of the resource range to be modified by the\r
                                 attributes specified by Attributes.\r
   @param  ResourceLength        A pointer to the length of the resource range to be modified by the\r
   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Attributes            The mask of attributes to set.\r
   @param  ResourceBase          A pointer to the base address of the resource range to be modified by the\r
                                 attributes specified by Attributes.\r
   @param  ResourceLength        A pointer to the length of the resource range to be modified by the\r

-                                attributes specified by Attributes.                                                                                                              \r
-                                \r
-  @retval EFI_SUCCESS           The set of attributes specified by Attributes for the resource   \r
-                                range specified by ResourceBase and ResourceLength               \r
+                                attributes specified by Attributes.\r
+\r
+  @retval EFI_SUCCESS           The set of attributes specified by Attributes for the resource\r
+                                range specified by ResourceBase and ResourceLength\r

                                 were set on the PCI root bridge, and the actual resource range is\r
                                 were set on the PCI root bridge, and the actual resource range is\r

-                                returned in ResuourceBase and ResourceLength.                    \r
+                                returned in ResuourceBase and ResourceLength.\r

   @retval EFI_UNSUPPORTED       A bit is set in Attributes that is not supported by the PCI Root\r
   @retval EFI_UNSUPPORTED       A bit is set in Attributes that is not supported by the PCI Root\r

-                                Bridge.                                                         \r
-  @retval EFI_OUT_OF_RESOURCES  There are not enough resources to set the attributes on the                              \r
-                                resource range specified by BaseAddress and Length.        \r
-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.                               \r
-                                     \r
+                                Bridge.\r
+  @retval EFI_OUT_OF_RESOURCES  There are not enough resources to set the attributes on the\r
+                                resource range specified by BaseAddress and Length.\r
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
+\r

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


@@ -386,10 +386,10 @@ EFI_STATUS
   IN OUT UINT64                                   *ResourceLength\r
   );\r
 \r
   IN OUT UINT64                                   *ResourceLength\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves the current resource settings of this PCI root bridge in the form of a set of ACPI\r
   resource descriptors.\r
   Retrieves the current resource settings of this PCI root bridge in the form of a set of ACPI\r
   resource descriptors.\r

-            \r
+\r

   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Resources             A pointer to the resource descriptors that describe the current\r
                                 configuration of this PCI root bridge.\r
   @param  This                  A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.\r
   @param  Resources             A pointer to the resource descriptors that describe the current\r
                                 configuration of this PCI root bridge.\r


@@ -408,8 +408,8 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// Provides the basic Memory, I/O, PCI configuration, and DMA interfaces that are \r
-/// used to abstract accesses to PCI controllers behind a PCI Root Bridge Controller. \r
+/// Provides the basic Memory, I/O, PCI configuration, and DMA interfaces that are\r
+/// used to abstract accesses to PCI controllers behind a PCI Root Bridge Controller.\r

 ///\r
 struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL {\r
   ///\r
 ///\r
 struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL {\r
   ///\r


@@ -430,7 +430,7 @@ struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL {
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GET_ATTRIBUTES  GetAttributes;\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_SET_ATTRIBUTES  SetAttributes;\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_CONFIGURATION   Configuration;\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GET_ATTRIBUTES  GetAttributes;\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_SET_ATTRIBUTES  SetAttributes;\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_CONFIGURATION   Configuration;\r

-  \r
+\r

   ///\r
   /// The segment number that this PCI root bridge resides.\r
   ///\r
   ///\r
   /// The segment number that this PCI root bridge resides.\r
   ///\r

diff --git a/MdePkg/Include/Protocol/PlatformDriverOverride.h b/MdePkg/Include/Protocol/PlatformDriverOverride.h
index 0fe42fc0a6742ea9901fba2d658ee0ea3e0d9a05..ee97e060dcb8da0a7392e081c2243bf9a2a07a05 100644 (file)
--- a/MdePkg/Include/Protocol/PlatformDriverOverride.h
+++ b/MdePkg/Include/Protocol/PlatformDriverOverride.h
@@ -1,14 +1,14 @@
 /** @file\r
   Platform Driver Override protocol as defined in the UEFI 2.1 specification.\r
 \r
 /** @file\r
   Platform Driver Override protocol as defined in the UEFI 2.1 specification.\r
 \r

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


@@ -29,24 +29,24 @@ typedef struct _EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL  EFI_PLATFORM_DRIVER_OVERR
 // Prototypes for the Platform Driver Override Protocol\r
 //\r
 \r
 // Prototypes for the Platform Driver Override Protocol\r
 //\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves the image handle of the platform override driver for a controller in the system.\r
   Retrieves the image handle of the platform override driver for a controller in the system.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_PLATFORM_DRIVER_OVERRIDE_\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  DriverImageHandle     On input, a pointer to the previous driver image handle returned\r
   @param  DriverImageHandle     On input, a pointer to the previous driver image handle returned\r

-                                by GetDriver(). On output, a pointer to the next driver         \r
-                                image handle.                                                   \r
-                                \r
+                                by GetDriver(). On output, a pointer to the next driver\r
+                                image handle.\r
+\r

   @retval EFI_SUCCESS           The driver override for ControllerHandle was returned in\r
   @retval EFI_SUCCESS           The driver override for ControllerHandle was returned in\r

-                                DriverImageHandle.                                      \r
+                                DriverImageHandle.\r

   @retval EFI_NOT_FOUND         A driver override for ControllerHandle was not found.\r
   @retval EFI_INVALID_PARAMETER The handle specified by ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER DriverImageHandle is not a handle that was returned on a\r
   @retval EFI_NOT_FOUND         A driver override for ControllerHandle was not found.\r
   @retval EFI_INVALID_PARAMETER The handle specified by ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER DriverImageHandle is not a handle that was returned on a\r

-                                previous call to GetDriver().                           \r
-                                   \r
+                                previous call to GetDriver().\r
+\r

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


@@ -56,25 +56,25 @@ EFI_STATUS
   IN OUT EFI_HANDLE                                     *DriverImageHandle\r
   );\r
 \r
   IN OUT EFI_HANDLE                                     *DriverImageHandle\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves the device path of the platform override driver for a controller in the system.\r
   Retrieves the device path of the platform override driver for a controller in the system.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL instance.\r
   @param  ControllerHandle      The device handle of the controller to check if a driver override\r
   @param  This                  A pointer to the EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL instance.\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_SUCCESS           The driver override for ControllerHandle was returned in\r
   @retval EFI_SUCCESS           The driver override for ControllerHandle was returned in\r

-                                DriverImageHandle.                                      \r
-  @retval EFI_UNSUPPORTED       The operation is not supported.                                \r
+                                DriverImageHandle.\r
+  @retval EFI_UNSUPPORTED       The operation is not supported.\r

   @retval EFI_NOT_FOUND         A driver override for ControllerHandle was not found.\r
   @retval EFI_INVALID_PARAMETER The handle specified by ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER DriverImagePath is not a device path that was returned on a\r
   @retval EFI_NOT_FOUND         A driver override for ControllerHandle was not found.\r
   @retval EFI_INVALID_PARAMETER The handle specified by ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER DriverImagePath is not a device path that was returned on a\r

-                                previous call to GetDriverPath().                          \r
-                                   \r
+                                previous call to GetDriverPath().\r
+\r

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


@@ -84,31 +84,31 @@ EFI_STATUS
   IN OUT EFI_DEVICE_PATH_PROTOCOL                       **DriverImagePath\r
   );\r
 \r
   IN OUT EFI_DEVICE_PATH_PROTOCOL                       **DriverImagePath\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Used to associate a driver image handle with a device path that was returned on a prior call to the\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
-  GetDriver() service.                                                                               \r
-    \r
+  GetDriverPath() service. This driver image handle will then be available through the\r
+  GetDriver() service.\r
+\r

   @param  This                  A pointer to the EFI_PLATFORM_DRIVER_OVERRIDE_\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
-  @retval EFI_SUCCESS           The association between DriverImagePath and                   \r
+                                when the driver specified by DriverImagePath was loaded\r
+                                into memory.\r
+\r
+  @retval EFI_SUCCESS           The association between DriverImagePath and\r

                                 DriverImageHandle was established for the controller specified\r
                                 DriverImageHandle was established for the controller specified\r

-                                by ControllerHandle.                                                                            \r
-  @retval EFI_UNSUPPORTED       The operation is not supported.                                \r
+                                by ControllerHandle.\r
+  @retval EFI_UNSUPPORTED       The operation is not supported.\r

   @retval EFI_NOT_FOUND         DriverImagePath is not a device path that was returned on a prior\r
   @retval EFI_NOT_FOUND         DriverImagePath is not a device path that was returned on a prior\r

-                                call to GetDriverPath() for the controller specified by          \r
-                                ControllerHandle.                                                \r
+                                call to GetDriverPath() for the controller specified by\r
+                                ControllerHandle.\r

   @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER DriverImagePath is not a valid device path.\r
   @retval EFI_INVALID_PARAMETER DriverImageHandle is not a valid image handle.\r
   @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER DriverImagePath is not a valid device path.\r
   @retval EFI_INVALID_PARAMETER DriverImageHandle is not a valid image handle.\r

-                                   \r
+\r

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


@@ -120,13 +120,13 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// This protocol matches one or more drivers to a controller. A platform driver \r
-/// produces this protocol, and it is installed on a separate handle. This protocol \r
-/// is used by the ConnectController() boot service to select the best driver \r
-/// for a controller. All of the drivers returned by this protocol have a higher \r
-/// precedence than drivers found from an EFI Bus Specific Driver Override Protocol \r
-/// or drivers found from the general UEFI driver Binding search algorithm. If more \r
-/// than one driver is returned by this protocol, then the drivers are returned in \r
+/// This protocol matches one or more drivers to a controller. A platform driver\r
+/// produces this protocol, and it is installed on a separate handle. This protocol\r
+/// is used by the ConnectController() boot service to select the best driver\r
+/// for a controller. All of the drivers returned by this protocol have a higher\r
+/// precedence than drivers found from an EFI Bus Specific Driver Override Protocol\r
+/// or drivers found from the general UEFI driver Binding search algorithm. If more\r
+/// than one driver is returned by this protocol, then the drivers are returned in\r

 /// order from highest precedence to lowest precedence.\r
 ///\r
 struct _EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL {\r
 /// order from highest precedence to lowest precedence.\r
 ///\r
 struct _EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/PlatformToDriverConfiguration.h b/MdePkg/Include/Protocol/PlatformToDriverConfiguration.h
index 4756af45160011d88c154730f55a46a4455cb044..91e0454d7a2ccdcb41d5d2cd93447ebe999d8779 100644 (file)
--- a/MdePkg/Include/Protocol/PlatformToDriverConfiguration.h
+++ b/MdePkg/Include/Protocol/PlatformToDriverConfiguration.h
@@ -1,18 +1,18 @@
 /** @file\r
   UEFI Platform to Driver Configuration Protocol is defined in UEFI specification.\r
 /** @file\r
   UEFI Platform to Driver Configuration Protocol is defined in UEFI specification.\r

-  \r
-  This is a protocol that is optionally produced by the platform and optionally consumed \r
-  by a UEFI Driver in its Start() function. This protocol allows the driver to receive \r
+\r
+  This is a protocol that is optionally produced by the platform and optionally consumed\r
+  by a UEFI Driver in its Start() function. This protocol allows the driver to receive\r

   configuration information as part of being started.\r
 \r
   configuration information as part of being started.\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


@@ -58,10 +58,10 @@ typedef struct _EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL EFI_PLATFORM_TO_DR
   increment the Instance value by one for each successive call to Query.\r
 \r
   @param This                 A pointer to the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL instance.\r
   increment the Instance value by one for each successive call to Query.\r
 \r
   @param This                 A pointer to the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL instance.\r

-  \r
+\r

   @param ControllerHandle     The handle the platform will return\r
                               configuration information about.\r
   @param ControllerHandle     The handle the platform will return\r
                               configuration information about.\r

-  \r
+\r

   @param ChildHandle          The handle of the child controller to\r
                               return information on. This is an optional\r
                               parameter that may be NULL. It will be\r
   @param ChildHandle          The handle of the child controller to\r
                               return information on. This is an optional\r
                               parameter that may be NULL. It will be\r


@@ -70,8 +70,8 @@ typedef struct _EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL EFI_PLATFORM_TO_DR
                               the bus controller. It will not be NULL\r
                               for a bus driver that attempts to get\r
                               options for one of its child controllers.\r
                               the bus controller. It will not be NULL\r
                               for a bus driver that attempts to get\r
                               options for one of its child controllers.\r

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

   @param Instance             Pointer to the Instance value. Zero means\r
                               return the first query data. The caller should\r
                               increment this value by one each time to retrieve\r
   @param Instance             Pointer to the Instance value. Zero means\r
                               return the first query data. The caller should\r
                               increment this value by one each time to retrieve\r


@@ -148,26 +148,26 @@ typedef enum {
   ///  configuration settings.\r
   ///\r
   EfiPlatformConfigurationActionNone              = 0,\r
   ///  configuration settings.\r
   ///\r
   EfiPlatformConfigurationActionNone              = 0,\r

-  \r
+\r

   ///\r
   ///  The driver has detected that the controller specified\r
   ///\r
   ///  The driver has detected that the controller specified\r

-  ///  by ControllerHandle is not in a usable state and \r
+  ///  by ControllerHandle is not in a usable state and\r

   ///  needs to be stopped. The calling agent can use the\r
   ///  DisconnectControservice to perform this operation, and\r
   ///  needs to be stopped. The calling agent can use the\r
   ///  DisconnectControservice to perform this operation, and\r

-  ///  it should be performed as soon as possible.  \r
+  ///  it should be performed as soon as possible.\r

   ///\r
   EfiPlatformConfigurationActionStopController    = 1,\r
   ///\r
   EfiPlatformConfigurationActionStopController    = 1,\r

-  \r
+\r

   ///\r
   ///  This controller specified by ControllerHandle needs to\r
   ///  be stopped and restarted before it can be used again.\r
   ///  The calling agent can use the DisconnectController()\r
   ///  and ConnectController() services to perform this\r
   ///  operation. The restart operation can be delayed until\r
   ///\r
   ///  This controller specified by ControllerHandle needs to\r
   ///  be stopped and restarted before it can be used again.\r
   ///  The calling agent can use the DisconnectController()\r
   ///  and ConnectController() services to perform this\r
   ///  operation. The restart operation can be delayed until\r

-  ///  all of the configuration options have been set.  \r
+  ///  all of the configuration options have been set.\r

   ///\r
   EfiPlatformConfigurationActionRestartController = 2,\r
   ///\r
   EfiPlatformConfigurationActionRestartController = 2,\r

-  \r
+\r

   ///\r
   ///  A configuration change has been made that requires the\r
   ///  platform to be restarted before the controller\r
   ///\r
   ///  A configuration change has been made that requires the\r
   ///  platform to be restarted before the controller\r


@@ -175,7 +175,7 @@ typedef enum {
   ///  calling agent can use the ResetSystem() services to\r
   ///  perform this operation. The restart operation can be\r
   ///  delayed until all of the configuration options have\r
   ///  calling agent can use the ResetSystem() services to\r
   ///  perform this operation. The restart operation can be\r
   ///  delayed until all of the configuration options have\r

-  ///  been set.  \r
+  ///  been set.\r

   ///\r
   EfiPlatformConfigurationActionRestartPlatform   = 3,\r
 \r
   ///\r
   EfiPlatformConfigurationActionRestartPlatform   = 3,\r
 \r


@@ -188,8 +188,8 @@ typedef enum {
   ///  are required before this controller can be used again\r
   ///  with the updated configuration settings, but these\r
   ///  configuration settings are not guaranteed to persist\r
   ///  are required before this controller can be used again\r
   ///  with the updated configuration settings, but these\r
   ///  configuration settings are not guaranteed to persist\r

-  ///  after ControllerHandle is stopped. \r
-  /// \r
+  ///  after ControllerHandle is stopped.\r
+  ///\r

   EfiPlatformConfigurationActionNvramFailed       = 4,\r
 \r
   ///\r
   EfiPlatformConfigurationActionNvramFailed       = 4,\r
 \r
   ///\r


@@ -249,17 +249,17 @@ typedef enum {
   @param ConfigurationAction The driver tells the platform what\r
                              action is required for ParameterBlock to\r
                              take effect.\r
   @param ConfigurationAction The driver tells the platform what\r
                              action is required for ParameterBlock to\r
                              take effect.\r

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

   @retval EFI_SUCCESS           The platform return parameter information\r
                                 for ControllerHandle.\r
   @retval EFI_SUCCESS           The platform return parameter information\r
                                 for ControllerHandle.\r

-  \r
+\r

   @retval EFI_NOT_FOUND         Instance was not found.\r
   @retval EFI_NOT_FOUND         Instance was not found.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.\r

- \r
+\r

   @retval EFI_INVALID_PARAMETER Instance is zero.\r
   @retval EFI_INVALID_PARAMETER Instance is zero.\r

-  \r
+\r

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


@@ -298,7 +298,7 @@ struct _EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL {
   {0x345ecc0e, 0xcb6, 0x4b75, { 0xbb, 0x57, 0x1b, 0x12, 0x9c, 0x47, 0x33,0x3e } }\r
 \r
 /**\r
   {0x345ecc0e, 0xcb6, 0x4b75, { 0xbb, 0x57, 0x1b, 0x12, 0x9c, 0x47, 0x33,0x3e } }\r
 \r
 /**\r

-   \r
+\r

   ParameterTypeGuid provides the support for parameters\r
   communicated through the DMTF SM CLP Specification 1.0 Final\r
   Standard to be used to configure the UEFI driver. In this\r
   ParameterTypeGuid provides the support for parameters\r
   communicated through the DMTF SM CLP Specification 1.0 Final\r
   Standard to be used to configure the UEFI driver. In this\r


@@ -311,8 +311,8 @@ struct _EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL {
 **/\r
 typedef struct {\r
   CHAR8   *CLPCommand;        ///<  A pointer to the null-terminated UTF-8 string that specifies the DMTF SM CLP command\r
 **/\r
 typedef struct {\r
   CHAR8   *CLPCommand;        ///<  A pointer to the null-terminated UTF-8 string that specifies the DMTF SM CLP command\r

-                              ///<  line that the driver is required to parse and process when this function is called. \r
-                              ///<  See the DMTF SM CLP Specification 1.0 Final Standard for details on the \r
+                              ///<  line that the driver is required to parse and process when this function is called.\r
+                              ///<  See the DMTF SM CLP Specification 1.0 Final Standard for details on the\r

                               ///<  format and syntax of the CLP command line string. CLPCommand buffer\r
                               ///<  is allocated by the producer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOOL.\r
   UINT32  CLPCommandLength;   ///< The length of the CLP Command in bytes.\r
                               ///<  format and syntax of the CLP command line string. CLPCommand buffer\r
                               ///<  is allocated by the producer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOOL.\r
   UINT32  CLPCommandLength;   ///< The length of the CLP Command in bytes.\r


@@ -329,20 +329,20 @@ typedef struct {
                               ///<  the SM CLP Coutput option requested by the caller is not supported by the\r
                               ///<  UEFI Driver). CLPReturnString buffer is allocated by the consumer of the\r
                               ///<  EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC OL and undefined prior to the call to\r
                               ///<  the SM CLP Coutput option requested by the caller is not supported by the\r
                               ///<  UEFI Driver). CLPReturnString buffer is allocated by the consumer of the\r
                               ///<  EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC OL and undefined prior to the call to\r

-                              ///<  Response().  \r
+                              ///<  Response().\r

   UINT32  CLPReturnStringLength; ///< The length of the CLP return status string in bytes.\r
   UINT8   CLPCmdStatus;       ///<  SM CLP Command Status (see DMTF SM CLP Specification 1.0 Final Standard -\r
                               ///<  Table 4) CLPErrorValue SM CLP Processing Error Value (see DMTF SM\r
                               ///<  CLP Specification 1.0 Final Standard - Table 6). This field is filled in by\r
   UINT32  CLPReturnStringLength; ///< The length of the CLP return status string in bytes.\r
   UINT8   CLPCmdStatus;       ///<  SM CLP Command Status (see DMTF SM CLP Specification 1.0 Final Standard -\r
                               ///<  Table 4) CLPErrorValue SM CLP Processing Error Value (see DMTF SM\r
                               ///<  CLP Specification 1.0 Final Standard - Table 6). This field is filled in by\r

-                              ///<  the consumer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC \r
-                              ///<  OL and undefined prior to the call to Response().  \r
+                              ///<  the consumer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC\r
+                              ///<  OL and undefined prior to the call to Response().\r

   UINT8   CLPErrorValue;      ///<  SM CLP Processing Error Value (see DMTF SM CLP Specification 1.0 Final Standard - Table 6).\r
   UINT8   CLPErrorValue;      ///<  SM CLP Processing Error Value (see DMTF SM CLP Specification 1.0 Final Standard - Table 6).\r

-                              ///<  This field is filled in by the consumer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL and undefined prior to the call to Response().                              \r
+                              ///<  This field is filled in by the consumer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL and undefined prior to the call to Response().\r

   UINT16  CLPMsgCode;         ///<  Bit 15: OEM Message Code Flag 0 = Message Code is an SM CLP Probable\r
                               ///<  Cause Value. (see SM CLP Specification Table 11) 1 = Message Code is OEM\r
                               ///<  Specific Bits 14-0: Message Code This field is filled in by the consumer of\r
                               ///<  the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC OL and undefined prior to the call to\r
   UINT16  CLPMsgCode;         ///<  Bit 15: OEM Message Code Flag 0 = Message Code is an SM CLP Probable\r
                               ///<  Cause Value. (see SM CLP Specification Table 11) 1 = Message Code is OEM\r
                               ///<  Specific Bits 14-0: Message Code This field is filled in by the consumer of\r
                               ///<  the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC OL and undefined prior to the call to\r

-                              ///<  Response(). \r
+                              ///<  Response().\r

 \r
 } EFI_CONFIGURE_CLP_PARAMETER_BLK;\r
 \r
 \r
 } EFI_CONFIGURE_CLP_PARAMETER_BLK;\r
 \r

diff --git a/MdePkg/Include/Protocol/PxeBaseCode.h b/MdePkg/Include/Protocol/PxeBaseCode.h
index 7cef457374c0259276364cb3c57d91bfa9293f47..d0fa29346b0d1e8312d75c8bf5267f76c7820d1d 100644 (file)
--- a/MdePkg/Include/Protocol/PxeBaseCode.h
+++ b/MdePkg/Include/Protocol/PxeBaseCode.h
@@ -1,18 +1,18 @@
 /** @file\r
 /** @file\r

-  EFI PXE Base Code Protocol definitions, which is used to access PXE-compatible \r
+  EFI PXE Base Code Protocol definitions, which is used to access PXE-compatible\r

   devices for network access and network booting.\r
 \r
   devices for network access and network booting.\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
-    \r
-THE PROGRAM 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
 \r

-  @par Revision Reference:          \r
-  This Protocol is introduced in EFI Specification 1.10.           \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+  @par Revision Reference:\r
+  This Protocol is introduced in EFI Specification 1.10.\r

 \r
 **/\r
 #ifndef __PXE_BASE_CODE_PROTOCOL_H__\r
 \r
 **/\r
 #ifndef __PXE_BASE_CODE_PROTOCOL_H__\r


@@ -30,7 +30,7 @@ typedef struct _EFI_PXE_BASE_CODE_PROTOCOL  EFI_PXE_BASE_CODE_PROTOCOL;
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r

-/// \r
+///\r

 typedef EFI_PXE_BASE_CODE_PROTOCOL  EFI_PXE_BASE_CODE;\r
 \r
 ///\r
 typedef EFI_PXE_BASE_CODE_PROTOCOL  EFI_PXE_BASE_CODE;\r
 \r
 ///\r


@@ -146,14 +146,14 @@ typedef UINT16  EFI_PXE_BASE_CODE_UDP_PORT;
 #define EFI_PXE_BASE_CODE_BOOT_LAYER_INITIAL  0x0000\r
 \r
 //\r
 #define EFI_PXE_BASE_CODE_BOOT_LAYER_INITIAL  0x0000\r
 \r
 //\r

-// PXE Tag definition that identifies the processor \r
+// PXE Tag definition that identifies the processor\r

 // and programming environment of the client system.\r
 // These identifiers are defined by IETF:\r
 // http://www.ietf.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml\r
 //\r
 #if defined (MDE_CPU_IA32)\r
 #define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE    0x0006\r
 // and programming environment of the client system.\r
 // These identifiers are defined by IETF:\r
 // http://www.ietf.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml\r
 //\r
 #if defined (MDE_CPU_IA32)\r
 #define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE    0x0006\r

-#elif defined (MDE_CPU_IPF) \r
+#elif defined (MDE_CPU_IPF)\r

 #define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE    0x0002\r
 #elif defined (MDE_CPU_X64)\r
 #define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE    0x0007\r
 #define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE    0x0002\r
 #elif defined (MDE_CPU_X64)\r
 #define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE    0x0007\r


@@ -263,7 +263,7 @@ typedef union {
 \r
 ///\r
 /// EFI_PXE_BASE_CODE_MODE.\r
 \r
 ///\r
 /// EFI_PXE_BASE_CODE_MODE.\r

-/// The data values in this structure are read-only and \r
+/// The data values in this structure are read-only and\r

 /// are updated by the code that produces the\r
 /// EFI_PXE_BASE_CODE_PROTOCOL functions.\r
 ///\r
 /// are updated by the code that produces the\r
 /// EFI_PXE_BASE_CODE_PROTOCOL functions.\r
 ///\r


@@ -308,7 +308,7 @@ typedef struct {
 // PXE Base Code Interface Function definitions\r
 //\r
 \r
 // PXE Base Code Interface Function definitions\r
 //\r
 \r

-/**                                                                 \r
+/**\r

   Enables the use of the PXE Base Code Protocol functions.\r
 \r
   This function enables the use of the PXE Base Code Protocol functions. If the\r
   Enables the use of the PXE Base Code Protocol functions.\r
 \r
   This function enables the use of the PXE Base Code Protocol functions. If the\r


@@ -355,22 +355,22 @@ typedef struct {
     TftpErrorZero-filled.\r
     MakeCallbacksSet to TRUE if the PXE Base Code Callback Protocol is available.\r
     Set to FALSE if the PXE Base Code Callback Protocol is not available.\r
     TftpErrorZero-filled.\r
     MakeCallbacksSet to TRUE if the PXE Base Code Callback Protocol is available.\r
     Set to FALSE if the PXE Base Code Callback Protocol is not available.\r

-    \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  UseIpv6               Specifies the type of IP addresses that are to be used during the session\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  UseIpv6               Specifies the type of IP addresses that are to be used during the session\r

-                                that is being started. Set to TRUE for IPv6 addresses, and FALSE for     \r
-                                IPv4 addresses.                                                                                                   \r
-                                \r
+                                that is being started. Set to TRUE for IPv6 addresses, and FALSE for\r
+                                IPv4 addresses.\r
+\r

   @retval EFI_SUCCESS           The PXE Base Code Protocol was started.\r
   @retval EFI_SUCCESS           The PXE Base Code Protocol was started.\r

-  @retval EFI_DEVICE_ERROR      The network device encountered an error during this oper  \r
+  @retval EFI_DEVICE_ERROR      The network device encountered an error during this oper\r

   @retval EFI_UNSUPPORTED       UseIpv6 is TRUE, but the Ipv6Supported field of the\r
   @retval EFI_UNSUPPORTED       UseIpv6 is TRUE, but the Ipv6Supported field of the\r

-                                EFI_PXE_BASE_CODE_MODE structure is FALSE.  \r
-  @retval EFI_ALREADY_STARTED   The PXE Base Code Protocol is already in the started state.                                   \r
+                                EFI_PXE_BASE_CODE_MODE structure is FALSE.\r
+  @retval EFI_ALREADY_STARTED   The PXE Base Code Protocol is already in the started state.\r

   @retval EFI_INVALID_PARAMETER The This parameter is NULL or does not point to a valid\r
   @retval EFI_INVALID_PARAMETER The This parameter is NULL or does not point to a valid\r

-                                EFI_PXE_BASE_CODE_PROTOCOL structure.      \r
-  @retval EFI_OUT_OF_RESOURCES  Could not allocate enough memory or other resources to start the                                          \r
-                                PXE Base Code Protocol.                                         \r
-                                     \r
+                                EFI_PXE_BASE_CODE_PROTOCOL structure.\r
+  @retval EFI_OUT_OF_RESOURCES  Could not allocate enough memory or other resources to start the\r
+                                PXE Base Code Protocol.\r
+\r

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


@@ -379,22 +379,22 @@ EFI_STATUS
   IN BOOLEAN                               UseIpv6\r
   );\r
 \r
   IN BOOLEAN                               UseIpv6\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Disables the use of the PXE Base Code Protocol functions.\r
 \r
   This function stops all activity on the network device. All the resources allocated\r
   in Start() are released, the Started field of the EFI_PXE_BASE_CODE_MODE structure is\r
   set to FALSE and EFI_SUCCESS is returned. If the Started field of the EFI_PXE_BASE_CODE_MODE\r
   structure is already FALSE, then EFI_NOT_STARTED will be returned.\r
   Disables the use of the PXE Base Code Protocol functions.\r
 \r
   This function stops all activity on the network device. All the resources allocated\r
   in Start() are released, the Started field of the EFI_PXE_BASE_CODE_MODE structure is\r
   set to FALSE and EFI_SUCCESS is returned. If the Started field of the EFI_PXE_BASE_CODE_MODE\r
   structure is already FALSE, then EFI_NOT_STARTED will be returned.\r

-  \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r

- \r
+\r

   @retval EFI_SUCCESS           The PXE Base Code Protocol was stopped.\r
   @retval EFI_SUCCESS           The PXE Base Code Protocol was stopped.\r

-  @retval EFI_NOT_STARTED       The PXE Base Code Protocol is already in the stopped state.  \r
+  @retval EFI_NOT_STARTED       The PXE Base Code Protocol is already in the stopped state.\r

   @retval EFI_INVALID_PARAMETER The This parameter is NULL or does not point to a valid\r
   @retval EFI_INVALID_PARAMETER The This parameter is NULL or does not point to a valid\r

-                                EFI_PXE_BASE_CODE_PROTOCOL structure.                  \r
-  @retval EFI_DEVICE_ERROR      The network device encountered an error during this operation.                                \r
-                                     \r
+                                EFI_PXE_BASE_CODE_PROTOCOL structure.\r
+  @retval EFI_DEVICE_ERROR      The network device encountered an error during this operation.\r
+\r

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


@@ -402,7 +402,7 @@ EFI_STATUS
   IN EFI_PXE_BASE_CODE_PROTOCOL    *This\r
   );\r
 \r
   IN EFI_PXE_BASE_CODE_PROTOCOL    *This\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Attempts to complete a DHCPv4 D.O.R.A. (discover / offer / request / acknowledge) or DHCPv6\r
   S.A.R.R (solicit / advertise / request / reply) sequence.\r
 \r
   Attempts to complete a DHCPv4 D.O.R.A. (discover / offer / request / acknowledge) or DHCPv6\r
   S.A.R.R (solicit / advertise / request / reply) sequence.\r
 \r


@@ -418,22 +418,22 @@ EFI_STATUS
   caller. If the DHCP sequence does not complete, then EFI_TIMEOUT will be returned.\r
   If the Callback Protocol does not return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE,\r
   then the DHCP sequence will be stopped and EFI_ABORTED will be returned.\r
   caller. If the DHCP sequence does not complete, then EFI_TIMEOUT will be returned.\r
   If the Callback Protocol does not return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE,\r
   then the DHCP sequence will be stopped and EFI_ABORTED will be returned.\r

-    \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  SortOffers            TRUE if the offers received should be sorted. Set to FALSE to try the\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  SortOffers            TRUE if the offers received should be sorted. Set to FALSE to try the\r

-                                offers in the order that they are received.                          \r
- \r
+                                offers in the order that they are received.\r
+\r

   @retval EFI_SUCCESS           Valid DHCP has completed.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_INVALID_PARAMETER The This parameter is NULL or does not point to a valid\r
   @retval EFI_SUCCESS           Valid DHCP has completed.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_INVALID_PARAMETER The This parameter is NULL or does not point to a valid\r

-                                EFI_PXE_BASE_CODE_PROTOCOL structure.                  \r
-  @retval EFI_DEVICE_ERROR      The network device encountered an error during this operation.                                \r
+                                EFI_PXE_BASE_CODE_PROTOCOL structure.\r
+  @retval EFI_DEVICE_ERROR      The network device encountered an error during this operation.\r

   @retval EFI_OUT_OF_RESOURCES  Could not allocate enough memory to complete the DHCP Protocol.\r
   @retval EFI_ABORTED           The callback function aborted the DHCP Protocol.\r
   @retval EFI_TIMEOUT           The DHCP Protocol timed out.\r
   @retval EFI_ICMP_ERROR        An ICMP error packet was received during the DHCP session.\r
   @retval EFI_NO_RESPONSE       Valid PXE offer was not received.\r
   @retval EFI_OUT_OF_RESOURCES  Could not allocate enough memory to complete the DHCP Protocol.\r
   @retval EFI_ABORTED           The callback function aborted the DHCP Protocol.\r
   @retval EFI_TIMEOUT           The DHCP Protocol timed out.\r
   @retval EFI_ICMP_ERROR        An ICMP error packet was received during the DHCP session.\r
   @retval EFI_NO_RESPONSE       Valid PXE offer was not received.\r

-                                     \r
+\r

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


@@ -442,7 +442,7 @@ EFI_STATUS
   IN BOOLEAN                               SortOffers\r
   );\r
 \r
   IN BOOLEAN                               SortOffers\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Attempts to complete the PXE Boot Server and/or boot image discovery sequence.\r
 \r
   This function attempts to complete the PXE Boot Server and/or boot image discovery\r
   Attempts to complete the PXE Boot Server and/or boot image discovery sequence.\r
 \r
   This function attempts to complete the PXE Boot Server and/or boot image discovery\r


@@ -464,26 +464,26 @@ EFI_STATUS
   additional details on the implementation of the Discovery sequence.\r
   If the Callback Protocol does not return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE,\r
   then the Discovery sequence is stopped and EFI_ABORTED will be returned.\r
   additional details on the implementation of the Discovery sequence.\r
   If the Callback Protocol does not return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE,\r
   then the Discovery sequence is stopped and EFI_ABORTED will be returned.\r

-    \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  Type                  The type of bootstrap to perform.\r
   @param  Layer                 The pointer to the boot server layer number to discover, which must be\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  Type                  The type of bootstrap to perform.\r
   @param  Layer                 The pointer to the boot server layer number to discover, which must be\r

-                                PXE_BOOT_LAYER_INITIAL when a new server type is being            \r
-                                discovered.                                                       \r
-  @param  UseBis                TRUE if Boot Integrity Services are to be used. FALSE otherwise.                                \r
+                                PXE_BOOT_LAYER_INITIAL when a new server type is being\r
+                                discovered.\r
+  @param  UseBis                TRUE if Boot Integrity Services are to be used. FALSE otherwise.\r

   @param  Info                  The pointer to a data structure that contains additional information on the\r
   @param  Info                  The pointer to a data structure that contains additional information on the\r

-                                type of discovery operation that is to be performed.                   \r
-                                  \r
+                                type of discovery operation that is to be performed.\r
+\r

   @retval EFI_SUCCESS           The Discovery sequence has been completed.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_SUCCESS           The Discovery sequence has been completed.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r

-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.                                \r
-  @retval EFI_DEVICE_ERROR      The network device encountered an error during this operation.                                \r
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
+  @retval EFI_DEVICE_ERROR      The network device encountered an error during this operation.\r

   @retval EFI_OUT_OF_RESOURCES  Could not allocate enough memory to complete Discovery.\r
   @retval EFI_ABORTED           The callback function aborted the Discovery sequence.\r
   @retval EFI_TIMEOUT           The Discovery sequence timed out.\r
   @retval EFI_ICMP_ERROR        An ICMP error packet was received during the PXE discovery\r
   @retval EFI_OUT_OF_RESOURCES  Could not allocate enough memory to complete Discovery.\r
   @retval EFI_ABORTED           The callback function aborted the Discovery sequence.\r
   @retval EFI_TIMEOUT           The Discovery sequence timed out.\r
   @retval EFI_ICMP_ERROR        An ICMP error packet was received during the PXE discovery\r

-                                session.                                                  \r
-                                       \r
+                                session.\r
+\r

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


@@ -495,7 +495,7 @@ EFI_STATUS
   IN EFI_PXE_BASE_CODE_DISCOVER_INFO      *Info   OPTIONAL\r
   );\r
 \r
   IN EFI_PXE_BASE_CODE_DISCOVER_INFO      *Info   OPTIONAL\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Used to perform TFTP and MTFTP services.\r
 \r
   This function is used to perform TFTP and MTFTP services. This includes the\r
   Used to perform TFTP and MTFTP services.\r
 \r
   This function is used to perform TFTP and MTFTP services. This includes the\r


@@ -540,31 +540,31 @@ EFI_STATUS
   IP address preceding the filename of the form %d.%d.%d.%d for IP v4. The final\r
   entry is itself null-terminated, so that the final information string is terminated\r
   with two null octets.\r
   IP address preceding the filename of the form %d.%d.%d.%d for IP v4. The final\r
   entry is itself null-terminated, so that the final information string is terminated\r
   with two null octets.\r

-    \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  Operation             The type of operation to perform.\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  Operation             The type of operation to perform.\r

-  @param  BufferPtr             A pointer to the data buffer.                                                                     \r
+  @param  BufferPtr             A pointer to the data buffer.\r

   @param  Overwrite             Only used on write file operations. TRUE if a file on a remote server can\r
   @param  Overwrite             Only used on write file operations. TRUE if a file on a remote server can\r

-                                be overwritten.                                                          \r
+                                be overwritten.\r

   @param  BufferSize            For get-file-size operations, *BufferSize returns the size of the\r
   @param  BufferSize            For get-file-size operations, *BufferSize returns the size of the\r

-                                requested file.                                                  \r
+                                requested file.\r

   @param  BlockSize             The requested block size to be used during a TFTP transfer.\r
   @param  ServerIp              The TFTP / MTFTP server IP address.\r
   @param  Filename              A Null-terminated ASCII string that specifies a directory name or a file\r
   @param  BlockSize             The requested block size to be used during a TFTP transfer.\r
   @param  ServerIp              The TFTP / MTFTP server IP address.\r
   @param  Filename              A Null-terminated ASCII string that specifies a directory name or a file\r

-                                name.                                                                   \r
+                                name.\r

   @param  Info                  The pointer to the MTFTP information.\r
   @param  Info                  The pointer to the MTFTP information.\r

-  @param  DontUseBuffer         Set to FALSE for normal TFTP and MTFTP read file operation.                       \r
-                                  \r
+  @param  DontUseBuffer         Set to FALSE for normal TFTP and MTFTP read file operation.\r
+\r

   @retval EFI_SUCCESS           The TFTP/MTFTP operation was completed.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_SUCCESS           The TFTP/MTFTP operation was completed.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r

-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.                                \r
-  @retval EFI_DEVICE_ERROR      The network device encountered an error during this operation.                                \r
-  @retval EFI_BUFFER_TOO_SMALL  The buffer is not large enough to complete the read operation.   \r
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
+  @retval EFI_DEVICE_ERROR      The network device encountered an error during this operation.\r
+  @retval EFI_BUFFER_TOO_SMALL  The buffer is not large enough to complete the read operation.\r

   @retval EFI_ABORTED           The callback function aborted the TFTP/MTFTP operation.\r
   @retval EFI_TIMEOUT           The TFTP/MTFTP operation timed out.\r
   @retval EFI_ICMP_ERROR        An ICMP error packet was received during the MTFTP session.\r
   @retval EFI_TFTP_ERROR        A TFTP error packet was received during the MTFTP session.\r
   @retval EFI_ABORTED           The callback function aborted the TFTP/MTFTP operation.\r
   @retval EFI_TIMEOUT           The TFTP/MTFTP operation timed out.\r
   @retval EFI_ICMP_ERROR        An ICMP error packet was received during the MTFTP session.\r
   @retval EFI_TFTP_ERROR        A TFTP error packet was received during the MTFTP session.\r

-                                                                      \r
+\r

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


@@ -581,7 +581,7 @@ EFI_STATUS
   IN BOOLEAN                                   DontUseBuffer\r
   );\r
 \r
   IN BOOLEAN                                   DontUseBuffer\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Writes a UDP packet to the network interface.\r
 \r
   This function writes a UDP packet specified by the (optional HeaderPtr and)\r
   Writes a UDP packet to the network interface.\r
 \r
   This function writes a UDP packet specified by the (optional HeaderPtr and)\r


@@ -594,29 +594,29 @@ EFI_STATUS
   the IcmpErrorReceived field is set to TRUE, the IcmpError field is filled in and\r
   EFI_ICMP_ERROR will be returned. If the Callback Protocol does not return\r
   EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE, then EFI_ABORTED will be returned.\r
   the IcmpErrorReceived field is set to TRUE, the IcmpError field is filled in and\r
   EFI_ICMP_ERROR will be returned. If the Callback Protocol does not return\r
   EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE, then EFI_ABORTED will be returned.\r

-    \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r

-  @param  OpFlags               The UDP operation flags. \r
+  @param  OpFlags               The UDP operation flags.\r

   @param  DestIp                The destination IP address.\r
   @param  DestIp                The destination IP address.\r

-  @param  DestPort              The destination UDP port number.                                                                         \r
-  @param  GatewayIp             The gateway IP address.                                                 \r
+  @param  DestPort              The destination UDP port number.\r
+  @param  GatewayIp             The gateway IP address.\r

   @param  SrcIp                 The source IP address.\r
   @param  SrcPort               The source UDP port number.\r
   @param  HeaderSize            An optional field which may be set to the length of a header at\r
   @param  SrcIp                 The source IP address.\r
   @param  SrcPort               The source UDP port number.\r
   @param  HeaderSize            An optional field which may be set to the length of a header at\r

-                                HeaderPtr to be prefixed to the data at BufferPtr.             \r
+                                HeaderPtr to be prefixed to the data at BufferPtr.\r

   @param  HeaderPtr             If HeaderSize is not NULL, a pointer to a header to be prefixed to the\r
   @param  HeaderPtr             If HeaderSize is not NULL, a pointer to a header to be prefixed to the\r

-                                data at BufferPtr.                                                    \r
+                                data at BufferPtr.\r

   @param  BufferSize            A pointer to the size of the data at BufferPtr.\r
   @param  BufferPtr             A pointer to the data to be written.\r
   @param  BufferSize            A pointer to the size of the data at BufferPtr.\r
   @param  BufferPtr             A pointer to the data to be written.\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The UDP Write operation was completed.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_SUCCESS           The UDP Write operation was completed.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r

-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.                                \r
-  @retval EFI_BAD_BUFFER_SIZE   The buffer is too long to be transmitted.  \r
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
+  @retval EFI_BAD_BUFFER_SIZE   The buffer is too long to be transmitted.\r

   @retval EFI_ABORTED           The callback function aborted the UDP Write operation.\r
   @retval EFI_TIMEOUT           The UDP Write operation timed out.\r
   @retval EFI_ABORTED           The callback function aborted the UDP Write operation.\r
   @retval EFI_TIMEOUT           The UDP Write operation timed out.\r

-  @retval EFI_ICMP_ERROR        An ICMP error packet was received during the UDP write session.  \r
-                                                                      \r
+  @retval EFI_ICMP_ERROR        An ICMP error packet was received during the UDP write session.\r
+\r

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


@@ -634,7 +634,7 @@ EFI_STATUS
   IN VOID                                      *BufferPtr\r
   );\r
 \r
   IN VOID                                      *BufferPtr\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Reads a UDP packet from the network interface.\r
 \r
   This function reads a UDP packet from a network interface. The data contents\r
   Reads a UDP packet from the network interface.\r
 \r
   This function reads a UDP packet from a network interface. The data contents\r


@@ -649,28 +649,28 @@ EFI_STATUS
   Depending on the values of OpFlags and the DestIp, DestPort, SrcIp, and SrcPort\r
   input values, different types of UDP packet receive filtering will be performed.\r
   The following tables summarize these receive filter operations.\r
   Depending on the values of OpFlags and the DestIp, DestPort, SrcIp, and SrcPort\r
   input values, different types of UDP packet receive filtering will be performed.\r
   The following tables summarize these receive filter operations.\r

-    \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r

-  @param  OpFlags               The UDP operation flags. \r
+  @param  OpFlags               The UDP operation flags.\r

   @param  DestIp                The destination IP address.\r
   @param  DestPort              The destination UDP port number.\r
   @param  SrcIp                 The source IP address.\r
   @param  SrcPort               The source UDP port number.\r
   @param  HeaderSize            An optional field which may be set to the length of a header at\r
   @param  DestIp                The destination IP address.\r
   @param  DestPort              The destination UDP port number.\r
   @param  SrcIp                 The source IP address.\r
   @param  SrcPort               The source UDP port number.\r
   @param  HeaderSize            An optional field which may be set to the length of a header at\r

-                                HeaderPtr to be prefixed to the data at BufferPtr.             \r
+                                HeaderPtr to be prefixed to the data at BufferPtr.\r

   @param  HeaderPtr             If HeaderSize is not NULL, a pointer to a header to be prefixed to the\r
   @param  HeaderPtr             If HeaderSize is not NULL, a pointer to a header to be prefixed to the\r

-                                data at BufferPtr.                                                    \r
+                                data at BufferPtr.\r

   @param  BufferSize            A pointer to the size of the data at BufferPtr.\r
   @param  BufferPtr             A pointer to the data to be read.\r
   @param  BufferSize            A pointer to the size of the data at BufferPtr.\r
   @param  BufferPtr             A pointer to the data to be read.\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The UDP Read operation was completed.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_SUCCESS           The UDP Read operation was completed.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\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_DEVICE_ERROR      The network device encountered an error during this operation.\r
   @retval EFI_BUFFER_TOO_SMALL  The packet is larger than Buffer can hold.\r
   @retval EFI_ABORTED           The callback function aborted the UDP Read operation.\r
   @retval EFI_DEVICE_ERROR      The network device encountered an error during this operation.\r
   @retval EFI_BUFFER_TOO_SMALL  The packet is larger than Buffer can hold.\r
   @retval EFI_ABORTED           The callback function aborted the UDP Read operation.\r

-  @retval EFI_TIMEOUT           The UDP Read operation timed out.  \r
-                                                                      \r
+  @retval EFI_TIMEOUT           The UDP Read operation timed out.\r
+\r

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


@@ -687,9 +687,9 @@ EFI_STATUS
   IN VOID                                      *BufferPtr\r
   );\r
 \r
   IN VOID                                      *BufferPtr\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Updates the IP receive filters of a network device and enables software filtering.\r
   Updates the IP receive filters of a network device and enables software filtering.\r

-  \r
+\r

   The NewFilter field is used to modify the network device's current IP receive\r
   filter settings and to enable a software filter. This function updates the IpFilter\r
   field of the EFI_PXE_BASE_CODE_MODE structure with the contents of NewIpFilter.\r
   The NewFilter field is used to modify the network device's current IP receive\r
   filter settings and to enable a software filter. This function updates the IpFilter\r
   field of the EFI_PXE_BASE_CODE_MODE structure with the contents of NewIpFilter.\r


@@ -710,14 +710,14 @@ EFI_STATUS
   The IPlist field is used to enable IPs other than the StationIP. They may be\r
   multicast or unicast. If IPcnt is set as well as EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP,\r
   then both the StationIP and the IPs from the IPlist will be used.\r
   The IPlist field is used to enable IPs other than the StationIP. They may be\r
   multicast or unicast. If IPcnt is set as well as EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP,\r
   then both the StationIP and the IPs from the IPlist will be used.\r

-    \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  NewFilter             The pointer to the new set of IP receive filters.\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  NewFilter             The pointer to the new set of IP receive filters.\r

-  \r
+\r

   @retval EFI_SUCCESS           The IP receive filter settings were updated.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_SUCCESS           The IP receive filter settings were updated.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r

-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.                                  \r
-                                                                      \r
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
+\r

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


@@ -726,9 +726,9 @@ EFI_STATUS
   IN EFI_PXE_BASE_CODE_IP_FILTER           *NewFilter\r
   );\r
 \r
   IN EFI_PXE_BASE_CODE_IP_FILTER           *NewFilter\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Uses the ARP protocol to resolve a MAC address.\r
   Uses the ARP protocol to resolve a MAC address.\r

-  \r
+\r

   This function uses the ARP protocol to resolve a MAC address. The UsingIpv6 field\r
   of the EFI_PXE_BASE_CODE_MODE structure is used to determine if IPv4 or IPv6\r
   addresses are being used. The IP address specified by IpAddr is used to resolve\r
   This function uses the ARP protocol to resolve a MAC address. The UsingIpv6 field\r
   of the EFI_PXE_BASE_CODE_MODE structure is used to determine if IPv4 or IPv6\r
   addresses are being used. The IP address specified by IpAddr is used to resolve\r


@@ -741,19 +741,19 @@ EFI_STATUS
   to resolve an address, then EFI_TIMEOUT is returned. If the Callback Protocol\r
   does not return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE, then EFI_ABORTED is\r
   returned.\r
   to resolve an address, then EFI_TIMEOUT is returned. If the Callback Protocol\r
   does not return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE, then EFI_ABORTED is\r
   returned.\r

-    \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  IpAddr                The pointer to the IP address that is used to resolve a MAC address.\r
   @param  MacAddr               If not NULL, a pointer to the MAC address that was resolved with the\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  IpAddr                The pointer to the IP address that is used to resolve a MAC address.\r
   @param  MacAddr               If not NULL, a pointer to the MAC address that was resolved with the\r

-                                ARP protocol.                                                       \r
-                                  \r
+                                ARP protocol.\r
+\r

   @retval EFI_SUCCESS           The IP or MAC address was resolved.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_SUCCESS           The IP or MAC address was resolved.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r

-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.                                \r
-  @retval EFI_DEVICE_ERROR      The network device encountered an error during this operation.  \r
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
+  @retval EFI_DEVICE_ERROR      The network device encountered an error during this operation.\r

   @retval EFI_ABORTED           The callback function aborted the ARP Protocol.\r
   @retval EFI_TIMEOUT           The ARP Protocol encountered a timeout condition.\r
   @retval EFI_ABORTED           The callback function aborted the ARP Protocol.\r
   @retval EFI_TIMEOUT           The ARP Protocol encountered a timeout condition.\r

-                                                                      \r
+\r

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


@@ -763,9 +763,9 @@ EFI_STATUS
   IN EFI_MAC_ADDRESS                       *MacAddr OPTIONAL\r
   );\r
 \r
   IN EFI_MAC_ADDRESS                       *MacAddr OPTIONAL\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Updates the parameters that affect the operation of the PXE Base Code Protocol.\r
   Updates the parameters that affect the operation of the PXE Base Code Protocol.\r

-  \r
+\r

   This function sets parameters that affect the operation of the PXE Base Code Protocol.\r
   The parameter specified by NewAutoArp is used to control the generation of ARP\r
   protocol packets. If NewAutoArp is TRUE, then ARP Protocol packets will be generated\r
   This function sets parameters that affect the operation of the PXE Base Code Protocol.\r
   The parameter specified by NewAutoArp is used to control the generation of ARP\r
   protocol packets. If NewAutoArp is TRUE, then ARP Protocol packets will be generated\r


@@ -777,23 +777,23 @@ EFI_STATUS
   the EFI_PXE_BASE_CODE_MODE structure to NewAutoArp.\r
   The SetParameters() call must be invoked after a Callback Protocol is installed\r
   to enable the use of callbacks.\r
   the EFI_PXE_BASE_CODE_MODE structure to NewAutoArp.\r
   The SetParameters() call must be invoked after a Callback Protocol is installed\r
   to enable the use of callbacks.\r

-    \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  NewAutoArp            If not NULL, a pointer to a value that specifies whether to replace the\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  NewAutoArp            If not NULL, a pointer to a value that specifies whether to replace the\r

-                                current value of AutoARP.                                              \r
+                                current value of AutoARP.\r

   @param  NewSendGUID           If not NULL, a pointer to a value that specifies whether to replace the\r
   @param  NewSendGUID           If not NULL, a pointer to a value that specifies whether to replace the\r

-                                current value of SendGUID.                                             \r
+                                current value of SendGUID.\r

   @param  NewTTL                If not NULL, a pointer to be used in place of the current value of TTL,\r
   @param  NewTTL                If not NULL, a pointer to be used in place of the current value of TTL,\r

-                                the "time to live" field of the IP header.                           \r
+                                the "time to live" field of the IP header.\r

   @param  NewToS                If not NULL, a pointer to be used in place of the current value of ToS,\r
   @param  NewToS                If not NULL, a pointer to be used in place of the current value of ToS,\r

-                                the "type of service" field of the IP header.                        \r
+                                the "type of service" field of the IP header.\r

   @param  NewMakeCallback       If not NULL, a pointer to a value that specifies whether to replace the\r
   @param  NewMakeCallback       If not NULL, a pointer to a value that specifies whether to replace the\r

-                                current value of the MakeCallback field of the Mode structure.                                                                \r
-                                  \r
+                                current value of the MakeCallback field of the Mode structure.\r
+\r

   @retval EFI_SUCCESS           The new parameters values were updated.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_SUCCESS           The new parameters values were updated.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r

-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.                                  \r
-                                                                      \r
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
+\r

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


@@ -806,9 +806,9 @@ EFI_STATUS
   IN BOOLEAN                               *NewMakeCallback OPTIONAL\r
   );\r
 \r
   IN BOOLEAN                               *NewMakeCallback OPTIONAL\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Updates the station IP address and/or subnet mask values of a network device.\r
   Updates the station IP address and/or subnet mask values of a network device.\r

-  \r
+\r

   This function updates the station IP address and/or subnet mask values of a network\r
   device.\r
   The NewStationIp field is used to modify the network device's current IP address.\r
   This function updates the station IP address and/or subnet mask values of a network\r
   device.\r
   The NewStationIp field is used to modify the network device's current IP address.\r


@@ -819,15 +819,15 @@ EFI_STATUS
   mask. If NewSubnetMask is NULL, then the current subnet mask will not be modified.\r
   Otherwise, this function updates the SubnetMask field of the EFI_PXE_BASE_CODE_MODE\r
   structure with NewSubnetMask.\r
   mask. If NewSubnetMask is NULL, then the current subnet mask will not be modified.\r
   Otherwise, this function updates the SubnetMask field of the EFI_PXE_BASE_CODE_MODE\r
   structure with NewSubnetMask.\r

-    \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r

-  @param  NewStationIp          The pointer to the new IP address to be used by the network device.  \r
-  @param  NewSubnetMask         The pointer to the new subnet mask to be used by the network device.                                 \r
-                                  \r
+  @param  NewStationIp          The pointer to the new IP address to be used by the network device.\r
+  @param  NewSubnetMask         The pointer to the new subnet mask to be used by the network device.\r
+\r

   @retval EFI_SUCCESS           The new station IP address and/or subnet mask were updated.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_SUCCESS           The new station IP address and/or subnet mask were updated.\r
   @retval EFI_NOT_STARTED       The PXE Base Code Protocol is in the stopped state.\r

-  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.                                  \r
-                                                                      \r
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
+\r

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


@@ -837,36 +837,36 @@ EFI_STATUS
   IN EFI_IP_ADDRESS                        *NewSubnetMask   OPTIONAL\r
   );\r
 \r
   IN EFI_IP_ADDRESS                        *NewSubnetMask   OPTIONAL\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Updates the contents of the cached DHCP and Discover packets.\r
   Updates the contents of the cached DHCP and Discover packets.\r

-  \r
+\r

   The pointers to the new packets are used to update the contents of the cached\r
   packets in the EFI_PXE_BASE_CODE_MODE structure.\r
   The pointers to the new packets are used to update the contents of the cached\r
   packets in the EFI_PXE_BASE_CODE_MODE structure.\r

-    \r
+\r

   @param  This                   The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  NewDhcpDiscoverValid   The pointer to a value that will replace the current\r
   @param  This                   The pointer to the EFI_PXE_BASE_CODE_PROTOCOL instance.\r
   @param  NewDhcpDiscoverValid   The pointer to a value that will replace the current\r

-                                 DhcpDiscoverValid field.                        \r
+                                 DhcpDiscoverValid field.\r

   @param  NewDhcpAckReceived     The pointer to a value that will replace the current\r
   @param  NewDhcpAckReceived     The pointer to a value that will replace the current\r

-                                 DhcpAckReceived field.                          \r
+                                 DhcpAckReceived field.\r

   @param  NewProxyOfferReceived  The pointer to a value that will replace the current\r
   @param  NewProxyOfferReceived  The pointer to a value that will replace the current\r

-                                 ProxyOfferReceived field.                       \r
-  @param  NewPxeDiscoverValid    The pointer to a value that will replace the current     \r
-                                 ProxyOfferReceived field.                       \r
+                                 ProxyOfferReceived field.\r
+  @param  NewPxeDiscoverValid    The pointer to a value that will replace the current\r
+                                 ProxyOfferReceived field.\r

   @param  NewPxeReplyReceived    The pointer to a value that will replace the current\r
   @param  NewPxeReplyReceived    The pointer to a value that will replace the current\r

-                                 PxeReplyReceived field.                         \r
+                                 PxeReplyReceived field.\r

   @param  NewPxeBisReplyReceived The pointer to a value that will replace the current\r
   @param  NewPxeBisReplyReceived The pointer to a value that will replace the current\r

-                                 PxeBisReplyReceived field.                      \r
-  @param  NewDhcpDiscover        The pointer to the new cached DHCP Discover packet contents.   \r
+                                 PxeBisReplyReceived field.\r
+  @param  NewDhcpDiscover        The pointer to the new cached DHCP Discover packet contents.\r

   @param  NewDhcpAck             The pointer to the new cached DHCP Ack packet contents.\r
   @param  NewProxyOffer          The pointer to the new cached Proxy Offer packet contents.\r
   @param  NewPxeDiscover         The pointer to the new cached PXE Discover packet contents.\r
   @param  NewPxeReply            The pointer to the new cached PXE Reply packet contents.\r
   @param  NewPxeBisReply         The pointer to the new cached PXE BIS Reply packet contents.\r
   @param  NewDhcpAck             The pointer to the new cached DHCP Ack packet contents.\r
   @param  NewProxyOffer          The pointer to the new cached Proxy Offer packet contents.\r
   @param  NewPxeDiscover         The pointer to the new cached PXE Discover packet contents.\r
   @param  NewPxeReply            The pointer to the new cached PXE Reply packet contents.\r
   @param  NewPxeBisReply         The pointer to the new cached PXE BIS Reply packet contents.\r

-                                   \r
+\r

   @retval EFI_SUCCESS            The cached packet contents were updated.\r
   @retval EFI_NOT_STARTED        The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_INVALID_PARAMETER  This is NULL or not point to a valid EFI_PXE_BASE_CODE_PROTOCOL structure.\r
   @retval EFI_SUCCESS            The cached packet contents were updated.\r
   @retval EFI_NOT_STARTED        The PXE Base Code Protocol is in the stopped state.\r
   @retval EFI_INVALID_PARAMETER  This is NULL or not point to a valid EFI_PXE_BASE_CODE_PROTOCOL structure.\r

-                                                                      \r
+\r

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


@@ -893,7 +893,7 @@ EFI_STATUS
 \r
 //\r
 // Revision defined in EFI1.1\r
 \r
 //\r
 // Revision defined in EFI1.1\r

-// \r
+//\r

 #define EFI_PXE_BASE_CODE_INTERFACE_REVISION  EFI_PXE_BASE_CODE_PROTOCOL_REVISION\r
 \r
 ///\r
 #define EFI_PXE_BASE_CODE_INTERFACE_REVISION  EFI_PXE_BASE_CODE_PROTOCOL_REVISION\r
 \r
 ///\r


@@ -906,8 +906,8 @@ EFI_STATUS
 ///\r
 struct _EFI_PXE_BASE_CODE_PROTOCOL {\r
   ///\r
 ///\r
 struct _EFI_PXE_BASE_CODE_PROTOCOL {\r
   ///\r

-  ///  The revision of the EFI_PXE_BASE_CODE_PROTOCOL. All future revisions must \r
-  ///  be backwards compatible. If a future version is not backwards compatible \r
+  ///  The revision of the EFI_PXE_BASE_CODE_PROTOCOL. All future revisions must\r
+  ///  be backwards compatible. If a future version is not backwards compatible\r

   ///  it is not the same GUID.\r
   ///\r
   UINT64                            Revision;\r
   ///  it is not the same GUID.\r
   ///\r
   UINT64                            Revision;\r


@@ -931,4 +931,4 @@ struct _EFI_PXE_BASE_CODE_PROTOCOL {
 \r
 extern EFI_GUID gEfiPxeBaseCodeProtocolGuid;\r
 \r
 \r
 extern EFI_GUID gEfiPxeBaseCodeProtocolGuid;\r
 \r

-#endif \r
+#endif\r

diff --git a/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h b/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h
index 210f962ed003eb467de9fcfe340b79df89b8e655..ebfe8e1c06d3dbd5d1efd905d72fad2f83ae6a37 100644 (file)
--- a/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h
+++ b/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h
@@ -1,17 +1,17 @@
 /** @file\r
 /** @file\r

-  It is invoked when the PXE Base Code Protocol is about to transmit, has received, \r
+  It is invoked when the PXE Base Code Protocol is about to transmit, has received,\r

   or is waiting to receive a packet.\r
 \r
   or is waiting to receive a packet.\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
-    \r
-THE PROGRAM 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
 \r

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

   This Protocol is introduced in EFI Specification 1.10\r
 \r
 **/\r
   This Protocol is introduced in EFI Specification 1.10\r
 \r
 **/\r


@@ -45,7 +45,7 @@ typedef struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL  EFI_PXE_BASE_CODE_CALLBACK_
 \r
 ///\r
 /// EFI1.1 Protocol name.\r
 \r
 ///\r
 /// EFI1.1 Protocol name.\r

-/// \r
+///\r

 typedef EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL   EFI_PXE_BASE_CODE_CALLBACK;\r
 \r
 ///\r
 typedef EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL   EFI_PXE_BASE_CODE_CALLBACK;\r
 \r
 ///\r


@@ -73,10 +73,10 @@ typedef enum {
   EFI_PXE_BASE_CODE_CALLBACK_STATUS_LAST\r
 } EFI_PXE_BASE_CODE_CALLBACK_STATUS;\r
 \r
   EFI_PXE_BASE_CODE_CALLBACK_STATUS_LAST\r
 } EFI_PXE_BASE_CODE_CALLBACK_STATUS;\r
 \r

-/**                                                                 \r
+/**\r

   Callback function that is invoked when the PXE Base Code Protocol is about to transmit, has\r
   Callback function that is invoked when the PXE Base Code Protocol is about to transmit, has\r

-  received, or is waiting to receive a packet.                                                 \r
-  \r
+  received, or is waiting to receive a packet.\r
+\r

   This function is invoked when the PXE Base Code Protocol is about to transmit, has received,\r
   or is waiting to receive a packet. Parameters Function and Received specify the type of event.\r
   Parameters PacketLen and Packet specify the packet that generated the event. If these fields\r
   This function is invoked when the PXE Base Code Protocol is about to transmit, has received,\r
   or is waiting to receive a packet. Parameters Function and Received specify the type of event.\r
   Parameters PacketLen and Packet specify the packet that generated the event. If these fields\r


@@ -86,22 +86,22 @@ typedef enum {
   the polling nature of UEFI device drivers, a callback function should not execute for more than 5 ms.\r
   The SetParameters() function must be called after a Callback Protocol is installed to enable the\r
   use of callbacks.\r
   the polling nature of UEFI device drivers, a callback function should not execute for more than 5 ms.\r
   The SetParameters() function must be called after a Callback Protocol is installed to enable the\r
   use of callbacks.\r

-  \r
+\r

   @param  This                  The pointer to the EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL instance.\r
   @param  This                  The pointer to the EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL instance.\r

-  @param  Function              The PXE Base Code Protocol function that is waiting for an event.                                                              \r
+  @param  Function              The PXE Base Code Protocol function that is waiting for an event.\r

   @param  Received              TRUE if the callback is being invoked due to a receive event. FALSE if\r
   @param  Received              TRUE if the callback is being invoked due to a receive event. FALSE if\r

-                                the callback is being invoked due to a transmit event.                \r
+                                the callback is being invoked due to a transmit event.\r

   @param  PacketLen             The length, in bytes, of Packet. This field will have a value of zero if\r
   @param  PacketLen             The length, in bytes, of Packet. This field will have a value of zero if\r

-                                this is a wait for receive event.                                       \r
+                                this is a wait for receive event.\r

   @param  Packet                If Received is TRUE, a pointer to the packet that was just received;\r
   @param  Packet                If Received is TRUE, a pointer to the packet that was just received;\r

-                                otherwise a pointer to the packet that is about to be transmitted.  \r
-                                  \r
-  @retval EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE if Function specifies a continue operation    \r
+                                otherwise a pointer to the packet that is about to be transmitted.\r
+\r
+  @retval EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE if Function specifies a continue operation\r

   @retval EFI_PXE_BASE_CODE_CALLBACK_STATUS_ABORT    if Function specifies an abort operation\r
   @retval EFI_PXE_BASE_CODE_CALLBACK_STATUS_ABORT    if Function specifies an abort operation\r

-                                   \r
+\r

 **/\r
 **/\r

-typedef \r
-EFI_PXE_BASE_CODE_CALLBACK_STATUS \r
+typedef\r
+EFI_PXE_BASE_CODE_CALLBACK_STATUS\r

 (EFIAPI *EFI_PXE_CALLBACK)(\r
   IN EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL  *This,\r
   IN EFI_PXE_BASE_CODE_FUNCTION           Function,\r
 (EFIAPI *EFI_PXE_CALLBACK)(\r
   IN EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL  *This,\r
   IN EFI_PXE_BASE_CODE_FUNCTION           Function,\r


@@ -111,13 +111,13 @@ EFI_PXE_BASE_CODE_CALLBACK_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// Protocol that is invoked when the PXE Base Code Protocol is about \r
+/// Protocol that is invoked when the PXE Base Code Protocol is about\r

 /// to transmit, has received, or is waiting to receive a packet.\r
 ///\r
 struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL {\r
   ///\r
 /// to transmit, has received, or is waiting to receive a packet.\r
 ///\r
 struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL {\r
   ///\r

-  ///  The revision of the EFI_PXE_BASE_CODE_PROTOCOL. All future revisions must \r
-  ///  be backwards compatible. If a future version is not backwards compatible \r
+  ///  The revision of the EFI_PXE_BASE_CODE_PROTOCOL. All future revisions must\r
+  ///  be backwards compatible. If a future version is not backwards compatible\r

   ///  it is not the same GUID.\r
   ///\r
   UINT64            Revision;\r
   ///  it is not the same GUID.\r
   ///\r
   UINT64            Revision;\r


@@ -126,5 +126,5 @@ struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL {
 \r
 extern EFI_GUID gEfiPxeBaseCodeCallbackProtocolGuid;\r
 \r
 \r
 extern EFI_GUID gEfiPxeBaseCodeCallbackProtocolGuid;\r
 \r

-#endif \r
+#endif\r

 \r
 \r

diff --git a/MdePkg/Include/Protocol/RealTimeClock.h b/MdePkg/Include/Protocol/RealTimeClock.h
index 936a07d77b75f30cdadebee5896523e1a687e6c4..63f522e84abbc152f4936a7c4b575fb98b179321 100644 (file)
--- a/MdePkg/Include/Protocol/RealTimeClock.h
+++ b/MdePkg/Include/Protocol/RealTimeClock.h
@@ -5,20 +5,20 @@
   Time and date related EFI runtime services.\r
 \r
   The GetTime (), SetTime (), GetWakeupTime (), and SetWakeupTime () UEFI 2.0\r
   Time and date related EFI runtime services.\r
 \r
   The GetTime (), SetTime (), GetWakeupTime (), and SetWakeupTime () UEFI 2.0\r

-  services are added to the EFI system table and the \r
-  EFI_REAL_TIME_CLOCK_ARCH_PROTOCOL_GUID protocol is registered with a NULL \r
+  services are added to the EFI system table and the\r
+  EFI_REAL_TIME_CLOCK_ARCH_PROTOCOL_GUID protocol is registered with a NULL\r

   pointer.\r
 \r
   No CRC of the EFI system table is required, since that is done in the DXE core.\r
 \r
   pointer.\r
 \r
   No CRC of the EFI system table is required, since that is done in the DXE core.\r
 \r

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

diff --git a/MdePkg/Include/Protocol/ReportStatusCodeHandler.h b/MdePkg/Include/Protocol/ReportStatusCodeHandler.h
index 44a6ded58e1e75805a1bcdc4b543fd3b065a8073..e45252cf78b7e62b6c0a85718003d4d85eb43a21 100644 (file)
--- a/MdePkg/Include/Protocol/ReportStatusCodeHandler.h
+++ b/MdePkg/Include/Protocol/ReportStatusCodeHandler.h
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  This protocol provide registering and unregistering services to status code \r
+  This protocol provide registering and unregistering services to status code\r

   consumers while in DXE.\r
   consumers while in DXE.\r

-  \r
-  Copyright (c) 2007 - 2009, 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


@@ -33,7 +33,7 @@ EFI_STATUS
 \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


@@ -47,16 +47,16 @@ EFI_STATUS
   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
                                     registered.\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_ALREADY_STARTED      The function was already registered. It can't be registered again.\r

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


@@ -67,16 +67,16 @@ EFI_STATUS
 \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_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_NOT_FOUND         The callback function was not found to be unregistered.\r

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

diff --git a/MdePkg/Include/Protocol/Reset.h b/MdePkg/Include/Protocol/Reset.h
index 9059eef77e10fa8baa02f39d2de653adcbd6e826..5744ef3837d2ca800389a3c37044b226f5a9443f 100644 (file)
--- a/MdePkg/Include/Protocol/Reset.h
+++ b/MdePkg/Include/Protocol/Reset.h
@@ -3,17 +3,17 @@
 \r
   Used to provide ResetSystem runtime services\r
 \r
 \r
   Used to provide ResetSystem runtime services\r
 \r

-  The ResetSystem () UEFI 2.0 service is added to the EFI system table and the \r
+  The ResetSystem () UEFI 2.0 service is added to the EFI system table and the\r

   EFI_RESET_ARCH_PROTOCOL_GUID protocol is registered with a NULL pointer.\r
 \r
   EFI_RESET_ARCH_PROTOCOL_GUID protocol is registered with a NULL pointer.\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
+  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

diff --git a/MdePkg/Include/Protocol/Rng.h b/MdePkg/Include/Protocol/Rng.h
index 5a4fe692ff70188e47b7114ef952bfed5ab9b66d..feb7a7fa2add1d18682b95476ddf98ce50a2d1b1 100644 (file)
--- a/MdePkg/Include/Protocol/Rng.h
+++ b/MdePkg/Include/Protocol/Rng.h
@@ -1,9 +1,9 @@
 /** @file\r
   EFI_RNG_PROTOCOL as defined in UEFI 2.4.\r
 /** @file\r
   EFI_RNG_PROTOCOL as defined in UEFI 2.4.\r

-  The UEFI Random Number Generator Protocol is used to provide random bits for use \r
+  The UEFI Random Number Generator Protocol is used to provide random bits for use\r

   in applications, or entropy for seeding other random number generators.\r
 \r
   in applications, or entropy for seeding other random number generators.\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 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


@@ -29,7 +29,7 @@ typedef struct _EFI_RNG_PROTOCOL EFI_RNG_PROTOCOL;
 \r
 ///\r
 /// A selection of EFI_RNG_PROTOCOL algorithms.\r
 \r
 ///\r
 /// A selection of EFI_RNG_PROTOCOL algorithms.\r

-/// The algorithms listed are optional, not meant to be exhaustive and be argmented by \r
+/// The algorithms listed are optional, not meant to be exhaustive and be argmented by\r

 /// vendors or other industry standards.\r
 ///\r
 \r
 /// vendors or other industry standards.\r
 ///\r
 \r


@@ -78,7 +78,7 @@ typedef EFI_GUID EFI_RNG_ALGORITHM;
   Returns information about the random number generation implementation.\r
 \r
   @param[in]     This                 A pointer to the EFI_RNG_PROTOCOL instance.\r
   Returns information about the random number generation implementation.\r
 \r
   @param[in]     This                 A pointer to the EFI_RNG_PROTOCOL instance.\r

-  @param[in,out] RNGAlgorithmListSize On input, the size in bytes of RNGAlgorithmList. \r
+  @param[in,out] RNGAlgorithmListSize On input, the size in bytes of RNGAlgorithmList.\r

                                       On output with a return code of EFI_SUCCESS, the size\r
                                       in bytes of the data returned in RNGAlgorithmList. On output\r
                                       with a return code of EFI_BUFFER_TOO_SMALL,\r
                                       On output with a return code of EFI_SUCCESS, the size\r
                                       in bytes of the data returned in RNGAlgorithmList. On output\r
                                       with a return code of EFI_BUFFER_TOO_SMALL,\r


@@ -137,7 +137,7 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The Random Number Generator (RNG) protocol provides random bits for use in \r
+/// The Random Number Generator (RNG) protocol provides random bits for use in\r

 /// applications, or entropy for seeding other random number generators.\r
 ///\r
 struct _EFI_RNG_PROTOCOL {\r
 /// applications, or entropy for seeding other random number generators.\r
 ///\r
 struct _EFI_RNG_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Runtime.h b/MdePkg/Include/Protocol/Runtime.h
index dfa7e5bab49c970422ee1f27b7c2104c2e4bf66d..f3786ef74f6b21589eb303d2cc9f12cec6bdeae2 100644 (file)
--- a/MdePkg/Include/Protocol/Runtime.h
+++ b/MdePkg/Include/Protocol/Runtime.h
@@ -1,23 +1,23 @@
 /** @file\r
   Runtime Architectural Protocol as defined in PI Specification VOLUME 2 DXE\r
 \r
 /** @file\r
   Runtime Architectural Protocol as defined in PI Specification VOLUME 2 DXE\r
 \r

-  Allows the runtime functionality of the DXE Foundation to be contained \r
-  in a separate driver. It also provides hooks for the DXE Foundation to \r
-  export information that is needed at runtime. As such, this protocol allows \r
-  services to the DXE Foundation to manage runtime drivers and events. \r
-  This protocol also implies that the runtime services required to transition \r
-  to virtual mode, SetVirtualAddressMap() and ConvertPointer(), have been \r
-  registered into the UEFI Runtime Table in the UEFI System Table. This protocol \r
+  Allows the runtime functionality of the DXE Foundation to be contained\r
+  in a separate driver. It also provides hooks for the DXE Foundation to\r
+  export information that is needed at runtime. As such, this protocol allows\r
+  services to the DXE Foundation to manage runtime drivers and events.\r
+  This protocol also implies that the runtime services required to transition\r
+  to virtual mode, SetVirtualAddressMap() and ConvertPointer(), have been\r
+  registered into the UEFI Runtime Table in the UEFI System Table. This protocol\r

   must be produced by a runtime DXE driver and may only be consumed by the DXE Foundation.\r
 \r
   must be produced by a runtime DXE driver and may only be consumed by the DXE Foundation.\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
+  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


@@ -33,7 +33,7 @@
 typedef struct _EFI_RUNTIME_ARCH_PROTOCOL  EFI_RUNTIME_ARCH_PROTOCOL;\r
 \r
 ///\r
 typedef struct _EFI_RUNTIME_ARCH_PROTOCOL  EFI_RUNTIME_ARCH_PROTOCOL;\r
 \r
 ///\r

-/// LIST_ENTRY from BaseType \r
+/// LIST_ENTRY from BaseType\r

 ///\r
 typedef LIST_ENTRY EFI_LIST_ENTRY;\r
 \r
 ///\r
 typedef LIST_ENTRY EFI_LIST_ENTRY;\r
 \r


@@ -44,7 +44,7 @@ typedef struct _EFI_RUNTIME_IMAGE_ENTRY  EFI_RUNTIME_IMAGE_ENTRY;
 ///\r
 struct _EFI_RUNTIME_IMAGE_ENTRY {\r
   ///\r
 ///\r
 struct _EFI_RUNTIME_IMAGE_ENTRY {\r
   ///\r

-  /// Start of image that has been loaded in memory. It is a pointer \r
+  /// Start of image that has been loaded in memory. It is a pointer\r

   /// to either the DOS header or PE header of the image.\r
   ///\r
   VOID                    *ImageBase;\r
   /// to either the DOS header or PE header of the image.\r
   ///\r
   VOID                    *ImageBase;\r


@@ -101,13 +101,13 @@ struct _EFI_RUNTIME_EVENT_ENTRY {
 };\r
 \r
 ///\r
 };\r
 \r
 ///\r

-/// Allows the runtime functionality of the DXE Foundation to be contained in a \r
-/// separate driver. It also provides hooks for the DXE Foundation to export \r
-/// information that is needed at runtime. As such, this protocol allows the DXE \r
-/// Foundation to manage runtime drivers and events. This protocol also implies \r
-/// that the runtime services required to transition to virtual mode, \r
-/// SetVirtualAddressMap() and ConvertPointer(), have been registered into the \r
-/// EFI Runtime Table in the EFI System Partition.  This protocol must be produced \r
+/// Allows the runtime functionality of the DXE Foundation to be contained in a\r
+/// separate driver. It also provides hooks for the DXE Foundation to export\r
+/// information that is needed at runtime. As such, this protocol allows the DXE\r
+/// Foundation to manage runtime drivers and events. This protocol also implies\r
+/// that the runtime services required to transition to virtual mode,\r
+/// SetVirtualAddressMap() and ConvertPointer(), have been registered into the\r
+/// EFI Runtime Table in the EFI System Partition.  This protocol must be produced\r

 /// by a runtime DXE driver and may only be consumed by the DXE Foundation.\r
 ///\r
 struct _EFI_RUNTIME_ARCH_PROTOCOL {\r
 /// by a runtime DXE driver and may only be consumed by the DXE Foundation.\r
 ///\r
 struct _EFI_RUNTIME_ARCH_PROTOCOL {\r


@@ -115,8 +115,8 @@ struct _EFI_RUNTIME_ARCH_PROTOCOL {
   EFI_LIST_ENTRY          EventHead;    ///< A list of type EFI_RUNTIME_EVENT_ENTRY.\r
   UINTN                   MemoryDescriptorSize;   ///< Size of a memory descriptor that is returned by GetMemoryMap().\r
   UINT32                  MemoryDesciptorVersion; ///< Version of a memory descriptor that is returned by GetMemoryMap().\r
   EFI_LIST_ENTRY          EventHead;    ///< A list of type EFI_RUNTIME_EVENT_ENTRY.\r
   UINTN                   MemoryDescriptorSize;   ///< Size of a memory descriptor that is returned by GetMemoryMap().\r
   UINT32                  MemoryDesciptorVersion; ///< Version of a memory descriptor that is returned by GetMemoryMap().\r

-  UINTN                   MemoryMapSize;///< Size of the memory map in bytes contained in MemoryMapPhysical and MemoryMapVirtual. \r
-  EFI_MEMORY_DESCRIPTOR   *MemoryMapPhysical;     ///< Pointer to a runtime buffer that contains a copy of \r
+  UINTN                   MemoryMapSize;///< Size of the memory map in bytes contained in MemoryMapPhysical and MemoryMapVirtual.\r
+  EFI_MEMORY_DESCRIPTOR   *MemoryMapPhysical;     ///< Pointer to a runtime buffer that contains a copy of\r

                                                   ///< the memory map returned via GetMemoryMap().\r
   EFI_MEMORY_DESCRIPTOR   *MemoryMapVirtual;      ///< Pointer to MemoryMapPhysical that is updated to virtual mode after SetVirtualAddressMap().\r
   BOOLEAN                 VirtualMode;  ///< Boolean that is TRUE if SetVirtualAddressMap() has been called.\r
                                                   ///< the memory map returned via GetMemoryMap().\r
   EFI_MEMORY_DESCRIPTOR   *MemoryMapVirtual;      ///< Pointer to MemoryMapPhysical that is updated to virtual mode after SetVirtualAddressMap().\r
   BOOLEAN                 VirtualMode;  ///< Boolean that is TRUE if SetVirtualAddressMap() has been called.\r

diff --git a/MdePkg/Include/Protocol/S3SaveState.h b/MdePkg/Include/Protocol/S3SaveState.h
index 5a72dd860d65c48de015a03deaaa939750606c15..9e7b4050f60a36f45f455796e6caceeca198deb0 100644 (file)
--- a/MdePkg/Include/Protocol/S3SaveState.h
+++ b/MdePkg/Include/Protocol/S3SaveState.h
@@ -1,21 +1,21 @@
 /** @file\r
   S3 Save State Protocol as defined in PI1.2 Specification VOLUME 5 Standard.\r
 \r
 /** @file\r
   S3 Save State Protocol as defined in PI1.2 Specification VOLUME 5 Standard.\r
 \r

-  This protocol is used by DXE PI module to store or record various IO operations \r
+  This protocol is used by DXE PI module to store or record various IO operations\r

   to be replayed during an S3 resume.\r
   This protocol is not required for all platforms.\r
   to be replayed during an S3 resume.\r
   This protocol is not required for all platforms.\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
   @par Revision Reference:\r
 \r
   @par Revision Reference:\r

-  This PPI is defined in UEFI Platform Initialization Specification 1.2 Volume 5: \r
+  This PPI is defined in UEFI Platform Initialization Specification 1.2 Volume 5:\r

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


@@ -33,20 +33,20 @@ typedef struct _EFI_S3_SAVE_STATE_PROTOCOL  EFI_S3_SAVE_STATE_PROTOCOL;
 \r
 /**\r
   Record operations that need to be replayed during an S3 resume.\r
 \r
 /**\r
   Record operations that need to be replayed during an S3 resume.\r

-  \r
+\r

   This function is used to store an OpCode to be replayed as part of the S3 resume boot path. It is\r
   assumed this protocol has platform specific mechanism to store the OpCode set and replay them\r
   during the S3 resume.\r
   This function is used to store an OpCode to be replayed as part of the S3 resume boot path. It is\r
   assumed this protocol has platform specific mechanism to store the OpCode set and replay them\r
   during the S3 resume.\r

-  \r
+\r

   @param[in]    This    A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param[in]    OpCode  The operation code (opcode) number.\r
   @param[in]    ...     Argument list that is specific to each opcode. See the following subsections for the\r
                         definition of each opcode.\r
   @param[in]    This    A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param[in]    OpCode  The operation code (opcode) number.\r
   @param[in]    ...     Argument list that is specific to each opcode. See the following subsections for the\r
                         definition of each opcode.\r

-                        \r
+\r

   @retval EFI_SUCCESS           The operation succeeded. A record was added into the specified\r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the specified\r

-                                script table.                    \r
+                                script table.\r

   @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.\r
   @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.\r

-  @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.                       \r
+  @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r

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


@@ -58,7 +58,7 @@ EFI_STATUS
 \r
 /**\r
   Record operations that need to be replayed during an S3 resume.\r
 \r
 /**\r
   Record operations that need to be replayed during an S3 resume.\r

-  \r
+\r

   This function is used to store an OpCode to be replayed as part of the S3 resume boot path. It is\r
   assumed this protocol has platform specific mechanism to store the OpCode set and replay them\r
   during the S3 resume.\r
   This function is used to store an OpCode to be replayed as part of the S3 resume boot path. It is\r
   assumed this protocol has platform specific mechanism to store the OpCode set and replay them\r
   during the S3 resume.\r


@@ -66,14 +66,14 @@ EFI_STATUS
   NULL then that position is after the last opcode in the table (BeforeOrAfter is TRUE) or before\r
   the first opcode in the table (BeforeOrAfter is FALSE). The position which is pointed to by\r
   Position upon return can be used for subsequent insertions.\r
   NULL then that position is after the last opcode in the table (BeforeOrAfter is TRUE) or before\r
   the first opcode in the table (BeforeOrAfter is FALSE). The position which is pointed to by\r
   Position upon return can be used for subsequent insertions.\r

-  \r
+\r

   This function has a variable parameter list. The exact parameter list depends on the OpCode that is\r
   passed into the function. If an unsupported OpCode or illegal parameter list is passed in, this\r
   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
   OpCode values of 0x80 - 0xFE are reserved for implementation specific functions.\r
   This function has a variable parameter list. The exact parameter list depends on the OpCode that is\r
   passed into the function. If an unsupported OpCode or illegal parameter list is passed in, this\r
   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
   OpCode values of 0x80 - 0xFE are reserved for implementation specific functions.\r

-  \r
+\r

   @param[in]        This            A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param[in]        BeforeOrAfter   Specifies whether the opcode is stored before (TRUE) or after (FALSE) the position\r
                                     in the boot script table specified by Position. If Position is NULL or points to\r
   @param[in]        This            A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param[in]        BeforeOrAfter   Specifies whether the opcode is stored before (TRUE) or after (FALSE) the position\r
                                     in the boot script table specified by Position. If Position is NULL or points to\r


@@ -85,12 +85,12 @@ EFI_STATUS
   @param[in]        OpCode          The operation code (opcode) number. See "Related Definitions" in Write() for the\r
                                     defined opcode types.\r
   @param[in]        ...             Argument list that is specific to each opcode. See the following subsections for the\r
   @param[in]        OpCode          The operation code (opcode) number. See "Related Definitions" in Write() for the\r
                                     defined opcode types.\r
   @param[in]        ...             Argument list that is specific to each opcode. See the following subsections for the\r

-                                    definition of each opcode. \r
-                                    \r
+                                    definition of each opcode.\r
+\r

   @retval EFI_SUCCESS               The operation succeeded. An opcode was added into the script.\r
   @retval EFI_INVALID_PARAMETER     The Opcode is an invalid opcode value.\r
   @retval EFI_INVALID_PARAMETER     The Position is not a valid position in the boot script table.\r
   @retval EFI_SUCCESS               The operation succeeded. An opcode was added into the script.\r
   @retval EFI_INVALID_PARAMETER     The Opcode is an invalid opcode value.\r
   @retval EFI_INVALID_PARAMETER     The Position is not a valid position in the boot script table.\r

-  @retval EFI_OUT_OF_RESOURCES      There is insufficient memory to store the boot script table.                                                                       \r
+  @retval EFI_OUT_OF_RESOURCES      There is insufficient memory to store the boot script table.\r

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


@@ -104,14 +104,14 @@ EFI_STATUS
 \r
 /**\r
   Find a label within the boot script table and, if not present, optionally create it.\r
 \r
 /**\r
   Find a label within the boot script table and, if not present, optionally create it.\r

-  \r
+\r

   If the label Label is already exists in the boot script table, then no new label is created, the\r
   position of the Label is returned in *Position and EFI_SUCCESS is returned.\r
   If the label Label does not already exist and CreateIfNotFound is TRUE, then it will be\r
   created before or after the specified position and EFI_SUCCESS is returned.\r
   If the label Label does not already exist and CreateIfNotFound is FALSE, then\r
   EFI_NOT_FOUND is returned.\r
   If the label Label is already exists in the boot script table, then no new label is created, the\r
   position of the Label is returned in *Position and EFI_SUCCESS is returned.\r
   If the label Label does not already exist and CreateIfNotFound is TRUE, then it will be\r
   created before or after the specified position and EFI_SUCCESS is returned.\r
   If the label Label does not already exist and CreateIfNotFound is FALSE, then\r
   EFI_NOT_FOUND is returned.\r

-  \r
+\r

   @param[in]      This                A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param[in]      BeforeOrAfter       Specifies whether the label is stored before (TRUE) or after (FALSE) the position in\r
                                       the boot script table specified by Position. If Position is NULL or points to\r
   @param[in]      This                A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param[in]      BeforeOrAfter       Specifies whether the label is stored before (TRUE) or after (FALSE) the position in\r
                                       the boot script table specified by Position. If Position is NULL or points to\r


@@ -122,7 +122,7 @@ EFI_STATUS
                                       either before or after, depending on BeforeOrAfter. On exit, specifies the position\r
                                       of the inserted label in the boot script table.\r
   @param[in]      Label               Points to the label which will be inserted in the boot script table.\r
                                       either before or after, depending on BeforeOrAfter. On exit, specifies the position\r
                                       of the inserted label in the boot script table.\r
   @param[in]      Label               Points to the label which will be inserted in the boot script table.\r

-  \r
+\r

   @retval    EFI_SUCCESS              The label already exists or was inserted.\r
   @retval    EFI_NOT_FOUND            The label did not already exist and CreateifNotFound was FALSE.\r
   @retval    EFI_INVALID_PARAMETER    The Label is NULL or points to an empty string.\r
   @retval    EFI_SUCCESS              The label already exists or was inserted.\r
   @retval    EFI_NOT_FOUND            The label did not already exist and CreateifNotFound was FALSE.\r
   @retval    EFI_INVALID_PARAMETER    The Label is NULL or points to an empty string.\r


@@ -141,16 +141,16 @@ EFI_STATUS
 \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[in]    This                A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param[in]    Position1           The positions in the boot script table to compare.\r
   @param[in]    Position2           The positions in the boot script table to compare.\r
   @param[out]   RelativePosition    On return, points to the result of the comparison.\r
   @param[in]    This                A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param[in]    Position1           The positions in the boot script table to compare.\r
   @param[in]    Position2           The positions in the boot script table to compare.\r
   @param[out]   RelativePosition    On return, points to the result of the comparison.\r

-  \r
+\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
   @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

diff --git a/MdePkg/Include/Protocol/S3SmmSaveState.h b/MdePkg/Include/Protocol/S3SmmSaveState.h
index 554c6a04375f4750c14f688b890f7c7422fe11f9..7c4a9ea55817406fa9c6dc36bfa63ea4a532bb9c 100644 (file)
--- a/MdePkg/Include/Protocol/S3SmmSaveState.h
+++ b/MdePkg/Include/Protocol/S3SmmSaveState.h
@@ -13,19 +13,19 @@
   EFI_OUT_OF_RESOURCES may be returned from a runtime call. It is the responsibility of the\r
   platform to ensure enough memory resource exists to save the system state. It is recommended that\r
   runtime calls be minimized by the caller.\r
   EFI_OUT_OF_RESOURCES may be returned from a runtime call. It is the responsibility of the\r
   platform to ensure enough memory resource exists to save the system state. It is recommended that\r
   runtime calls be minimized by the caller.\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
 \r

-  THE PROGRAM 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
   @par Revision Reference:\r
 \r
   @par Revision Reference:\r

-  This PPI is defined in UEFI Platform Initialization Specification 1.2 Volume 5: \r
-  Standards          \r
+  This PPI is defined in UEFI Platform Initialization Specification 1.2 Volume 5:\r
+  Standards\r

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


@@ -36,11 +36,11 @@
 \r
 #define EFI_S3_SMM_SAVE_STATE_PROTOCOL_GUID \\r
     {0x320afe62, 0xe593, 0x49cb, { 0xa9, 0xf1, 0xd4, 0xc2, 0xf4, 0xaf, 0x1, 0x4c }}\r
 \r
 #define EFI_S3_SMM_SAVE_STATE_PROTOCOL_GUID \\r
     {0x320afe62, 0xe593, 0x49cb, { 0xa9, 0xf1, 0xd4, 0xc2, 0xf4, 0xaf, 0x1, 0x4c }}\r

-    \r
+\r

 \r
 typedef EFI_S3_SAVE_STATE_PROTOCOL EFI_S3_SMM_SAVE_STATE_PROTOCOL;\r
 \r
 extern EFI_GUID gEfiS3SmmSaveStateProtocolGuid;\r
 \r
 typedef EFI_S3_SAVE_STATE_PROTOCOL EFI_S3_SMM_SAVE_STATE_PROTOCOL;\r
 \r
 extern EFI_GUID gEfiS3SmmSaveStateProtocolGuid;\r

-    \r
+\r

 #endif // __S3_SMM_SAVE_STATE_H__\r
 \r
 #endif // __S3_SMM_SAVE_STATE_H__\r
 \r

diff --git a/MdePkg/Include/Protocol/ScsiIo.h b/MdePkg/Include/Protocol/ScsiIo.h
index d605b18e0e090fa6f7e4fc07f1e33df8b8d317be..1e7bc86b2967252bf3938c45383d8cf2536a6c5e 100644 (file)
--- a/MdePkg/Include/Protocol/ScsiIo.h
+++ b/MdePkg/Include/Protocol/ScsiIo.h
@@ -1,17 +1,17 @@
 /** @file\r
   EFI_SCSI_IO_PROTOCOL as defined in UEFI 2.0.\r
 /** @file\r
   EFI_SCSI_IO_PROTOCOL as defined in UEFI 2.0.\r

-  This protocol is used by code, typically drivers, running in the EFI boot \r
-  services environment to access SCSI devices. In particular, functions for \r
+  This protocol is used by code, typically drivers, running in the EFI boot\r
+  services environment to access SCSI devices. In particular, functions for\r

   managing devices on SCSI buses are defined here.\r
 \r
   managing devices on SCSI buses are defined here.\r
 \r

-  Copyright (c) 2006 - 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) 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


@@ -301,12 +301,12 @@ struct _EFI_SCSI_IO_PROTOCOL {
   EFI_SCSI_IO_PROTOCOL_GET_DEVICE_LOCATION  GetDeviceLocation;\r
   EFI_SCSI_IO_PROTOCOL_RESET_BUS            ResetBus;\r
   EFI_SCSI_IO_PROTOCOL_RESET_DEVICE         ResetDevice;\r
   EFI_SCSI_IO_PROTOCOL_GET_DEVICE_LOCATION  GetDeviceLocation;\r
   EFI_SCSI_IO_PROTOCOL_RESET_BUS            ResetBus;\r
   EFI_SCSI_IO_PROTOCOL_RESET_DEVICE         ResetDevice;\r

-  EFI_SCSI_IO_PROTOCOL_EXEC_SCSI_COMMAND    ExecuteScsiCommand;    \r
+  EFI_SCSI_IO_PROTOCOL_EXEC_SCSI_COMMAND    ExecuteScsiCommand;\r

 \r
   ///\r
 \r
   ///\r

-  /// Supplies the alignment requirement for any buffer used in a data transfer. \r
-  /// IoAlign values of 0 and 1 mean that the buffer can be placed anywhere in memory. \r
-  /// Otherwise, IoAlign must be a power of 2, and the requirement is that the \r
+  /// Supplies the alignment requirement for any buffer used in a data transfer.\r
+  /// IoAlign values of 0 and 1 mean that the buffer can be placed anywhere in memory.\r
+  /// Otherwise, IoAlign must be a power of 2, and the requirement is that the\r

   /// start address of a buffer must be evenly divisible by IoAlign with no remainder.\r
   ///\r
   UINT32                                    IoAlign;\r
   /// start address of a buffer must be evenly divisible by IoAlign with no remainder.\r
   ///\r
   UINT32                                    IoAlign;\r

diff --git a/MdePkg/Include/Protocol/ScsiPassThru.h b/MdePkg/Include/Protocol/ScsiPassThru.h
index ef601e7dfb7db7d4dc2f92e0d22d45b3f203ff36..7dcead10f9e1361d0e3d7f98a2f8f86934b5bd46 100644 (file)
--- a/MdePkg/Include/Protocol/ScsiPassThru.h
+++ b/MdePkg/Include/Protocol/ScsiPassThru.h
@@ -1,21 +1,21 @@
 /** @file\r
   SCSI Pass Through protocol as defined in EFI 1.1.\r
 /** @file\r
   SCSI Pass Through protocol as defined in EFI 1.1.\r

-  This protocol allows information about a SCSI channel to be collected, \r
+  This protocol allows information about a SCSI channel to be collected,\r

   and allows SCSI Request Packets to be sent to any SCSI devices on a SCSI\r
   and allows SCSI Request Packets to be sent to any SCSI devices on a SCSI\r

-  channel even if those devices are not boot devices. This protocol is attached \r
-  to the device handle of each SCSI channel in a system that the protocol \r
-  supports, and can be used for diagnostics. It may also be used to build \r
+  channel even if those devices are not boot devices. This protocol is attached\r
+  to the device handle of each SCSI channel in a system that the protocol\r
+  supports, and can be used for diagnostics. It may also be used to build\r

   a Block I/O driver for SCSI hard drives and SCSI CD-ROM or DVD drives to\r
   allow those devices to become boot devices.\r
 \r
   a Block I/O driver for SCSI hard drives and SCSI CD-ROM or DVD drives to\r
   allow those devices to become boot devices.\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
+  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


@@ -149,9 +149,9 @@ typedef struct {
 } EFI_SCSI_PASS_THRU_MODE;\r
 \r
 /**\r
 } EFI_SCSI_PASS_THRU_MODE;\r
 \r
 /**\r

-  Sends a SCSI Request Packet to a SCSI device that is attached to \r
-  the SCSI channel. This function supports both blocking I/O and \r
-  non-blocking I/O.  The blocking I/O functionality is required, \r
+  Sends a SCSI Request Packet to a SCSI device that is attached to\r
+  the SCSI channel. This function supports both blocking I/O and\r
+  non-blocking I/O.  The blocking I/O functionality is required,\r

   and the non-blocking I/O functionality is optional.\r
 \r
   @param  This   Protocol instance pointer.\r
   and the non-blocking I/O functionality is optional.\r
 \r
   @param  This   Protocol instance pointer.\r


@@ -198,7 +198,7 @@ typedef struct {
                                     Request Packet to execute. See HostAdapterStatus,\r
                                     TargetStatus, SenseDataLength, and SenseData in\r
                                     that order for additional status information.\r
                                     Request Packet to execute. See HostAdapterStatus,\r
                                     TargetStatus, SenseDataLength, and SenseData in\r
                                     that order for additional status information.\r

-                                    \r
+\r

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


@@ -211,7 +211,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Used to retrieve the list of legal Target IDs for SCSI devices \r
+  Used to retrieve the list of legal Target IDs for SCSI devices\r

   on a SCSI channel.\r
 \r
   @param  This   Protocol instance pointer.\r
   on a SCSI channel.\r
 \r
   @param  This   Protocol instance pointer.\r


@@ -243,7 +243,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Used to allocate and build a device path node for a SCSI device \r
+  Used to allocate and build a device path node for a SCSI device\r

   on a SCSI channel.\r
 \r
   @param  This       Protocol instance pointer.\r
   on a SCSI channel.\r
 \r
   @param  This       Protocol instance pointer.\r


@@ -311,7 +311,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Resets a SCSI channel.This operation resets all the \r
+  Resets a SCSI channel.This operation resets all the\r

   SCSI devices connected to the SCSI channel.\r
 \r
   @param  This Protocol instance pointer.\r
   SCSI devices connected to the SCSI channel.\r
 \r
   @param  This Protocol instance pointer.\r

diff --git a/MdePkg/Include/Protocol/ScsiPassThruExt.h b/MdePkg/Include/Protocol/ScsiPassThruExt.h
index c6e75a1fdf9fc22f3ebeb5d71b43e1ba76e910cc..6c7959e64278430ad8e156d141e796983bb3d0b8 100644 (file)
--- a/MdePkg/Include/Protocol/ScsiPassThruExt.h
+++ b/MdePkg/Include/Protocol/ScsiPassThruExt.h
@@ -1,16 +1,16 @@
 /** @file\r
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL as defined in UEFI 2.0.\r
 /** @file\r
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL as defined in UEFI 2.0.\r

-  This protocol provides services that allow SCSI Pass Thru commands \r
+  This protocol provides services that allow SCSI Pass Thru commands\r

   to be sent to SCSI devices attached to a SCSI channel.\r
 \r
   to be sent to SCSI devices attached to a SCSI channel.\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
+  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


@@ -148,9 +148,9 @@ typedef struct {
 } EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET;\r
 \r
 /**\r
 } EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET;\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  This    A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param  Target  The Target is an array of size TARGET_MAX_BYTES and it represents\r
 \r
   @param  This    A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param  Target  The Target is an array of size TARGET_MAX_BYTES and it represents\r


@@ -196,14 +196,14 @@ EFI_STATUS
   IN UINT64                                         Lun,\r
   IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
   IN EFI_EVENT                                      Event     OPTIONAL\r
   IN UINT64                                         Lun,\r
   IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
   IN EFI_EVENT                                      Event     OPTIONAL\r

-  );      \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  This   A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param  Target On input, a pointer to the Target ID (an array of size\r
 \r
   @param  This   A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param  Target On input, a pointer to the Target ID (an array of size\r


@@ -230,7 +230,7 @@ EFI_STATUS
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
   IN OUT UINT8                                      **Target,\r
   IN OUT UINT64                                     *Lun\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
   IN OUT UINT8                                      **Target,\r
   IN OUT UINT64                                     *Lun\r

-  );   \r
+  );\r

 \r
 /**\r
   Used to allocate and build a device path node for a SCSI device on a SCSI channel.\r
 \r
 /**\r
   Used to allocate and build a device path node for a SCSI device on a SCSI channel.\r


@@ -294,7 +294,7 @@ EFI_STATUS
   IN EFI_DEVICE_PATH_PROTOCOL                      *DevicePath,\r
   OUT UINT8                                        **Target,\r
   OUT UINT64                                       *Lun\r
   IN EFI_DEVICE_PATH_PROTOCOL                      *DevicePath,\r
   OUT UINT8                                        **Target,\r
   OUT UINT64                                       *Lun\r

-  );       \r
+  );\r

 \r
 /**\r
   Resets a SCSI channel. This operation resets all the SCSI devices connected to the SCSI channel.\r
 \r
 /**\r
   Resets a SCSI channel. This operation resets all the SCSI devices connected to the SCSI channel.\r


@@ -311,8 +311,8 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_EXT_SCSI_PASS_THRU_RESET_CHANNEL)(\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_EXT_SCSI_PASS_THRU_RESET_CHANNEL)(\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This\r

-  );    \r
-  \r
+  );\r
+\r

 /**\r
   Resets a SCSI logical unit that is connected to a SCSI channel.\r
 \r
 /**\r
   Resets a SCSI logical unit that is connected to a SCSI channel.\r
 \r


@@ -338,13 +338,13 @@ EFI_STATUS
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
   IN UINT8                                         *Target,\r
   IN UINT64                                        Lun\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
   IN UINT8                                         *Target,\r
   IN UINT64                                        Lun\r

-  );         \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  This   A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param  Target (TARGET_MAX_BYTES) of a SCSI device present on the SCSI channel.\r
 \r
   @param  This   A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param  Target (TARGET_MAX_BYTES) of a SCSI device present on the SCSI channel.\r


@@ -367,12 +367,12 @@ EFI_STATUS
 (EFIAPI *EFI_EXT_SCSI_PASS_THRU_GET_NEXT_TARGET)(\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
   IN OUT UINT8                                     **Target\r
 (EFIAPI *EFI_EXT_SCSI_PASS_THRU_GET_NEXT_TARGET)(\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
   IN OUT UINT8                                     **Target\r

-  );          \r
+  );\r

 \r
 ///\r
 \r
 ///\r

-/// The EFI_EXT_SCSI_PASS_THRU_PROTOCOL provides information about a SCSI channel \r
-/// and the ability to send SCI Request Packets to any SCSI device attached to \r
-/// that SCSI channel. The information includes the Target ID of the host controller \r
+/// The EFI_EXT_SCSI_PASS_THRU_PROTOCOL provides information about a SCSI channel\r
+/// and the ability to send SCI Request Packets to any SCSI device attached to\r
+/// that SCSI channel. The information includes the Target ID of the host controller\r

 /// on the SCSI channel and the attributes of the SCSI channel.\r
 ///\r
 struct _EFI_EXT_SCSI_PASS_THRU_PROTOCOL {\r
 /// on the SCSI channel and the attributes of the SCSI channel.\r
 ///\r
 struct _EFI_EXT_SCSI_PASS_THRU_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Security.h b/MdePkg/Include/Protocol/Security.h
index ff52cf5243941d1407a3dce844f54cfae289773a..f8c452472df535d7b04aabd241aeaad38c222487 100644 (file)
--- a/MdePkg/Include/Protocol/Security.h
+++ b/MdePkg/Include/Protocol/Security.h
@@ -1,9 +1,9 @@
 /** @file\r
   Security Architectural Protocol as defined in PI Specification VOLUME 2 DXE\r
 \r
 /** @file\r
   Security Architectural Protocol as defined in PI Specification VOLUME 2 DXE\r
 \r

-  Used to provide Security services.  Specifically, dependening upon the \r
-  authentication state of a discovered driver in a Firmware Volume, the \r
-  portable DXE Core Dispatcher will call into the Security Architectural \r
+  Used to provide Security services.  Specifically, dependening upon the\r
+  authentication state of a discovered driver in a Firmware Volume, the\r
+  portable DXE Core Dispatcher will call into the Security Architectural\r

   Protocol (SAP) with the authentication state of the driver.\r
 \r
   This call-out allows for OEM-specific policy decisions to be made, such\r
   Protocol (SAP) with the authentication state of the driver.\r
 \r
   This call-out allows for OEM-specific policy decisions to be made, such\r


@@ -11,17 +11,17 @@
   an unsigned driver or failed signature check, or other exception response.\r
 \r
   The SAP can also change system behavior by having the DXE core put a driver\r
   an unsigned driver or failed signature check, or other exception response.\r
 \r
   The SAP can also change system behavior by having the DXE core put a driver\r

-  in the Schedule-On-Request (SOR) state.  This will allow for later disposition \r
+  in the Schedule-On-Request (SOR) state.  This will allow for later disposition\r

   of the driver by platform agent, such as Platform BDS.\r
 \r
   of the driver by platform agent, such as Platform BDS.\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
+  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


@@ -37,31 +37,31 @@
 typedef struct _EFI_SECURITY_ARCH_PROTOCOL    EFI_SECURITY_ARCH_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_SECURITY_ARCH_PROTOCOL    EFI_SECURITY_ARCH_PROTOCOL;\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


@@ -81,7 +81,7 @@ typedef struct _EFI_SECURITY_ARCH_PROTOCOL    EFI_SECURITY_ARCH_PROTOCOL;
                                 used for any purpose.\r
 \r
 **/\r
                                 used for any purpose.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_SECURITY_FILE_AUTHENTICATION_STATE)(\r
   IN  CONST EFI_SECURITY_ARCH_PROTOCOL *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_SECURITY_FILE_AUTHENTICATION_STATE)(\r
   IN  CONST EFI_SECURITY_ARCH_PROTOCOL *This,\r


@@ -91,7 +91,7 @@ EFI_STATUS
 \r
 ///\r
 /// The EFI_SECURITY_ARCH_PROTOCOL is used to abstract platform-specific policy\r
 \r
 ///\r
 /// The EFI_SECURITY_ARCH_PROTOCOL is used to abstract platform-specific policy\r

-/// from the DXE core.  This includes locking flash upon failure to authenticate, \r
+/// from the DXE core.  This includes locking flash upon failure to authenticate,\r

 /// attestation logging, and other exception operations.\r
 ///\r
 struct _EFI_SECURITY_ARCH_PROTOCOL {\r
 /// attestation logging, and other exception operations.\r
 ///\r
 struct _EFI_SECURITY_ARCH_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Security2.h b/MdePkg/Include/Protocol/Security2.h
index d282837b395d78ac86f0b13b0141ba153f00eb90..5db4dbde37956ede510642a3523baf3c8eacf902 100644 (file)
--- a/MdePkg/Include/Protocol/Security2.h
+++ b/MdePkg/Include/Protocol/Security2.h
@@ -4,27 +4,27 @@
   Abstracts security-specific functions from the DXE Foundation of UEFI Image Verification,\r
   Trusted Computing Group (TCG) measured boot, and User Identity policy for image loading and\r
   consoles. This protocol must be produced by a boot service or runtime DXE driver.\r
   Abstracts security-specific functions from the DXE Foundation of UEFI Image Verification,\r
   Trusted Computing Group (TCG) measured boot, and User Identity policy for image loading and\r
   consoles. This protocol must be produced by a boot service or runtime DXE driver.\r

-  \r
+\r

   This protocol is optional and must be published prior to the EFI_SECURITY_ARCH_PROTOCOL.\r
   As a result, the same driver must publish both of these interfaces.\r
   This protocol is optional and must be published prior to the EFI_SECURITY_ARCH_PROTOCOL.\r
   As a result, the same driver must publish both of these interfaces.\r

-  \r
+\r

   When both Security and Security2 Architectural Protocols are published, LoadImage must use\r
   them in accordance with the following rules:\r
     The Security2 protocol must be used on every image being loaded.\r
   When both Security and Security2 Architectural Protocols are published, LoadImage must use\r
   them in accordance with the following rules:\r
     The Security2 protocol must be used on every image being loaded.\r

-    The Security protocol must be used after the Securiy2 protocol and only on images that \r
+    The Security protocol must be used after the Securiy2 protocol and only on images that\r

     have been read using Firmware Volume protocol.\r
 \r
   When only Security architectural protocol is published, LoadImage must use it on every image\r
   being loaded.\r
 \r
     have been read using Firmware Volume protocol.\r
 \r
   When only Security architectural protocol is published, LoadImage must use it on every image\r
   being loaded.\r
 \r

-  Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \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) 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
+  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


@@ -36,7 +36,7 @@
 ///\r
 #define EFI_SECURITY2_ARCH_PROTOCOL_GUID \\r
   { 0x94ab2f58, 0x1438, 0x4ef1, {0x91, 0x52, 0x18, 0x94, 0x1a, 0x3a, 0x0e, 0x68 } }\r
 ///\r
 #define EFI_SECURITY2_ARCH_PROTOCOL_GUID \\r
   { 0x94ab2f58, 0x1438, 0x4ef1, {0x91, 0x52, 0x18, 0x94, 0x1a, 0x3a, 0x0e, 0x68 } }\r

-  \r
+\r

 typedef struct _EFI_SECURITY2_ARCH_PROTOCOL    EFI_SECURITY2_ARCH_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_SECURITY2_ARCH_PROTOCOL    EFI_SECURITY2_ARCH_PROTOCOL;\r
 \r
 /**\r


@@ -51,7 +51,7 @@ typedef struct _EFI_SECURITY2_ARCH_PROTOCOL    EFI_SECURITY2_ARCH_PROTOCOL;
   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


@@ -60,7 +60,7 @@ typedef struct _EFI_SECURITY2_ARCH_PROTOCOL    EFI_SECURITY2_ARCH_PROTOCOL;
   @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


@@ -84,7 +84,7 @@ typedef struct _EFI_SECURITY2_ARCH_PROTOCOL    EFI_SECURITY2_ARCH_PROTOCOL;
                                   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 EFI_STATUS (EFIAPI *EFI_SECURITY2_FILE_AUTHENTICATION) (  \r
+typedef EFI_STATUS (EFIAPI *EFI_SECURITY2_FILE_AUTHENTICATION) (\r

   IN CONST EFI_SECURITY2_ARCH_PROTOCOL *This,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL    *DevicePath,\r
   IN VOID                              *FileBuffer,\r
   IN CONST EFI_SECURITY2_ARCH_PROTOCOL *This,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL    *DevicePath,\r
   IN VOID                              *FileBuffer,\r

diff --git a/MdePkg/Include/Protocol/SecurityPolicy.h b/MdePkg/Include/Protocol/SecurityPolicy.h
index 7c4afb622463627a40fd24802bb5ffec94d91fec..a69e3a1c9d38abbd3dff6c0ad529c2eb9d586f79 100644 (file)
--- a/MdePkg/Include/Protocol/SecurityPolicy.h
+++ b/MdePkg/Include/Protocol/SecurityPolicy.h
@@ -1,14 +1,14 @@
 /** @file\r
   Security Policy protocol as defined in PI Specification VOLUME 2 DXE\r
 \r
 /** @file\r
   Security Policy protocol as defined in PI Specification VOLUME 2 DXE\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
+  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

diff --git a/MdePkg/Include/Protocol/SerialIo.h b/MdePkg/Include/Protocol/SerialIo.h
index 1263dc4fe9731b285fab0a60683742290f2491ff..9f08b298e3dbc41bb09d0fb1da80503a23fab8c6 100644 (file)
--- a/MdePkg/Include/Protocol/SerialIo.h
+++ b/MdePkg/Include/Protocol/SerialIo.h
@@ -4,14 +4,14 @@
   Abstraction of a basic serial device. Targeted at 16550 UART, but\r
   could be much more generic.\r
 \r
   Abstraction of a basic serial device. Targeted at 16550 UART, but\r
   could be much more generic.\r
 \r

-  Copyright (c) 2006 - 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) 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


@@ -25,7 +25,7 @@
 \r
 ///\r
 /// Protocol GUID defined in EFI1.1.\r
 \r
 ///\r
 /// Protocol GUID defined in EFI1.1.\r

-/// \r
+///\r

 #define SERIAL_IO_PROTOCOL  EFI_SERIAL_IO_PROTOCOL_GUID\r
 \r
 typedef struct _EFI_SERIAL_IO_PROTOCOL EFI_SERIAL_IO_PROTOCOL;\r
 #define SERIAL_IO_PROTOCOL  EFI_SERIAL_IO_PROTOCOL_GUID\r
 \r
 typedef struct _EFI_SERIAL_IO_PROTOCOL EFI_SERIAL_IO_PROTOCOL;\r


@@ -33,7 +33,7 @@ typedef struct _EFI_SERIAL_IO_PROTOCOL EFI_SERIAL_IO_PROTOCOL;
 \r
 ///\r
 /// Backward-compatible with EFI1.1.\r
 \r
 ///\r
 /// Backward-compatible with EFI1.1.\r

-/// \r
+///\r

 typedef EFI_SERIAL_IO_PROTOCOL  SERIAL_IO_INTERFACE;\r
 \r
 ///\r
 typedef EFI_SERIAL_IO_PROTOCOL  SERIAL_IO_INTERFACE;\r
 \r
 ///\r


@@ -92,7 +92,7 @@ typedef enum {
   Reset the serial device.\r
 \r
   @param  This              Protocol instance pointer.\r
   Reset the serial device.\r
 \r
   @param  This              Protocol instance pointer.\r

-                            \r
+\r

   @retval EFI_SUCCESS       The device was reset.\r
   @retval EFI_DEVICE_ERROR  The serial device could not be reset.\r
 \r
   @retval EFI_SUCCESS       The device was reset.\r
   @retval EFI_DEVICE_ERROR  The serial device could not be reset.\r
 \r


@@ -104,7 +104,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Sets the baud rate, receive FIFO depth, transmit/receice time out, parity, \r
+  Sets the baud rate, receive FIFO depth, transmit/receice time out, parity,\r

   data bits, and stop bits on a serial device.\r
 \r
   @param  This             Protocol instance pointer.\r
   data bits, and stop bits on a serial device.\r
 \r
   @param  This             Protocol instance pointer.\r


@@ -165,7 +165,7 @@ EFI_STATUS
 \r
   @param  This              Protocol instance pointer.\r
   @param  Control           A pointer to return the current Control signals from the serial device.\r
 \r
   @param  This              Protocol instance pointer.\r
   @param  Control           A pointer to return the current Control signals from the serial device.\r

-                            \r
+\r

   @retval EFI_SUCCESS       The control bits were read from the serial device.\r
   @retval EFI_DEVICE_ERROR  The serial device is not functioning correctly.\r
 \r
   @retval EFI_SUCCESS       The control bits were read from the serial device.\r
   @retval EFI_DEVICE_ERROR  The serial device is not functioning correctly.\r
 \r


@@ -221,33 +221,33 @@ EFI_STATUS
 \r
 /**\r
   @par Data Structure Description:\r
 \r
 /**\r
   @par Data Structure Description:\r

-  The data values in SERIAL_IO_MODE are read-only and are updated by the code \r
+  The data values in SERIAL_IO_MODE are read-only and are updated by the code\r

   that produces the SERIAL_IO_PROTOCOL member functions.\r
 \r
   @param ControlMask\r
   A mask for the Control bits that the device supports. The device\r
   must always support the Input Buffer Empty control bit.\r
   that produces the SERIAL_IO_PROTOCOL member functions.\r
 \r
   @param ControlMask\r
   A mask for the Control bits that the device supports. The device\r
   must always support the Input Buffer Empty control bit.\r

-  \r
+\r

   @param TimeOut\r
   If applicable, the number of microseconds to wait before timing out\r
   a Read or Write operation.\r
   @param TimeOut\r
   If applicable, the number of microseconds to wait before timing out\r
   a Read or Write operation.\r

-  \r
+\r

   @param BaudRate\r
   If applicable, the current baud rate setting of the device; otherwise,\r
   baud rate has the value of zero to indicate that device runs at the\r
   device's designed speed.\r
   @param BaudRate\r
   If applicable, the current baud rate setting of the device; otherwise,\r
   baud rate has the value of zero to indicate that device runs at the\r
   device's designed speed.\r

-  \r
+\r

   @param ReceiveFifoDepth\r
   The number of characters the device will buffer on input\r
   @param ReceiveFifoDepth\r
   The number of characters the device will buffer on input\r

-  \r
+\r

   @param DataBits\r
   The number of characters the device will buffer on input\r
   @param DataBits\r
   The number of characters the device will buffer on input\r

-  \r
+\r

   @param Parity\r
   @param Parity\r

-  If applicable, this is the EFI_PARITY_TYPE that is computed or \r
+  If applicable, this is the EFI_PARITY_TYPE that is computed or\r

   checked as each character is transmitted or reveived. If the device\r
   does not support parity the value is the default parity value.\r
   checked as each character is transmitted or reveived. If the device\r
   does not support parity the value is the default parity value.\r

-  \r
+\r

   @param StopBits\r
   If applicable, the EFI_STOP_BITS_TYPE number of stop bits per\r
   character. If the device does not support stop bits the value is\r
   @param StopBits\r
   If applicable, the EFI_STOP_BITS_TYPE number of stop bits per\r
   character. If the device does not support stop bits the value is\r


@@ -272,14 +272,14 @@ typedef struct {
 #define SERIAL_IO_INTERFACE_REVISION  EFI_SERIAL_IO_PROTOCOL_REVISION\r
 \r
 ///\r
 #define SERIAL_IO_INTERFACE_REVISION  EFI_SERIAL_IO_PROTOCOL_REVISION\r
 \r
 ///\r

-/// The Serial I/O protocol is used to communicate with UART-style serial devices. \r
-/// These can be standard UART serial ports in PC-AT systems, serial ports attached \r
+/// The Serial I/O protocol is used to communicate with UART-style serial devices.\r
+/// These can be standard UART serial ports in PC-AT systems, serial ports attached\r

 /// to a USB interface, or potentially any character-based I/O device.\r
 ///\r
 struct _EFI_SERIAL_IO_PROTOCOL {\r
   ///\r
 /// to a USB interface, or potentially any character-based I/O device.\r
 ///\r
 struct _EFI_SERIAL_IO_PROTOCOL {\r
   ///\r

-  /// The revision to which the EFI_SERIAL_IO_PROTOCOL adheres. All future revisions \r
-  /// must be backwards compatible. If a future version is not backwards compatible, \r
+  /// The revision to which the EFI_SERIAL_IO_PROTOCOL adheres. All future revisions\r
+  /// must be backwards compatible. If a future version is not backwards compatible,\r

   /// it is not the same GUID.\r
   ///\r
   UINT32                      Revision;\r
   /// it is not the same GUID.\r
   ///\r
   UINT32                      Revision;\r

diff --git a/MdePkg/Include/Protocol/ServiceBinding.h b/MdePkg/Include/Protocol/ServiceBinding.h
index 6b8f8283ecdd69f45031ffaedd9763dd37ebd919..99d8bcaedd350f223b4901d700172b6634b69fd2 100644 (file)
--- a/MdePkg/Include/Protocol/ServiceBinding.h
+++ b/MdePkg/Include/Protocol/ServiceBinding.h
@@ -1,18 +1,18 @@
-/** @file  \r
+/** @file\r

   UEFI Service Binding Protocol is defined in UEFI specification.\r
 \r
   The file defines the generic Service Binding Protocol functions.\r
   UEFI Service Binding Protocol is defined in UEFI specification.\r
 \r
   The file defines the generic Service Binding Protocol functions.\r

-  It provides services that are required to create and destroy child \r
+  It provides services that are required to create and destroy child\r

   handles that support a given set of protocols.\r
 \r
   handles that support a given set of protocols.\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


@@ -26,14 +26,14 @@ typedef struct _EFI_SERVICE_BINDING_PROTOCOL EFI_SERVICE_BINDING_PROTOCOL;
 \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


@@ -52,9 +52,9 @@ EFI_STATUS
 \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


@@ -76,14 +76,14 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The EFI_SERVICE_BINDING_PROTOCOL provides member functions to create and destroy \r
-/// child handles. A driver is responsible for adding protocols to the child handle \r
-/// in CreateChild() and removing protocols in DestroyChild(). It is also required \r
-/// that the CreateChild() function opens the parent protocol BY_CHILD_CONTROLLER \r
+/// The EFI_SERVICE_BINDING_PROTOCOL provides member functions to create and destroy\r
+/// child handles. A driver is responsible for adding protocols to the child handle\r
+/// in CreateChild() and removing protocols in DestroyChild(). It is also required\r
+/// that the CreateChild() function opens the parent protocol BY_CHILD_CONTROLLER\r

 /// to establish the parent-child relationship, and closes the protocol in DestroyChild().\r
 /// to establish the parent-child relationship, and closes the protocol in DestroyChild().\r

-/// The pseudo code for CreateChild() and DestroyChild() is provided to specify the \r
-/// required behavior, not to specify the required implementation. Each consumer of \r
-/// a software protocol is responsible for calling CreateChild() when it requires the \r
+/// The pseudo code for CreateChild() and DestroyChild() is provided to specify the\r
+/// required behavior, not to specify the required implementation. Each consumer of\r
+/// a software protocol is responsible for calling CreateChild() when it requires the\r

 /// protocol and calling DestroyChild() when it is finished with that protocol.\r
 ///\r
 struct _EFI_SERVICE_BINDING_PROTOCOL {\r
 /// protocol and calling DestroyChild() when it is finished with that protocol.\r
 ///\r
 struct _EFI_SERVICE_BINDING_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Shell.h b/MdePkg/Include/Protocol/Shell.h
index e3889a96e2408ef50e436668ab5061831be3979b..5795bae4d15551a4406954bd0466bbfa26dd472b 100644 (file)
--- a/MdePkg/Include/Protocol/Shell.h
+++ b/MdePkg/Include/Protocol/Shell.h
@@ -2,7 +2,7 @@
   EFI Shell protocol as defined in the UEFI Shell 2.0 specification including errata.\r
 \r
   (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
   EFI Shell protocol as defined in the UEFI Shell 2.0 specification including errata.\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


@@ -547,7 +547,7 @@ CONST CHAR16 *
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Gets the environment variable and Attributes, or list of environment variables.  Can be \r
+  Gets the environment variable and Attributes, or list of environment variables.  Can be\r

   used instead of GetEnv().\r
 \r
   This function returns the current value of the specified environment variable and\r
   used instead of GetEnv().\r
 \r
   This function returns the current value of the specified environment variable and\r


@@ -555,18 +555,18 @@ CONST CHAR16 *
   variables will be returned.\r
 \r
   @param[in] Name               A pointer to the environment variable name. If Name is NULL,\r
   variables will be returned.\r
 \r
   @param[in] Name               A pointer to the environment variable name. If Name is NULL,\r

-                                then the function will return all of the defined shell \r
+                                then the function will return all of the defined shell\r

                                 environment variables. In the case where multiple environment\r
                                 environment variables. In the case where multiple environment\r

-                                variables are being returned, each variable will be terminated \r
+                                variables are being returned, each variable will be terminated\r

                                 by a NULL, and the list will be terminated by a double NULL.\r
   @param[out] Attributes        If not NULL, a pointer to the returned attributes bitmask for\r
                                 the environment variable. In the case where Name is NULL, and\r
                                 multiple environment variables are being returned, Attributes\r
                                 is undefined.\r
 \r
                                 by a NULL, and the list will be terminated by a double NULL.\r
   @param[out] Attributes        If not NULL, a pointer to the returned attributes bitmask for\r
                                 the environment variable. In the case where Name is NULL, and\r
                                 multiple environment variables are being returned, Attributes\r
                                 is undefined.\r
 \r

-  @retval NULL                  The environment variable doesn't exist.  \r
-  @return                       The environment variable's value. The returned pointer does not \r
-                                need to be freed by the caller.  \r
+  @retval NULL                  The environment variable doesn't exist.\r
+  @return                       The environment variable's value. The returned pointer does not\r
+                                need to be freed by the caller.\r

 **/\r
 typedef\r
 CONST CHAR16 *\r
 **/\r
 typedef\r
 CONST CHAR16 *\r


@@ -1011,7 +1011,7 @@ EFI_STATUS
                                 aliases will be returned in ReturnedData.\r
   @param[out] Volatile          Upon return of a single command if TRUE indicates\r
                                 this is stored in a volatile fashion.  FALSE otherwise.\r
                                 aliases will be returned in ReturnedData.\r
   @param[out] Volatile          Upon return of a single command if TRUE indicates\r
                                 this is stored in a volatile fashion.  FALSE otherwise.\r

-  @return                              If Alias is not NULL, it will return a pointer to\r
+  @return                        If Alias is not NULL, it will return a pointer to\r

                                 the NULL-terminated command for that alias.\r
                                 If Alias is NULL, ReturnedData points to a ';'\r
                                 delimited list of alias (e.g.\r
                                 the NULL-terminated command for that alias.\r
                                 If Alias is NULL, ReturnedData points to a ';'\r
                                 delimited list of alias (e.g.\r

diff --git a/MdePkg/Include/Protocol/ShellDynamicCommand.h b/MdePkg/Include/Protocol/ShellDynamicCommand.h
index e9498788e1d91abb8fbb6e07b1ea3d0c70c1b2ee..45c899ac92e06fc24303c03c3eab12628d46fb6c 100644 (file)
--- a/MdePkg/Include/Protocol/ShellDynamicCommand.h
+++ b/MdePkg/Include/Protocol/ShellDynamicCommand.h
@@ -2,7 +2,7 @@
   EFI Shell Dynamic Command registration protocol\r
 \r
   (C) Copyright 2012-2014 Hewlett-Packard Development Company, L.P.<BR>\r
   EFI Shell Dynamic Command registration protocol\r
 \r
   (C) Copyright 2012-2014 Hewlett-Packard Development Company, L.P.<BR>\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


@@ -73,7 +73,7 @@ CHAR16*
 \r
 /// EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL protocol structure.\r
 struct _EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL {\r
 \r
 /// EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL protocol structure.\r
 struct _EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL {\r

-  \r
+\r

   CONST CHAR16           *CommandName;\r
   SHELL_COMMAND_HANDLER  Handler;\r
   SHELL_COMMAND_GETHELP  GetHelp;\r
   CONST CHAR16           *CommandName;\r
   SHELL_COMMAND_HANDLER  Handler;\r
   SHELL_COMMAND_GETHELP  GetHelp;\r

diff --git a/MdePkg/Include/Protocol/SimpleFileSystem.h b/MdePkg/Include/Protocol/SimpleFileSystem.h
index 461e568225f6fc56e85630664c675a160e875cfe..d3e097ab3b1b58181cc4026f18ad266f9f0924a7 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleFileSystem.h
+++ b/MdePkg/Include/Protocol/SimpleFileSystem.h
@@ -1,20 +1,20 @@
 /** @file\r
   SimpleFileSystem protocol as defined in the UEFI 2.0 specification.\r
 \r
 /** @file\r
   SimpleFileSystem protocol as defined in the UEFI 2.0 specification.\r
 \r

-  The SimpleFileSystem protocol is the programmatic access to the FAT (12,16,32) \r
-  file system specified in UEFI 2.0. It can also be used to abstract a file  \r
+  The SimpleFileSystem protocol is the programmatic access to the FAT (12,16,32)\r
+  file system specified in UEFI 2.0. It can also be used to abstract a file\r

   system other than FAT.\r
 \r
   UEFI 2.0 can boot from any valid EFI image contained in a SimpleFileSystem.\r
 \r
   system other than FAT.\r
 \r
   UEFI 2.0 can boot from any valid EFI image contained in a SimpleFileSystem.\r
 \r

-Copyright (c) 2006 - 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) 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
-    \r
-THE PROGRAM 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


@@ -33,12 +33,12 @@ typedef struct _EFI_FILE_PROTOCOL         *EFI_FILE_HANDLE;
 \r
 ///\r
 /// Protocol GUID name defined in EFI1.1.\r
 \r
 ///\r
 /// Protocol GUID name defined in EFI1.1.\r

-/// \r
+///\r

 #define SIMPLE_FILE_SYSTEM_PROTOCOL       EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID\r
 \r
 ///\r
 /// Protocol name defined in EFI1.1.\r
 #define SIMPLE_FILE_SYSTEM_PROTOCOL       EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID\r
 \r
 ///\r
 /// Protocol name defined in EFI1.1.\r

-/// \r
+///\r

 typedef EFI_SIMPLE_FILE_SYSTEM_PROTOCOL   EFI_FILE_IO_INTERFACE;\r
 typedef EFI_FILE_PROTOCOL                 EFI_FILE;\r
 \r
 typedef EFI_SIMPLE_FILE_SYSTEM_PROTOCOL   EFI_FILE_IO_INTERFACE;\r
 typedef EFI_FILE_PROTOCOL                 EFI_FILE;\r
 \r


@@ -73,7 +73,7 @@ EFI_STATUS
 \r
 ///\r
 /// Revision defined in EFI1.1\r
 \r
 ///\r
 /// Revision defined in EFI1.1\r

-/// \r
+///\r

 #define EFI_FILE_IO_INTERFACE_REVISION  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION\r
 \r
 struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL {\r
 #define EFI_FILE_IO_INTERFACE_REVISION  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION\r
 \r
 struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL {\r


@@ -99,7 +99,7 @@ struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL {
                      and "..".\r
   @param  OpenMode   The mode to open the file. The only valid combinations that the\r
                      file may be opened with are: Read, Read/Write, or Create/Read/Write.\r
                      and "..".\r
   @param  OpenMode   The mode to open the file. The only valid combinations that the\r
                      file may be opened with are: Read, Read/Write, or Create/Read/Write.\r

-  @param  Attributes Only valid for EFI_FILE_MODE_CREATE, in which case these are the \r
+  @param  Attributes Only valid for EFI_FILE_MODE_CREATE, in which case these are the\r

                      attribute bits for the newly created file.\r
 \r
   @retval EFI_SUCCESS          The file was opened.\r
                      attribute bits for the newly created file.\r
 \r
   @retval EFI_SUCCESS          The file was opened.\r


@@ -147,7 +147,7 @@ EFI_STATUS
 /**\r
   Closes a specified file handle.\r
 \r
 /**\r
   Closes a specified file handle.\r
 \r

-  @param  This          A pointer to the EFI_FILE_PROTOCOL instance that is the file \r
+  @param  This          A pointer to the EFI_FILE_PROTOCOL instance that is the file\r

                         handle to close.\r
 \r
   @retval EFI_SUCCESS   The file was closed.\r
                         handle to close.\r
 \r
   @retval EFI_SUCCESS   The file was closed.\r


@@ -345,7 +345,7 @@ EFI_STATUS
 /**\r
   Flushes all modified data associated with a file to a device.\r
 \r
 /**\r
   Flushes all modified data associated with a file to a device.\r
 \r

-  @param  This A pointer to the EFI_FILE_PROTOCOL instance that is the file \r
+  @param  This A pointer to the EFI_FILE_PROTOCOL instance that is the file\r

                handle to flush.\r
 \r
   @retval EFI_SUCCESS          The data was flushed.\r
                handle to flush.\r
 \r
   @retval EFI_SUCCESS          The data was flushed.\r


@@ -409,7 +409,7 @@ typedef struct {
                      and "..".\r
   @param  OpenMode   The mode to open the file. The only valid combinations that the\r
                      file may be opened with are: Read, Read/Write, or Create/Read/Write.\r
                      and "..".\r
   @param  OpenMode   The mode to open the file. The only valid combinations that the\r
                      file may be opened with are: Read, Read/Write, or Create/Read/Write.\r

-  @param  Attributes Only valid for EFI_FILE_MODE_CREATE, in which case these are the \r
+  @param  Attributes Only valid for EFI_FILE_MODE_CREATE, in which case these are the\r

                      attribute bits for the newly created file.\r
   @param  Token      A pointer to the token associated with the transaction.\r
 \r
                      attribute bits for the newly created file.\r
   @param  Token      A pointer to the token associated with the transaction.\r
 \r


@@ -488,13 +488,13 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_WRITE_EX) (\r
   IN EFI_FILE_PROTOCOL        *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_WRITE_EX) (\r
   IN EFI_FILE_PROTOCOL        *This,\r

-  IN OUT EFI_FILE_IO_TOKEN    *Token \r
+  IN OUT EFI_FILE_IO_TOKEN    *Token\r

 );\r
 \r
 /**\r
   Flushes all modified data associated with a file to a device.\r
 \r
 );\r
 \r
 /**\r
   Flushes all modified data associated with a file to a device.\r
 \r

-  @param  This  A pointer to the EFI_FILE_PROTOCOL instance that is the file \r
+  @param  This  A pointer to the EFI_FILE_PROTOCOL instance that is the file\r

                 handle to flush.\r
   @param  Token A pointer to the token associated with the transaction.\r
 \r
                 handle to flush.\r
   @param  Token A pointer to the token associated with the transaction.\r
 \r


@@ -523,19 +523,19 @@ EFI_STATUS
 \r
 //\r
 // Revision defined in EFI1.1.\r
 \r
 //\r
 // Revision defined in EFI1.1.\r

-// \r
+//\r

 #define EFI_FILE_REVISION   EFI_FILE_PROTOCOL_REVISION\r
 \r
 ///\r
 /// The EFI_FILE_PROTOCOL provides file IO access to supported file systems.\r
 #define EFI_FILE_REVISION   EFI_FILE_PROTOCOL_REVISION\r
 \r
 ///\r
 /// The EFI_FILE_PROTOCOL provides file IO access to supported file systems.\r

-/// An EFI_FILE_PROTOCOL provides access to a file's or directory's contents, \r
-/// and is also a reference to a location in the directory tree of the file system \r
-/// in which the file resides. With any given file handle, other files may be opened \r
+/// An EFI_FILE_PROTOCOL provides access to a file's or directory's contents,\r
+/// and is also a reference to a location in the directory tree of the file system\r
+/// in which the file resides. With any given file handle, other files may be opened\r

 /// relative to this file's location, yielding new file handles.\r
 ///\r
 struct _EFI_FILE_PROTOCOL {\r
   ///\r
 /// relative to this file's location, yielding new file handles.\r
 ///\r
 struct _EFI_FILE_PROTOCOL {\r
   ///\r

-  /// The version of the EFI_FILE_PROTOCOL interface. The version specified \r
+  /// The version of the EFI_FILE_PROTOCOL interface. The version specified\r

   /// by this specification is EFI_FILE_PROTOCOL_LATEST_REVISION.\r
   /// Future versions are required to be backward compatible to version 1.0.\r
   ///\r
   /// by this specification is EFI_FILE_PROTOCOL_LATEST_REVISION.\r
   /// Future versions are required to be backward compatible to version 1.0.\r
   ///\r

diff --git a/MdePkg/Include/Protocol/SimpleNetwork.h b/MdePkg/Include/Protocol/SimpleNetwork.h
index 839f526beb3e729ae6049ec189ecacb4b86dc6d8..3e47079194b069aa4bb7831890d13f55abc5f15c 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleNetwork.h
+++ b/MdePkg/Include/Protocol/SimpleNetwork.h
@@ -1,5 +1,5 @@
 /** @file\r
 /** @file\r

-  The EFI_SIMPLE_NETWORK_PROTOCOL provides services to initialize a network interface, \r
+  The EFI_SIMPLE_NETWORK_PROTOCOL provides services to initialize a network interface,\r

   transmit packets, receive packets, and close a network interface.\r
 \r
   Basic network device abstraction.\r
   transmit packets, receive packets, and close a network interface.\r
 \r
   Basic network device abstraction.\r


@@ -9,17 +9,17 @@
   MCast - MultiCast\r
   ...\r
 \r
   MCast - MultiCast\r
   ...\r
 \r

-Copyright (c) 2006 - 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) 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
-    \r
-THE PROGRAM 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
 \r

-  @par Revision Reference:          \r
-  This Protocol is introduced in EFI Specification 1.10.          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+  @par Revision Reference:\r
+  This Protocol is introduced in EFI Specification 1.10.\r

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


@@ -36,7 +36,7 @@ typedef struct _EFI_SIMPLE_NETWORK_PROTOCOL  EFI_SIMPLE_NETWORK_PROTOCOL;
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r

-/// \r
+///\r

 typedef EFI_SIMPLE_NETWORK_PROTOCOL   EFI_SIMPLE_NETWORK;\r
 \r
 ///\r
 typedef EFI_SIMPLE_NETWORK_PROTOCOL   EFI_SIMPLE_NETWORK;\r
 \r
 ///\r


@@ -288,8 +288,8 @@ EFI_STATUS
   );\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 \r
+  Resets a network adapter and allocates the transmit and receive buffers\r
+  required by the network interface; optionally, also requests allocation\r

   of additional transmit and receive buffers.\r
 \r
   @param  This              The protocol instance pointer.\r
   of additional transmit and receive buffers.\r
 \r
   @param  This              The protocol instance pointer.\r


@@ -322,8 +322,8 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Resets a network adapter and re-initializes it with the parameters that were \r
-  provided in the previous call to Initialize().  \r
+  Resets a network adapter and re-initializes it with the parameters that were\r
+  provided in the previous call to Initialize().\r

 \r
   @param  This                 The protocol instance pointer.\r
   @param  ExtendedVerification Indicates that the driver may perform a more\r
 \r
   @param  This                 The protocol instance pointer.\r
   @param  ExtendedVerification Indicates that the driver may perform a more\r


@@ -345,7 +345,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Resets a network adapter and leaves it in a state that is safe for \r
+  Resets a network adapter and leaves it in a state that is safe for\r

   another driver to initialize.\r
 \r
   @param  This Protocol instance pointer.\r
   another driver to initialize.\r
 \r
   @param  This Protocol instance pointer.\r


@@ -482,7 +482,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Performs read and write operations on the NVRAM device attached to a \r
+  Performs read and write operations on the NVRAM device attached to a\r

   network interface.\r
 \r
   @param  This       The protocol instance pointer.\r
   network interface.\r
 \r
   @param  This       The protocol instance pointer.\r


@@ -512,7 +512,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Reads the current interrupt status and recycled transmit buffer status from \r
+  Reads the current interrupt status and recycled transmit buffer status from\r

   a network interface.\r
 \r
   @param  This            The protocol instance pointer.\r
   a network interface.\r
 \r
   @param  This            The protocol instance pointer.\r


@@ -570,7 +570,7 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS           The packet was placed on the transmit queue.\r
   @retval EFI_NOT_STARTED       The network interface has not been started.\r
 \r
   @retval EFI_SUCCESS           The packet was placed on the transmit queue.\r
   @retval EFI_NOT_STARTED       The network interface has not been started.\r

-  @retval EFI_NOT_READY         The network interface is too busy to accept this transmit request.                      \r
+  @retval EFI_NOT_READY         The network interface is too busy to accept this transmit request.\r

   @retval EFI_BUFFER_TOO_SMALL  The BufferSize parameter is too small.\r
   @retval EFI_INVALID_PARAMETER One or more of the parameters has an unsupported value.\r
   @retval EFI_DEVICE_ERROR      The command could not be sent to the network interface.\r
   @retval EFI_BUFFER_TOO_SMALL  The BufferSize parameter is too small.\r
   @retval EFI_INVALID_PARAMETER One or more of the parameters has an unsupported value.\r
   @retval EFI_DEVICE_ERROR      The command could not be sent to the network interface.\r


@@ -637,19 +637,19 @@ EFI_STATUS
 \r
 //\r
 // Revision defined in EFI1.1\r
 \r
 //\r
 // Revision defined in EFI1.1\r

-// \r
+//\r

 #define EFI_SIMPLE_NETWORK_INTERFACE_REVISION   EFI_SIMPLE_NETWORK_PROTOCOL_REVISION\r
 \r
 ///\r
 #define EFI_SIMPLE_NETWORK_INTERFACE_REVISION   EFI_SIMPLE_NETWORK_PROTOCOL_REVISION\r
 \r
 ///\r

-/// The EFI_SIMPLE_NETWORK_PROTOCOL protocol is used to initialize access \r
-/// to a network adapter. Once the network adapter initializes, \r
-/// the EFI_SIMPLE_NETWORK_PROTOCOL protocol provides services that \r
+/// The EFI_SIMPLE_NETWORK_PROTOCOL protocol is used to initialize access\r
+/// to a network adapter. Once the network adapter initializes,\r
+/// the EFI_SIMPLE_NETWORK_PROTOCOL protocol provides services that\r

 /// allow packets to be transmitted and received.\r
 ///\r
 struct _EFI_SIMPLE_NETWORK_PROTOCOL {\r
   ///\r
 /// allow packets to be transmitted and received.\r
 ///\r
 struct _EFI_SIMPLE_NETWORK_PROTOCOL {\r
   ///\r

-  /// Revision of the EFI_SIMPLE_NETWORK_PROTOCOL. All future revisions must \r
-  /// be backwards compatible. If a future version is not backwards compatible \r
+  /// Revision of the EFI_SIMPLE_NETWORK_PROTOCOL. All future revisions must\r
+  /// be backwards compatible. If a future version is not backwards compatible\r

   /// it is not the same GUID.\r
   ///\r
   UINT64                              Revision;\r
   /// it is not the same GUID.\r
   ///\r
   UINT64                              Revision;\r

diff --git a/MdePkg/Include/Protocol/SimplePointer.h b/MdePkg/Include/Protocol/SimplePointer.h
index 5ea6c05b7c89bf0ad3ecfedfccb3623fd85e9e18..ff168b8d7b0d78c3195c7636255a1ab2d2c1fb34 100644 (file)
--- a/MdePkg/Include/Protocol/SimplePointer.h
+++ b/MdePkg/Include/Protocol/SimplePointer.h
@@ -3,14 +3,14 @@
 \r
   Abstraction of a very simple pointer device like a mouse or trackball.\r
 \r
 \r
   Abstraction of a very simple pointer device like a mouse or trackball.\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
+  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


@@ -78,17 +78,17 @@ typedef struct {
   BOOLEAN RightButton;\r
 } EFI_SIMPLE_POINTER_MODE;\r
 \r
   BOOLEAN RightButton;\r
 } EFI_SIMPLE_POINTER_MODE;\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\r
   @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL\r

-                                instance.                                   \r
+                                instance.\r

   @param  ExtendedVerification  Indicates that the driver may perform a more exhaustive\r
   @param  ExtendedVerification  Indicates that the driver may perform a more exhaustive\r

-                                verification operation of the device during reset.                                       \r
-                                \r
+                                verification operation of the device during reset.\r
+\r

   @retval EFI_SUCCESS           The device was reset.\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_DEVICE_ERROR      The device is not functioning correctly and could not be reset.\r
+\r

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


@@ -97,19 +97,19 @@ EFI_STATUS
   IN BOOLEAN                                ExtendedVerification\r
   );\r
 \r
   IN BOOLEAN                                ExtendedVerification\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves the current state of a pointer device.\r
   Retrieves the current state of a pointer device.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL\r
   @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL\r

-                                instance.                                   \r
+                                instance.\r

   @param  State                 A pointer to the state information on the pointer device.\r
   @param  State                 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
-                                   \r
+                                current state.\r
+\r

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


@@ -119,10 +119,10 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The EFI_SIMPLE_POINTER_PROTOCOL provides a set of services for a pointer \r
-/// device that can use used as an input device from an application written \r
-/// to this specification. The services include the ability to reset the \r
-/// pointer device, retrieve get the state of the pointer device, and \r
+/// The EFI_SIMPLE_POINTER_PROTOCOL provides a set of services for a pointer\r
+/// device that can use used as an input device from an application written\r
+/// to this specification. The services include the ability to reset the\r
+/// pointer device, retrieve get the state of the pointer device, and\r

 /// retrieve the capabilities of the pointer device.\r
 ///\r
 struct _EFI_SIMPLE_POINTER_PROTOCOL {\r
 /// retrieve the capabilities of the pointer device.\r
 ///\r
 struct _EFI_SIMPLE_POINTER_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/SimpleTextOut.h b/MdePkg/Include/Protocol/SimpleTextOut.h
index c1a23faada3d7d80f74721e20c4c68a8b96d5fb0..49d989ca1fea04663a94bec0f405207849b7a716 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleTextOut.h
+++ b/MdePkg/Include/Protocol/SimpleTextOut.h
@@ -6,14 +6,14 @@
   a single hardware device or a virtual device that is an aggregation\r
   of multiple physical devices.\r
 \r
   a single hardware device or a virtual device that is an aggregation\r
   of multiple physical devices.\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
-    \r
-THE PROGRAM 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


@@ -27,14 +27,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 ///\r
 /// Protocol GUID defined in EFI1.1.\r
 \r
 ///\r
 /// Protocol GUID defined in EFI1.1.\r

-/// \r
+///\r

 #define SIMPLE_TEXT_OUTPUT_PROTOCOL   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID\r
 \r
 typedef struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;\r
 \r
 ///\r
 /// Backward-compatible with EFI1.1.\r
 #define SIMPLE_TEXT_OUTPUT_PROTOCOL   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID\r
 \r
 typedef struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;\r
 \r
 ///\r
 /// Backward-compatible with EFI1.1.\r

-/// \r
+///\r

 typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   SIMPLE_TEXT_OUTPUT_INTERFACE;\r
 \r
 //\r
 typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   SIMPLE_TEXT_OUTPUT_INTERFACE;\r
 \r
 //\r


@@ -125,8 +125,8 @@ typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   SIMPLE_TEXT_OUTPUT_INTERFACE;
 #define EFI_WHITE                 (EFI_BLUE | EFI_GREEN | EFI_RED | EFI_BRIGHT)\r
 \r
 //\r
 #define EFI_WHITE                 (EFI_BLUE | EFI_GREEN | EFI_RED | EFI_BRIGHT)\r
 \r
 //\r

-// Macro to accept color values in their raw form to create \r
-// a value that represents both a foreground and background \r
+// Macro to accept color values in their raw form to create\r
+// a value that represents both a foreground and background\r

 // color in a single byte.\r
 // For Foreground, and EFI_* value is valid from EFI_BLACK(0x00) to\r
 // EFI_WHITE (0x0F).\r
 // color in a single byte.\r
 // For Foreground, and EFI_* value is valid from EFI_BLACK(0x00) to\r
 // EFI_WHITE (0x0F).\r


@@ -148,7 +148,7 @@ typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   SIMPLE_TEXT_OUTPUT_INTERFACE;
 \r
 //\r
 // We currently define attributes from 0 - 7F for color manipulations\r
 \r
 //\r
 // We currently define attributes from 0 - 7F for color manipulations\r

-// To internally handle the local display characteristics for a particular character, \r
+// To internally handle the local display characteristics for a particular character,\r

 // Bit 7 signifies the local glyph representation for a character.  If turned on, glyphs will be\r
 // pulled from the wide glyph database and will display locally as a wide character (16 X 19 versus 8 X 19)\r
 // If bit 7 is off, the narrow glyph database will be used.  This does NOT affect information that is sent to\r
 // Bit 7 signifies the local glyph representation for a character.  If turned on, glyphs will be\r
 // pulled from the wide glyph database and will display locally as a wide character (16 X 19 versus 8 X 19)\r
 // If bit 7 is off, the narrow glyph database will be used.  This does NOT affect information that is sent to\r


@@ -201,7 +201,7 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Verifies that all characters in a string can be output to the \r
+  Verifies that all characters in a string can be output to the\r

   target device.\r
 \r
   @param  This   The protocol instance pointer.\r
   target device.\r
 \r
   @param  This   The protocol instance pointer.\r


@@ -231,7 +231,7 @@ EFI_STATUS
                      requested ModeNumber.\r
   @param  Rows       Returns the geometry of the text output device for the\r
                      requested ModeNumber.\r
                      requested ModeNumber.\r
   @param  Rows       Returns the geometry of the text output device for the\r
                      requested ModeNumber.\r

-                                          \r
+\r

   @retval EFI_SUCCESS      The requested mode information was returned.\r
   @retval EFI_DEVICE_ERROR The device had an error and could not complete the request.\r
   @retval EFI_UNSUPPORTED  The mode number was not valid.\r
   @retval EFI_SUCCESS      The requested mode information was returned.\r
   @retval EFI_DEVICE_ERROR The device had an error and could not complete the request.\r
   @retval EFI_UNSUPPORTED  The mode number was not valid.\r


@@ -286,11 +286,11 @@ EFI_STATUS
   );\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
   @param  This              The protocol instance pointer.\r
   color.\r
 \r
   @param  This              The protocol instance pointer.\r

-                           \r
+\r

   @retval  EFI_SUCCESS      The operation completed successfully.\r
   @retval  EFI_DEVICE_ERROR The device had an error and could not complete the request.\r
   @retval  EFI_UNSUPPORTED  The output device is not in a valid text mode.\r
   @retval  EFI_SUCCESS      The operation completed successfully.\r
   @retval  EFI_DEVICE_ERROR The device had an error and could not complete the request.\r
   @retval  EFI_UNSUPPORTED  The output device is not in a valid text mode.\r


@@ -385,9 +385,9 @@ typedef struct {
 } EFI_SIMPLE_TEXT_OUTPUT_MODE;\r
 \r
 ///\r
 } EFI_SIMPLE_TEXT_OUTPUT_MODE;\r
 \r
 ///\r

-/// The SIMPLE_TEXT_OUTPUT protocol is used to control text-based output devices. \r
-/// It is the minimum required protocol for any handle supplied as the ConsoleOut \r
-/// or StandardError device. In addition, the minimum supported text mode of such \r
+/// The SIMPLE_TEXT_OUTPUT protocol is used to control text-based output devices.\r
+/// It is the minimum required protocol for any handle supplied as the ConsoleOut\r
+/// or StandardError device. In addition, the minimum supported text mode of such\r

 /// devices is at least 80 x 25 characters.\r
 ///\r
 struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL {\r
 /// devices is at least 80 x 25 characters.\r
 ///\r
 struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Smbios.h b/MdePkg/Include/Protocol/Smbios.h
index f52c4dfc5bacbb92a531be251930ecdc98356cf8..1f9023b40514768306755b59430c216a9b7ed6e7 100644 (file)
--- a/MdePkg/Include/Protocol/Smbios.h
+++ b/MdePkg/Include/Protocol/Smbios.h
@@ -1,7 +1,7 @@
 /** @file\r
   SMBIOS Protocol as defined in PI1.2 Specification VOLUME 5 Standard.\r
 \r
 /** @file\r
   SMBIOS Protocol as defined in PI1.2 Specification VOLUME 5 Standard.\r
 \r

-  SMBIOS protocol allows consumers to log SMBIOS data records, and enables the producer \r
+  SMBIOS protocol allows consumers to log SMBIOS data records, and enables the producer\r

   to create the SMBIOS tables for a platform.\r
 \r
   This protocol provides an interface to add, remove or discover SMBIOS records. The driver which\r
   to create the SMBIOS tables for a platform.\r
 \r
   This protocol provides an interface to add, remove or discover SMBIOS records. The driver which\r


@@ -13,14 +13,14 @@
   requiring an update to MajorVersion and MinorVersion.\r
   The SMBIOS protocol can only be called a TPL < TPL_NOTIFY.\r
 \r
   requiring an update to MajorVersion and MinorVersion.\r
   The SMBIOS protocol can only be called a TPL < TPL_NOTIFY.\r
 \r

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


@@ -84,12 +84,12 @@ typedef SMBIOS_TABLE_STRING EFI_SMBIOS_STRING;
 typedef SMBIOS_TYPE         EFI_SMBIOS_TYPE;\r
 typedef SMBIOS_HANDLE       EFI_SMBIOS_HANDLE;\r
 typedef SMBIOS_STRUCTURE    EFI_SMBIOS_TABLE_HEADER;\r
 typedef SMBIOS_TYPE         EFI_SMBIOS_TYPE;\r
 typedef SMBIOS_HANDLE       EFI_SMBIOS_HANDLE;\r
 typedef SMBIOS_STRUCTURE    EFI_SMBIOS_TABLE_HEADER;\r

-    \r
+\r

 typedef struct _EFI_SMBIOS_PROTOCOL EFI_SMBIOS_PROTOCOL;\r
 \r
 /**\r
   Add an SMBIOS record.\r
 typedef struct _EFI_SMBIOS_PROTOCOL EFI_SMBIOS_PROTOCOL;\r
 \r
 /**\r
   Add an SMBIOS record.\r

-  \r
+\r

   This function allows any agent to add SMBIOS records. The caller is responsible for ensuring\r
   Record is formatted in a way that matches the version of the SMBIOS specification as defined in\r
   the MajorRevision and MinorRevision fields of the EFI_SMBIOS_PROTOCOL.\r
   This function allows any agent to add SMBIOS records. The caller is responsible for ensuring\r
   Record is formatted in a way that matches the version of the SMBIOS specification as defined in\r
   the MajorRevision and MinorRevision fields of the EFI_SMBIOS_PROTOCOL.\r


@@ -100,7 +100,7 @@ typedef struct _EFI_SMBIOS_PROTOCOL EFI_SMBIOS_PROTOCOL;
   directly following the last string. The number of optional strings is not defined by the formatted area,\r
   but is fixed by the call to Add(). A string can be a place holder, but it must not be a NULL string as\r
   two NULL strings look like the double-null that terminates the structure.\r
   directly following the last string. The number of optional strings is not defined by the formatted area,\r
   but is fixed by the call to Add(). A string can be a place holder, but it must not be a NULL string as\r
   two NULL strings look like the double-null that terminates the structure.\r

-  \r
+\r

   @param[in]        This                The EFI_SMBIOS_PROTOCOL instance.\r
   @param[in]        ProducerHandle      The handle of the controller or driver associated with the SMBIOS information. NULL means no handle.\r
   @param[in, out]   SmbiosHandle        On entry, the handle of the SMBIOS record to add. If FFFEh, then a unique handle\r
   @param[in]        This                The EFI_SMBIOS_PROTOCOL instance.\r
   @param[in]        ProducerHandle      The handle of the controller or driver associated with the SMBIOS information. NULL means no handle.\r
   @param[in, out]   SmbiosHandle        On entry, the handle of the SMBIOS record to add. If FFFEh, then a unique handle\r


@@ -110,7 +110,7 @@ typedef struct _EFI_SMBIOS_PROTOCOL EFI_SMBIOS_PROTOCOL;
                                         determined by EFI_SMBIOS_TABLE_HEADER.Type. The size of the formatted\r
                                         area is defined by EFI_SMBIOS_TABLE_HEADER.Length and either followed\r
                                         by a double-null (0x0000) or a set of null terminated strings and a null.\r
                                         determined by EFI_SMBIOS_TABLE_HEADER.Type. The size of the formatted\r
                                         area is defined by EFI_SMBIOS_TABLE_HEADER.Length and either followed\r
                                         by a double-null (0x0000) or a set of null terminated strings and a null.\r

-  \r
+\r

   @retval EFI_SUCCESS                   Record was added.\r
   @retval EFI_OUT_OF_RESOURCES          Record was not added.\r
   @retval EFI_ALREADY_STARTED           The SmbiosHandle passed in was already in use.\r
   @retval EFI_SUCCESS                   Record was added.\r
   @retval EFI_OUT_OF_RESOURCES          Record was not added.\r
   @retval EFI_ALREADY_STARTED           The SmbiosHandle passed in was already in use.\r


@@ -126,19 +126,19 @@ EFI_STATUS
 \r
 /**\r
   Update the string associated with an existing SMBIOS record.\r
 \r
 /**\r
   Update the string associated with an existing SMBIOS record.\r

-  \r
+\r

   This function allows the update of specific SMBIOS strings. The number of valid strings for any\r
   SMBIOS record is defined by how many strings were present when Add() was called.\r
   This function allows the update of specific SMBIOS strings. The number of valid strings for any\r
   SMBIOS record is defined by how many strings were present when Add() was called.\r

-  \r
+\r

   @param[in]    This            The EFI_SMBIOS_PROTOCOL instance.\r
   @param[in]    SmbiosHandle    SMBIOS Handle of structure that will have its string updated.\r
   @param[in]    StringNumber    The non-zero string number of the string to update.\r
   @param[in]    String          Update the StringNumber string with String.\r
   @param[in]    This            The EFI_SMBIOS_PROTOCOL instance.\r
   @param[in]    SmbiosHandle    SMBIOS Handle of structure that will have its string updated.\r
   @param[in]    StringNumber    The non-zero string number of the string to update.\r
   @param[in]    String          Update the StringNumber string with String.\r

-  \r
+\r

   @retval EFI_SUCCESS           SmbiosHandle had its StringNumber String updated.\r
   @retval EFI_INVALID_PARAMETER SmbiosHandle does not exist.\r
   @retval EFI_UNSUPPORTED       String was not added because it is longer than the SMBIOS Table supports.\r
   @retval EFI_SUCCESS           SmbiosHandle had its StringNumber String updated.\r
   @retval EFI_INVALID_PARAMETER SmbiosHandle does not exist.\r
   @retval EFI_UNSUPPORTED       String was not added because it is longer than the SMBIOS Table supports.\r

-  @retval EFI_NOT_FOUND         The StringNumber.is not valid for this SMBIOS record.    \r
+  @retval EFI_NOT_FOUND         The StringNumber.is not valid for this SMBIOS record.\r

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


@@ -151,12 +151,12 @@ EFI_STATUS
 \r
 /**\r
   Remove an SMBIOS record.\r
 \r
 /**\r
   Remove an SMBIOS record.\r

-  \r
+\r

   This function removes an SMBIOS record using the handle specified by SmbiosHandle.\r
   This function removes an SMBIOS record using the handle specified by SmbiosHandle.\r

-  \r
+\r

   @param[in]    This                The EFI_SMBIOS_PROTOCOL instance.\r
   @param[in]    SmbiosHandle        The handle of the SMBIOS record to remove.\r
   @param[in]    This                The EFI_SMBIOS_PROTOCOL instance.\r
   @param[in]    SmbiosHandle        The handle of the SMBIOS record to remove.\r

-  \r
+\r

   @retval EFI_SUCCESS               SMBIOS record was removed.\r
   @retval EFI_INVALID_PARAMETER     SmbiosHandle does not specify a valid SMBIOS record.\r
 **/\r
   @retval EFI_SUCCESS               SMBIOS record was removed.\r
   @retval EFI_INVALID_PARAMETER     SmbiosHandle does not specify a valid SMBIOS record.\r
 **/\r


@@ -169,10 +169,10 @@ EFI_STATUS
 \r
 /**\r
   Allow the caller to discover all or some of the SMBIOS records.\r
 \r
 /**\r
   Allow the caller to discover all or some of the SMBIOS records.\r

-  \r
+\r

   This function allows all of the SMBIOS records to be discovered. It's possible to find\r
   only the SMBIOS records that match the optional Type argument.\r
   This function allows all of the SMBIOS records to be discovered. It's possible to find\r
   only the SMBIOS records that match the optional Type argument.\r

-  \r
+\r

   @param[in]        This            The EFI_SMBIOS_PROTOCOL instance.\r
   @param[in, out]   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
   @param[in]        This            The EFI_SMBIOS_PROTOCOL instance.\r
   @param[in, out]   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


@@ -207,7 +207,7 @@ struct _EFI_SMBIOS_PROTOCOL {
   UINT8                    MajorVersion;    ///< The major revision of the SMBIOS specification supported.\r
   UINT8                    MinorVersion;    ///< The minor revision of the SMBIOS specification supported.\r
 };\r
   UINT8                    MajorVersion;    ///< The major revision of the SMBIOS specification supported.\r
   UINT8                    MinorVersion;    ///< The minor revision of the SMBIOS specification supported.\r
 };\r

-    \r
+\r

 extern EFI_GUID gEfiSmbiosProtocolGuid;\r
 extern EFI_GUID gEfiSmbiosProtocolGuid;\r

-    \r
+\r

 #endif // __SMBIOS_PROTOCOL_H__\r
 #endif // __SMBIOS_PROTOCOL_H__\r

diff --git a/MdePkg/Include/Protocol/SmbusHc.h b/MdePkg/Include/Protocol/SmbusHc.h
index ed20a471785913c5ab6a512fb783e1409580b5bd..152d40625f6a933ea8b77367286bffa934d06d96 100644 (file)
--- a/MdePkg/Include/Protocol/SmbusHc.h
+++ b/MdePkg/Include/Protocol/SmbusHc.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  The file provides basic SMBus host controller management \r
+  The file provides basic SMBus host controller management\r

   and basic data transactions over the SMBus.\r
 \r
   and basic data transactions over the SMBus.\r
 \r

-  Copyright (c) 2006 - 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
+  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
   @par Revision Reference: PI\r
   Version 1.00.\r
 \r
   @par Revision Reference: PI\r
   Version 1.00.\r


@@ -27,13 +27,13 @@
 typedef struct _EFI_SMBUS_HC_PROTOCOL EFI_SMBUS_HC_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_SMBUS_HC_PROTOCOL EFI_SMBUS_HC_PROTOCOL;\r
 \r
 /**\r

-     \r
+\r

   The Execute() function provides a standard way to execute an\r
   operation as defined in the System Management Bus (SMBus)\r
   Specification. The resulting transaction will be either that\r
   the SMBus slave devices accept this transaction or that this\r
   The Execute() function provides a standard way to execute an\r
   operation as defined in the System Management Bus (SMBus)\r
   Specification. The resulting transaction will be either that\r
   the SMBus slave devices accept this transaction or that this\r

-  function returns with error. \r
-  \r
+  function returns with error.\r
+\r

   @param This     A pointer to the EFI_SMBUS_HC_PROTOCOL instance.\r
                   SlaveAddress The SMBus slave address of the device\r
                   with which to communicate. Type\r
   @param This     A pointer to the EFI_SMBUS_HC_PROTOCOL instance.\r
                   SlaveAddress The SMBus slave address of the device\r
                   with which to communicate. Type\r


@@ -65,8 +65,8 @@ typedef struct _EFI_SMBUS_HC_PROTOCOL EFI_SMBUS_HC_PROTOCOL;
   @param PecCheck Defines if Packet Error Code (PEC) checking\r
                   is required for this operation. SMBus Host\r
                   Controller Code Definitions Version 1.0\r
   @param PecCheck Defines if Packet Error Code (PEC) checking\r
                   is required for this operation. SMBus Host\r
                   Controller Code Definitions Version 1.0\r

-                  August 21, 2006 13 \r
-                  \r
+                  August 21, 2006 13\r
+\r

  @param Length    Signifies the number of bytes that this operation will do.\r
                   The maximum number of bytes can be revision\r
                   specific and operation specific. This field\r
  @param Length    Signifies the number of bytes that this operation will do.\r
                   The maximum number of bytes can be revision\r
                   specific and operation specific. This field\r


@@ -78,8 +78,8 @@ typedef struct _EFI_SMBUS_HC_PROTOCOL EFI_SMBUS_HC_PROTOCOL;
                   SMBus slave device. Not all operations require\r
                   this argument. The length of this buffer is\r
                   identified by Length.\r
                   SMBus slave device. Not all operations require\r
                   this argument. The length of this buffer is\r
                   identified by Length.\r

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

   @retval EFI_SUCCESS           The last data that was returned from the\r
                                 access matched the poll exit criteria.\r
 \r
   @retval EFI_SUCCESS           The last data that was returned from the\r
                                 access matched the poll exit criteria.\r
 \r


@@ -113,7 +113,7 @@ typedef struct _EFI_SMBUS_HC_PROTOCOL EFI_SMBUS_HC_PROTOCOL;
                                 values.\r
 \r
   @retval EFI_UNSUPPORTED       The SMBus operation or PEC is not\r
                                 values.\r
 \r
   @retval EFI_UNSUPPORTED       The SMBus operation or PEC is not\r

-                                supported. \r
+                                supported.\r

 \r
   @retval EFI_BUFFER_TOO_SMALL  Buffer is not sufficient for\r
                                 this operation.\r
 \r
   @retval EFI_BUFFER_TOO_SMALL  Buffer is not sufficient for\r
                                 this operation.\r


@@ -134,10 +134,10 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-   \r
-  The ArpDevice() function provides a standard way for a device driver to \r
+\r
+  The ArpDevice() function provides a standard way for a device driver to\r

   enumerate the entire SMBus or specific devices on the bus.\r
   enumerate the entire SMBus or specific devices on the bus.\r

-  \r
+\r

   @param This           A pointer to the EFI_SMBUS_HC_PROTOCOL instance.\r
 \r
   @param ArpAll         A Boolean expression that indicates if the\r
   @param This           A pointer to the EFI_SMBUS_HC_PROTOCOL instance.\r
 \r
   @param ArpAll         A Boolean expression that indicates if the\r


@@ -183,7 +183,7 @@ EFI_STATUS
 \r
   @retval EFI_UNSUPPORTED       ArpDevice, GetArpMap, and Notify are\r
                                 not implemented by this driver.\r
 \r
   @retval EFI_UNSUPPORTED       ArpDevice, GetArpMap, and Notify are\r
                                 not implemented by this driver.\r

-   \r
+\r

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


@@ -196,23 +196,23 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  The GetArpMap() function returns the mapping of all the SMBus devices \r
+  The GetArpMap() function returns the mapping of all the SMBus devices\r

   that were enumerated by the SMBus host driver.\r
   that were enumerated by the SMBus host driver.\r

-  \r
+\r

   @param This           A pointer to the EFI_SMBUS_HC_PROTOCOL instance.\r
   @param This           A pointer to the EFI_SMBUS_HC_PROTOCOL instance.\r

-  \r
+\r

   @param Length         Size of the buffer that contains the SMBus\r
                         device map.\r
   @param Length         Size of the buffer that contains the SMBus\r
                         device map.\r

-  \r
+\r

   @param SmbusDeviceMap The pointer to the device map as\r
                         enumerated by the SMBus controller\r
                         driver.\r
   @param SmbusDeviceMap The pointer to the device map as\r
                         enumerated by the SMBus controller\r
                         driver.\r

-  \r
+\r

   @retval EFI_SUCCESS       The SMBus returned the current device map.\r
   @retval EFI_SUCCESS       The SMBus returned the current device map.\r

-  \r
+\r

   @retval EFI_UNSUPPORTED   ArpDevice, GetArpMap, and Notify are\r
                             not implemented by this driver.\r
   @retval EFI_UNSUPPORTED   ArpDevice, GetArpMap, and Notify are\r
                             not implemented by this driver.\r

-  \r
+\r

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


@@ -224,13 +224,13 @@ EFI_STATUS
 \r
 /**\r
   The notify function does some actions.\r
 \r
 /**\r
   The notify function does some actions.\r

-  \r
+\r

   @param SlaveAddress\r
   The SMBUS hardware address to which the SMBUS device is preassigned or allocated.\r
 \r
   @param Data\r
   Data of the SMBus host notify command that the caller wants to be called.\r
   @param SlaveAddress\r
   The SMBUS hardware address to which the SMBUS device is preassigned or allocated.\r
 \r
   @param Data\r
   Data of the SMBus host notify command that the caller wants to be called.\r

-  \r
+\r

   @return EFI_STATUS\r
 **/\r
 typedef\r
   @return EFI_STATUS\r
 **/\r
 typedef\r


@@ -242,13 +242,13 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-   \r
+\r

   The Notify() function registers all the callback functions to\r
   The Notify() function registers all the callback functions to\r

-  allow the bus driver to call these functions when the \r
+  allow the bus driver to call these functions when the\r

   SlaveAddress/Data pair happens.\r
   SlaveAddress/Data pair happens.\r

-  \r
+\r

   @param  This            A pointer to the EFI_SMBUS_HC_PROTOCOL instance.\r
   @param  This            A pointer to the EFI_SMBUS_HC_PROTOCOL instance.\r

-  \r
+\r

   @param  SlaveAddress    Address that the host controller detects\r
                           as sending a message and calls all the registered function.\r
 \r
   @param  SlaveAddress    Address that the host controller detects\r
                           as sending a message and calls all the registered function.\r
 \r


@@ -261,7 +261,7 @@ EFI_STATUS
                           Data pair.\r
 \r
   @retval EFI_SUCCESS       NotifyFunction was registered.\r
                           Data pair.\r
 \r
   @retval EFI_SUCCESS       NotifyFunction was registered.\r

-  \r
+\r

   @retval EFI_UNSUPPORTED   ArpDevice, GetArpMap, and Notify are\r
                             not implemented by this driver.\r
 \r
   @retval EFI_UNSUPPORTED   ArpDevice, GetArpMap, and Notify are\r
                             not implemented by this driver.\r
 \r

diff --git a/MdePkg/Include/Protocol/SmmAccess2.h b/MdePkg/Include/Protocol/SmmAccess2.h
index 3dc15fe597af35f1c73e6fa689e3d044c3551b86..c5b59233fd20389433c92a43ad7f32669e697f89 100644 (file)
--- a/MdePkg/Include/Protocol/SmmAccess2.h
+++ b/MdePkg/Include/Protocol/SmmAccess2.h
@@ -5,20 +5,20 @@
   It abstracts the location and characteristics of SMRAM.  The expectation is\r
   that the north bridge or memory controller would publish this protocol.\r
 \r
   It abstracts the location and characteristics of SMRAM.  The expectation is\r
   that the north bridge or memory controller would publish this protocol.\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) 2009 - 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) 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
 \r

-  THE PROGRAM 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/MdePkg/Include/Protocol/SmmBase2.h b/MdePkg/Include/Protocol/SmmBase2.h
index 0033e4e13faff9aea2470c34bfa11c21d5776aae..17b358f566fc149422d1c7dd085f9fe9ac1c66b4 100644 (file)
--- a/MdePkg/Include/Protocol/SmmBase2.h
+++ b/MdePkg/Include/Protocol/SmmBase2.h
@@ -4,14 +4,14 @@
   This protocol is utilized by all SMM drivers to locate the SMM infrastructure services and determine\r
   whether the driver is being invoked inside SMRAM or outside of SMRAM.\r
 \r
   This protocol is utilized by all SMM drivers to locate the SMM infrastructure services and determine\r
   whether the driver is being invoked inside SMRAM or outside of SMRAM.\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
+  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
 \r

-  THE PROGRAM 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,13 +27,13 @@ typedef struct _EFI_SMM_BASE2_PROTOCOL  EFI_SMM_BASE2_PROTOCOL;
 \r
 /**\r
   Service to indicate whether the driver is currently executing in the SMM Initialization phase.\r
 \r
 /**\r
   Service to indicate whether the driver is currently executing in the SMM Initialization phase.\r

-  \r
-  This service is used to indicate whether the driver is currently executing in the SMM Initialization \r
-  phase. For SMM drivers, this will return TRUE in InSmram while inside the driver's entry point and \r
+\r
+  This service is used to indicate whether the driver is currently executing in the SMM Initialization\r
+  phase. For SMM drivers, this will return TRUE in InSmram while inside the driver's entry point and\r

   otherwise FALSE. For combination SMM/DXE drivers, this will return FALSE in the DXE launch. For the\r
   SMM launch, it behaves as an SMM driver.\r
 \r
   otherwise FALSE. For combination SMM/DXE drivers, this will return FALSE in the DXE launch. For the\r
   SMM launch, it behaves as an SMM driver.\r
 \r

-  @param[in]  This               The EFI_SMM_BASE2_PROTOCOL instance. \r
+  @param[in]  This               The EFI_SMM_BASE2_PROTOCOL instance.\r

   @param[out] InSmram            Pointer to a Boolean which, on return, indicates that the driver is\r
                                  currently executing inside of SMRAM (TRUE) or outside of SMRAM (FALSE).\r
 \r
   @param[out] InSmram            Pointer to a Boolean which, on return, indicates that the driver is\r
                                  currently executing inside of SMRAM (TRUE) or outside of SMRAM (FALSE).\r
 \r


@@ -51,8 +51,8 @@ EFI_STATUS
 /**\r
   Returns the location of the System Management Service Table (SMST).\r
 \r
 /**\r
   Returns the location of the System Management Service Table (SMST).\r
 \r

-  This function returns the location of the System Management Service Table (SMST).  The use of the \r
-  API is such that a driver can discover the location of the SMST in its entry point and then cache it in \r
+  This function returns the location of the System Management Service Table (SMST).  The use of the\r
+  API is such that a driver can discover the location of the SMST in its entry point and then cache it in\r

   some driver global variable so that the SMST can be invoked in subsequent handlers.\r
 \r
   @param[in]     This            The EFI_SMM_BASE2_PROTOCOL instance.\r
   some driver global variable so that the SMST can be invoked in subsequent handlers.\r
 \r
   @param[in]     This            The EFI_SMM_BASE2_PROTOCOL instance.\r

diff --git a/MdePkg/Include/Protocol/SmmCommunication.h b/MdePkg/Include/Protocol/SmmCommunication.h
index 95b8d0d115fb8b79603fc71bcbdd794e7a0371ba..70a02eba23bf9fc37fb3a7a78c0345362c3bb338 100644 (file)
--- a/MdePkg/Include/Protocol/SmmCommunication.h
+++ b/MdePkg/Include/Protocol/SmmCommunication.h
@@ -1,17 +1,17 @@
 /** @file\r
   EFI SMM Communication Protocol as defined in the PI 1.2 specification.\r
 \r
 /** @file\r
   EFI SMM Communication Protocol as defined in the PI 1.2 specification.\r
 \r

-  This protocol provides a means of communicating between drivers outside of SMM and SMI \r
-  handlers inside of SMM.  \r
+  This protocol provides a means of communicating between drivers outside of SMM and SMI\r
+  handlers inside of SMM.\r

 \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
+  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
 \r

-  THE PROGRAM 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/MdePkg/Include/Protocol/SmmConfiguration.h b/MdePkg/Include/Protocol/SmmConfiguration.h
index af47edbe910bcbf301213953d6f9cdef70a85824..db1655a70ade3e634f00104d862f77a8662ab816 100644 (file)
--- a/MdePkg/Include/Protocol/SmmConfiguration.h
+++ b/MdePkg/Include/Protocol/SmmConfiguration.h
@@ -5,15 +5,15 @@
   1) report the portions of SMRAM regions which cannot be used for the SMRAM heap.\r
   2) register the SMM Foundation entry point with the processor code. The entry\r
      point will be invoked by the SMM processor entry code.\r
   1) report the portions of SMRAM regions which cannot be used for the SMRAM heap.\r
   2) register the SMM Foundation entry point with the processor code. The entry\r
      point will be invoked by the SMM processor entry code.\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
 \r

-  THE PROGRAM 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


@@ -30,12 +30,12 @@
 ///\r
 typedef struct _EFI_SMM_RESERVED_SMRAM_REGION {\r
   ///\r
 ///\r
 typedef struct _EFI_SMM_RESERVED_SMRAM_REGION {\r
   ///\r

-  /// Starting address of the reserved SMRAM area, as it appears while SMRAM is open. \r
+  /// Starting address of the reserved SMRAM area, as it appears while SMRAM is open.\r

   /// Ignored if SmramReservedSize is 0.\r
   ///\r
   EFI_PHYSICAL_ADDRESS    SmramReservedStart;\r
   ///\r
   /// Ignored if SmramReservedSize is 0.\r
   ///\r
   EFI_PHYSICAL_ADDRESS    SmramReservedStart;\r
   ///\r

-  /// Number of bytes occupied by the reserved SMRAM area. A size of zero indicates the \r
+  /// Number of bytes occupied by the reserved SMRAM area. A size of zero indicates the\r

   /// last SMRAM area.\r
   ///\r
   UINT64                  SmramReservedSize;\r
   /// last SMRAM area.\r
   ///\r
   UINT64                  SmramReservedSize;\r


@@ -45,13 +45,13 @@ typedef struct _EFI_SMM_CONFIGURATION_PROTOCOL  EFI_SMM_CONFIGURATION_PROTOCOL;
 \r
 /**\r
   Register the SMM Foundation entry point.\r
 \r
 /**\r
   Register the SMM Foundation entry point.\r

-  \r
-  This function registers the SMM Foundation entry point with the processor code. This entry point \r
+\r
+  This function registers the SMM Foundation entry point with the processor code. This entry point\r

   will be invoked by the SMM Processor entry code.\r
 \r
   @param[in] This                The EFI_SMM_CONFIGURATION_PROTOCOL instance.\r
   @param[in] SmmEntryPoint       SMM Foundation entry point.\r
   will be invoked by the SMM Processor entry code.\r
 \r
   @param[in] This                The EFI_SMM_CONFIGURATION_PROTOCOL instance.\r
   @param[in] SmmEntryPoint       SMM Foundation entry point.\r

-  \r
+\r

   @retval EFI_SUCCESS            Success to register SMM Entry Point.\r
   @retval EFI_INVALID_PARAMETER  SmmEntryPoint is NULL.\r
 **/\r
   @retval EFI_SUCCESS            Success to register SMM Entry Point.\r
   @retval EFI_INVALID_PARAMETER  SmmEntryPoint is NULL.\r
 **/\r


@@ -64,10 +64,10 @@ EFI_STATUS
 \r
 ///\r
 /// The EFI SMM Configuration Protocol is a mandatory protocol published by a DXE CPU driver to\r
 \r
 ///\r
 /// The EFI SMM Configuration Protocol is a mandatory protocol published by a DXE CPU driver to\r

-/// indicate which areas within SMRAM are reserved for use by the CPU for any purpose, \r
+/// indicate which areas within SMRAM are reserved for use by the CPU for any purpose,\r

 /// such as stack, save state or SMM entry point.\r
 ///\r
 /// such as stack, save state or SMM entry point.\r
 ///\r

-/// The RegisterSmmEntry() function allows the SMM IPL DXE driver to register the SMM \r
+/// The RegisterSmmEntry() function allows the SMM IPL DXE driver to register the SMM\r

 /// Foundation entry point with the SMM entry vector code.\r
 ///\r
 struct _EFI_SMM_CONFIGURATION_PROTOCOL {\r
 /// Foundation entry point with the SMM entry vector code.\r
 ///\r
 struct _EFI_SMM_CONFIGURATION_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/SmmControl2.h b/MdePkg/Include/Protocol/SmmControl2.h
index 7177f8e8cb57c92e17b8fafe1a7494ea07f977b0..1cef3a2e84710ef6456ba06b00c8f1e54618e5f0 100644 (file)
--- a/MdePkg/Include/Protocol/SmmControl2.h
+++ b/MdePkg/Include/Protocol/SmmControl2.h
@@ -3,22 +3,22 @@
 \r
   This protocol is used initiate synchronous SMI activations. This protocol could be published by a\r
   processor driver to abstract the SMI IPI or a driver which abstracts the ASIC that is supporting the\r
 \r
   This protocol is used initiate synchronous SMI activations. This protocol could be published by a\r
   processor driver to abstract the SMI IPI or a driver which abstracts the ASIC that is supporting the\r

-  APM port. Because of the possibility of performing SMI IPI transactions, the ability to generate this \r
+  APM port. Because of the possibility of performing SMI IPI transactions, the ability to generate this\r

   event from a platform chipset agent is an optional capability for both IA-32 and x64-based systems.\r
 \r
   event from a platform chipset agent is an optional capability for both IA-32 and x64-based systems.\r
 \r

-  The EFI_SMM_CONTROL2_PROTOCOL is produced by a runtime driver. It provides  an \r
-  abstraction of the platform hardware that generates an SMI.  There are often I/O ports that, when \r
-  accessed, will generate the SMI.  Also, the hardware optionally supports the periodic generation of \r
+  The EFI_SMM_CONTROL2_PROTOCOL is produced by a runtime driver. It provides  an\r
+  abstraction of the platform hardware that generates an SMI.  There are often I/O ports that, when\r
+  accessed, will generate the SMI.  Also, the hardware optionally supports the periodic generation of\r

   these signals.\r
 \r
   these signals.\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
+  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
 \r

-  THE PROGRAM 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/MdePkg/Include/Protocol/SmmCpu.h b/MdePkg/Include/Protocol/SmmCpu.h
index 117b9a36ee874d11aad95fbcb9357fa9456aacdf..de578334d448596c57b950f7d7cc59099eef500b 100644 (file)
--- a/MdePkg/Include/Protocol/SmmCpu.h
+++ b/MdePkg/Include/Protocol/SmmCpu.h
@@ -1,19 +1,19 @@
 /** @file\r
   EFI SMM CPU Protocol as defined in the PI 1.2 specification.\r
 \r
 /** @file\r
   EFI SMM CPU Protocol as defined in the PI 1.2 specification.\r
 \r

-  This protocol allows SMM drivers to access architecture-standard registers from any of the CPU \r
-  save state areas. In some cases, difference processors provide the same information in the save state, \r
-  but not in the same format. These so-called pseudo-registers provide this information in a standard \r
-  format.  \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
+  This protocol allows SMM drivers to access architecture-standard registers from any of the CPU\r
+  save state areas. In some cases, difference processors provide the same information in the save state,\r
+  but not in the same format. These so-called pseudo-registers provide this information in a standard\r
+  format.\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

diff --git a/MdePkg/Include/Protocol/SmmGpiDispatch2.h b/MdePkg/Include/Protocol/SmmGpiDispatch2.h
index bda3f98d5e5c09c89a03d018be62500d447025c6..6f82bd2b5550fcd7fb5f39dc676ccf24f279a96c 100644 (file)
--- a/MdePkg/Include/Protocol/SmmGpiDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmGpiDispatch2.h
@@ -2,14 +2,14 @@
   SMM General Purpose Input (GPI) Dispatch2 Protocol as defined in PI 1.1 Specification\r
   Volume 4 System Management Mode Core Interface.\r
 \r
   SMM General Purpose Input (GPI) Dispatch2 Protocol as defined in PI 1.1 Specification\r
   Volume 4 System Management Mode Core Interface.\r
 \r

-  This protocol provides the parent dispatch service for the General Purpose Input \r
+  This protocol provides the parent dispatch service for the General Purpose Input\r

   (GPI) SMI source generator.\r
 \r
   (GPI) SMI source generator.\r
 \r

-  The EFI_SMM_GPI_DISPATCH2_PROTOCOL provides the ability to install child handlers for the \r
-  given event types.  Several inputs can be enabled.  This purpose of this interface is to generate an \r
+  The EFI_SMM_GPI_DISPATCH2_PROTOCOL provides the ability to install child handlers for the\r
+  given event types.  Several inputs can be enabled.  This purpose of this interface is to generate an\r

   SMI in response to any of these inputs having a true value provided.\r
 \r
   SMI in response to any of these inputs having a true value provided.\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

diff --git a/MdePkg/Include/Protocol/SmmPciRootBridgeIo.h b/MdePkg/Include/Protocol/SmmPciRootBridgeIo.h
index 0f23875f010e339c38284654ea1c818f162ed7e8..6d72382666f4be7450534d4dafefb86d064c09a7 100644 (file)
--- a/MdePkg/Include/Protocol/SmmPciRootBridgeIo.h
+++ b/MdePkg/Include/Protocol/SmmPciRootBridgeIo.h
@@ -3,7 +3,7 @@
 \r
   This protocol provides PCI I/O and memory access within SMM.\r
 \r
 \r
   This protocol provides PCI I/O and memory access within SMM.\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


@@ -22,8 +22,8 @@
 #define EFI_SMM_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID EFI_MM_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID\r
 \r
 ///\r
 #define EFI_SMM_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID EFI_MM_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID\r
 \r
 ///\r

-/// This protocol provides the same functionality as the PCI Root Bridge I/O Protocol defined in the \r
-/// UEFI 2.1 Specifcation, section 13.2, except that the functions for Map() and Unmap() may return \r
+/// This protocol provides the same functionality as the PCI Root Bridge I/O Protocol defined in the\r
+/// UEFI 2.1 Specifcation, section 13.2, except that the functions for Map() and Unmap() may return\r

 /// EFI_UNSUPPORTED.\r
 ///\r
 typedef EFI_MM_PCI_ROOT_BRIDGE_IO_PROTOCOL  EFI_SMM_PCI_ROOT_BRIDGE_IO_PROTOCOL;\r
 /// EFI_UNSUPPORTED.\r
 ///\r
 typedef EFI_MM_PCI_ROOT_BRIDGE_IO_PROTOCOL  EFI_SMM_PCI_ROOT_BRIDGE_IO_PROTOCOL;\r

diff --git a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h b/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
index 078a91b4c083b84f69e95858832b2ead9f72e920..eff1c42c58853834173b474dbb1209e00b9bc444 100644 (file)
--- a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
@@ -4,7 +4,7 @@
 \r
   This protocol provides the parent dispatch service for the periodical timer SMI source generator.\r
 \r
 \r
   This protocol provides the parent dispatch service for the periodical timer SMI source generator.\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,21 +47,21 @@
 ///\r
 typedef struct {\r
   ///\r
 ///\r
 typedef struct {\r
   ///\r

-  /// The minimum period of time in 100 nanosecond units that the child gets called. The \r
+  /// The minimum period of time in 100 nanosecond units that the child gets called. The\r

   /// child will be called back after a time greater than the time Period.\r
   ///\r
   UINT64  Period;\r
   ///\r
   /// child will be called back after a time greater than the time Period.\r
   ///\r
   UINT64  Period;\r
   ///\r

-  /// The period of time interval between SMIs. Children of this interface should use this \r
-  /// field when registering for periodic timer intervals when a finer granularity periodic \r
+  /// The period of time interval between SMIs. Children of this interface should use this\r
+  /// field when registering for periodic timer intervals when a finer granularity periodic\r

   /// SMI is desired.\r
   ///\r
   UINT64  SmiTickInterval;\r
 } EFI_SMM_PERIODIC_TIMER_REGISTER_CONTEXT;\r
 \r
 ///\r
   /// SMI is desired.\r
   ///\r
   UINT64  SmiTickInterval;\r
 } EFI_SMM_PERIODIC_TIMER_REGISTER_CONTEXT;\r
 \r
 ///\r

-/// The DispatchFunction will be called with Context set to the same value as was passed into \r
-/// Register() in RegisterContext and with CommBuffer pointing to an instance of \r
+/// The DispatchFunction will be called with Context set to the same value as was passed into\r
+/// Register() in RegisterContext and with CommBuffer pointing to an instance of\r

 /// EFI_SMM_PERIODIC_TIMER_CONTEXT and CommBufferSize pointing to its size.\r
 ///\r
 typedef EFI_MM_PERIODIC_TIMER_CONTEXT EFI_SMM_PERIODIC_TIMER_CONTEXT;\r
 /// EFI_SMM_PERIODIC_TIMER_CONTEXT and CommBufferSize pointing to its size.\r
 ///\r
 typedef EFI_MM_PERIODIC_TIMER_CONTEXT EFI_SMM_PERIODIC_TIMER_CONTEXT;\r


@@ -71,22 +71,22 @@ typedef struct _EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL  EFI_SMM_PERIODIC_TIME
 /**\r
   Register a child SMI source dispatch function for SMM periodic timer.\r
 \r
 /**\r
   Register a child SMI source dispatch function for SMM periodic timer.\r
 \r

-  This service registers a function (DispatchFunction) which will be called when at least the \r
-  amount of time specified by RegisterContext has elapsed. On return, DispatchHandle \r
+  This service registers a function (DispatchFunction) which will be called when at least the\r
+  amount of time specified by RegisterContext has elapsed. On return, DispatchHandle\r

   contains a unique handle which may be used later to unregister the function using UnRegister().\r
   contains a unique handle which may be used later to unregister the function using UnRegister().\r

-  The DispatchFunction will be called with Context set to the same value as was passed into \r
-  this function in RegisterContext and with CommBuffer pointing to an instance of \r
+  The DispatchFunction will be called with Context set to the same value as was passed into\r
+  this function in RegisterContext and with CommBuffer pointing to an instance of\r

   EFI_SMM_PERIODIC_TIMER_CONTEXT and CommBufferSize pointing to its size.\r
 \r
   @param[in]  This               Pointer to the EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL instance.\r
   @param[in]  DispatchFunction   Function to register for handler when at least the specified amount\r
   EFI_SMM_PERIODIC_TIMER_CONTEXT and CommBufferSize pointing to its size.\r
 \r
   @param[in]  This               Pointer to the EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL instance.\r
   @param[in]  DispatchFunction   Function to register for handler when at least the specified amount\r

-                                 of time has elapsed. \r
+                                 of time has elapsed.\r

   @param[in]  RegisterContext    Pointer to the dispatch function's context.\r
                                  The caller fills this context in before calling\r
                                  the register function to indicate to the register\r
                                  function the period at which the dispatch function\r
                                  should be invoked.\r
   @param[in]  RegisterContext    Pointer to the dispatch function's context.\r
                                  The caller fills this context in before calling\r
                                  the register function to indicate to the register\r
                                  function the period at which the dispatch function\r
                                  should be invoked.\r

-  @param[out] DispatchHandle     Handle generated by the dispatcher to track the function instance. \r
+  @param[out] DispatchHandle     Handle generated by the dispatcher to track the function instance.\r

 \r
   @retval EFI_SUCCESS            The dispatch function has been successfully\r
                                  registered and the SMI source has been enabled.\r
 \r
   @retval EFI_SUCCESS            The dispatch function has been successfully\r
                                  registered and the SMI source has been enabled.\r


@@ -107,7 +107,7 @@ EFI_STATUS
 /**\r
   Unregisters a periodic timer service.\r
 \r
 /**\r
   Unregisters a periodic timer service.\r
 \r

-  This service removes the handler associated with DispatchHandle so that it will no longer be \r
+  This service removes the handler associated with DispatchHandle so that it will no longer be\r

   called when the time has elapsed.\r
 \r
   @param[in] This                Pointer to the EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL instance.\r
   called when the time has elapsed.\r
 \r
   @param[in] This                Pointer to the EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL instance.\r

diff --git a/MdePkg/Include/Protocol/SmmReportStatusCodeHandler.h b/MdePkg/Include/Protocol/SmmReportStatusCodeHandler.h
index 8cddfac7f82b9b22fcd8769af980c8c667aa9778..78be7125ba7967172f67f3e10ab6f39a717ec74e 100644 (file)
--- a/MdePkg/Include/Protocol/SmmReportStatusCodeHandler.h
+++ b/MdePkg/Include/Protocol/SmmReportStatusCodeHandler.h
@@ -1,7 +1,7 @@
 /** @file\r
   This protocol provides registering and unregistering services to status code consumers while in DXE SMM.\r
 /** @file\r
   This protocol provides registering and unregistering services to status code consumers while in DXE SMM.\r

-  \r
-  Copyright (c) 2007 - 2017, 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

diff --git a/MdePkg/Include/Protocol/SmmStatusCode.h b/MdePkg/Include/Protocol/SmmStatusCode.h
index 0c03e8d01a3124a5d6cb70bfac96f4177a22603d..6d9646fc567a8da50e5603a617ee89e289a83074 100644 (file)
--- a/MdePkg/Include/Protocol/SmmStatusCode.h
+++ b/MdePkg/Include/Protocol/SmmStatusCode.h
@@ -1,16 +1,16 @@
 /** @file\r
   EFI SMM Status Code Protocol as defined in the PI 1.2 specification.\r
 \r
 /** @file\r
   EFI SMM Status Code Protocol as defined in the PI 1.2 specification.\r
 \r

-  This protocol provides the basic status code services while in SMM. \r
+  This protocol provides the basic status code services while in SMM.\r

 \r
 \r

-  Copyright (c) 2009 - 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) 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
 \r

-  THE PROGRAM 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/MdePkg/Include/Protocol/SmmSwDispatch2.h b/MdePkg/Include/Protocol/SmmSwDispatch2.h
index b49ef96e481ec25006e07ccbbdc7d7124d3d527f..bd1e5b6c7773a5a1900a7aa3b22d49fc1dd1e300 100644 (file)
--- a/MdePkg/Include/Protocol/SmmSwDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmSwDispatch2.h
@@ -4,7 +4,7 @@
 \r
   This protocol provides the parent dispatch service for a given SMI source generator.\r
 \r
 \r
   This protocol provides the parent dispatch service for a given SMI source generator.\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


@@ -33,9 +33,9 @@ typedef struct {
 } EFI_SMM_SW_REGISTER_CONTEXT;\r
 \r
 ///\r
 } EFI_SMM_SW_REGISTER_CONTEXT;\r
 \r
 ///\r

-/// The DispatchFunction will be called with Context set to the same value as was passed into \r
+/// The DispatchFunction will be called with Context set to the same value as was passed into\r

 /// this function in RegisterContext and with CommBuffer (and CommBufferSize) pointing\r
 /// this function in RegisterContext and with CommBuffer (and CommBufferSize) pointing\r

-/// to an instance of EFI_SMM_SW_CONTEXT indicating the index of the CPU which generated the \r
+/// to an instance of EFI_SMM_SW_CONTEXT indicating the index of the CPU which generated the\r

 /// software SMI.\r
 ///\r
 typedef struct {\r
 /// software SMI.\r
 ///\r
 typedef struct {\r


@@ -58,14 +58,14 @@ typedef struct _EFI_SMM_SW_DISPATCH2_PROTOCOL  EFI_SMM_SW_DISPATCH2_PROTOCOL;
 /**\r
   Register a child SMI source dispatch function for the specified software SMI.\r
 \r
 /**\r
   Register a child SMI source dispatch function for the specified software SMI.\r
 \r

-  This service registers a function (DispatchFunction) which will be called when the software \r
-  SMI source specified by RegisterContext->SwSmiCpuIndex is detected. On return, \r
-  DispatchHandle contains a unique handle which may be used later to unregister the function \r
+  This service registers a function (DispatchFunction) which will be called when the software\r
+  SMI source specified by RegisterContext->SwSmiCpuIndex is detected. On return,\r
+  DispatchHandle contains a unique handle which may be used later to unregister the function\r

   using UnRegister().\r
 \r
   @param[in]  This                 Pointer to the EFI_SMM_SW_DISPATCH2_PROTOCOL instance.\r
   using UnRegister().\r
 \r
   @param[in]  This                 Pointer to the EFI_SMM_SW_DISPATCH2_PROTOCOL instance.\r

-  @param[in]  DispatchFunction     Function to register for handler when the specified software \r
-                                   SMI is generated. \r
+  @param[in]  DispatchFunction     Function to register for handler when the specified software\r
+                                   SMI is generated.\r

   @param[in, out] RegisterContext  Pointer to the dispatch function's context.\r
                                    The caller fills this context in before calling\r
                                    the register function to indicate to the register\r
   @param[in, out] RegisterContext  Pointer to the dispatch function's context.\r
                                    The caller fills this context in before calling\r
                                    the register function to indicate to the register\r


@@ -96,7 +96,7 @@ EFI_STATUS
 /**\r
   Unregister a child SMI source dispatch function for the specified software SMI.\r
 \r
 /**\r
   Unregister a child SMI source dispatch function for the specified software SMI.\r
 \r

-  This service removes the handler associated with DispatchHandle so that it will no longer be \r
+  This service removes the handler associated with DispatchHandle so that it will no longer be\r

   called in response to a software SMI.\r
 \r
   @param[in] This                Pointer to the EFI_SMM_SW_DISPATCH2_PROTOCOL instance.\r
   called in response to a software SMI.\r
 \r
   @param[in] This                Pointer to the EFI_SMM_SW_DISPATCH2_PROTOCOL instance.\r


@@ -115,15 +115,15 @@ EFI_STATUS
 ///\r
 /// Interface structure for the SMM Software SMI Dispatch Protocol.\r
 ///\r
 ///\r
 /// Interface structure for the SMM Software SMI Dispatch Protocol.\r
 ///\r

-/// The EFI_SMM_SW_DISPATCH2_PROTOCOL provides the ability to install child handlers for the \r
-/// given software.  These handlers will respond to software interrupts, and the maximum software \r
+/// The EFI_SMM_SW_DISPATCH2_PROTOCOL provides the ability to install child handlers for the\r
+/// given software.  These handlers will respond to software interrupts, and the maximum software\r

 /// interrupt in the EFI_SMM_SW_REGISTER_CONTEXT is denoted by MaximumSwiValue.\r
 ///\r
 struct _EFI_SMM_SW_DISPATCH2_PROTOCOL {\r
   EFI_SMM_SW_REGISTER2    Register;\r
   EFI_SMM_SW_UNREGISTER2  UnRegister;\r
   ///\r
 /// interrupt in the EFI_SMM_SW_REGISTER_CONTEXT is denoted by MaximumSwiValue.\r
 ///\r
 struct _EFI_SMM_SW_DISPATCH2_PROTOCOL {\r
   EFI_SMM_SW_REGISTER2    Register;\r
   EFI_SMM_SW_UNREGISTER2  UnRegister;\r
   ///\r

-  /// A read-only field that describes the maximum value that can be used in the \r
+  /// A read-only field that describes the maximum value that can be used in the\r

   /// EFI_SMM_SW_DISPATCH2_PROTOCOL.Register() service.\r
   ///\r
   UINTN                  MaximumSwiValue;\r
   /// EFI_SMM_SW_DISPATCH2_PROTOCOL.Register() service.\r
   ///\r
   UINTN                  MaximumSwiValue;\r

diff --git a/MdePkg/Include/Protocol/StatusCode.h b/MdePkg/Include/Protocol/StatusCode.h
index a1165189c7daf25c2ed52406d55febadcc40d5b2..d844d6afd23064a022c2ae68052ba8648dc1a4a1 100644 (file)
--- a/MdePkg/Include/Protocol/StatusCode.h
+++ b/MdePkg/Include/Protocol/StatusCode.h
@@ -1,14 +1,14 @@
 /** @file\r
   Status code Runtime Protocol as defined in PI Specification 1.4a VOLUME 2 DXE\r
 \r
 /** @file\r
   Status code Runtime Protocol as defined in PI Specification 1.4a VOLUME 2 DXE\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
-  THE PROGRAM 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/MdePkg/Include/Protocol/StorageSecurityCommand.h b/MdePkg/Include/Protocol/StorageSecurityCommand.h
index 96ac7c164d68d8bc06aae3fdbc48b257d667ed0a..ae1a99170db5a824dca5a5e10f357ce0214acc9e 100644 (file)
--- a/MdePkg/Include/Protocol/StorageSecurityCommand.h
+++ b/MdePkg/Include/Protocol/StorageSecurityCommand.h
@@ -5,7 +5,7 @@
   storage devices without specific knowledge of the type of device or controller\r
   that manages the device.\r
 \r
   storage devices without specific knowledge of the type of device or controller\r
   that manages the device.\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


@@ -149,7 +149,7 @@ EFI_STATUS
                                        of the security protocol command. A Timeout value of 0\r
                                        means that this function will wait indefinitely for the\r
                                        security protocol command to execute. If Timeout is greater\r
                                        of the security protocol command. A Timeout value of 0\r
                                        means that this function will wait indefinitely for the\r
                                        security protocol command to execute. If Timeout is greater\r

-                                       than zero, then this function will return EFI_TIMEOUT if the \r
+                                       than zero, then this function will return EFI_TIMEOUT if the\r

                                        time required to execute the receive data command is greater than Timeout.\r
   @param  SecurityProtocolId           The value of the "Security Protocol" parameter of\r
                                        the security protocol command to be sent.\r
                                        time required to execute the receive data command is greater than Timeout.\r
   @param  SecurityProtocolId           The value of the "Security Protocol" parameter of\r
                                        the security protocol command to be sent.\r

diff --git a/MdePkg/Include/Protocol/SuperIo.h b/MdePkg/Include/Protocol/SuperIo.h
index d318d2ffb841c6a9b66d8aeed2651985347c23ec..77846060c480bbb0c48475455cab118df43248c6 100644 (file)
--- a/MdePkg/Include/Protocol/SuperIo.h
+++ b/MdePkg/Include/Protocol/SuperIo.h
@@ -5,14 +5,14 @@
   Super I/O is powered up, enabled, and assigned with the default set of resources. In the Stop()\r
   routine of the Super I/O driver, the device is disabled and Super I/O protocol is uninstalled.\r
 \r
   Super I/O is powered up, enabled, and assigned with the default set of resources. In the Stop()\r
   routine of the Super I/O driver, the device is disabled and Super I/O protocol is uninstalled.\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
+  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


@@ -33,12 +33,12 @@ typedef struct {
   UINT8 AndMask;        ///< Bitwise AND mask.\r
   UINT8 OrMask;         ///< Bitwise OR mask.\r
 } EFI_SIO_REGISTER_MODIFY;\r
   UINT8 AndMask;        ///< Bitwise AND mask.\r
   UINT8 OrMask;         ///< Bitwise OR mask.\r
 } EFI_SIO_REGISTER_MODIFY;\r

-  \r
+\r

 typedef struct _EFI_SIO_PROTOCOL  EFI_SIO_PROTOCOL;\r
 typedef struct _EFI_SIO_PROTOCOL  EFI_SIO_PROTOCOL;\r

-  \r
+\r

 /**\r
   Provides a low level access to the registers for the Super I/O.\r
 /**\r
   Provides a low level access to the registers for the Super I/O.\r

-  \r
+\r

   @param[in]        This        Indicates a pointer to the calling context.\r
   @param[in]        Write       Specifies the type of the register operation. If this parameter is TRUE, Value is\r
                                 interpreted as an input parameter and the operation is a register write. If this parameter\r
   @param[in]        This        Indicates a pointer to the calling context.\r
   @param[in]        Write       Specifies the type of the register operation. If this parameter is TRUE, Value is\r
                                 interpreted as an input parameter and the operation is a register write. If this parameter\r


@@ -53,13 +53,13 @@ typedef struct _EFI_SIO_PROTOCOL  EFI_SIO_PROTOCOL;
   @param[in]        Register    Register number.\r
   @param[in, out]   Value       If Write is TRUE, Value is a pointer to the buffer containing the byte of data to be\r
                                 written to the Super I/O register. If Write is FALSE, Value is a pointer to the\r
   @param[in]        Register    Register number.\r
   @param[in, out]   Value       If Write is TRUE, Value is a pointer to the buffer containing the byte of data to be\r
                                 written to the Super I/O register. If Write is FALSE, Value is a pointer to the\r

-                                destination buffer for the byte of data to be read from the Super I/O register. \r
+                                destination buffer for the byte of data to be read from the Super I/O register.\r

 \r
   @retval EFI_SUCCESS           The operation completed successfully\r
   @retval EFI_INVALID_PARAMETER The Value is NULL\r
   @retval EFI_INVALID_PARAMETER Invalid Register number\r
 \r
   @retval EFI_SUCCESS           The operation completed successfully\r
   @retval EFI_INVALID_PARAMETER The Value is NULL\r
   @retval EFI_INVALID_PARAMETER Invalid Register number\r

-  \r
-**/  \r
+\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIO_REGISTER_ACCESS)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIO_REGISTER_ACCESS)(\r


@@ -69,36 +69,36 @@ EFI_STATUS
   IN          UINT8             Register,\r
   IN OUT      UINT8             *Value\r
 );\r
   IN          UINT8             Register,\r
   IN OUT      UINT8             *Value\r
 );\r

-  \r
+\r

 /**\r
   Provides an interface to get a list of the current resources consumed by the device in the ACPI\r
   Resource Descriptor format.\r
 /**\r
   Provides an interface to get a list of the current resources consumed by the device in the ACPI\r
   Resource Descriptor format.\r

-  \r
+\r

   GetResources() returns a list of resources currently consumed by the device. The\r
   ResourceList is a pointer to the buffer containing resource descriptors for the device. The\r
   descriptors are in the format of Small or Large ACPI resource descriptor as defined by ACPI\r
   specification (2.0 & 3.0). The buffer of resource descriptors is terminated with the 'End tag'\r
   resource descriptor.\r
   GetResources() returns a list of resources currently consumed by the device. The\r
   ResourceList is a pointer to the buffer containing resource descriptors for the device. The\r
   descriptors are in the format of Small or Large ACPI resource descriptor as defined by ACPI\r
   specification (2.0 & 3.0). The buffer of resource descriptors is terminated with the 'End tag'\r
   resource descriptor.\r

-  \r
+\r

   @param[in]    This            Indicates a pointer to the calling context.\r
   @param[out]   ResourceList    A pointer to an ACPI resource descriptor list that defines the current resources used by\r
                                 the device. Type ACPI_RESOURCE_HEADER_PTR is defined in the "Related\r
                                 Definitions" below.\r
   @param[in]    This            Indicates a pointer to the calling context.\r
   @param[out]   ResourceList    A pointer to an ACPI resource descriptor list that defines the current resources used by\r
                                 the device. Type ACPI_RESOURCE_HEADER_PTR is defined in the "Related\r
                                 Definitions" below.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The operation completed successfully\r
   @retval EFI_INVALID_PARAMETER ResourceList is NULL\r
   @retval EFI_SUCCESS           The operation completed successfully\r
   @retval EFI_INVALID_PARAMETER ResourceList is NULL\r

-                                \r
-**/  \r
+\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIO_GET_RESOURCES)(\r
   IN  CONST EFI_SIO_PROTOCOL            *This,\r
   OUT       ACPI_RESOURCE_HEADER_PTR    *ResourceList\r
 );\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIO_GET_RESOURCES)(\r
   IN  CONST EFI_SIO_PROTOCOL            *This,\r
   OUT       ACPI_RESOURCE_HEADER_PTR    *ResourceList\r
 );\r

-  \r
+\r

 /**\r
   Sets the resources for the device.\r
 /**\r
   Sets the resources for the device.\r

-  \r
+\r

   @param[in]  This          Indicates a pointer to the calling context.\r
   @param[in]  ResourceList  Pointer to the ACPI resource descriptor list. Type ACPI_RESOURCE_HEADER_PTR\r
                             is defined in the "Related Definitions" section of\r
   @param[in]  This          Indicates a pointer to the calling context.\r
   @param[in]  ResourceList  Pointer to the ACPI resource descriptor list. Type ACPI_RESOURCE_HEADER_PTR\r
                             is defined in the "Related Definitions" section of\r


@@ -107,35 +107,35 @@ EFI_STATUS
   @retval EFI_SUCCESS           The operation completed successfully\r
   @retval EFI_INVALID_PARAMETER ResourceList is invalid\r
   @retval EFI_ACCESS_DENIED     Some of the resources in ResourceList are in use\r
   @retval EFI_SUCCESS           The operation completed successfully\r
   @retval EFI_INVALID_PARAMETER ResourceList is invalid\r
   @retval EFI_ACCESS_DENIED     Some of the resources in ResourceList are in use\r

-                            \r
-**/  \r
+\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIO_SET_RESOURCES)(\r
   IN CONST  EFI_SIO_PROTOCOL        *This,\r
   IN        ACPI_RESOURCE_HEADER_PTR ResourceList\r
 );\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIO_SET_RESOURCES)(\r
   IN CONST  EFI_SIO_PROTOCOL        *This,\r
   IN        ACPI_RESOURCE_HEADER_PTR ResourceList\r
 );\r

-  \r
+\r

 /**\r
   Provides a collection of resource descriptor lists. Each resource descriptor list in the collection\r
   defines a combination of resources that can potentially be used by the device.\r
 /**\r
   Provides a collection of resource descriptor lists. Each resource descriptor list in the collection\r
   defines a combination of resources that can potentially be used by the device.\r

-  \r
+\r

   @param[in]  This                  Indicates a pointer to the calling context.\r
   @param[out] ResourceCollection    Collection of the resource descriptor lists.\r
   @param[in]  This                  Indicates a pointer to the calling context.\r
   @param[out] ResourceCollection    Collection of the resource descriptor lists.\r

-  \r
+\r

   @retval EFI_SUCCESS               The operation completed successfully\r
   @retval EFI_INVALID_PARAMETER     ResourceCollection is NULL\r
   @retval EFI_SUCCESS               The operation completed successfully\r
   @retval EFI_INVALID_PARAMETER     ResourceCollection is NULL\r

-**/  \r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIO_POSSIBLE_RESOURCES)(\r
   IN  CONST EFI_SIO_PROTOCOL         *This,\r
   OUT       ACPI_RESOURCE_HEADER_PTR *ResourceCollection\r
 );\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIO_POSSIBLE_RESOURCES)(\r
   IN  CONST EFI_SIO_PROTOCOL         *This,\r
   OUT       ACPI_RESOURCE_HEADER_PTR *ResourceCollection\r
 );\r

-  \r
+\r

 /**\r
   Provides an interface for a table based programming of the Super I/O registers.\r
 /**\r
   Provides an interface for a table based programming of the Super I/O registers.\r

-  \r
+\r

   The Modify() function provides an interface for table based programming of the Super I/O\r
   registers. This function can be used to perform programming of multiple Super I/O registers with a\r
   single function call. For each table entry, the Register is read, its content is bitwise ANDed with\r
   The Modify() function provides an interface for table based programming of the Super I/O\r
   registers. This function can be used to perform programming of multiple Super I/O registers with a\r
   single function call. For each table entry, the Register is read, its content is bitwise ANDed with\r


@@ -148,12 +148,12 @@ EFI_STATUS
   @param[in] Command    A pointer to an array of NumberOfCommands EFI_SIO_REGISTER_MODIFY\r
                         structures. Each structure specifies a single Super I/O register modify operation. Type\r
                         EFI_SIO_REGISTER_MODIFY is defined in the "Related Definitions" below.\r
   @param[in] Command    A pointer to an array of NumberOfCommands EFI_SIO_REGISTER_MODIFY\r
                         structures. Each structure specifies a single Super I/O register modify operation. Type\r
                         EFI_SIO_REGISTER_MODIFY is defined in the "Related Definitions" below.\r

-  @param[in] NumberOfCommands Number of elements in the Command array.  \r
-  \r
+  @param[in] NumberOfCommands Number of elements in the Command array.\r
+\r

   @retval EFI_SUCCESS           The operation completed successfully\r
   @retval EFI_INVALID_PARAMETER Command is NULL\r
   @retval EFI_SUCCESS           The operation completed successfully\r
   @retval EFI_INVALID_PARAMETER Command is NULL\r

-  \r
-**/  \r
+\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIO_MODIFY)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIO_MODIFY)(\r


@@ -161,14 +161,14 @@ EFI_STATUS
   IN CONST EFI_SIO_REGISTER_MODIFY  *Command,\r
   IN       UINTN                    NumberOfCommands\r
 );\r
   IN CONST EFI_SIO_REGISTER_MODIFY  *Command,\r
   IN       UINTN                    NumberOfCommands\r
 );\r

-  \r
+\r

 struct _EFI_SIO_PROTOCOL {\r
   EFI_SIO_REGISTER_ACCESS       RegisterAccess;\r
   EFI_SIO_GET_RESOURCES         GetResources;\r
   EFI_SIO_SET_RESOURCES         SetResources;\r
   EFI_SIO_POSSIBLE_RESOURCES    PossibleResources;\r
   EFI_SIO_MODIFY Modify;\r
 struct _EFI_SIO_PROTOCOL {\r
   EFI_SIO_REGISTER_ACCESS       RegisterAccess;\r
   EFI_SIO_GET_RESOURCES         GetResources;\r
   EFI_SIO_SET_RESOURCES         SetResources;\r
   EFI_SIO_POSSIBLE_RESOURCES    PossibleResources;\r
   EFI_SIO_MODIFY Modify;\r

-};  \r
+};\r

 \r
 extern EFI_GUID gEfiSioProtocolGuid;\r
 \r
 \r
 extern EFI_GUID gEfiSioProtocolGuid;\r
 \r

diff --git a/MdePkg/Include/Protocol/SuperIoControl.h b/MdePkg/Include/Protocol/SuperIoControl.h
index e68fce8118bb339c01cf5ec0312450dcb17a63ae..264a28d37d28d6681ab00c3c171ce2fa352e7fc1 100644 (file)
--- a/MdePkg/Include/Protocol/SuperIoControl.h
+++ b/MdePkg/Include/Protocol/SuperIoControl.h
@@ -3,14 +3,14 @@
   the low-level services for SIO devices that enable them to be used in the UEFI\r
   driver model.\r
 \r
   the low-level services for SIO devices that enable them to be used in the UEFI\r
   driver model.\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
+  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
 \r

-  THE PROGRAM 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
   @par Revision Reference:\r
   This protocol is from PI Version 1.2.1.\r
 \r
   @par Revision Reference:\r
   This protocol is from PI Version 1.2.1.\r


@@ -38,7 +38,7 @@ typedef struct _EFI_SIO_CONTROL_PROTOCOL *PEFI_SIO_CONTROL_PROTOCOL;
 \r
   @retval EFI_SUCCESS          The device is enabled successfully.\r
   @retval EFI_OUT_OF_RESOURCES The device could not be enabled because there\r
 \r
   @retval EFI_SUCCESS          The device is enabled successfully.\r
   @retval EFI_OUT_OF_RESOURCES The device could not be enabled because there\r

-                               were insufficient resources either for the device \r
+                               were insufficient resources either for the device\r

                                itself or for the records needed to track the device.\r
   @retval EFI_ALREADY_STARTED  The device is already enabled.\r
   @retval EFI_UNSUPPORTED      The device cannot be enabled.\r
                                itself or for the records needed to track the device.\r
   @retval EFI_ALREADY_STARTED  The device is already enabled.\r
   @retval EFI_UNSUPPORTED      The device cannot be enabled.\r


@@ -61,7 +61,7 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS          The device is disabled successfully.\r
   @retval EFI_OUT_OF_RESOURCES The device could not be disabled because there\r
 \r
   @retval EFI_SUCCESS          The device is disabled successfully.\r
   @retval EFI_OUT_OF_RESOURCES The device could not be disabled because there\r

-                               were insufficient resources either for the device \r
+                               were insufficient resources either for the device\r

                                itself or for the records needed to track the device.\r
   @retval EFI_ALREADY_STARTED  The device is already disabled.\r
   @retval EFI_UNSUPPORTED      The device cannot be disabled.\r
                                itself or for the records needed to track the device.\r
   @retval EFI_ALREADY_STARTED  The device is already disabled.\r
   @retval EFI_UNSUPPORTED      The device cannot be disabled.\r

diff --git a/MdePkg/Include/Protocol/TapeIo.h b/MdePkg/Include/Protocol/TapeIo.h
index 222f5b5aed7f0e825cb27fcc28599a4dc4952917..07afb9598e9fc641853188d0bf911c9d3fa2a428 100644 (file)
--- a/MdePkg/Include/Protocol/TapeIo.h
+++ b/MdePkg/Include/Protocol/TapeIo.h
@@ -2,14 +2,14 @@
   EFI_TAPE_IO_PROTOCOL as defined in the UEFI 2.0.\r
   Provide services to control and access a tape device.\r
 \r
   EFI_TAPE_IO_PROTOCOL as defined in the UEFI 2.0.\r
   Provide services to control and access a tape 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
-    \r
-THE PROGRAM 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


@@ -70,13 +70,13 @@ typedef struct _EFI_TAPE_HEADER {
                                 from the media.\r
 \r
 **/\r
                                 from the media.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_READ)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN OUT UINTN            *BufferSize,\r
   OUT VOID                *Buffer\r
 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_READ)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN OUT UINTN            *BufferSize,\r
   OUT VOID                *Buffer\r

-  );    \r
+  );\r

 \r
 /**\r
   Writes to the tape.\r
 \r
 /**\r
   Writes to the tape.\r


@@ -106,14 +106,14 @@ EFI_STATUS
                                 from the media.\r
 \r
 **/\r
                                 from the media.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_WRITE)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN UINTN                *BufferSize,\r
   IN VOID                 *Buffer\r
 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_WRITE)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN UINTN                *BufferSize,\r
   IN VOID                 *Buffer\r

-  ); \r
-  \r
+  );\r
+\r

 \r
 /**\r
   Rewinds the tape.\r
 \r
 /**\r
   Rewinds the tape.\r


@@ -129,11 +129,11 @@ EFI_STATUS
   @retval EFI_DEVICE_ERROR A device error occurred while attempting to reposition the media.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR A device error occurred while attempting to reposition the media.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_REWIND)(\r
   IN EFI_TAPE_IO_PROTOCOL *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_REWIND)(\r
   IN EFI_TAPE_IO_PROTOCOL *This\r

-  );   \r
+  );\r

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


@@ -143,7 +143,7 @@ EFI_STATUS
   @param  Direction Direction and number of data blocks or filemarks to space over on media.\r
   @param  Type      Type of mark to space over on media.\r
                     The following Type marks are mandatory:\r
   @param  Direction Direction and number of data blocks or filemarks to space over on media.\r
   @param  Type      Type of mark to space over on media.\r
                     The following Type marks are mandatory:\r

-                    BLOCK type    : 0 \r
+                    BLOCK type    : 0\r

                     FILEMARK type : 1\r
 \r
   @retval EFI_SUCCESS       The media was successfully repositioned.\r
                     FILEMARK type : 1\r
 \r
   @retval EFI_SUCCESS       The media was successfully repositioned.\r


@@ -166,7 +166,7 @@ EFI_STATUS
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN INTN                 Direction,\r
   IN UINTN                Type\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN INTN                 Direction,\r
   IN UINTN                Type\r

-  );   \r
+  );\r

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


@@ -187,12 +187,12 @@ EFI_STATUS
   @retval EFI_DEVICE_ERROR  A device error occurred while attempting to transfer data from the media.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR  A device error occurred while attempting to transfer data from the media.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_WRITEFM)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN UINTN                Count\r
 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_WRITEFM)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN UINTN                Count\r

-  );   \r
+  );\r

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


@@ -210,17 +210,17 @@ EFI_STATUS
   @retval  EFI_DEVICE_ERROR A device error occurred while attempting to reset the bus and/or device.\r
 \r
 **/\r
   @retval  EFI_DEVICE_ERROR A device error occurred while attempting to reset the bus and/or device.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_RESET)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN BOOLEAN              ExtendedVerification\r
 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_RESET)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN BOOLEAN              ExtendedVerification\r

-  );    \r
+  );\r

 \r
 ///\r
 \r
 ///\r

-/// The EFI_TAPE_IO_PROTOCOL provides basic sequential operations for tape devices. \r
-/// These include read, write, rewind, space, write filemarks and reset functions. \r
-/// Per this specification, a boot application uses the services of this protocol \r
+/// The EFI_TAPE_IO_PROTOCOL provides basic sequential operations for tape devices.\r
+/// These include read, write, rewind, space, write filemarks and reset functions.\r
+/// Per this specification, a boot application uses the services of this protocol\r

 /// to load the bootloader image from tape.\r
 ///\r
 struct _EFI_TAPE_IO_PROTOCOL {\r
 /// to load the bootloader image from tape.\r
 ///\r
 struct _EFI_TAPE_IO_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Tcg2Protocol.h b/MdePkg/Include/Protocol/Tcg2Protocol.h
index 0bda105a44814f949ea1d82a4ecabc97a5d52c49..09dc179417fb66933efeb97a9e4af7ed319935be 100644 (file)
--- a/MdePkg/Include/Protocol/Tcg2Protocol.h
+++ b/MdePkg/Include/Protocol/Tcg2Protocol.h
@@ -2,13 +2,13 @@
   TPM2 Protocol as defined in TCG PC Client Platform EFI Protocol Specification Family "2.0".\r
   See http://trustedcomputinggroup.org for the latest specification\r
 \r
   TPM2 Protocol as defined in TCG PC Client Platform EFI Protocol Specification Family "2.0".\r
   See http://trustedcomputinggroup.org for the latest specification\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
+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
 http://opensource.org/licenses/bsd-license.php\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,13 +44,13 @@ typedef struct tdEFI_TCG2_BOOT_SERVICE_CAPABILITY {
   //\r
   // Version of the EFI_TCG2_BOOT_SERVICE_CAPABILITY structure itself.\r
   // For this version of the protocol, the Major version shall be set to 1\r
   //\r
   // Version of the EFI_TCG2_BOOT_SERVICE_CAPABILITY structure itself.\r
   // For this version of the protocol, the Major version shall be set to 1\r

-  // and the Minor version shall be set to 1. \r
+  // and the Minor version shall be set to 1.\r

   //\r
   EFI_TCG2_VERSION                 StructureVersion;\r
   //\r
   // Version of the EFI TCG2 protocol.\r
   // For this version of the protocol, the Major version shall be set to 1\r
   //\r
   EFI_TCG2_VERSION                 StructureVersion;\r
   //\r
   // Version of the EFI TCG2 protocol.\r
   // For this version of the protocol, the Major version shall be set to 1\r

-  // and the Minor version shall be set to 1. \r
+  // and the Minor version shall be set to 1.\r

   //\r
   EFI_TCG2_VERSION                 ProtocolVersion;\r
   //\r
   //\r
   EFI_TCG2_VERSION                 ProtocolVersion;\r
   //\r


@@ -116,7 +116,7 @@ typedef struct tdEFI_TCG2_BOOT_SERVICE_CAPABILITY {
 \r
 typedef struct {\r
   //\r
 \r
 typedef struct {\r
   //\r

-  // Size of the event header itself (sizeof(EFI_TCG2_EVENT_HEADER)). \r
+  // Size of the event header itself (sizeof(EFI_TCG2_EVENT_HEADER)).\r

   //\r
   UINT32            HeaderSize;\r
   //\r
   //\r
   UINT32            HeaderSize;\r
   //\r


@@ -124,18 +124,18 @@ typedef struct {
   //\r
   UINT16            HeaderVersion;\r
   //\r
   //\r
   UINT16            HeaderVersion;\r
   //\r

-  // Index of the PCR that shall be extended (0 - 23). \r
+  // Index of the PCR that shall be extended (0 - 23).\r

   //\r
   TCG_PCRINDEX      PCRIndex;\r
   //\r
   //\r
   TCG_PCRINDEX      PCRIndex;\r
   //\r

-  // Type of the event that shall be extended (and optionally logged). \r
+  // Type of the event that shall be extended (and optionally logged).\r

   //\r
   TCG_EVENTTYPE     EventType;\r
 } EFI_TCG2_EVENT_HEADER;\r
 \r
 typedef struct tdEFI_TCG2_EVENT {\r
   //\r
   //\r
   TCG_EVENTTYPE     EventType;\r
 } EFI_TCG2_EVENT_HEADER;\r
 \r
 typedef struct tdEFI_TCG2_EVENT {\r
   //\r

-  // Total size of the event including the Size component, the header and the Event data. \r
+  // Total size of the event including the Size component, the header and the Event data.\r

   //\r
   UINT32                Size;\r
   EFI_TCG2_EVENT_HEADER Header;\r
   //\r
   UINT32                Size;\r
   EFI_TCG2_EVENT_HEADER Header;\r


@@ -157,11 +157,11 @@ typedef struct tdEFI_TCG2_EVENT {
 \r
   @retval EFI_SUCCESS            Operation completed successfully.\r
   @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
 \r
   @retval EFI_SUCCESS            Operation completed successfully.\r
   @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r

-                                 The ProtocolCapability variable will not be populated. \r
+                                 The ProtocolCapability variable will not be populated.\r

   @retval EFI_INVALID_PARAMETER  One or more of the parameters are incorrect.\r
                                  The ProtocolCapability variable will not be populated.\r
   @retval EFI_BUFFER_TOO_SMALL   The ProtocolCapability variable is too small to hold the full response.\r
   @retval EFI_INVALID_PARAMETER  One or more of the parameters are incorrect.\r
                                  The ProtocolCapability variable will not be populated.\r
   @retval EFI_BUFFER_TOO_SMALL   The ProtocolCapability variable is too small to hold the full response.\r

-                                 It will be partially populated (required Size field will be set). \r
+                                 It will be partially populated (required Size field will be set).\r

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


@@ -172,7 +172,7 @@ EFI_STATUS
 \r
 /**\r
   The EFI_TCG2_PROTOCOL Get Event Log function call allows a caller to\r
 \r
 /**\r
   The EFI_TCG2_PROTOCOL Get Event Log function call allows a caller to\r

-  retrieve the address of a given event log and its last entry. \r
+  retrieve the address of a given event log and its last entry.\r

 \r
   @param[in]  This               Indicates the calling context\r
   @param[in]  EventLogFormat     The type of the event log for which the information is requested.\r
 \r
   @param[in]  This               Indicates the calling context\r
   @param[in]  EventLogFormat     The type of the event log for which the information is requested.\r


@@ -200,13 +200,13 @@ EFI_STATUS
 /**\r
   The EFI_TCG2_PROTOCOL HashLogExtendEvent function call provides callers with\r
   an opportunity to extend and optionally log events without requiring\r
 /**\r
   The EFI_TCG2_PROTOCOL HashLogExtendEvent function call provides callers with\r
   an opportunity to extend and optionally log events without requiring\r

-  knowledge of actual TPM commands. \r
+  knowledge of actual TPM commands.\r

   The extend operation will occur even if this function cannot create an event\r
   The extend operation will occur even if this function cannot create an event\r

-  log entry (e.g. due to the event log being full). \r
+  log entry (e.g. due to the event log being full).\r

 \r
   @param[in]  This               Indicates the calling context\r
   @param[in]  Flags              Bitmap providing additional information.\r
 \r
   @param[in]  This               Indicates the calling context\r
   @param[in]  Flags              Bitmap providing additional information.\r

-  @param[in]  DataToHash         Physical address of the start of the data buffer to be hashed. \r
+  @param[in]  DataToHash         Physical address of the start of the data buffer to be hashed.\r

   @param[in]  DataToHashLen      The length in bytes of the buffer referenced by DataToHash.\r
   @param[in]  EfiTcgEvent        Pointer to data buffer containing information about the event.\r
 \r
   @param[in]  DataToHashLen      The length in bytes of the buffer referenced by DataToHash.\r
   @param[in]  EfiTcgEvent        Pointer to data buffer containing information about the event.\r
 \r


@@ -238,7 +238,7 @@ EFI_STATUS
   @retval EFI_SUCCESS            The command byte stream was successfully sent to the device and a response was successfully received.\r
   @retval EFI_DEVICE_ERROR       The command was not successfully sent to the device or a response was not successfully received from the device.\r
   @retval EFI_INVALID_PARAMETER  One or more of the parameters are incorrect.\r
   @retval EFI_SUCCESS            The command byte stream was successfully sent to the device and a response was successfully received.\r
   @retval EFI_DEVICE_ERROR       The command was not successfully sent to the device or a response was not successfully received from the device.\r
   @retval EFI_INVALID_PARAMETER  One or more of the parameters are incorrect.\r

-  @retval EFI_BUFFER_TOO_SMALL   The output parameter block is too small. \r
+  @retval EFI_BUFFER_TOO_SMALL   The output parameter block is too small.\r

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


@@ -257,7 +257,7 @@ EFI_STATUS
   @param[out] ActivePcrBanks  Pointer to the variable receiving the bitmap of currently active PCR banks.\r
 \r
   @retval EFI_SUCCESS           The bitmap of active PCR banks was stored in the ActivePcrBanks parameter.\r
   @param[out] ActivePcrBanks  Pointer to the variable receiving the bitmap of currently active PCR banks.\r
 \r
   @retval EFI_SUCCESS           The bitmap of active PCR banks was stored in the ActivePcrBanks parameter.\r

-  @retval EFI_INVALID_PARAMETER One or more of the parameters are incorrect. \r
+  @retval EFI_INVALID_PARAMETER One or more of the parameters are incorrect.\r

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

diff --git a/MdePkg/Include/Protocol/TcgService.h b/MdePkg/Include/Protocol/TcgService.h
index 5911740e4ea4aac502630966c0dee2a15db33783..90e30b342624c2efc0ef8ae3c3a87574ac65041b 100644 (file)
--- a/MdePkg/Include/Protocol/TcgService.h
+++ b/MdePkg/Include/Protocol/TcgService.h
@@ -2,13 +2,13 @@
   TCG Service Protocol as defined in TCG_EFI_Protocol_1_22_Final\r
   See http://trustedcomputinggroup.org for the latest specification\r
 \r
   TCG Service Protocol as defined in TCG_EFI_Protocol_1_22_Final\r
   See http://trustedcomputinggroup.org for the latest specification\r
 \r

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


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <IndustryStandard/UefiTcgPlatform.h>\r
 \r
 #define EFI_TCG_PROTOCOL_GUID  \\r
 #include <IndustryStandard/UefiTcgPlatform.h>\r
 \r
 #define EFI_TCG_PROTOCOL_GUID  \\r

-  {0xf541796d, 0xa62e, 0x4954, { 0xa7, 0x75, 0x95, 0x84, 0xf6, 0x1b, 0x9c, 0xdd } } \r
+  {0xf541796d, 0xa62e, 0x4954, { 0xa7, 0x75, 0x95, 0x84, 0xf6, 0x1b, 0x9c, 0xdd } }\r

 \r
 typedef struct _EFI_TCG_PROTOCOL EFI_TCG_PROTOCOL;\r
 \r
 \r
 typedef struct _EFI_TCG_PROTOCOL EFI_TCG_PROTOCOL;\r
 \r


@@ -32,9 +32,9 @@ typedef struct {
 \r
 typedef struct _TCG_EFI_BOOT_SERVICE_CAPABILITY {\r
   UINT8          Size;                /// Size of this structure.\r
 \r
 typedef struct _TCG_EFI_BOOT_SERVICE_CAPABILITY {\r
   UINT8          Size;                /// Size of this structure.\r

-  TCG_VERSION    StructureVersion;    \r
+  TCG_VERSION    StructureVersion;\r

   TCG_VERSION    ProtocolSpecVersion;\r
   TCG_VERSION    ProtocolSpecVersion;\r

-  UINT8          HashAlgorithmBitmap; /// Hash algorithms . \r
+  UINT8          HashAlgorithmBitmap; /// Hash algorithms .\r

                                       /// This protocol is capable of : 01=SHA-1.\r
   BOOLEAN        TPMPresentFlag;      /// 00h = TPM not present.\r
   BOOLEAN        TPMDeactivatedFlag;  /// 01h = TPM currently deactivated.\r
                                       /// This protocol is capable of : 01=SHA-1.\r
   BOOLEAN        TPMPresentFlag;      /// 00h = TPM not present.\r
   BOOLEAN        TPMDeactivatedFlag;  /// 01h = TPM currently deactivated.\r


@@ -43,22 +43,22 @@ typedef struct _TCG_EFI_BOOT_SERVICE_CAPABILITY {
 typedef UINT32   TCG_ALGORITHM_ID;\r
 \r
 /**\r
 typedef UINT32   TCG_ALGORITHM_ID;\r
 \r
 /**\r

-  This service provides EFI protocol capability information, state information \r
+  This service provides EFI protocol capability information, state information\r

   about the TPM, and Event Log state information.\r
 \r
   @param  This                   Indicates the calling context\r
   about the TPM, and Event Log state information.\r
 \r
   @param  This                   Indicates the calling context\r

-  @param  ProtocolCapability     The callee allocates memory for a TCG_BOOT_SERVICE_CAPABILITY \r
-                                 structure and fills in the fields with the EFI protocol \r
+  @param  ProtocolCapability     The callee allocates memory for a TCG_BOOT_SERVICE_CAPABILITY\r
+                                 structure and fills in the fields with the EFI protocol\r

                                  capability information and the current TPM state information.\r
                                  capability information and the current TPM state information.\r

-  @param  TCGFeatureFlags        This is a pointer to the feature flags. No feature \r
-                                 flags are currently defined so this parameter \r
-                                 MUST be set to 0. However, in the future, \r
-                                 feature flags may be defined that, for example, \r
+  @param  TCGFeatureFlags        This is a pointer to the feature flags. No feature\r
+                                 flags are currently defined so this parameter\r
+                                 MUST be set to 0. However, in the future,\r
+                                 feature flags may be defined that, for example,\r

                                  enable hash algorithm agility.\r
   @param  EventLogLocation       This is a pointer to the address of the event log in memory.\r
                                  enable hash algorithm agility.\r
   @param  EventLogLocation       This is a pointer to the address of the event log in memory.\r

-  @param  EventLogLastEntry      If the Event Log contains more than one entry, \r
-                                 this is a pointer to the address of the start of \r
-                                 the last entry in the event log in memory. \r
+  @param  EventLogLastEntry      If the Event Log contains more than one entry,\r
+                                 this is a pointer to the address of the start of\r
+                                 the last entry in the event log in memory.\r

 \r
   @retval EFI_SUCCESS            The operation completed successfully.\r
   @retval EFI_INVALID_PARAMETER  ProtocolCapability does not match TCG capability.\r
 \r
   @retval EFI_SUCCESS            The operation completed successfully.\r
   @retval EFI_INVALID_PARAMETER  ProtocolCapability does not match TCG capability.\r


@@ -76,14 +76,14 @@ EFI_STATUS
 \r
 /**\r
   This service abstracts the capability to do a hash operation on a data buffer.\r
 \r
 /**\r
   This service abstracts the capability to do a hash operation on a data buffer.\r

-  \r
+\r

   @param  This                   Indicates the calling context.\r
   @param  HashData               The pointer to the data buffer to be hashed.\r
   @param  HashDataLen            The length of the data buffer to be hashed.\r
   @param  AlgorithmId            Identification of the Algorithm to use for the hashing operation.\r
   @param  HashedDataLen          Resultant length of the hashed data.\r
   @param  HashedDataResult       Resultant buffer of the hashed data.\r
   @param  This                   Indicates the calling context.\r
   @param  HashData               The pointer to the data buffer to be hashed.\r
   @param  HashDataLen            The length of the data buffer to be hashed.\r
   @param  AlgorithmId            Identification of the Algorithm to use for the hashing operation.\r
   @param  HashedDataLen          Resultant length of the hashed data.\r
   @param  HashedDataResult       Resultant buffer of the hashed data.\r

-  \r
+\r

   @retval EFI_SUCCESS            The operation completed successfully.\r
   @retval EFI_INVALID_PARAMETER  HashDataLen is NULL.\r
   @retval EFI_INVALID_PARAMETER  HashDataLenResult is NULL.\r
   @retval EFI_SUCCESS            The operation completed successfully.\r
   @retval EFI_INVALID_PARAMETER  HashDataLen is NULL.\r
   @retval EFI_INVALID_PARAMETER  HashDataLenResult is NULL.\r


@@ -106,15 +106,15 @@ EFI_STATUS
   This service abstracts the capability to add an entry to the Event Log.\r
 \r
   @param  This                   Indicates the calling context\r
   This service abstracts the capability to add an entry to the Event Log.\r
 \r
   @param  This                   Indicates the calling context\r

-  @param  TCGLogData             The pointer to the start of the data buffer containing \r
-                                 the TCG_PCR_EVENT data structure. All fields in \r
+  @param  TCGLogData             The pointer to the start of the data buffer containing\r
+                                 the TCG_PCR_EVENT data structure. All fields in\r

                                  this structure are properly filled by the caller.\r
   @param  EventNumber            The event number of the event just logged.\r
                                  this structure are properly filled by the caller.\r
   @param  EventNumber            The event number of the event just logged.\r

-  @param  Flags                  Indicates additional flags. Only one flag has been \r
-                                 defined at this time, which is 0x01 and means the \r
-                                 extend operation should not be performed. All \r
-                                 other bits are reserved. \r
- \r
+  @param  Flags                  Indicates additional flags. Only one flag has been\r
+                                 defined at this time, which is 0x01 and means the\r
+                                 extend operation should not be performed. All\r
+                                 other bits are reserved.\r
+\r

   @retval EFI_SUCCESS            The operation completed successfully.\r
   @retval EFI_OUT_OF_RESOURCES   Insufficient memory in the event log to complete this action.\r
 **/\r
   @retval EFI_SUCCESS            The operation completed successfully.\r
   @retval EFI_OUT_OF_RESOURCES   Insufficient memory in the event log to complete this action.\r
 **/\r


@@ -155,17 +155,17 @@ EFI_STATUS
   This service abstracts the capability to do a hash operation on a data buffer, extend a specific TPM PCR with the hash result, and add an entry to the Event Log\r
 \r
   @param  This                   Indicates the calling context\r
   This service abstracts the capability to do a hash operation on a data buffer, extend a specific TPM PCR with the hash result, and add an entry to the Event Log\r
 \r
   @param  This                   Indicates the calling context\r

-  @param  HashData               The physical address of the start of the data buffer \r
+  @param  HashData               The physical address of the start of the data buffer\r

                                  to be hashed, extended, and logged.\r
   @param  HashDataLen            The length, in bytes, of the buffer referenced by HashData\r
   @param  AlgorithmId            Identification of the Algorithm to use for the hashing operation\r
                                  to be hashed, extended, and logged.\r
   @param  HashDataLen            The length, in bytes, of the buffer referenced by HashData\r
   @param  AlgorithmId            Identification of the Algorithm to use for the hashing operation\r

-  @param  TCGLogData             The physical address of the start of the data \r
+  @param  TCGLogData             The physical address of the start of the data\r

                                  buffer containing the TCG_PCR_EVENT data structure.\r
   @param  EventNumber            The event number of the event just logged.\r
                                  buffer containing the TCG_PCR_EVENT data structure.\r
   @param  EventNumber            The event number of the event just logged.\r

-  @param  EventLogLastEntry      The physical address of the first byte of the entry \r
-                                 just placed in the Event Log. If the Event Log was \r
-                                 empty when this function was called then this physical \r
-                                 address will be the same as the physical address of \r
+  @param  EventLogLastEntry      The physical address of the first byte of the entry\r
+                                 just placed in the Event Log. If the Event Log was\r
+                                 empty when this function was called then this physical\r
+                                 address will be the same as the physical address of\r

                                  the start of the Event Log.\r
 \r
   @retval EFI_SUCCESS            The operation completed successfully.\r
                                  the start of the Event Log.\r
 \r
   @retval EFI_SUCCESS            The operation completed successfully.\r

diff --git a/MdePkg/Include/Protocol/Tcp4.h b/MdePkg/Include/Protocol/Tcp4.h
index e27581b1d87d622c25472f51b6c2699a15cc42db..4a1e8a078b873940128adba1602340f0ec0c2a39 100644 (file)
--- a/MdePkg/Include/Protocol/Tcp4.h
+++ b/MdePkg/Include/Protocol/Tcp4.h
@@ -4,13 +4,13 @@
   and destroy child of the driver to communicate with other host using TCP protocol.\r
   The EFI TCPv4 Protocol provides services to send and receive data stream.\r
 \r
   and destroy child of the driver to communicate with other host using TCP protocol.\r
   The EFI TCPv4 Protocol provides services to send and receive data stream.\r
 \r

-Copyright (c) 2006 - 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) 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
-    \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
   @par Revision Reference:\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

diff --git a/MdePkg/Include/Protocol/Timer.h b/MdePkg/Include/Protocol/Timer.h
index ffdb0a1468f0c35da823de4d9823c0c0f740979c..82bfb9aef54c2e4cf1bc672e59096872f353c4bd 100644 (file)
--- a/MdePkg/Include/Protocol/Timer.h
+++ b/MdePkg/Include/Protocol/Timer.h
@@ -3,14 +3,14 @@
 \r
   This code is used to provide the timer tick for the DXE core.\r
 \r
 \r
   This code is used to provide the timer tick for the DXE core.\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


@@ -29,10 +29,10 @@
 typedef struct _EFI_TIMER_ARCH_PROTOCOL   EFI_TIMER_ARCH_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_TIMER_ARCH_PROTOCOL   EFI_TIMER_ARCH_PROTOCOL;\r
 \r
 /**\r

-  This function of this type is called when a timer interrupt fires.  This \r
+  This function of this type is called when a timer interrupt fires.  This\r

   function executes at TPL_HIGH_LEVEL.  The DXE Core will register a function\r
   function executes at TPL_HIGH_LEVEL.  The DXE Core will register a function\r

-  of this type to be called for the timer interrupt, so it can know how much \r
-  time has passed.  This information is used to signal timer based events.  \r
+  of this type to be called for the timer interrupt, so it can know how much\r
+  time has passed.  This information is used to signal timer based events.\r

 \r
   @param  Time   Time since the last timer interrupt in 100 ns units. This will\r
                  typically be TimerPeriod, but if a timer interrupt is missed, and the\r
 \r
   @param  Time   Time since the last timer interrupt in 100 ns units. This will\r
                  typically be TimerPeriod, but if a timer interrupt is missed, and the\r


@@ -49,16 +49,16 @@ VOID
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function registers the handler NotifyFunction so it is called every time \r
-  the timer interrupt fires.  It also passes the amount of time since the last \r
-  handler call to the NotifyFunction.  If NotifyFunction is NULL, then the \r
-  handler is unregistered.  If the handler is registered, then EFI_SUCCESS is \r
-  returned.  If the CPU does not support registering a timer interrupt handler, \r
-  then EFI_UNSUPPORTED is returned.  If an attempt is made to register a handler \r
-  when a handler is already registered, then EFI_ALREADY_STARTED is returned.  \r
-  If an attempt is made to unregister a handler when a handler is not registered, \r
-  then EFI_INVALID_PARAMETER is returned.  If an error occurs attempting to \r
-  register the NotifyFunction with the timer interrupt, then EFI_DEVICE_ERROR \r
+  This function registers the handler NotifyFunction so it is called every time\r
+  the timer interrupt fires.  It also passes the amount of time since the last\r
+  handler call to the NotifyFunction.  If NotifyFunction is NULL, then the\r
+  handler is unregistered.  If the handler is registered, then EFI_SUCCESS is\r
+  returned.  If the CPU does not support registering a timer interrupt handler,\r
+  then EFI_UNSUPPORTED is returned.  If an attempt is made to register a handler\r
+  when a handler is already registered, then EFI_ALREADY_STARTED is returned.\r
+  If an attempt is made to unregister a handler when a handler is not registered,\r
+  then EFI_INVALID_PARAMETER is returned.  If an error occurs attempting to\r
+  register the NotifyFunction with the timer interrupt, then EFI_DEVICE_ERROR\r

   is returned.\r
 \r
   @param  This             The EFI_TIMER_ARCH_PROTOCOL instance.\r
   is returned.\r
 \r
   @param  This             The EFI_TIMER_ARCH_PROTOCOL instance.\r


@@ -77,7 +77,7 @@ VOID
   @retval EFI_DEVICE_ERROR      The timer handler could not be registered.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR      The timer handler could not be registered.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_TIMER_REGISTER_HANDLER)(\r
   IN EFI_TIMER_ARCH_PROTOCOL    *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_TIMER_REGISTER_HANDLER)(\r
   IN EFI_TIMER_ARCH_PROTOCOL    *This,\r


@@ -85,17 +85,17 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-  This function adjusts the period of timer interrupts to the value specified \r
-  by TimerPeriod.  If the timer period is updated, then the selected timer \r
-  period is stored in EFI_TIMER.TimerPeriod, and EFI_SUCCESS is returned.  If \r
-  the timer hardware is not programmable, then EFI_UNSUPPORTED is returned.  \r
-  If an error occurs while attempting to update the timer period, then the \r
-  timer hardware will be put back in its state prior to this call, and \r
-  EFI_DEVICE_ERROR is returned.  If TimerPeriod is 0, then the timer interrupt \r
-  is disabled.  This is not the same as disabling the CPU's interrupts.  \r
-  Instead, it must either turn off the timer hardware, or it must adjust the \r
-  interrupt controller so that a CPU interrupt is not generated when the timer \r
-  interrupt fires. \r
+  This function adjusts the period of timer interrupts to the value specified\r
+  by TimerPeriod.  If the timer period is updated, then the selected timer\r
+  period is stored in EFI_TIMER.TimerPeriod, and EFI_SUCCESS is returned.  If\r
+  the timer hardware is not programmable, then EFI_UNSUPPORTED is returned.\r
+  If an error occurs while attempting to update the timer period, then the\r
+  timer hardware will be put back in its state prior to this call, and\r
+  EFI_DEVICE_ERROR is returned.  If TimerPeriod is 0, then the timer interrupt\r
+  is disabled.  This is not the same as disabling the CPU's interrupts.\r
+  Instead, it must either turn off the timer hardware, or it must adjust the\r
+  interrupt controller so that a CPU interrupt is not generated when the timer\r
+  interrupt fires.\r

 \r
   @param  This             The EFI_TIMER_ARCH_PROTOCOL instance.\r
   @param  TimerPeriod      The rate to program the timer interrupt in 100 nS units. If\r
 \r
   @param  This             The EFI_TIMER_ARCH_PROTOCOL instance.\r
   @param  TimerPeriod      The rate to program the timer interrupt in 100 nS units. If\r


@@ -110,7 +110,7 @@ EFI_STATUS
   @retval EFI_DEVICE_ERROR      The timer period could not be changed due to a device error.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR      The timer period could not be changed due to a device error.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_TIMER_SET_TIMER_PERIOD)(\r
   IN EFI_TIMER_ARCH_PROTOCOL    *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_TIMER_SET_TIMER_PERIOD)(\r
   IN EFI_TIMER_ARCH_PROTOCOL    *This,\r


@@ -118,9 +118,9 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function retrieves the period of timer interrupts in 100 ns units, \r
-  returns that value in TimerPeriod, and returns EFI_SUCCESS.  If TimerPeriod \r
-  is NULL, then EFI_INVALID_PARAMETER is returned.  If a TimerPeriod of 0 is \r
+  This function retrieves the period of timer interrupts in 100 ns units,\r
+  returns that value in TimerPeriod, and returns EFI_SUCCESS.  If TimerPeriod\r
+  is NULL, then EFI_INVALID_PARAMETER is returned.  If a TimerPeriod of 0 is\r

   returned, then the timer is currently disabled.\r
 \r
   @param  This             The EFI_TIMER_ARCH_PROTOCOL instance.\r
   returned, then the timer is currently disabled.\r
 \r
   @param  This             The EFI_TIMER_ARCH_PROTOCOL instance.\r


@@ -131,7 +131,7 @@ EFI_STATUS
   @retval EFI_INVALID_PARAMETER TimerPeriod is NULL.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER TimerPeriod is NULL.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_TIMER_GET_TIMER_PERIOD)(\r
   IN EFI_TIMER_ARCH_PROTOCOL      *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_TIMER_GET_TIMER_PERIOD)(\r
   IN EFI_TIMER_ARCH_PROTOCOL      *This,\r


@@ -139,12 +139,12 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function generates a soft timer interrupt. If the platform does not support soft \r
-  timer interrupts, then EFI_UNSUPPORTED is returned. Otherwise, EFI_SUCCESS is returned. \r
-  If a handler has been registered through the EFI_TIMER_ARCH_PROTOCOL.RegisterHandler() \r
-  service, then a soft timer interrupt will be generated. If the timer interrupt is \r
-  enabled when this service is called, then the registered handler will be invoked. The \r
-  registered handler should not be able to distinguish a hardware-generated timer \r
+  This function generates a soft timer interrupt. If the platform does not support soft\r
+  timer interrupts, then EFI_UNSUPPORTED is returned. Otherwise, EFI_SUCCESS is returned.\r
+  If a handler has been registered through the EFI_TIMER_ARCH_PROTOCOL.RegisterHandler()\r
+  service, then a soft timer interrupt will be generated. If the timer interrupt is\r
+  enabled when this service is called, then the registered handler will be invoked. The\r
+  registered handler should not be able to distinguish a hardware-generated timer\r

   interrupt from a software-generated timer interrupt.\r
 \r
   @param  This                  The EFI_TIMER_ARCH_PROTOCOL instance.\r
   interrupt from a software-generated timer interrupt.\r
 \r
   @param  This                  The EFI_TIMER_ARCH_PROTOCOL instance.\r


@@ -153,7 +153,7 @@ EFI_STATUS
   @retval EFI_UNSUPPORTED       The platform does not support the generation of soft timer interrupts.\r
 \r
 **/\r
   @retval EFI_UNSUPPORTED       The platform does not support the generation of soft timer interrupts.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_TIMER_GENERATE_SOFT_INTERRUPT)(\r
   IN EFI_TIMER_ARCH_PROTOCOL    *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_TIMER_GENERATE_SOFT_INTERRUPT)(\r
   IN EFI_TIMER_ARCH_PROTOCOL    *This\r


@@ -161,11 +161,11 @@ EFI_STATUS
 \r
 \r
 ///\r
 \r
 \r
 ///\r

-/// This protocol provides the services to initialize a periodic timer \r
+/// This protocol provides the services to initialize a periodic timer\r

 /// interrupt, and to register a handler that is called each time the timer\r
 /// interrupt fires.  It may also provide a service to adjust the rate of the\r
 /// interrupt, and to register a handler that is called each time the timer\r
 /// interrupt fires.  It may also provide a service to adjust the rate of the\r

-/// periodic timer interrupt.  When a timer interrupt occurs, the handler is \r
-/// passed the amount of time that has passed since the previous timer \r
+/// periodic timer interrupt.  When a timer interrupt occurs, the handler is\r
+/// passed the amount of time that has passed since the previous timer\r

 /// interrupt.\r
 ///\r
 struct _EFI_TIMER_ARCH_PROTOCOL {\r
 /// interrupt.\r
 ///\r
 struct _EFI_TIMER_ARCH_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Timestamp.h b/MdePkg/Include/Protocol/Timestamp.h
index 9be72426e6646336ab0eca46291a4435ae5cb8b0..f3c3addc073fe512170fc3c245d7507bfddb4a8a 100644 (file)
--- a/MdePkg/Include/Protocol/Timestamp.h
+++ b/MdePkg/Include/Protocol/Timestamp.h
@@ -1,19 +1,19 @@
 /** @file\r
 /** @file\r

-  EFI Timestamp Protocol as defined in UEFI2.4 Specification. \r
+  EFI Timestamp Protocol as defined in UEFI2.4 Specification.\r

   Used to provide a platform independent interface for retrieving a high resolution timestamp counter.\r
   Used to provide a platform independent interface for retrieving a high resolution timestamp counter.\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
-  \r
-  @par Revision Reference:          \r
-  This Protocol is introduced in UEFI Specification 2.4    \r
-       \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
+\r
+  @par Revision Reference:\r
+  This Protocol is introduced in UEFI Specification 2.4\r
+\r

 **/\r
 \r
 #ifndef __EFI_TIME_STAMP_PROTOCOL_H__\r
 **/\r
 \r
 #ifndef __EFI_TIME_STAMP_PROTOCOL_H__\r


@@ -32,30 +32,30 @@ typedef struct _EFI_TIMESTAMP_PROTOCOL  EFI_TIMESTAMP_PROTOCOL;
 /// EFI_TIMESTAMP_PROPERTIES\r
 ///\r
 typedef struct {\r
 /// EFI_TIMESTAMP_PROPERTIES\r
 ///\r
 typedef struct {\r

-  /// \r
+  ///\r

   /// The frequency of the timestamp counter in Hz.\r
   /// The frequency of the timestamp counter in Hz.\r

-  /// \r
+  ///\r

   UINT64                               Frequency;\r
   UINT64                               Frequency;\r

-  /// \r
+  ///\r

   /// The value that the timestamp counter ends with immediately before it rolls over.\r
   /// For example, a 64-bit free running counter would have an EndValue of 0xFFFFFFFFFFFFFFFF.\r
   /// A 24-bit free running counter would have an EndValue of 0xFFFFFF.\r
   ///\r
   UINT64                               EndValue;\r
 } EFI_TIMESTAMP_PROPERTIES;\r
   /// The value that the timestamp counter ends with immediately before it rolls over.\r
   /// For example, a 64-bit free running counter would have an EndValue of 0xFFFFFFFFFFFFFFFF.\r
   /// A 24-bit free running counter would have an EndValue of 0xFFFFFF.\r
   ///\r
   UINT64                               EndValue;\r
 } EFI_TIMESTAMP_PROPERTIES;\r

- \r
+\r

 /**\r
   Retrieves the current value of a 64-bit free running timestamp counter.\r
 /**\r
   Retrieves the current value of a 64-bit free running timestamp counter.\r

-  \r
+\r

   The counter shall count up in proportion to the amount of time that has passed. The counter value\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 counter shall count up in proportion to the amount of time that has passed. The counter value\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
+  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
   vary as long as the value reflecting time passed remains consistent.\r
 \r

-  @param  None.             \r
+  @param  None.\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


@@ -71,13 +71,13 @@ UINT64
 \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

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *TIMESTAMP_GET_PROPERTIES)(\r
   OUT   EFI_TIMESTAMP_PROPERTIES       *Properties\r
 EFI_STATUS\r
 (EFIAPI *TIMESTAMP_GET_PROPERTIES)(\r
   OUT   EFI_TIMESTAMP_PROPERTIES       *Properties\r


@@ -87,7 +87,7 @@ EFI_STATUS
 \r
 ///\r
 /// EFI_TIMESTAMP_PROTOCOL\r
 \r
 ///\r
 /// EFI_TIMESTAMP_PROTOCOL\r

-/// The protocol provides a platform independent interface for retrieving a high resolution \r
+/// The protocol provides a platform independent interface for retrieving a high resolution\r

 /// timestamp counter.\r
 ///\r
 struct _EFI_TIMESTAMP_PROTOCOL {\r
 /// timestamp counter.\r
 ///\r
 struct _EFI_TIMESTAMP_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/TrEEProtocol.h b/MdePkg/Include/Protocol/TrEEProtocol.h
index 9a437384bece5f4fa363b362ae93215ad5c2bc6c..dce830e72d50a135636626b5ca67208552227173 100644 (file)
--- a/MdePkg/Include/Protocol/TrEEProtocol.h
+++ b/MdePkg/Include/Protocol/TrEEProtocol.h
@@ -1,13 +1,13 @@
 /** @file\r
   This protocol is defined to abstract TPM2 hardware access in boot phase.\r
 \r
 /** @file\r
   This protocol is defined to abstract TPM2 hardware access in boot phase.\r
 \r

-Copyright (c) 2013 - 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
+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
 http://opensource.org/licenses/bsd-license.php\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,19 +35,19 @@ typedef UINT32 TREE_EVENT_LOG_FORMAT;
 \r
 typedef struct _TREE_BOOT_SERVICE_CAPABILITY {\r
   //\r
 \r
 typedef struct _TREE_BOOT_SERVICE_CAPABILITY {\r
   //\r

-  // Allocated size of the structure passed in \r
+  // Allocated size of the structure passed in\r

   //\r
   UINT8                 Size;\r
   //\r
   // Version of the TREE_BOOT_SERVICE_CAPABILITY structure itself.\r
   // For this version of the protocol, the Major version shall be set to 1\r
   //\r
   UINT8                 Size;\r
   //\r
   // Version of the TREE_BOOT_SERVICE_CAPABILITY structure itself.\r
   // For this version of the protocol, the Major version shall be set to 1\r

-  // and the Minor version shall be set to 0. \r
+  // and the Minor version shall be set to 0.\r

   //\r
   TREE_VERSION          StructureVersion;\r
   //\r
   // Version of the TrEE protocol.\r
   // For this version of the protocol, the Major version shall be set to 1\r
   //\r
   TREE_VERSION          StructureVersion;\r
   //\r
   // Version of the TrEE protocol.\r
   // For this version of the protocol, the Major version shall be set to 1\r

-  // and the Minor version shall be set to 0. \r
+  // and the Minor version shall be set to 0.\r

   //\r
   TREE_VERSION          ProtocolVersion;\r
   //\r
   //\r
   TREE_VERSION          ProtocolVersion;\r
   //\r


@@ -59,20 +59,20 @@ typedef struct _TREE_BOOT_SERVICE_CAPABILITY {
   //\r
   TREE_EVENT_LOG_BITMAP SupportedEventLogs;\r
   //\r
   //\r
   TREE_EVENT_LOG_BITMAP SupportedEventLogs;\r
   //\r

-  // False = TrEE not present \r
+  // False = TrEE not present\r

   //\r
   BOOLEAN               TrEEPresentFlag;\r
   //\r
   //\r
   BOOLEAN               TrEEPresentFlag;\r
   //\r

-  // Max size (in bytes) of a command that can be sent to the TrEE \r
+  // Max size (in bytes) of a command that can be sent to the TrEE\r

   //\r
   UINT16                MaxCommandSize;\r
   //\r
   //\r
   UINT16                MaxCommandSize;\r
   //\r

-  // Max size (in bytes) of a response that can be provided by the TrEE \r
+  // Max size (in bytes) of a response that can be provided by the TrEE\r

   //\r
   UINT16                MaxResponseSize;\r
   //\r
   // 4-byte Vendor ID (see Trusted Computing Group, "TCG Vendor ID Registry,"\r
   //\r
   UINT16                MaxResponseSize;\r
   //\r
   // 4-byte Vendor ID (see Trusted Computing Group, "TCG Vendor ID Registry,"\r

-  // Version 1.0, Revision 0.1, August 31, 2007, "TPM Capabilities Vendor ID" section) \r
+  // Version 1.0, Revision 0.1, August 31, 2007, "TPM Capabilities Vendor ID" section)\r

   //\r
   UINT32                ManufacturerID;\r
 } TREE_BOOT_SERVICE_CAPABILITY_1_0;\r
   //\r
   UINT32                ManufacturerID;\r
 } TREE_BOOT_SERVICE_CAPABILITY_1_0;\r


@@ -103,7 +103,7 @@ typedef UINT32 TrEE_EVENTTYPE;
 \r
 typedef struct {\r
   //\r
 \r
 typedef struct {\r
   //\r

-  // Size of the event header itself (sizeof(TrEE_EVENT_HEADER)). \r
+  // Size of the event header itself (sizeof(TrEE_EVENT_HEADER)).\r

   //\r
   UINT32            HeaderSize;\r
   //\r
   //\r
   UINT32            HeaderSize;\r
   //\r


@@ -111,18 +111,18 @@ typedef struct {
   //\r
   UINT16            HeaderVersion;\r
   //\r
   //\r
   UINT16            HeaderVersion;\r
   //\r

-  // Index of the PCR that shall be extended (0 - 23). \r
+  // Index of the PCR that shall be extended (0 - 23).\r

   //\r
   TrEE_PCRINDEX     PCRIndex;\r
   //\r
   //\r
   TrEE_PCRINDEX     PCRIndex;\r
   //\r

-  // Type of the event that shall be extended (and optionally logged). \r
+  // Type of the event that shall be extended (and optionally logged).\r

   //\r
   TrEE_EVENTTYPE    EventType;\r
 } TrEE_EVENT_HEADER;\r
 \r
 typedef struct {\r
   //\r
   //\r
   TrEE_EVENTTYPE    EventType;\r
 } TrEE_EVENT_HEADER;\r
 \r
 typedef struct {\r
   //\r

-  // Total size of the event including the Size component, the header and the Event data. \r
+  // Total size of the event including the Size component, the header and the Event data.\r

   //\r
   UINT32            Size;\r
   TrEE_EVENT_HEADER Header;\r
   //\r
   UINT32            Size;\r
   TrEE_EVENT_HEADER Header;\r


@@ -144,11 +144,11 @@ typedef struct {
 \r
   @retval EFI_SUCCESS            Operation completed successfully.\r
   @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
 \r
   @retval EFI_SUCCESS            Operation completed successfully.\r
   @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r

-                                 The ProtocolCapability variable will not be populated. \r
+                                 The ProtocolCapability variable will not be populated.\r

   @retval EFI_INVALID_PARAMETER  One or more of the parameters are incorrect.\r
                                  The ProtocolCapability variable will not be populated.\r
   @retval EFI_BUFFER_TOO_SMALL   The ProtocolCapability variable is too small to hold the full response.\r
   @retval EFI_INVALID_PARAMETER  One or more of the parameters are incorrect.\r
                                  The ProtocolCapability variable will not be populated.\r
   @retval EFI_BUFFER_TOO_SMALL   The ProtocolCapability variable is too small to hold the full response.\r

-                                 It will be partially populated (required Size field will be set). \r
+                                 It will be partially populated (required Size field will be set).\r

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


@@ -159,7 +159,7 @@ EFI_STATUS
 \r
 /**\r
   The EFI_TREE_PROTOCOL Get Event Log function call allows a caller to\r
 \r
 /**\r
   The EFI_TREE_PROTOCOL Get Event Log function call allows a caller to\r

-  retrieve the address of a given event log and its last entry. \r
+  retrieve the address of a given event log and its last entry.\r

 \r
   @param[in]  This               Indicates the calling context\r
   @param[in]  EventLogFormat     The type of the event log for which the information is requested.\r
 \r
   @param[in]  This               Indicates the calling context\r
   @param[in]  EventLogFormat     The type of the event log for which the information is requested.\r


@@ -187,13 +187,13 @@ EFI_STATUS
 /**\r
   The EFI_TREE_PROTOCOL HashLogExtendEvent function call provides callers with\r
   an opportunity to extend and optionally log events without requiring\r
 /**\r
   The EFI_TREE_PROTOCOL HashLogExtendEvent function call provides callers with\r
   an opportunity to extend and optionally log events without requiring\r

-  knowledge of actual TPM commands. \r
+  knowledge of actual TPM commands.\r

   The extend operation will occur even if this function cannot create an event\r
   The extend operation will occur even if this function cannot create an event\r

-  log entry (e.g. due to the event log being full). \r
+  log entry (e.g. due to the event log being full).\r

 \r
   @param[in]  This               Indicates the calling context\r
   @param[in]  Flags              Bitmap providing additional information.\r
 \r
   @param[in]  This               Indicates the calling context\r
   @param[in]  Flags              Bitmap providing additional information.\r

-  @param[in]  DataToHash         Physical address of the start of the data buffer to be hashed. \r
+  @param[in]  DataToHash         Physical address of the start of the data buffer to be hashed.\r

   @param[in]  DataToHashLen      The length in bytes of the buffer referenced by DataToHash.\r
   @param[in]  Event              Pointer to data buffer containing information about the event.\r
 \r
   @param[in]  DataToHashLen      The length in bytes of the buffer referenced by DataToHash.\r
   @param[in]  Event              Pointer to data buffer containing information about the event.\r
 \r


@@ -225,7 +225,7 @@ EFI_STATUS
   @retval EFI_SUCCESS            The command byte stream was successfully sent to the device and a response was successfully received.\r
   @retval EFI_DEVICE_ERROR       The command was not successfully sent to the device or a response was not successfully received from the device.\r
   @retval EFI_INVALID_PARAMETER  One or more of the parameters are incorrect.\r
   @retval EFI_SUCCESS            The command byte stream was successfully sent to the device and a response was successfully received.\r
   @retval EFI_DEVICE_ERROR       The command was not successfully sent to the device or a response was not successfully received from the device.\r
   @retval EFI_INVALID_PARAMETER  One or more of the parameters are incorrect.\r

-  @retval EFI_BUFFER_TOO_SMALL   The output parameter block is too small. \r
+  @retval EFI_BUFFER_TOO_SMALL   The output parameter block is too small.\r

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

diff --git a/MdePkg/Include/Protocol/Udp4.h b/MdePkg/Include/Protocol/Udp4.h
index dfd550757b2696cdbf2d0404ba91c59b1de13821..0d2ade0525f1d89ec3e908cbe8cfe9dca5725ff6 100644 (file)
--- a/MdePkg/Include/Protocol/Udp4.h
+++ b/MdePkg/Include/Protocol/Udp4.h
@@ -1,20 +1,20 @@
 /** @file\r
   UDP4 Service Binding Protocol as defined in UEFI specification.\r
 \r
 /** @file\r
   UDP4 Service Binding Protocol as defined in UEFI specification.\r
 \r

-  The EFI UDPv4 Protocol provides simple packet-oriented services \r
-  to transmit and receive UDP packets.  \r
+  The EFI UDPv4 Protocol provides simple packet-oriented services\r
+  to transmit and receive UDP packets.\r

 \r
 \r

-Copyright (c) 2006 - 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) 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
-    \r
-THE PROGRAM 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
 \r

-  @par Revision Reference:          \r
-  This Protocol is introduced in UEFI Specification 2.0.       \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+  @par Revision Reference:\r
+  This Protocol is introduced in UEFI Specification 2.0.\r

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


@@ -35,8 +35,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     0x3ad9df29, 0x4501, 0x478d, {0xb1, 0xf8, 0x7f, 0x7f, 0xe7, 0x0e, 0x50, 0xf3 } \\r
   }\r
 \r
     0x3ad9df29, 0x4501, 0x478d, {0xb1, 0xf8, 0x7f, 0x7f, 0xe7, 0x0e, 0x50, 0xf3 } \\r
   }\r
 \r

-typedef struct _EFI_UDP4_PROTOCOL EFI_UDP4_PROTOCOL; \r
-  \r
+typedef struct _EFI_UDP4_PROTOCOL EFI_UDP4_PROTOCOL;\r
+\r

 ///\r
 /// EFI_UDP4_SERVICE_POINT is deprecated in the UEFI 2.4B and should not be used any more.\r
 /// The definition in here is only present to provide backwards compatability.\r
 ///\r
 /// EFI_UDP4_SERVICE_POINT is deprecated in the UEFI 2.4B and should not be used any more.\r
 /// The definition in here is only present to provide backwards compatability.\r


@@ -47,7 +47,7 @@ typedef struct {
   UINT16                  LocalPort;\r
   EFI_IPv4_ADDRESS        RemoteAddress;\r
   UINT16                  RemotePort;\r
   UINT16                  LocalPort;\r
   EFI_IPv4_ADDRESS        RemoteAddress;\r
   UINT16                  RemotePort;\r

-} EFI_UDP4_SERVICE_POINT; \r
+} EFI_UDP4_SERVICE_POINT;\r

 \r
 ///\r
 /// EFI_UDP4_VARIABLE_DATA is deprecated in the UEFI 2.4B and should not be used any more.\r
 \r
 ///\r
 /// EFI_UDP4_VARIABLE_DATA is deprecated in the UEFI 2.4B and should not be used any more.\r


@@ -101,7 +101,7 @@ typedef struct {
   EFI_UDP4_SESSION_DATA     *UdpSessionData;       //OPTIONAL\r
   EFI_IPv4_ADDRESS          *GatewayAddress;       //OPTIONAL\r
   UINT32                    DataLength;\r
   EFI_UDP4_SESSION_DATA     *UdpSessionData;       //OPTIONAL\r
   EFI_IPv4_ADDRESS          *GatewayAddress;       //OPTIONAL\r
   UINT32                    DataLength;\r

-  UINT32                    FragmentCount; \r
+  UINT32                    FragmentCount;\r

   EFI_UDP4_FRAGMENT_DATA    FragmentTable[1];\r
 } EFI_UDP4_TRANSMIT_DATA;\r
 \r
   EFI_UDP4_FRAGMENT_DATA    FragmentTable[1];\r
 } EFI_UDP4_TRANSMIT_DATA;\r
 \r


@@ -152,13 +152,13 @@ EFI_STATUS
   OUT EFI_IP4_MODE_DATA                *Ip4ModeData    OPTIONAL,\r
   OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL,\r
   OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL\r
   OUT EFI_IP4_MODE_DATA                *Ip4ModeData    OPTIONAL,\r
   OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL,\r
   OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL\r

-  );  \r
-  \r
+  );\r
+\r

 \r
 /**\r
   Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv4\r
   Protocol.\r
 \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


@@ -190,7 +190,7 @@ EFI_STATUS
   @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
 typedef\r
 \r
 **/\r
 typedef\r


@@ -198,11 +198,11 @@ EFI_STATUS
 (EFIAPI *EFI_UDP4_CONFIGURE)(\r
   IN EFI_UDP4_PROTOCOL      *This,\r
   IN EFI_UDP4_CONFIG_DATA   *UdpConfigData OPTIONAL\r
 (EFIAPI *EFI_UDP4_CONFIGURE)(\r
   IN EFI_UDP4_PROTOCOL      *This,\r
   IN EFI_UDP4_CONFIG_DATA   *UdpConfigData OPTIONAL\r

-  );  \r
+  );\r

 \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


@@ -235,11 +235,11 @@ EFI_STATUS
   IN EFI_UDP4_PROTOCOL      *This,\r
   IN BOOLEAN                JoinFlag,\r
   IN EFI_IPv4_ADDRESS       *MulticastAddress    OPTIONAL\r
   IN EFI_UDP4_PROTOCOL      *This,\r
   IN BOOLEAN                JoinFlag,\r
   IN EFI_IPv4_ADDRESS       *MulticastAddress    OPTIONAL\r

-  );   \r
+  );\r

 \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


@@ -283,11 +283,11 @@ EFI_STATUS
   IN EFI_IPv4_ADDRESS       *SubnetAddress,\r
   IN EFI_IPv4_ADDRESS       *SubnetMask,\r
   IN EFI_IPv4_ADDRESS       *GatewayAddress\r
   IN EFI_IPv4_ADDRESS       *SubnetAddress,\r
   IN EFI_IPv4_ADDRESS       *SubnetMask,\r
   IN EFI_IPv4_ADDRESS       *GatewayAddress\r

-  );     \r
+  );\r

 \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


@@ -309,11 +309,11 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_UDP4_POLL)(\r
   IN EFI_UDP4_PROTOCOL      *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_UDP4_POLL)(\r
   IN EFI_UDP4_PROTOCOL      *This\r

-  );   \r
+  );\r

 \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


@@ -347,11 +347,11 @@ EFI_STATUS
 (EFIAPI *EFI_UDP4_RECEIVE)(\r
   IN EFI_UDP4_PROTOCOL          *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN  *Token\r
 (EFIAPI *EFI_UDP4_RECEIVE)(\r
   IN EFI_UDP4_PROTOCOL          *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN  *Token\r

-  );   \r
+  );\r

 \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


@@ -384,11 +384,11 @@ EFI_STATUS
 (EFIAPI *EFI_UDP4_TRANSMIT)(\r
   IN EFI_UDP4_PROTOCOL           *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN   *Token\r
 (EFIAPI *EFI_UDP4_TRANSMIT)(\r
   IN EFI_UDP4_PROTOCOL           *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN   *Token\r

-  );     \r
+  );\r

 \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


@@ -419,13 +419,13 @@ EFI_STATUS
 (EFIAPI *EFI_UDP4_CANCEL)(\r
   IN EFI_UDP4_PROTOCOL          *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN  *Token  OPTIONAL\r
 (EFIAPI *EFI_UDP4_CANCEL)(\r
   IN EFI_UDP4_PROTOCOL          *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN  *Token  OPTIONAL\r

-  );       \r
+  );\r

 \r
 ///\r
 \r
 ///\r

-/// The EFI_UDP4_PROTOCOL defines an EFI UDPv4 Protocol session that can be used \r
-/// by any network drivers, applications, or daemons to transmit or receive UDP packets. \r
-/// This protocol instance can either be bound to a specified port as a service or \r
-/// connected to some remote peer as an active client. Each instance has its own settings, \r
+/// The EFI_UDP4_PROTOCOL defines an EFI UDPv4 Protocol session that can be used\r
+/// by any network drivers, applications, or daemons to transmit or receive UDP packets.\r
+/// This protocol instance can either be bound to a specified port as a service or\r
+/// connected to some remote peer as an active client. Each instance has its own settings,\r

 /// such as the routing table and group table, which are independent from each other.\r
 ///\r
 struct _EFI_UDP4_PROTOCOL {\r
 /// such as the routing table and group table, which are independent from each other.\r
 ///\r
 struct _EFI_UDP4_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/Udp6.h b/MdePkg/Include/Protocol/Udp6.h
index 13cce8c4afd4aead8698eb644b5d33e81ed3bb32..3ae94b5f032ec7bb99b5c8017d901e85e6a7c1b1 100644 (file)
--- a/MdePkg/Include/Protocol/Udp6.h
+++ b/MdePkg/Include/Protocol/Udp6.h
@@ -3,16 +3,16 @@
   the EFI IPv6 Protocol and provides simple packet-oriented services to transmit and receive\r
   UDP packets.\r
 \r
   the EFI IPv6 Protocol and provides simple packet-oriented services to transmit and receive\r
   UDP packets.\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
-\r
-  @par Revision Reference:          \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
+  @par Revision Reference:\r

   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r
   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r


@@ -57,7 +57,7 @@ typedef struct {
   ///\r
   EFI_IPv6_ADDRESS    RemoteAddress;\r
   ///\r
   ///\r
   EFI_IPv6_ADDRESS    RemoteAddress;\r
   ///\r

-  /// The port number in host byte order on which the remote host is \r
+  /// The port number in host byte order on which the remote host is\r

   /// listening. Maybe zero if it is not connected to any remote host.\r
   ///\r
   UINT16              RemotePort;\r
   /// listening. Maybe zero if it is not connected to any remote host.\r
   ///\r
   UINT16              RemotePort;\r


@@ -115,7 +115,7 @@ typedef struct {
   ///\r
   EFI_IPv6_ADDRESS   DestinationAddress;\r
   ///\r
   ///\r
   EFI_IPv6_ADDRESS   DestinationAddress;\r
   ///\r

-  /// Port to which this packet is sent. When sending packet, it'll be \r
+  /// Port to which this packet is sent. When sending packet, it'll be\r

   /// ignored if it is zero.\r
   ///\r
   UINT16             DestinationPort;\r
   /// ignored if it is zero.\r
   ///\r
   UINT16             DestinationPort;\r


@@ -168,7 +168,7 @@ typedef struct {
   ///\r
   /// The port number to which this EFI UDPv6 Protocol instance is bound. If a client\r
   /// of the EFI UDPv6 Protocol does not care about the port number, set StationPort\r
   ///\r
   /// The port number to which this EFI UDPv6 Protocol instance is bound. If a client\r
   /// of the EFI UDPv6 Protocol does not care about the port number, set StationPort\r

-  /// to zero. The EFI UDPv6 Protocol driver will assign a random port number to transmitted \r
+  /// to zero. The EFI UDPv6 Protocol driver will assign a random port number to transmitted\r

   /// UDP packets. Ignored it if AcceptAnyPort is TRUE.\r
   ///\r
   UINT16            StationPort;\r
   /// UDP packets. Ignored it if AcceptAnyPort is TRUE.\r
   ///\r
   UINT16            StationPort;\r


@@ -219,8 +219,8 @@ typedef struct {
 /// packets, the CompletionToken.Packet.RxData field is updated to this incoming packet and\r
 /// the CompletionToken.Event is signaled. The EFI UDPv6 Protocol client must signal the\r
 /// RecycleSignal after processing the packet.\r
 /// packets, the CompletionToken.Packet.RxData field is updated to this incoming packet and\r
 /// the CompletionToken.Event is signaled. The EFI UDPv6 Protocol client must signal the\r
 /// RecycleSignal after processing the packet.\r

-/// FragmentTable could contain multiple buffers that are not in the continuous memory locations. \r
-/// The EFI UDPv6 Protocol client might need to combine two or more buffers in FragmentTable to \r
+/// FragmentTable could contain multiple buffers that are not in the continuous memory locations.\r
+/// The EFI UDPv6 Protocol client might need to combine two or more buffers in FragmentTable to\r

 /// form their own protocol header.\r
 ///\r
 typedef struct {\r
 /// form their own protocol header.\r
 ///\r
 typedef struct {\r


@@ -271,15 +271,15 @@ typedef struct {
   ///   - EFI_SUCCESS: The receive or transmit operation completed successfully.\r
   ///   - EFI_ABORTED: The receive or transmit was aborted.\r
   ///   - EFI_TIMEOUT: The transmit timeout expired.\r
   ///   - EFI_SUCCESS: The receive or transmit operation completed successfully.\r
   ///   - EFI_ABORTED: The receive or transmit was aborted.\r
   ///   - EFI_TIMEOUT: The transmit timeout expired.\r

-  ///   - EFI_NETWORK_UNREACHABLE: The destination network is unreachable. RxData is set to \r
+  ///   - EFI_NETWORK_UNREACHABLE: The destination network is unreachable. RxData is set to\r

   ///     NULL in this situation.\r
   ///     NULL in this situation.\r

-  ///   - EFI_HOST_UNREACHABLE: The destination host is unreachable. RxData is set to NULL in \r
+  ///   - EFI_HOST_UNREACHABLE: The destination host is unreachable. RxData is set to NULL in\r

   ///     this situation.\r
   ///     this situation.\r

-  ///   - EFI_PROTOCOL_UNREACHABLE: The UDP protocol is unsupported in the remote system. \r
+  ///   - EFI_PROTOCOL_UNREACHABLE: The UDP protocol is unsupported in the remote system.\r

   ///     RxData is set to NULL in this situation.\r
   ///     RxData is set to NULL in this situation.\r

-  ///   - EFI_PORT_UNREACHABLE: No service is listening on the remote port. RxData is set to \r
+  ///   - EFI_PORT_UNREACHABLE: No service is listening on the remote port. RxData is set to\r

   ///     NULL in this situation.\r
   ///     NULL in this situation.\r

-  ///   - EFI_ICMP_ERROR: Some other Internet Control Message Protocol (ICMP) error report was \r
+  ///   - EFI_ICMP_ERROR: Some other Internet Control Message Protocol (ICMP) error report was\r

   ///     received. For example, packets are being sent too fast for the destination to receive them\r
   ///     and the destination sent an ICMP source quench report. RxData is set to NULL in this situation.\r
   ///   - EFI_DEVICE_ERROR: An unexpected system or network error occurred.\r
   ///     received. For example, packets are being sent too fast for the destination to receive them\r
   ///     and the destination sent an ICMP source quench report. RxData is set to NULL in this situation.\r
   ///   - EFI_DEVICE_ERROR: An unexpected system or network error occurred.\r


@@ -304,7 +304,7 @@ typedef struct {
 \r
   The GetModeData() function copies the current operational settings of this EFI UDPv6 Protocol\r
   instance into user-supplied buffers. This function is used optionally to retrieve the operational\r
 \r
   The GetModeData() function copies the current operational settings of this EFI UDPv6 Protocol\r
   instance into user-supplied buffers. This function is used optionally to retrieve the operational\r

-  mode data of underlying networks or drivers. \r
+  mode data of underlying networks or drivers.\r

 \r
   @param[in]   This             Pointer to the EFI_UDP6_PROTOCOL instance.\r
   @param[out]  Udp6ConfigData   The buffer in which the current UDP configuration data is returned.\r
 \r
   @param[in]   This             Pointer to the EFI_UDP6_PROTOCOL instance.\r
   @param[out]  Udp6ConfigData   The buffer in which the current UDP configuration data is returned.\r


@@ -330,13 +330,13 @@ EFI_STATUS
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-  Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv6 \r
+  Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv6\r

   Protocol.\r
 \r
   The Configure() function is used to do the following:\r
   - Initialize and start this instance of the EFI UDPv6 Protocol.\r
   - Change the filtering rules and operational parameters.\r
   Protocol.\r
 \r
   The Configure() function is used to do the following:\r
   - Initialize and start this instance of the EFI UDPv6 Protocol.\r
   - Change the filtering rules and operational parameters.\r

-  - Reset this instance of the EFI UDPv6 Protocol. \r
+  - Reset this instance of the EFI UDPv6 Protocol.\r

 \r
   Until these parameters are initialized, no network traffic can be sent or received by this instance.\r
   This instance can be also reset by calling Configure() with UdpConfigData set to NULL.\r
 \r
   Until these parameters are initialized, no network traffic can be sent or received by this instance.\r
   This instance can be also reset by calling Configure() with UdpConfigData set to NULL.\r


@@ -350,7 +350,7 @@ EFI_STATUS
   @param[in]   UdpConfigData    Pointer to the buffer contained the configuration data.\r
 \r
   @retval EFI_SUCCESS           The configuration settings were set, changed, or reset successfully.\r
   @param[in]   UdpConfigData    Pointer to the buffer contained the configuration data.\r
 \r
   @retval EFI_SUCCESS           The configuration settings were set, changed, or reset successfully.\r

-  @retval EFI_NO_MAPPING        The underlying IPv6 driver was responsible for choosing a source \r
+  @retval EFI_NO_MAPPING        The underlying IPv6 driver was responsible for choosing a source\r

                                 address for this instance, but no source address was available for use.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE:\r
                                 - This is NULL.\r
                                 address for this instance, but no source address was available for use.\r
   @retval EFI_INVALID_PARAMETER One or more following conditions are TRUE:\r
                                 - This is NULL.\r


@@ -363,7 +363,7 @@ EFI_STATUS
                                 ReceiveTimeout, and TransmitTimeout can be reconfigured without stopping\r
                                 the current instance of the EFI UDPv6 Protocol.\r
   @retval EFI_ACCESS_DENIED     UdpConfigData.AllowDuplicatePort is FALSE and UdpConfigData.StationPort\r
                                 ReceiveTimeout, and TransmitTimeout can be reconfigured without stopping\r
                                 the current instance of the EFI UDPv6 Protocol.\r
   @retval EFI_ACCESS_DENIED     UdpConfigData.AllowDuplicatePort is FALSE and UdpConfigData.StationPort\r

-                                is already used by other instance. \r
+                                is already used by other instance.\r

   @retval EFI_OUT_OF_RESOURCES  The EFI UDPv6 Protocol driver cannot allocate memory for this EFI UDPv6\r
                                 Protocol instance.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred and this instance was not\r
   @retval EFI_OUT_OF_RESOURCES  The EFI UDPv6 Protocol driver cannot allocate memory for this EFI UDPv6\r
                                 Protocol instance.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred and this instance was not\r


@@ -418,7 +418,7 @@ EFI_STATUS
   receive the notification and transmitting status.\r
 \r
   @param[in]   This             Pointer to the EFI_UDP6_PROTOCOL instance.\r
   receive the notification and transmitting status.\r
 \r
   @param[in]   This             Pointer to the EFI_UDP6_PROTOCOL instance.\r

-  @param[in]   Token            Pointer to the completion token that will be placed into the \r
+  @param[in]   Token            Pointer to the completion token that will be placed into the\r

                                 transmit queue.\r
 \r
   @retval EFI_SUCCESS           The data has been queued for transmission.\r
                                 transmit queue.\r
 \r
   @retval EFI_SUCCESS           The data has been queued for transmission.\r


@@ -440,12 +440,12 @@ EFI_STATUS
                                   fields is NULL.\r
                                 - Token.Packet.TxData.UdpSessionData.DestinationAddress is not zero\r
                                   and is not valid unicast Ipv6 address if UdpSessionData is not NULL.\r
                                   fields is NULL.\r
                                 - Token.Packet.TxData.UdpSessionData.DestinationAddress is not zero\r
                                   and is not valid unicast Ipv6 address if UdpSessionData is not NULL.\r

-                                - Token.Packet.TxData.UdpSessionData is NULL and this instance's \r
+                                - Token.Packet.TxData.UdpSessionData is NULL and this instance's\r

                                   UdpConfigData.RemoteAddress is unspecified.\r
                                 - Token.Packet.TxData.UdpSessionData.DestinationAddress is non-zero\r
                                   when DestinationAddress is configured as non-zero when doing Configure()\r
                                   for this EFI Udp6 protocol instance.\r
                                   UdpConfigData.RemoteAddress is unspecified.\r
                                 - Token.Packet.TxData.UdpSessionData.DestinationAddress is non-zero\r
                                   when DestinationAddress is configured as non-zero when doing Configure()\r
                                   for this EFI Udp6 protocol instance.\r

-                                - Token.Packet.TxData.UdpSesionData.DestinationAddress is zero when \r
+                                - Token.Packet.TxData.UdpSesionData.DestinationAddress is zero when\r

                                   DestinationAddress is unspecified when doing Configure() for this\r
                                   EFI Udp6 protocol instance.\r
   @retval EFI_ACCESS_DENIED     The transmit completion token with the same Token.Event was already\r
                                   DestinationAddress is unspecified when doing Configure() for this\r
                                   EFI Udp6 protocol instance.\r
   @retval EFI_ACCESS_DENIED     The transmit completion token with the same Token.Event was already\r


@@ -469,7 +469,7 @@ EFI_STATUS
 \r
   The Receive() function places a completion token into the receive packet queue. This function is\r
   always asynchronous.\r
 \r
   The Receive() function places a completion token into the receive packet queue. This function is\r
   always asynchronous.\r

-  The caller must fill in the Token.Event field in the completion token, and this field cannot be \r
+  The caller must fill in the Token.Event field in the completion token, and this field cannot be\r

   NULL. When the receive operation completes, the EFI UDPv6 Protocol driver updates the Token.Status\r
   and Token.Packet.RxData fields and the Token.Event is signaled.\r
   Providing a proper notification function and context for the event will enable the user to receive\r
   NULL. When the receive operation completes, the EFI UDPv6 Protocol driver updates the Token.Status\r
   and Token.Packet.RxData fields and the Token.Event is signaled.\r
   Providing a proper notification function and context for the event will enable the user to receive\r


@@ -487,11 +487,11 @@ EFI_STATUS
                                 - This is NULL.\r
                                 - Token is NULL.\r
                                 - Token.Event is NULL.\r
                                 - This is NULL.\r
                                 - Token is NULL.\r
                                 - Token.Event is NULL.\r

-  @retval EFI_OUT_OF_RESOURCES  The receive completion token could not be queued due to a lack of system \r
+  @retval EFI_OUT_OF_RESOURCES  The receive completion token could not be queued due to a lack of system\r

                                 resources (usually memory).\r
   @retval EFI_DEVICE_ERROR      An unexpected system or network error occurred. The EFI UDPv6 Protocol\r
                                 instance has been reset to startup defaults.\r
                                 resources (usually memory).\r
   @retval EFI_DEVICE_ERROR      An unexpected system or network error occurred. The EFI UDPv6 Protocol\r
                                 instance has been reset to startup defaults.\r

-  @retval EFI_ACCESS_DENIED     A receive completion token with the same Token.Event was already in \r
+  @retval EFI_ACCESS_DENIED     A receive completion token with the same Token.Event was already in\r

                                 the receive queue.\r
   @retval EFI_NOT_READY         The receive request could not be queued because the receive queue is full.\r
 \r
                                 the receive queue.\r
   @retval EFI_NOT_READY         The receive request could not be queued because the receive queue is full.\r
 \r


@@ -547,7 +547,7 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS           Incoming or outgoing data was processed.\r
   @retval EFI_INVALID_PARAMETER This is NULL.\r
 \r
   @retval EFI_SUCCESS           Incoming or outgoing data was processed.\r
   @retval EFI_INVALID_PARAMETER This is NULL.\r

-  @retval EFI_DEVICE_ERROR      An unexpected system or network error occurred. \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 queue.\r
                                 Consider increasing the polling rate.\r
 \r
   @retval EFI_TIMEOUT           Data was dropped out of the transmit and/or receive queue.\r
                                 Consider increasing the polling rate.\r
 \r


@@ -563,7 +563,7 @@ EFI_STATUS
 /// applications, or daemons to transmit or receive UDP packets. This protocol instance can either be\r
 /// bound to a specified port as a service or connected to some remote peer as an active client.\r
 /// Each instance has its own settings, such as group table, that are independent from each other.\r
 /// applications, or daemons to transmit or receive UDP packets. This protocol instance can either be\r
 /// bound to a specified port as a service or connected to some remote peer as an active client.\r
 /// Each instance has its own settings, such as group table, that are independent from each other.\r

-/// \r
+///\r

 struct _EFI_UDP6_PROTOCOL {\r
   EFI_UDP6_GET_MODE_DATA  GetModeData;\r
   EFI_UDP6_CONFIGURE      Configure;\r
 struct _EFI_UDP6_PROTOCOL {\r
   EFI_UDP6_GET_MODE_DATA  GetModeData;\r
   EFI_UDP6_CONFIGURE      Configure;\r

diff --git a/MdePkg/Include/Protocol/UgaDraw.h b/MdePkg/Include/Protocol/UgaDraw.h
index 17db38db086e865a86576ec97382c60847addea4..18eecc059d3551480e8577c6eafdec1de1e605bd 100644 (file)
--- a/MdePkg/Include/Protocol/UgaDraw.h
+++ b/MdePkg/Include/Protocol/UgaDraw.h
@@ -3,7 +3,7 @@
 \r
   Abstraction of a very simple graphics device.\r
 \r
 \r
   Abstraction of a very simple graphics device.\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


@@ -92,26 +92,26 @@ typedef enum {
                             ///< directly to every pixel of the video display rectangle\r
                             ///< (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height).\r
                             ///< Only one pixel will be used from the BltBuffer. Delta is NOT used.\r
                             ///< directly to every pixel of the video display rectangle\r
                             ///< (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height).\r
                             ///< Only one pixel will be used from the BltBuffer. Delta is NOT used.\r

-                            \r
+\r

   EfiUgaVideoToBltBuffer,   ///< Read data from the video display rectangle\r
                             ///< (SourceX, SourceY) (SourceX + Width, SourceY + Height) and place it in\r
                             ///< the BltBuffer rectangle (DestinationX, DestinationY )\r
                             ///< (DestinationX + Width, DestinationY + Height). If DestinationX or\r
                             ///< DestinationY is not zero then Delta must be set to the length in bytes\r
                             ///< of a row in the BltBuffer.\r
   EfiUgaVideoToBltBuffer,   ///< Read data from the video display rectangle\r
                             ///< (SourceX, SourceY) (SourceX + Width, SourceY + Height) and place it in\r
                             ///< the BltBuffer rectangle (DestinationX, DestinationY )\r
                             ///< (DestinationX + Width, DestinationY + Height). If DestinationX or\r
                             ///< DestinationY is not zero then Delta must be set to the length in bytes\r
                             ///< of a row in the BltBuffer.\r

-                            \r
+\r

   EfiUgaBltBufferToVideo,   ///< Write data from the  BltBuffer rectangle\r
                             ///< (SourceX, SourceY) (SourceX + Width, SourceY + Height) directly to the\r
                             ///< video display rectangle (DestinationX, DestinationY)\r
                             ///< (DestinationX + Width, DestinationY + Height). If SourceX or SourceY is\r
                             ///< not zero then Delta must be set to the length in bytes of a row in the\r
                             ///< BltBuffer.\r
   EfiUgaBltBufferToVideo,   ///< Write data from the  BltBuffer rectangle\r
                             ///< (SourceX, SourceY) (SourceX + Width, SourceY + Height) directly to the\r
                             ///< video display rectangle (DestinationX, DestinationY)\r
                             ///< (DestinationX + Width, DestinationY + Height). If SourceX or SourceY is\r
                             ///< not zero then Delta must be set to the length in bytes of a row in the\r
                             ///< BltBuffer.\r

-  \r
+\r

   EfiUgaVideoToVideo,       ///< Copy from the video display rectangle (SourceX, SourceY)\r
                             ///< (SourceX + Width, SourceY + Height) .to the video display rectangle\r
                             ///< (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height).\r
                             ///< The BltBuffer and Delta  are not used in this mode.\r
   EfiUgaVideoToVideo,       ///< Copy from the video display rectangle (SourceX, SourceY)\r
                             ///< (SourceX + Width, SourceY + Height) .to the video display rectangle\r
                             ///< (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height).\r
                             ///< The BltBuffer and Delta  are not used in this mode.\r

-                            \r
+\r

   EfiUgaBltMax              ///< Maxmimum value for enumration value of Blt operation. If a Blt operation\r
                             ///< larger or equal to this enumration value, it is invalid.\r
 } EFI_UGA_BLT_OPERATION;\r
   EfiUgaBltMax              ///< Maxmimum value for enumration value of Blt operation. If a Blt operation\r
                             ///< larger or equal to this enumration value, it is invalid.\r
 } EFI_UGA_BLT_OPERATION;\r


@@ -152,8 +152,8 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// This protocol provides a basic abstraction to set video modes and \r
-/// copy pixels to and from the graphics controller's frame buffer. \r
+/// This protocol provides a basic abstraction to set video modes and\r
+/// copy pixels to and from the graphics controller's frame buffer.\r

 ///\r
 struct _EFI_UGA_DRAW_PROTOCOL {\r
   EFI_UGA_DRAW_PROTOCOL_GET_MODE  GetMode;\r
 ///\r
 struct _EFI_UGA_DRAW_PROTOCOL {\r
   EFI_UGA_DRAW_PROTOCOL_GET_MODE  GetMode;\r

diff --git a/MdePkg/Include/Protocol/UgaIo.h b/MdePkg/Include/Protocol/UgaIo.h
index b6884219180cfaeecfae22b005661c7b2c2508c6..56e845b4731fa19d63bfc800d2599f679048b9bb 100644 (file)
--- a/MdePkg/Include/Protocol/UgaIo.h
+++ b/MdePkg/Include/Protocol/UgaIo.h
@@ -2,15 +2,15 @@
   UGA IO protocol from the EFI 1.10 specification.\r
 \r
   Abstraction of a very simple graphics device.\r
   UGA IO protocol from the EFI 1.10 specification.\r
 \r
   Abstraction of a very simple graphics device.\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
 \r

-  THE PROGRAM 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,15 +90,15 @@ typedef struct {
 /**\r
   Dynamically allocate storage for a child UGA_DEVICE.\r
 \r
 /**\r
   Dynamically allocate storage for a child UGA_DEVICE.\r
 \r

-  @param[in]     This            The EFI_UGA_IO_PROTOCOL instance. \r
+  @param[in]     This            The EFI_UGA_IO_PROTOCOL instance.\r

   @param[in]     ParentDevice    ParentDevice specifies a pointer to the parent device of Device.\r
   @param[in]     DeviceData      A pointer to UGA_DEVICE_DATA returned from a call to DispatchService()\r
   @param[in]     ParentDevice    ParentDevice specifies a pointer to the parent device of Device.\r
   @param[in]     DeviceData      A pointer to UGA_DEVICE_DATA returned from a call to DispatchService()\r

-                                 with a UGA_DEVICE of Parent and an IoRequest of type UgaIoGetChildDevice.      \r
-  @param[in]     RunTimeContext  Context to associate with Device.  \r
+                                 with a UGA_DEVICE of Parent and an IoRequest of type UgaIoGetChildDevice.\r
+  @param[in]     RunTimeContext  Context to associate with Device.\r

   @param[out]    Device          The Device returns a dynamically allocated child UGA_DEVICE object\r
                                  for ParentDevice. The caller is responsible for deleting Device.\r
 \r
   @param[out]    Device          The Device returns a dynamically allocated child UGA_DEVICE object\r
                                  for ParentDevice. The caller is responsible for deleting Device.\r
 \r

-                                 \r
+\r

   @retval  EFI_SUCCESS           Device was returned.\r
   @retval  EFI_INVALID_PARAMETER One of the arguments was not valid.\r
   @retval  EFI_DEVICE_ERROR      The device had an error and could not complete the request.\r
   @retval  EFI_SUCCESS           Device was returned.\r
   @retval  EFI_INVALID_PARAMETER One of the arguments was not valid.\r
   @retval  EFI_DEVICE_ERROR      The device had an error and could not complete the request.\r


@@ -118,12 +118,12 @@ EFI_STATUS
 /**\r
   Delete a dynamically allocated child UGA_DEVICE object that was allocated via CreateDevice().\r
 \r
 /**\r
   Delete a dynamically allocated child UGA_DEVICE object that was allocated via CreateDevice().\r
 \r

-  @param[in]     This            The EFI_UGA_IO_PROTOCOL instance. Type EFI_UGA_IO_PROTOCOL is \r
+  @param[in]     This            The EFI_UGA_IO_PROTOCOL instance. Type EFI_UGA_IO_PROTOCOL is\r

                                  defined in Section 10.7.\r
   @param[in]     Device          The Device points to a UGA_DEVICE object that was dynamically\r
                                  allocated via a CreateDevice() call.\r
 \r
                                  defined in Section 10.7.\r
   @param[in]     Device          The Device points to a UGA_DEVICE object that was dynamically\r
                                  allocated via a CreateDevice() call.\r
 \r

-                                 \r
+\r

   @retval  EFI_SUCCESS           Device was returned.\r
   @retval  EFI_INVALID_PARAMETER The Device was not allocated via CreateDevice().\r
 \r
   @retval  EFI_SUCCESS           Device was returned.\r
   @retval  EFI_INVALID_PARAMETER The Device was not allocated via CreateDevice().\r
 \r


@@ -138,23 +138,23 @@ EFI_STATUS
 /**\r
   This is the main UGA service dispatch routine for all UGA_IO_REQUEST s.\r
 \r
 /**\r
   This is the main UGA service dispatch routine for all UGA_IO_REQUEST s.\r
 \r

-  @param pDevice pDevice specifies a pointer to a device object associated with a \r
-                 device enumerated by a pIoRequest->ioRequestCode of type \r
-                 UgaIoGetChildDevice. The root device for the EFI_UGA_IO_PROTOCOL \r
+  @param pDevice pDevice specifies a pointer to a device object associated with a\r
+                 device enumerated by a pIoRequest->ioRequestCode of type\r
+                 UgaIoGetChildDevice. The root device for the EFI_UGA_IO_PROTOCOL\r

                  is represented by pDevice being set to NULL.\r
 \r
                  is represented by pDevice being set to NULL.\r
 \r

-  @param pIoRequest \r
+  @param pIoRequest\r

                  pIoRequest points to a caller allocated buffer that contains data\r
                  defined by pIoRequest->ioRequestCode. See Related Definitions for\r
                  pIoRequest points to a caller allocated buffer that contains data\r
                  defined by pIoRequest->ioRequestCode. See Related Definitions for\r

-                 a definition of UGA_IO_REQUEST_CODE s and their associated data \r
+                 a definition of UGA_IO_REQUEST_CODE s and their associated data\r

                  structures.\r
 \r
   @return UGA_STATUS\r
 \r
 **/\r
                  structures.\r
 \r
   @return UGA_STATUS\r
 \r
 **/\r

-typedef UGA_STATUS \r
+typedef UGA_STATUS\r

 (EFIAPI *PUGA_FW_SERVICE_DISPATCH)(\r
 (EFIAPI *PUGA_FW_SERVICE_DISPATCH)(\r

-  IN PUGA_DEVICE pDevice, \r
+  IN PUGA_DEVICE pDevice,\r

   IN OUT PUGA_IO_REQUEST pIoRequest\r
   );\r
 \r
   IN OUT PUGA_IO_REQUEST pIoRequest\r
   );\r
 \r

diff --git a/MdePkg/Include/Protocol/UnicodeCollation.h b/MdePkg/Include/Protocol/UnicodeCollation.h
index e9eef61210f054d3ae1780ab34c98e02f31289c8..239badca3fce7e0bb991e89d2e81516c95cc0fe3 100644 (file)
--- a/MdePkg/Include/Protocol/UnicodeCollation.h
+++ b/MdePkg/Include/Protocol/UnicodeCollation.h
@@ -1,16 +1,16 @@
 /** @file\r
   Unicode Collation protocol that follows the UEFI 2.0 specification.\r
 /** @file\r
   Unicode Collation protocol that follows the UEFI 2.0 specification.\r

-  This protocol is used to allow code running in the boot services environment \r
+  This protocol is used to allow code running in the boot services environment\r

   to perform lexical comparison functions on Unicode strings for given languages.\r
 \r
   to perform lexical comparison functions on Unicode strings for given languages.\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
-    \r
-THE PROGRAM 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


@@ -32,12 +32,12 @@ typedef struct _EFI_UNICODE_COLLATION_PROTOCOL  EFI_UNICODE_COLLATION_PROTOCOL;
 \r
 ///\r
 /// Protocol GUID name defined in EFI1.1.\r
 \r
 ///\r
 /// Protocol GUID name defined in EFI1.1.\r

-/// \r
+///\r

 #define UNICODE_COLLATION_PROTOCOL              EFI_UNICODE_COLLATION_PROTOCOL_GUID\r
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r
 #define UNICODE_COLLATION_PROTOCOL              EFI_UNICODE_COLLATION_PROTOCOL_GUID\r
 \r
 ///\r
 /// Protocol defined in EFI1.1.\r

-/// \r
+///\r

 typedef EFI_UNICODE_COLLATION_PROTOCOL          UNICODE_COLLATION_INTERFACE;\r
 \r
 ///\r
 typedef EFI_UNICODE_COLLATION_PROTOCOL          UNICODE_COLLATION_INTERFACE;\r
 \r
 ///\r


@@ -69,7 +69,7 @@ INTN
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Performs a case-insensitive comparison of a Null-terminated \r
+  Performs a case-insensitive comparison of a Null-terminated\r

   pattern string and a Null-terminated string.\r
 \r
   @param  This    A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.\r
   pattern string and a Null-terminated string.\r
 \r
   @param  This    A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.\r


@@ -89,7 +89,7 @@ BOOLEAN
   );\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   A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.\r
   lower case characters.\r
 \r
   @param  This   A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.\r


@@ -119,7 +119,7 @@ VOID
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Converts an 8.3 FAT file name in an OEM character set to a Null-terminated \r
+  Converts an 8.3 FAT file name in an OEM character set to a Null-terminated\r

   string.\r
 \r
   @param  This    A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.\r
   string.\r
 \r
   @param  This    A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.\r


@@ -140,13 +140,13 @@ VOID
   );\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    A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.\r
   @param  String  A pointer to a Null-terminated string.\r
   @param  FatSize The size of the string Fat in bytes.\r
 \r
   @param  This    A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.\r
   @param  String  A pointer to a Null-terminated string.\r
   @param  FatSize The size of the string Fat in bytes.\r

-  @param  Fat     A pointer to a string that contains the converted version of \r
+  @param  Fat     A pointer to a string that contains the converted version of\r

                   String using legal FAT characters from an OEM character set.\r
 \r
   @retval TRUE    One or more conversions failed and were substituted with '_'\r
                   String using legal FAT characters from an OEM character set.\r
 \r
   @retval TRUE    One or more conversions failed and were substituted with '_'\r


@@ -163,8 +163,8 @@ BOOLEAN
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The EFI_UNICODE_COLLATION_PROTOCOL is used to perform case-insensitive \r
-/// comparisons of strings. \r
+/// The EFI_UNICODE_COLLATION_PROTOCOL is used to perform case-insensitive\r
+/// comparisons of strings.\r

 ///\r
 struct _EFI_UNICODE_COLLATION_PROTOCOL {\r
   EFI_UNICODE_COLLATION_STRICOLL    StriColl;\r
 ///\r
 struct _EFI_UNICODE_COLLATION_PROTOCOL {\r
   EFI_UNICODE_COLLATION_STRICOLL    StriColl;\r


@@ -177,7 +177,7 @@ struct _EFI_UNICODE_COLLATION_PROTOCOL {
   //\r
   EFI_UNICODE_COLLATION_FATTOSTR    FatToStr;\r
   EFI_UNICODE_COLLATION_STRTOFAT    StrToFat;\r
   //\r
   EFI_UNICODE_COLLATION_FATTOSTR    FatToStr;\r
   EFI_UNICODE_COLLATION_STRTOFAT    StrToFat;\r

-  \r
+\r

   ///\r
   /// A Null-terminated ASCII string array that contains one or more language codes.\r
   /// When this field is used for UnicodeCollation2, it is specified in RFC 4646 format.\r
   ///\r
   /// A Null-terminated ASCII string array that contains one or more language codes.\r
   /// When this field is used for UnicodeCollation2, it is specified in RFC 4646 format.\r

diff --git a/MdePkg/Include/Protocol/Usb2HostController.h b/MdePkg/Include/Protocol/Usb2HostController.h
index 692ff187a8f3c2ef89b63de7e381c45cbed229e1..b861259462555f3d183ffaf6cd94b7d36c988570 100644 (file)
--- a/MdePkg/Include/Protocol/Usb2HostController.h
+++ b/MdePkg/Include/Protocol/Usb2HostController.h
@@ -1,10 +1,10 @@
 /** @file\r
   EFI_USB2_HC_PROTOCOL as defined in UEFI 2.0.\r
 /** @file\r
   EFI_USB2_HC_PROTOCOL as defined in UEFI 2.0.\r

-  The USB Host Controller Protocol is used by code, typically USB bus drivers, \r
-  running in the EFI boot services environment, to perform data transactions over \r
+  The USB Host Controller Protocol is used by code, typically USB bus drivers,\r
+  running in the EFI boot services environment, to perform data transactions over\r

   a USB bus. In addition, it provides an abstraction for the root hub of the USB bus.\r
 \r
   a USB bus. In addition, it provides an abstraction for the root hub of the USB bus.\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


@@ -37,7 +37,7 @@ typedef struct {
 } EFI_USB_PORT_STATUS;\r
 \r
 ///\r
 } EFI_USB_PORT_STATUS;\r
 \r
 ///\r

-/// EFI_USB_PORT_STATUS.PortStatus bit definition \r
+/// EFI_USB_PORT_STATUS.PortStatus bit definition\r

 ///\r
 #define USB_PORT_STAT_CONNECTION    0x0001\r
 #define USB_PORT_STAT_ENABLE        0x0002\r
 ///\r
 #define USB_PORT_STAT_CONNECTION    0x0001\r
 #define USB_PORT_STAT_ENABLE        0x0002\r


@@ -51,7 +51,7 @@ typedef struct {
 #define USB_PORT_STAT_OWNER         0x2000\r
 \r
 ///\r
 #define USB_PORT_STAT_OWNER         0x2000\r
 \r
 ///\r

-/// EFI_USB_PORT_STATUS.PortChangeStatus bit definition \r
+/// EFI_USB_PORT_STATUS.PortChangeStatus bit definition\r

 ///\r
 #define USB_PORT_STAT_C_CONNECTION  0x0001\r
 #define USB_PORT_STAT_C_ENABLE      0x0002\r
 ///\r
 #define USB_PORT_STAT_C_CONNECTION  0x0001\r
 #define USB_PORT_STAT_C_ENABLE      0x0002\r


@@ -62,7 +62,7 @@ typedef struct {
 \r
 ///\r
 /// Usb port features value\r
 \r
 ///\r
 /// Usb port features value\r

-/// Each value indicates its bit index in the port status and status change bitmaps, \r
+/// Each value indicates its bit index in the port status and status change bitmaps,\r

 /// if combines these two bitmaps into a 32-bit bitmap.\r
 ///\r
 typedef enum {\r
 /// if combines these two bitmaps into a 32-bit bitmap.\r
 ///\r
 typedef enum {\r


@@ -158,7 +158,7 @@ typedef enum {
                                     ///< Explicitly set by software. 3)\r
                                     ///< Triggered by a fatal error such as\r
                                     ///< consistency check failure.\r
                                     ///< Explicitly set by software. 3)\r
                                     ///< Triggered by a fatal error such as\r
                                     ///< consistency check failure.\r

-                                    \r
+\r

   EfiUsbHcStateOperational,         ///< The host controller is in an\r
                                     ///< operational state. When in\r
                                     ///< this state, the host\r
   EfiUsbHcStateOperational,         ///< The host controller is in an\r
                                     ///< operational state. When in\r
                                     ///< this state, the host\r


@@ -166,7 +166,7 @@ typedef enum {
                                     ///< traffic. This state must be\r
                                     ///< explicitly set to enable the\r
                                     ///< USB bus traffic.\r
                                     ///< traffic. This state must be\r
                                     ///< explicitly set to enable the\r
                                     ///< USB bus traffic.\r

-                                    \r
+\r

   EfiUsbHcStateSuspend,             ///< The host controller is in the\r
                                     ///< suspend state. No USB\r
                                     ///< transactions can occur while in\r
   EfiUsbHcStateSuspend,             ///< The host controller is in the\r
                                     ///< suspend state. No USB\r
                                     ///< transactions can occur while in\r


@@ -176,7 +176,7 @@ typedef enum {
                                     ///< set by software. 2) Triggered\r
                                     ///< when there is no bus traffic for\r
                                     ///< 3 microseconds.\r
                                     ///< set by software. 2) Triggered\r
                                     ///< when there is no bus traffic for\r
                                     ///< 3 microseconds.\r

-                                    \r
+\r

   EfiUsbHcStateMaximum              ///< Maximum value for enumration value of HC status.\r
 } EFI_USB_HC_STATE;\r
 \r
   EfiUsbHcStateMaximum              ///< Maximum value for enumration value of HC status.\r
 } EFI_USB_HC_STATE;\r
 \r


@@ -413,30 +413,30 @@ EFI_STATUS
 /**\r
   Submits isochronous transfer to an isochronous endpoint of a USB device.\r
 \r
 /**\r
   Submits isochronous transfer to an isochronous endpoint of a USB device.\r
 \r

-  This function is used to submit isochronous transfer to a target endpoint of a USB device. \r
-  The target endpoint is specified by DeviceAddressand EndpointAddress. Isochronous transfers are \r
-  used when working with isochronous date. It provides periodic, continuous communication between \r
-  the host and a device. Isochronous transfers can beused only by full-speed, high-speed, and \r
+  This function is used to submit isochronous transfer to a target endpoint of a USB device.\r
+  The target endpoint is specified by DeviceAddressand EndpointAddress. Isochronous transfers are\r
+  used when working with isochronous date. It provides periodic, continuous communication between\r
+  the host and a device. Isochronous transfers can beused only by full-speed, high-speed, and\r

   super-speed devices.\r
 \r
   super-speed devices.\r
 \r

-  High-speed isochronous transfers can be performed using multiple data buffers. The number of \r
+  High-speed isochronous transfers can be performed using multiple data buffers. The number of\r

   buffers that are actually prepared for the transfer is specified by DataBuffersNumber. For\r
   full-speed isochronous transfers this value is ignored.\r
 \r
   Data represents a list of pointers to the data buffers. For full-speed isochronous transfers\r
   only the data pointed by Data[0]shall be used. For high-speed isochronous transfers and for\r
   the split transactions depending on DataLengththere several data buffers canbe used. For the\r
   buffers that are actually prepared for the transfer is specified by DataBuffersNumber. For\r
   full-speed isochronous transfers this value is ignored.\r
 \r
   Data represents a list of pointers to the data buffers. For full-speed isochronous transfers\r
   only the data pointed by Data[0]shall be used. For high-speed isochronous transfers and for\r
   the split transactions depending on DataLengththere several data buffers canbe used. For the\r

-  high-speed isochronous transfers the total number of buffers must not exceed EFI_USB_MAX_ISO_BUFFER_NUM. \r
+  high-speed isochronous transfers the total number of buffers must not exceed EFI_USB_MAX_ISO_BUFFER_NUM.\r

 \r
   For split transactions performed on full-speed device by high-speed host controller the total\r
   number of buffers is limited to EFI_USB_MAX_ISO_BUFFER_NUM1.\r
 \r
   For split transactions performed on full-speed device by high-speed host controller the total\r
   number of buffers is limited to EFI_USB_MAX_ISO_BUFFER_NUM1.\r

-  If the isochronous transfer is successful, then EFI_SUCCESSis returned. The isochronous transfer \r
+  If the isochronous transfer is successful, then EFI_SUCCESSis returned. The isochronous transfer\r

   is designed to be completed within one USB frame time, if it cannot be completed, EFI_TIMEOUT\r
   is returned. If an error other than timeout occurs during the USB transfer, then EFI_DEVICE_ERROR\r
   is returned and the detailed status code will be returned in TransferResult.\r
 \r
   EFI_INVALID_PARAMETERis returned if one of the following conditionsis satisfied:\r
   is designed to be completed within one USB frame time, if it cannot be completed, EFI_TIMEOUT\r
   is returned. If an error other than timeout occurs during the USB transfer, then EFI_DEVICE_ERROR\r
   is returned and the detailed status code will be returned in TransferResult.\r
 \r
   EFI_INVALID_PARAMETERis returned if one of the following conditionsis satisfied:\r

-    - Data is NULL. \r
+    - Data is NULL.\r

     - DataLength is 0.\r
     - DeviceSpeed is not one of the supported values listed above.\r
     - MaximumPacketLength is invalid. MaximumPacketLength must be 1023 or less for full-speed devices,\r
     - DataLength is 0.\r
     - DeviceSpeed is not one of the supported values listed above.\r
     - MaximumPacketLength is invalid. MaximumPacketLength must be 1023 or less for full-speed devices,\r


@@ -447,7 +447,7 @@ EFI_STATUS
   @param  DeviceAddress         Represents the address of the target device on the USB.\r
   @param  EndPointAddress       The combination of an endpoint number and an endpoint direction of the\r
                                 target USB device.\r
   @param  DeviceAddress         Represents the address of the target device on the USB.\r
   @param  EndPointAddress       The combination of an endpoint number and an endpoint direction of the\r
                                 target USB device.\r

-  @param  DeviceSpeed           Indicates device speed. The supported values are EFI_USB_SPEED_FULL, \r
+  @param  DeviceSpeed           Indicates device speed. The supported values are EFI_USB_SPEED_FULL,\r

                                 EFI_USB_SPEED_HIGH, or EFI_USB_SPEED_SUPER.\r
   @param  MaximumPacketLength   Indicates the maximum packet size the target endpoint is capable of\r
                                 sending or receiving.\r
                                 EFI_USB_SPEED_HIGH, or EFI_USB_SPEED_SUPER.\r
   @param  MaximumPacketLength   Indicates the maximum packet size the target endpoint is capable of\r
                                 sending or receiving.\r


@@ -497,7 +497,7 @@ EFI_STATUS
   between the host and a device. Isochronous transfers can be used only by full-speed, high-speed,\r
   and super-speed devices.\r
 \r
   between the host and a device. Isochronous transfers can be used only by full-speed, high-speed,\r
   and super-speed devices.\r
 \r

-  High-speed isochronous transfers can be performed using multiple data buffers. The number of \r
+  High-speed isochronous transfers can be performed using multiple data buffers. The number of\r

   buffers that are actually prepared for the transfer is specified by DataBuffersNumber. For\r
   full-speed isochronous transfers this value is ignored.\r
 \r
   buffers that are actually prepared for the transfer is specified by DataBuffersNumber. For\r
   full-speed isochronous transfers this value is ignored.\r
 \r


@@ -510,17 +510,17 @@ EFI_STATUS
   number of buffers is limited to EFI_USB_MAX_ISO_BUFFER_NUM1.\r
 \r
   EFI_INVALID_PARAMETER is returned if one of the following conditionsis satisfied:\r
   number of buffers is limited to EFI_USB_MAX_ISO_BUFFER_NUM1.\r
 \r
   EFI_INVALID_PARAMETER is returned if one of the following conditionsis satisfied:\r

-    - Data is NULL. \r
+    - Data is NULL.\r

     - DataLength is 0.\r
     - DeviceSpeed is not one of the supported values listed above.\r
     - DataLength is 0.\r
     - DeviceSpeed is not one of the supported values listed above.\r

-    - MaximumPacketLength is invalid. MaximumPacketLength must be 1023 or less for full-speed \r
+    - MaximumPacketLength is invalid. MaximumPacketLength must be 1023 or less for full-speed\r

       devices and 1024 or less for high-speed and super-speed devices.\r
 \r
   @param  This                  A pointer to the EFI_USB2_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB.\r
   @param  EndPointAddress       The combination of an endpoint number and an endpoint direction of the\r
                                 target USB device.\r
       devices and 1024 or less for high-speed and super-speed devices.\r
 \r
   @param  This                  A pointer to the EFI_USB2_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB.\r
   @param  EndPointAddress       The combination of an endpoint number and an endpoint direction of the\r
                                 target USB device.\r

-  @param  DeviceSpeed           Indicates device speed. The supported values are EFI_USB_SPEED_FULL, \r
+  @param  DeviceSpeed           Indicates device speed. The supported values are EFI_USB_SPEED_FULL,\r

                                 EFI_USB_SPEED_HIGH, or EFI_USB_SPEED_SUPER.\r
   @param  MaximumPacketLength   Indicates the maximum packet size the target endpoint is capable of\r
                                 sending or receiving.\r
                                 EFI_USB_SPEED_HIGH, or EFI_USB_SPEED_SUPER.\r
   @param  MaximumPacketLength   Indicates the maximum packet size the target endpoint is capable of\r
                                 sending or receiving.\r


@@ -622,11 +622,11 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The EFI_USB2_HC_PROTOCOL provides USB host controller management, basic \r
-/// data transactions over a USB bus, and USB root hub access. A device driver \r
-/// that wishes to manage a USB bus in a system retrieves the EFI_USB2_HC_PROTOCOL \r
-/// instance that is associated with the USB bus to be managed. A device handle \r
-/// for a USB host controller will minimally contain an EFI_DEVICE_PATH_PROTOCOL \r
+/// The EFI_USB2_HC_PROTOCOL provides USB host controller management, basic\r
+/// data transactions over a USB bus, and USB root hub access. A device driver\r
+/// that wishes to manage a USB bus in a system retrieves the EFI_USB2_HC_PROTOCOL\r
+/// instance that is associated with the USB bus to be managed. A device handle\r
+/// for a USB host controller will minimally contain an EFI_DEVICE_PATH_PROTOCOL\r

 /// instance, and an EFI_USB2_HC_PROTOCOL instance.\r
 ///\r
 struct _EFI_USB2_HC_PROTOCOL {\r
 /// instance, and an EFI_USB2_HC_PROTOCOL instance.\r
 ///\r
 struct _EFI_USB2_HC_PROTOCOL {\r


@@ -643,18 +643,18 @@ struct _EFI_USB2_HC_PROTOCOL {
   EFI_USB2_HC_PROTOCOL_GET_ROOTHUB_PORT_STATUS     GetRootHubPortStatus;\r
   EFI_USB2_HC_PROTOCOL_SET_ROOTHUB_PORT_FEATURE    SetRootHubPortFeature;\r
   EFI_USB2_HC_PROTOCOL_CLEAR_ROOTHUB_PORT_FEATURE  ClearRootHubPortFeature;\r
   EFI_USB2_HC_PROTOCOL_GET_ROOTHUB_PORT_STATUS     GetRootHubPortStatus;\r
   EFI_USB2_HC_PROTOCOL_SET_ROOTHUB_PORT_FEATURE    SetRootHubPortFeature;\r
   EFI_USB2_HC_PROTOCOL_CLEAR_ROOTHUB_PORT_FEATURE  ClearRootHubPortFeature;\r

-  \r
+\r

   ///\r
   ///\r

-  /// The major revision number of the USB host controller. The revision information \r
-  /// indicates the release of the Universal Serial Bus Specification with which the \r
+  /// The major revision number of the USB host controller. The revision information\r
+  /// indicates the release of the Universal Serial Bus Specification with which the\r

   /// host controller is compliant.\r
   ///\r
   UINT16                                           MajorRevision;\r
 \r
   ///\r
   /// host controller is compliant.\r
   ///\r
   UINT16                                           MajorRevision;\r
 \r
   ///\r

-  /// The minor revision number of the USB host controller. The revision information \r
-  /// indicates the release of the Universal Serial Bus Specification with which the \r
-  /// host controller is compliant.  \r
+  /// The minor revision number of the USB host controller. The revision information\r
+  /// indicates the release of the Universal Serial Bus Specification with which the\r
+  /// host controller is compliant.\r

   ///\r
   UINT16                                           MinorRevision;\r
 };\r
   ///\r
   UINT16                                           MinorRevision;\r
 };\r

diff --git a/MdePkg/Include/Protocol/UsbHostController.h b/MdePkg/Include/Protocol/UsbHostController.h
index cd9d52d9496529b6057d6b2f41d93c9191513d18..48d1bcc48e3a4317f86dfe99f5599722619744f1 100644 (file)
--- a/MdePkg/Include/Protocol/UsbHostController.h
+++ b/MdePkg/Include/Protocol/UsbHostController.h
@@ -1,18 +1,18 @@
 /** @file\r
   EFI_USB_HC_PROTOCOL as defined in EFI 1.10.\r
 \r
 /** @file\r
   EFI_USB_HC_PROTOCOL as defined in EFI 1.10.\r
 \r

-  The USB Host Controller Protocol is used by code, typically USB bus drivers, \r
-  running in the EFI boot services environment, to perform data transactions \r
+  The USB Host Controller Protocol is used by code, typically USB bus drivers,\r
+  running in the EFI boot services environment, to perform data transactions\r

   over a USB bus. In addition, it provides an abstraction for the root hub of the USB bus.\r
 \r
   over a USB bus. In addition, it provides an abstraction for the root hub of the USB bus.\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
+  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


@@ -35,18 +35,18 @@ typedef struct _EFI_USB_HC_PROTOCOL EFI_USB_HC_PROTOCOL;
 // Protocol definitions\r
 //\r
 \r
 // Protocol definitions\r
 //\r
 \r

-/**                                                                 \r
+/**\r

   Provides software reset for the USB host controller.\r
   Provides software reset for the USB host controller.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  Attributes            A bit mask of the reset operation to perform.\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  Attributes            A bit mask of the reset operation to perform.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The reset operation succeeded.\r
   @retval EFI_UNSUPPORTED       The type of reset specified by Attributes is not currently supported\r
   @retval EFI_SUCCESS           The reset operation succeeded.\r
   @retval EFI_UNSUPPORTED       The type of reset specified by Attributes is not currently supported\r

-                                by the host controller hardware.                                    \r
+                                by the host controller hardware.\r

   @retval EFI_INVALID_PARAMETER Attributes is not valid.\r
   @retval EFI_DEVICE_ERROR      An error was encountered while attempting to perform the reset operation.\r
   @retval EFI_INVALID_PARAMETER Attributes is not valid.\r
   @retval EFI_DEVICE_ERROR      An error was encountered while attempting to perform the reset operation.\r

-                                   \r
+\r

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


@@ -55,18 +55,18 @@ EFI_STATUS
   IN UINT16                  Attributes\r
   );\r
 \r
   IN UINT16                  Attributes\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves current state of the USB host controller.\r
   Retrieves current state of the USB host controller.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  State                 A pointer to the EFI_USB_HC_STATE data structure that\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  State                 A pointer to the EFI_USB_HC_STATE data structure that\r

-                                indicates current state of the USB host controller.  \r
-                                \r
+                                indicates current state of the USB host controller.\r
+\r

   @retval EFI_SUCCESS           The state information of the host controller was returned in State.\r
   @retval EFI_INVALID_PARAMETER State is NULL.\r
   @retval EFI_DEVICE_ERROR      An error was encountered while attempting to retrieve the host controller's\r
   @retval EFI_SUCCESS           The state information of the host controller was returned in State.\r
   @retval EFI_INVALID_PARAMETER State is NULL.\r
   @retval EFI_DEVICE_ERROR      An error was encountered while attempting to retrieve the host controller's\r

-                                current state.                                                                 \r
-                                \r
+                                current state.\r
+\r

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


@@ -75,17 +75,17 @@ EFI_STATUS
   OUT EFI_USB_HC_STATE       *State\r
   );\r
 \r
   OUT EFI_USB_HC_STATE       *State\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Sets the USB host controller to a specific state.\r
   Sets the USB host controller to a specific state.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r

-  @param  State                 Indicates the state of the host controller that will be set.                                \r
-                                \r
+  @param  State                 Indicates the state of the host controller that will be set.\r
+\r

   @retval EFI_SUCCESS           The USB host controller was successfully placed in the state specified by\r
   @retval EFI_SUCCESS           The USB host controller was successfully placed in the state specified by\r

-                                State.                                                                   \r
+                                State.\r

   @retval EFI_INVALID_PARAMETER State is NULL.\r
   @retval EFI_INVALID_PARAMETER State is NULL.\r

-  @retval EFI_DEVICE_ERROR      Failed to set the state specified by State due to device error.                                \r
-                                \r
+  @retval EFI_DEVICE_ERROR      Failed to set the state specified by State due to device error.\r
+\r

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


@@ -94,36 +94,36 @@ EFI_STATUS
   IN EFI_USB_HC_STATE        State\r
   );\r
 \r
   IN EFI_USB_HC_STATE        State\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Submits control transfer to a target USB device.\r
   Submits control transfer to a target USB device.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r

-                                assigned during USB enumeration.                                \r
+                                assigned during USB enumeration.\r

   @param  IsSlowDevice          Indicates whether the target device is slow device or full-speed\r
   @param  IsSlowDevice          Indicates whether the target device is slow device or full-speed\r

-                                device.                                                         \r
-  @param  MaximumPacketLength   Indicates the maximum packet size that the default control \r
-                                transfer endpoint is capable of sending or receiving.     \r
+                                device.\r
+  @param  MaximumPacketLength   Indicates the maximum packet size that the default control\r
+                                transfer endpoint is capable of sending or receiving.\r

   @param  Request               A pointer to the USB device request that will be sent to the USB\r
                                 device.\r
   @param  Request               A pointer to the USB device request that will be sent to the USB\r
                                 device.\r

-  @param  TransferDirection     Specifies the data direction for the transfer. There are three \r
+  @param  TransferDirection     Specifies the data direction for the transfer. There are three\r

                                 values available, EfiUsbDataIn, EfiUsbDataOut and EfiUsbNoData.\r
                                 values available, EfiUsbDataIn, EfiUsbDataOut and EfiUsbNoData.\r

-  @param  Data                  A pointer to the buffer of data that will be transmitted to USB  \r
-                                device or received from USB device.                            \r
+  @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
+                                device or received from USB device.\r

   @param  DataLength            On input, indicates the size, in bytes, of the data buffer specified\r
   @param  DataLength            On input, indicates the size, in bytes, of the data buffer specified\r

-                                by Data. On output, indicates the amount of data actually           \r
-                                transferred.                                                        \r
+                                by Data. On output, indicates the amount of data actually\r
+                                transferred.\r

   @param  TimeOut               Indicates the maximum time, in milliseconds, which the transfer\r
   @param  TimeOut               Indicates the maximum time, in milliseconds, which the transfer\r

-                                is allowed to complete.                                        \r
-  @param  TransferResult        A pointer to the detailed result information generated by this  \r
+                                is allowed to complete.\r
+  @param  TransferResult        A pointer to the detailed result information generated by this\r

                                 control transfer.\r
                                 control transfer.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The control transfer was completed successfully.\r
   @retval EFI_SUCCESS           The control transfer was completed successfully.\r

-  @retval EFI_OUT_OF_RESOURCES  The control transfer could not be completed due to a lack of resources.                                \r
+  @retval EFI_OUT_OF_RESOURCES  The control transfer could not be completed due to a lack of resources.\r

   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_TIMEOUT           The control transfer failed due to timeout.\r
   @retval EFI_DEVICE_ERROR      The control transfer failed due to host controller or device error.\r
   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_TIMEOUT           The control transfer failed due to timeout.\r
   @retval EFI_DEVICE_ERROR      The control transfer failed due to host controller or device error.\r

-                                \r
+\r

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


@@ -140,36 +140,36 @@ EFI_STATUS
   OUT    UINT32                    *TransferResult\r
   );\r
 \r
   OUT    UINT32                    *TransferResult\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Submits bulk transfer to a bulk endpoint of a USB device.\r
   Submits bulk transfer to a bulk endpoint of a USB device.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r

-                                assigned during USB enumeration.                                \r
-  @param  EndPointAddress       The combination of an endpoint number and an endpoint \r
-                                direction of the target USB device. Each endpoint address \r
-                                supports data transfer in one direction except the control \r
-                                endpoint (whose default endpoint address is 0). It is the \r
-                                caller's responsibility to make sure that the EndPointAddress \r
-                                represents a bulk endpoint.                 \r
-  @param  MaximumPacketLength   Indicates the maximum packet size that the default control \r
-                                transfer endpoint is capable of sending or receiving.     \r
-  @param  Data                  A pointer to the buffer of data that will be transmitted to USB  \r
-                                device or received from USB device.                            \r
+                                assigned during USB enumeration.\r
+  @param  EndPointAddress       The combination of an endpoint number and an endpoint\r
+                                direction of the target USB device. Each endpoint address\r
+                                supports data transfer in one direction except the control\r
+                                endpoint (whose default endpoint address is 0). It is the\r
+                                caller's responsibility to make sure that the EndPointAddress\r
+                                represents a bulk endpoint.\r
+  @param  MaximumPacketLength   Indicates the maximum packet size that the default control\r
+                                transfer endpoint is capable of sending or receiving.\r
+  @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
+                                device or received from USB device.\r

   @param  DataLength            On input, indicates the size, in bytes, of the data buffer specified\r
   @param  DataLength            On input, indicates the size, in bytes, of the data buffer specified\r

-                                by Data. On output, indicates the amount of data actually           \r
-                                transferred.             \r
-  @param  DataToggle            A pointer to the data toggle value.                                                                           \r
+                                by Data. On output, indicates the amount of data actually\r
+                                transferred.\r
+  @param  DataToggle            A pointer to the data toggle value.\r

   @param  TimeOut               Indicates the maximum time, in milliseconds, which the transfer\r
   @param  TimeOut               Indicates the maximum time, in milliseconds, which the transfer\r

-                                is allowed to complete.                                        \r
+                                is allowed to complete.\r

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

-                                \r
+\r

   @retval EFI_SUCCESS           The bulk transfer was completed successfully.\r
   @retval EFI_SUCCESS           The bulk transfer was completed successfully.\r

-  @retval EFI_OUT_OF_RESOURCES  The bulk transfer could not be completed due to a lack of resources.                                \r
+  @retval EFI_OUT_OF_RESOURCES  The bulk transfer could not be completed due to a lack of resources.\r

   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_TIMEOUT           The bulk transfer failed due to timeout.\r
   @retval EFI_DEVICE_ERROR      The bulk transfer failed due to host controller or device error.\r
   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_TIMEOUT           The bulk transfer failed due to timeout.\r
   @retval EFI_DEVICE_ERROR      The bulk transfer failed due to host controller or device error.\r

-                                \r
+\r

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


@@ -185,47 +185,47 @@ EFI_STATUS
   OUT    UINT32                 *TransferResult\r
   );\r
 \r
   OUT    UINT32                 *TransferResult\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Submits an asynchronous interrupt transfer to an interrupt endpoint of a USB device.\r
   Submits an asynchronous interrupt transfer to an interrupt endpoint of a USB device.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r

-                                assigned during USB enumeration.                                \r
+                                assigned during USB enumeration.\r

   @param  EndPointAddress       The combination of an endpoint number and an endpoint\r
                                 direction of the target USB device. Each endpoint address\r
                                 supports data transfer in one direction except the control\r
                                 endpoint (whose default endpoint address is zero). It is the\r
                                 caller's responsibility to make sure that the\r
   @param  EndPointAddress       The combination of an endpoint number and an endpoint\r
                                 direction of the target USB device. Each endpoint address\r
                                 supports data transfer in one direction except the control\r
                                 endpoint (whose default endpoint address is zero). It is the\r
                                 caller's responsibility to make sure that the\r

-                                EndPointAddress represents an interrupt endpoint.     \r
+                                EndPointAddress represents an interrupt endpoint.\r

   @param  IsSlowDevice          Indicates whether the target device is slow device or full-speed\r
   @param  IsSlowDevice          Indicates whether the target device is slow device or full-speed\r

-                                device.                                                                          \r
-  @param  MaximumPacketLength   Indicates the maximum packet size that the default control \r
-                                transfer endpoint is capable of sending or receiving.     \r
-  @param  IsNewTransfer         If TRUE, an asynchronous interrupt pipe is built between the host                       \r
-                                and the target interrupt endpoint. If FALSE, the specified asynchronous \r
-                                interrupt pipe is canceled. If TRUE, and an interrupt transfer exists \r
-                                for the target end point, then EFI_INVALID_PARAMETER is returned.      \r
-  @param  DataToggle            A pointer to the data toggle value. On input, it is valid when \r
-                                IsNewTransfer is TRUE, and it indicates the initial data toggle \r
-                                value the asynchronous interrupt transfer should adopt. On output, \r
-                                it is valid when IsNewTransfer is FALSE, and it is updated to indicate \r
-                                the data toggle value of the subsequent asynchronous interrupt transfer.     \r
+                                device.\r
+  @param  MaximumPacketLength   Indicates the maximum packet size that the default control\r
+                                transfer endpoint is capable of sending or receiving.\r
+  @param  IsNewTransfer         If TRUE, an asynchronous interrupt pipe is built between the host\r
+                                and the target interrupt endpoint. If FALSE, the specified asynchronous\r
+                                interrupt pipe is canceled. If TRUE, and an interrupt transfer exists\r
+                                for the target end point, then EFI_INVALID_PARAMETER is returned.\r
+  @param  DataToggle            A pointer to the data toggle value. On input, it is valid when\r
+                                IsNewTransfer is TRUE, and it indicates the initial data toggle\r
+                                value the asynchronous interrupt transfer should adopt. On output,\r
+                                it is valid when IsNewTransfer is FALSE, and it is updated to indicate\r
+                                the data toggle value of the subsequent asynchronous interrupt transfer.\r

   @param  PollingInterval       Indicates the interval, in milliseconds, that the asynchronous\r
   @param  PollingInterval       Indicates the interval, in milliseconds, that the asynchronous\r

-                                interrupt transfer is polled. \r
+                                interrupt transfer is polled.\r

   @param  DataLength            Indicates the length of data to be received at the rate specified by\r
   @param  DataLength            Indicates the length of data to be received at the rate specified by\r

-                                PollingInterval from the target asynchronous interrupt              \r
-                                endpoint. This parameter is only required when IsNewTransfer is TRUE.                                                            \r
-  @param  CallBackFunction      The Callback function. This function is called at the rate specified by \r
-                                PollingInterval. This parameter is only required when IsNewTransfer is TRUE.                               \r
+                                PollingInterval from the target asynchronous interrupt\r
+                                endpoint. This parameter is only required when IsNewTransfer is TRUE.\r
+  @param  CallBackFunction      The Callback function. This function is called at the rate specified by\r
+                                PollingInterval. This parameter is only required when IsNewTransfer is TRUE.\r

   @param  Context               The context that is passed to the CallBackFunction.\r
   @param  Context               The context that is passed to the CallBackFunction.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The asynchronous interrupt transfer request has been successfully\r
   @retval EFI_SUCCESS           The asynchronous interrupt transfer request has been successfully\r

-                                submitted or canceled.    \r
-  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.                                \r
+                                submitted or canceled.\r
+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r

   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_TIMEOUT           The bulk transfer failed due to timeout.\r
   @retval EFI_DEVICE_ERROR      The bulk transfer failed due to host controller or device error.\r
   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_TIMEOUT           The bulk transfer failed due to timeout.\r
   @retval EFI_DEVICE_ERROR      The bulk transfer failed due to host controller or device error.\r

-                                \r
+\r

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


@@ -243,41 +243,41 @@ EFI_STATUS
   IN     VOID                                                *Context         OPTIONAL\r
   );\r
 \r
   IN     VOID                                                *Context         OPTIONAL\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Submits synchronous interrupt transfer to an interrupt endpoint of a USB device.\r
   Submits synchronous interrupt transfer to an interrupt endpoint of a USB device.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r

-                                assigned during USB enumeration.                                \r
+                                assigned during USB enumeration.\r

   @param  EndPointAddress       The combination of an endpoint number and an endpoint\r
                                 direction of the target USB device. Each endpoint address\r
                                 supports data transfer in one direction except the control\r
                                 endpoint (whose default endpoint address is zero). It is the\r
                                 caller's responsibility to make sure that the\r
   @param  EndPointAddress       The combination of an endpoint number and an endpoint\r
                                 direction of the target USB device. Each endpoint address\r
                                 supports data transfer in one direction except the control\r
                                 endpoint (whose default endpoint address is zero). It is the\r
                                 caller's responsibility to make sure that the\r

-                                EndPointAddress represents an interrupt endpoint.  \r
+                                EndPointAddress represents an interrupt endpoint.\r

   @param  IsSlowDevice          Indicates whether the target device is slow device or full-speed\r
   @param  IsSlowDevice          Indicates whether the target device is slow device or full-speed\r

-                                device.                                                                          \r
-  @param  MaximumPacketLength   Indicates the maximum packet size that the default control \r
-                                transfer endpoint is capable of sending or receiving.       \r
+                                device.\r
+  @param  MaximumPacketLength   Indicates the maximum packet size that the default control\r
+                                transfer endpoint is capable of sending or receiving.\r

   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r

-                                device or received from USB device.                                                                                            asynchronous interrupt pipe is canceled.                         \r
+                                device or received from USB device.                                                                                            asynchronous interrupt pipe is canceled.\r

   @param  DataLength            On input, the size, in bytes, of the data buffer specified by Data.\r
   @param  DataLength            On input, the size, in bytes, of the data buffer specified by Data.\r

-                                On output, the number of bytes transferred.                          \r
-  @param  DataToggle            A pointer to the data toggle value. On input, it indicates the initial \r
-                                data toggle value the synchronous interrupt transfer should adopt; \r
-                                on output, it is updated to indicate the data toggle value of the \r
-                                subsequent synchronous interrupt transfer.                               \r
-  @param  TimeOut               Indicates the maximum time, in milliseconds, which the transfer    \r
-                                is allowed to complete.                                            \r
+                                On output, the number of bytes transferred.\r
+  @param  DataToggle            A pointer to the data toggle value. On input, it indicates the initial\r
+                                data toggle value the synchronous interrupt transfer should adopt;\r
+                                on output, it is updated to indicate the data toggle value of the\r
+                                subsequent synchronous interrupt transfer.\r
+  @param  TimeOut               Indicates the maximum time, in milliseconds, which the transfer\r
+                                is allowed to complete.\r

   @param  TransferResult        A pointer to the detailed result information from the synchronous\r
                                 interrupt transfer.\r
   @param  TransferResult        A pointer to the detailed result information from the synchronous\r
                                 interrupt transfer.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The synchronous interrupt transfer was completed successfully.\r
   @retval EFI_SUCCESS           The synchronous interrupt transfer was completed successfully.\r

-  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.                                  \r
+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r

   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_TIMEOUT           The synchronous interrupt transfer failed due to timeout.\r
   @retval EFI_DEVICE_ERROR      The synchronous interrupt transfer failed due to host controller or device error.\r
   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_TIMEOUT           The synchronous interrupt transfer failed due to timeout.\r
   @retval EFI_DEVICE_ERROR      The synchronous interrupt transfer failed due to host controller or device error.\r

-                                \r
+\r

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


@@ -294,33 +294,33 @@ EFI_STATUS
   OUT    UINT32                 *TransferResult\r
   );\r
 \r
   OUT    UINT32                 *TransferResult\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Submits isochronous transfer to an isochronous endpoint of a USB device.\r
   Submits isochronous transfer to an isochronous endpoint of a USB device.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r

-                                assigned during USB enumeration.                                \r
+                                assigned during USB enumeration.\r

   @param  EndPointAddress       The combination of an endpoint number and an endpoint\r
                                 direction of the target USB device. Each endpoint address\r
                                 supports data transfer in one direction except the control\r
                                 endpoint (whose default endpoint address is 0). It is the caller's\r
                                 responsibility to make sure that the EndPointAddress\r
   @param  EndPointAddress       The combination of an endpoint number and an endpoint\r
                                 direction of the target USB device. Each endpoint address\r
                                 supports data transfer in one direction except the control\r
                                 endpoint (whose default endpoint address is 0). It is the caller's\r
                                 responsibility to make sure that the EndPointAddress\r

-                                represents an isochronous endpoint.                  \r
-  @param  MaximumPacketLength   Indicates the maximum packet size that the default control \r
-                                transfer endpoint is capable of sending or receiving.       \r
+                                represents an isochronous endpoint.\r
+  @param  MaximumPacketLength   Indicates the maximum packet size that the default control\r
+                                transfer endpoint is capable of sending or receiving.\r

   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r

-                                device or received from USB device.                                                                                            asynchronous interrupt pipe is canceled.                         \r
+                                device or received from USB device.                                                                                            asynchronous interrupt pipe is canceled.\r

   @param  DataLength            Specifies the length, in bytes, of the data to be sent to or received\r
   @param  DataLength            Specifies the length, in bytes, of the data to be sent to or received\r

-                                from the USB device.                                                 \r
+                                from the USB device.\r

   @param  TransferResult        A pointer to the detailed result information from the isochronous\r
                                 transfer.\r
   @param  TransferResult        A pointer to the detailed result information from the isochronous\r
                                 transfer.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The isochronous transfer was completed successfully.\r
   @retval EFI_SUCCESS           The isochronous transfer was completed successfully.\r

-  @retval EFI_OUT_OF_RESOURCES  The isochronous could not be completed due to a lack of resources.                                  \r
+  @retval EFI_OUT_OF_RESOURCES  The isochronous could not be completed due to a lack of resources.\r

   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_TIMEOUT           The isochronous transfer failed due to timeout.\r
   @retval EFI_DEVICE_ERROR      The isochronous transfer failed due to host controller or device error.\r
   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_TIMEOUT           The isochronous transfer failed due to timeout.\r
   @retval EFI_DEVICE_ERROR      The isochronous transfer failed due to host controller or device error.\r

-                                \r
+\r

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


@@ -334,36 +334,36 @@ EFI_STATUS
   OUT    UINT32                 *TransferResult\r
   );\r
 \r
   OUT    UINT32                 *TransferResult\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Submits nonblocking isochronous transfer to an isochronous endpoint of a USB device.\r
   Submits nonblocking isochronous transfer to an isochronous endpoint of a USB device.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  DeviceAddress         Represents the address of the target device on the USB, which is\r

-                                assigned during USB enumeration.                                \r
+                                assigned during USB enumeration.\r

   @param  EndPointAddress       The combination of an endpoint number and an endpoint\r
                                 direction of the target USB device. Each endpoint address\r
                                 supports data transfer in one direction except the control\r
                                 endpoint (whose default endpoint address is zero). It is the\r
                                 caller's responsibility to make sure that the\r
   @param  EndPointAddress       The combination of an endpoint number and an endpoint\r
                                 direction of the target USB device. Each endpoint address\r
                                 supports data transfer in one direction except the control\r
                                 endpoint (whose default endpoint address is zero). It is the\r
                                 caller's responsibility to make sure that the\r

-                                EndPointAddress represents an isochronous endpoint.             \r
-  @param  MaximumPacketLength   Indicates the maximum packet size that the default control \r
-                                transfer endpoint is capable of sending or receiving. For isochronous \r
-                                endpoints, this value is used to reserve the bus time in the schedule, \r
+                                EndPointAddress represents an isochronous endpoint.\r
+  @param  MaximumPacketLength   Indicates the maximum packet size that the default control\r
+                                transfer endpoint is capable of sending or receiving. For isochronous\r
+                                endpoints, this value is used to reserve the bus time in the schedule,\r

                                 required for the perframe data payloads. The pipe may, on an ongoing basis,\r
                                 required for the perframe data payloads. The pipe may, on an ongoing basis,\r

-                                actually use less bandwidth than that reserved.      \r
+                                actually use less bandwidth than that reserved.\r

   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r

-                                device or received from USB device.                                                                                            asynchronous interrupt pipe is canceled.                         \r
+                                device or received from USB device.                                                                                            asynchronous interrupt pipe is canceled.\r

   @param  DataLength            Specifies the length, in bytes, of the data to be sent to or received\r
   @param  DataLength            Specifies the length, in bytes, of the data to be sent to or received\r

-                                from the USB device.                                                 \r
+                                from the USB device.\r

   @param  IsochronousCallback   The Callback function.This function is called if the requested\r
                                 isochronous transfer is completed.\r
   @param  Context               Data passed to the IsochronousCallback function. This is\r
                                 an optional parameter and may be NULL.\r
   @param  IsochronousCallback   The Callback function.This function is called if the requested\r
                                 isochronous transfer is completed.\r
   @param  Context               Data passed to the IsochronousCallback function. This is\r
                                 an optional parameter and may be NULL.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The asynchronous isochronous transfer was completed successfully.\r
   @retval EFI_SUCCESS           The asynchronous isochronous transfer was completed successfully.\r

-  @retval EFI_OUT_OF_RESOURCES  The asynchronous isochronous could not be completed due to a lack of resources.                                  \r
+  @retval EFI_OUT_OF_RESOURCES  The asynchronous isochronous could not be completed due to a lack of resources.\r

   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r

-                                \r
+\r

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


@@ -378,16 +378,16 @@ EFI_STATUS
   IN     VOID                               *Context OPTIONAL\r
   );\r
 \r
   IN     VOID                               *Context OPTIONAL\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves the number of root hub ports.\r
   Retrieves the number of root hub ports.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r

-  @param  PortNumber            A pointer to the number of the root hub ports.                                \r
-                                \r
+  @param  PortNumber            A pointer to the number of the root hub ports.\r
+\r

   @retval EFI_SUCCESS           The port number was retrieved successfully.\r
   @retval EFI_DEVICE_ERROR      An error was encountered while attempting to retrieve the port number.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r
   @retval EFI_SUCCESS           The port number was retrieved successfully.\r
   @retval EFI_DEVICE_ERROR      An error was encountered while attempting to retrieve the port number.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r

-                                \r
+\r

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


@@ -396,20 +396,20 @@ EFI_STATUS
   OUT UINT8                 *PortNumber\r
   );\r
 \r
   OUT UINT8                 *PortNumber\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Retrieves the current status of a USB root hub port.\r
   Retrieves the current status of a USB root hub port.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  PortNumber            Specifies the root hub port from which the status is to be retrieved.\r
                                 This value is zero based. For example, if a root hub has two ports,\r
                                 then the first port is numbered 0, and the second port is\r
                                 numbered 1.\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  PortNumber            Specifies the root hub port from which the status is to be retrieved.\r
                                 This value is zero based. For example, if a root hub has two ports,\r
                                 then the first port is numbered 0, and the second port is\r
                                 numbered 1.\r

-  @param  PortStatus            A pointer to the current port status bits and port status change bits.                                \r
-                                \r
+  @param  PortStatus            A pointer to the current port status bits and port status change bits.\r
+\r

   @retval EFI_SUCCESS           The status of the USB root hub port specified by PortNumber\r
   @retval EFI_SUCCESS           The status of the USB root hub port specified by PortNumber\r

-                                was returned in PortStatus.                                \r
+                                was returned in PortStatus.\r

   @retval EFI_INVALID_PARAMETER PortNumber is invalid.\r
   @retval EFI_INVALID_PARAMETER PortNumber is invalid.\r

-                                \r
+\r

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


@@ -419,9 +419,9 @@ EFI_STATUS
   OUT EFI_USB_PORT_STATUS    *PortStatus\r
   );\r
 \r
   OUT EFI_USB_PORT_STATUS    *PortStatus\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Sets a feature for the specified root hub port.\r
   Sets a feature for the specified root hub port.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  PortNumber            Specifies the root hub port from which the status is to be retrieved.\r
                                 This value is zero based. For example, if a root hub has two ports,\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  PortNumber            Specifies the root hub port from which the status is to be retrieved.\r
                                 This value is zero based. For example, if a root hub has two ports,\r


@@ -429,11 +429,11 @@ EFI_STATUS
                                 numbered 1.\r
   @param  PortFeature           Indicates the feature selector associated with the feature set\r
                                 request.\r
                                 numbered 1.\r
   @param  PortFeature           Indicates the feature selector associated with the feature set\r
                                 request.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The feature specified by PortFeature was set for the USB\r
   @retval EFI_SUCCESS           The feature specified by PortFeature was set for the USB\r

-                                root hub port specified by PortNumber.                  \r
+                                root hub port specified by PortNumber.\r

   @retval EFI_INVALID_PARAMETER PortNumber is invalid or PortFeature is invalid for this function.\r
   @retval EFI_INVALID_PARAMETER PortNumber is invalid or PortFeature is invalid for this function.\r

-                                \r
+\r

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


@@ -443,9 +443,9 @@ EFI_STATUS
   IN EFI_USB_PORT_FEATURE    PortFeature\r
   );\r
 \r
   IN EFI_USB_PORT_FEATURE    PortFeature\r
   );\r
 \r

-/**                                                                 \r
+/**\r

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

-    \r
+\r

   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  PortNumber            Specifies the root hub port from which the status is to be retrieved.\r
                                 This value is zero based. For example, if a root hub has two ports,\r
   @param  This                  A pointer to the EFI_USB_HC_PROTOCOL instance.\r
   @param  PortNumber            Specifies the root hub port from which the status is to be retrieved.\r
                                 This value is zero based. For example, if a root hub has two ports,\r


@@ -453,11 +453,11 @@ EFI_STATUS
                                 numbered 1.\r
   @param  PortFeature           Indicates the feature selector associated with the feature clear\r
                                 request.\r
                                 numbered 1.\r
   @param  PortFeature           Indicates the feature selector associated with the feature clear\r
                                 request.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The feature specified by PortFeature was cleared for the USB\r
   @retval EFI_SUCCESS           The feature specified by PortFeature was cleared for the USB\r

-                                root hub port specified by PortNumber.                  \r
+                                root hub port specified by PortNumber.\r

   @retval EFI_INVALID_PARAMETER PortNumber is invalid or PortFeature is invalid for this function.\r
   @retval EFI_INVALID_PARAMETER PortNumber is invalid or PortFeature is invalid for this function.\r

-                                \r
+\r

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


@@ -473,7 +473,7 @@ EFI_STATUS
 /// over a USB bus, and USB root hub access. A device driver that wishes to manage a USB bus in a\r
 /// system retrieves the EFI_USB_HC_PROTOCOL instance that is associated with the USB bus to be\r
 /// managed. A device handle for a USB host controller will minimally contain an\r
 /// over a USB bus, and USB root hub access. A device driver that wishes to manage a USB bus in a\r
 /// system retrieves the EFI_USB_HC_PROTOCOL instance that is associated with the USB bus to be\r
 /// managed. A device handle for a USB host controller will minimally contain an\r

-/// EFI_DEVICE_PATH_PROTOCOL instance, and an EFI_USB_HC_PROTOCOL instance. \r
+/// EFI_DEVICE_PATH_PROTOCOL instance, and an EFI_USB_HC_PROTOCOL instance.\r

 ///\r
 struct _EFI_USB_HC_PROTOCOL {\r
   EFI_USB_HC_PROTOCOL_RESET                       Reset;\r
 ///\r
 struct _EFI_USB_HC_PROTOCOL {\r
   EFI_USB_HC_PROTOCOL_RESET                       Reset;\r


@@ -490,16 +490,16 @@ struct _EFI_USB_HC_PROTOCOL {
   EFI_USB_HC_PROTOCOL_SET_ROOTHUB_PORT_FEATURE    SetRootHubPortFeature;\r
   EFI_USB_HC_PROTOCOL_CLEAR_ROOTHUB_PORT_FEATURE  ClearRootHubPortFeature;\r
   ///\r
   EFI_USB_HC_PROTOCOL_SET_ROOTHUB_PORT_FEATURE    SetRootHubPortFeature;\r
   EFI_USB_HC_PROTOCOL_CLEAR_ROOTHUB_PORT_FEATURE  ClearRootHubPortFeature;\r
   ///\r

-  /// The major revision number of the USB host controller. The revision information \r
-  /// indicates the release of the Universal Serial Bus Specification with which the \r
+  /// The major revision number of the USB host controller. The revision information\r
+  /// indicates the release of the Universal Serial Bus Specification with which the\r

   /// host controller is compliant.\r
   /// host controller is compliant.\r

-  ///  \r
+  ///\r

   UINT16                                          MajorRevision;\r
   ///\r
   UINT16                                          MajorRevision;\r
   ///\r

-  /// The minor revision number of the USB host controller. The revision information \r
-  /// indicates the release of the Universal Serial Bus Specification with which the \r
-  /// host controller is compliant.  \r
-  ///  \r
+  /// The minor revision number of the USB host controller. The revision information\r
+  /// indicates the release of the Universal Serial Bus Specification with which the\r
+  /// host controller is compliant.\r
+  ///\r

   UINT16                                          MinorRevision;\r
 };\r
 \r
   UINT16                                          MinorRevision;\r
 };\r
 \r

diff --git a/MdePkg/Include/Protocol/UsbIo.h b/MdePkg/Include/Protocol/UsbIo.h
index 227d2862038a91a9e0b5f1de256bdd9a301019e9..1d102f17aa19350b9bc416f4b0460b766024ac18 100644 (file)
--- a/MdePkg/Include/Protocol/UsbIo.h
+++ b/MdePkg/Include/Protocol/UsbIo.h
@@ -1,11 +1,11 @@
 /** @file\r
   EFI Usb I/O Protocol as defined in UEFI specification.\r
 /** @file\r
   EFI Usb I/O Protocol as defined in UEFI specification.\r

-  This protocol is used by code, typically drivers, running in the EFI \r
-  boot services environment to access USB devices like USB keyboards, \r
-  mice and mass storage devices. In particular, functions for managing devices \r
+  This protocol is used by code, typically drivers, running in the EFI\r
+  boot services environment to access USB devices like USB keyboards,\r
+  mice and mass storage devices. In particular, functions for managing devices\r

   on USB buses are defined here.\r
   on USB buses are defined here.\r

-  \r
-  Copyright (c) 2006 - 2008, 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


@@ -134,13 +134,13 @@ EFI_STATUS
   typically used to transfer large amounts of data to/from USB devices.\r
 \r
   @param  This                  A pointer to the EFI_USB_IO_PROTOCOL instance.\r
   typically used to transfer large amounts of data to/from USB devices.\r
 \r
   @param  This                  A pointer to the EFI_USB_IO_PROTOCOL instance.\r

-  @param  DeviceEndpoint        The destination USB device endpoint to which the \r
-                                device request is being sent. DeviceEndpoint must \r
-                                be between 0x01 and 0x0F or between 0x81 and 0x8F, \r
-                                otherwise EFI_INVALID_PARAMETER is returned. If \r
-                                the endpoint is not a BULK endpoint, EFI_INVALID_PARAMETER \r
-                                is returned. The MSB of this parameter indicates \r
-                                the endpoint direction. The number "1" stands for \r
+  @param  DeviceEndpoint        The destination USB device endpoint to which the\r
+                                device request is being sent. DeviceEndpoint must\r
+                                be between 0x01 and 0x0F or between 0x81 and 0x8F,\r
+                                otherwise EFI_INVALID_PARAMETER is returned. If\r
+                                the endpoint is not a BULK endpoint, EFI_INVALID_PARAMETER\r
+                                is returned. The MSB of this parameter indicates\r
+                                the endpoint direction. The number "1" stands for\r

                                 an IN endpoint, and "0" stands for an OUT endpoint.\r
   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
                                 device or received from USB device.\r
                                 an IN endpoint, and "0" stands for an OUT endpoint.\r
   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
                                 device or received from USB device.\r


@@ -148,8 +148,8 @@ EFI_STATUS
                                 On input, the size, in bytes, of the data buffer specified by Data.\r
                                 On output, the number of bytes that were actually transferred.\r
   @param  Timeout               Indicating the transfer should be completed within this time frame.\r
                                 On input, the size, in bytes, of the data buffer specified by Data.\r
                                 On output, the number of bytes that were actually transferred.\r
   @param  Timeout               Indicating the transfer should be completed within this time frame.\r

-                                The units are in milliseconds. If Timeout is 0, then the \r
-                                caller must wait for the function to be completed until \r
+                                The units are in milliseconds. If Timeout is 0, then the\r
+                                caller must wait for the function to be completed until\r

                                 EFI_SUCCESS or EFI_DEVICE_ERROR is returned.\r
   @param  Status                This parameter indicates the USB transfer status.\r
 \r
                                 EFI_SUCCESS or EFI_DEVICE_ERROR is returned.\r
   @param  Status                This parameter indicates the USB transfer status.\r
 \r


@@ -178,27 +178,27 @@ EFI_STATUS
   a fixed rate.\r
 \r
   @param  This                  A pointer to the EFI_USB_IO_PROTOCOL instance.\r
   a fixed rate.\r
 \r
   @param  This                  A pointer to the EFI_USB_IO_PROTOCOL instance.\r

-  @param  DeviceEndpoint        The destination USB device endpoint to which the \r
-                                device request is being sent. DeviceEndpoint must \r
-                                be between 0x01 and 0x0F or between 0x81 and 0x8F, \r
-                                otherwise EFI_INVALID_PARAMETER is returned. If \r
-                                the endpoint is not a BULK endpoint, EFI_INVALID_PARAMETER \r
-                                is returned. The MSB of this parameter indicates \r
-                                the endpoint direction. The number "1" stands for \r
+  @param  DeviceEndpoint        The destination USB device endpoint to which the\r
+                                device request is being sent. DeviceEndpoint must\r
+                                be between 0x01 and 0x0F or between 0x81 and 0x8F,\r
+                                otherwise EFI_INVALID_PARAMETER is returned. If\r
+                                the endpoint is not a BULK endpoint, EFI_INVALID_PARAMETER\r
+                                is returned. The MSB of this parameter indicates\r
+                                the endpoint direction. The number "1" stands for\r

                                 an IN endpoint, and "0" stands for an OUT endpoint.\r
   @param  IsNewTransfer         If TRUE, a new transfer will be submitted to USB controller. If\r
                                 FALSE, the interrupt transfer is deleted from the device's interrupt\r
                                 transfer queue.\r
   @param  PollingInterval       Indicates the periodic rate, in milliseconds, that the transfer is to be\r
                                 an IN endpoint, and "0" stands for an OUT endpoint.\r
   @param  IsNewTransfer         If TRUE, a new transfer will be submitted to USB controller. If\r
                                 FALSE, the interrupt transfer is deleted from the device's interrupt\r
                                 transfer queue.\r
   @param  PollingInterval       Indicates the periodic rate, in milliseconds, that the transfer is to be\r

-                                executed.This parameter is required when IsNewTransfer is TRUE. The \r
-                                value must be between 1 to 255, otherwise EFI_INVALID_PARAMETER is returned. \r
+                                executed.This parameter is required when IsNewTransfer is TRUE. The\r
+                                value must be between 1 to 255, otherwise EFI_INVALID_PARAMETER is returned.\r

                                 The units are in milliseconds.\r
   @param  DataLength            Specifies the length, in bytes, of the data to be received from the\r
                                 USB device. This parameter is only required when IsNewTransfer is TRUE.\r
   @param  InterruptCallback     The Callback function. This function is called if the asynchronous\r
                                 The units are in milliseconds.\r
   @param  DataLength            Specifies the length, in bytes, of the data to be received from the\r
                                 USB device. This parameter is only required when IsNewTransfer is TRUE.\r
   @param  InterruptCallback     The Callback function. This function is called if the asynchronous\r

-                                interrupt transfer is completed. This parameter is required \r
+                                interrupt transfer is completed. This parameter is required\r

                                 when IsNewTransfer is TRUE.\r
                                 when IsNewTransfer is TRUE.\r

-  @param  Context               Data passed to the InterruptCallback function. This is an optional \r
+  @param  Context               Data passed to the InterruptCallback function. This is an optional\r

                                 parameter and may be NULL.\r
 \r
   @retval EFI_SUCCESS           The asynchronous USB transfer request transfer has been successfully executed.\r
                                 parameter and may be NULL.\r
 \r
   @retval EFI_SUCCESS           The asynchronous USB transfer request transfer has been successfully executed.\r


@@ -221,21 +221,21 @@ EFI_STATUS
   This function is used to manage a USB device with an interrupt transfer pipe.\r
 \r
   @param  This                  A pointer to the EFI_USB_IO_PROTOCOL instance.\r
   This function is used to manage a USB device with an interrupt transfer pipe.\r
 \r
   @param  This                  A pointer to the EFI_USB_IO_PROTOCOL instance.\r

-  @param  DeviceEndpoint        The destination USB device endpoint to which the \r
-                                device request is being sent. DeviceEndpoint must \r
-                                be between 0x01 and 0x0F or between 0x81 and 0x8F, \r
-                                otherwise EFI_INVALID_PARAMETER is returned. If \r
-                                the endpoint is not a BULK endpoint, EFI_INVALID_PARAMETER \r
-                                is returned. The MSB of this parameter indicates \r
-                                the endpoint direction. The number "1" stands for \r
+  @param  DeviceEndpoint        The destination USB device endpoint to which the\r
+                                device request is being sent. DeviceEndpoint must\r
+                                be between 0x01 and 0x0F or between 0x81 and 0x8F,\r
+                                otherwise EFI_INVALID_PARAMETER is returned. If\r
+                                the endpoint is not a BULK endpoint, EFI_INVALID_PARAMETER\r
+                                is returned. The MSB of this parameter indicates\r
+                                the endpoint direction. The number "1" stands for\r

                                 an IN endpoint, and "0" stands for an OUT endpoint.\r
   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
                                 device or received from USB device.\r
   @param  DataLength            On input, then size, in bytes, of the buffer Data. On output, the\r
                                 amount of data actually transferred.\r
                                 an IN endpoint, and "0" stands for an OUT endpoint.\r
   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
                                 device or received from USB device.\r
   @param  DataLength            On input, then size, in bytes, of the buffer Data. On output, the\r
                                 amount of data actually transferred.\r

-  @param  Timeout               The time out, in seconds, for this transfer. If Timeout is 0, \r
-                                then the caller must wait for the function to be completed \r
-                                until EFI_SUCCESS or EFI_DEVICE_ERROR is returned. If the \r
+  @param  Timeout               The time out, in seconds, for this transfer. If Timeout is 0,\r
+                                then the caller must wait for the function to be completed\r
+                                until EFI_SUCCESS or EFI_DEVICE_ERROR is returned. If the\r

                                 transfer is not completed in this time frame, then EFI_TIMEOUT is returned.\r
   @param  Status                This parameter indicates the USB transfer status.\r
 \r
                                 transfer is not completed in this time frame, then EFI_TIMEOUT is returned.\r
   @param  Status                This parameter indicates the USB transfer status.\r
 \r


@@ -261,13 +261,13 @@ EFI_STATUS
   transfer is typically used to transfer streaming data.\r
 \r
   @param  This                  A pointer to the EFI_USB_IO_PROTOCOL instance.\r
   transfer is typically used to transfer streaming data.\r
 \r
   @param  This                  A pointer to the EFI_USB_IO_PROTOCOL instance.\r

-  @param  DeviceEndpoint        The destination USB device endpoint to which the \r
-                                device request is being sent. DeviceEndpoint must \r
-                                be between 0x01 and 0x0F or between 0x81 and 0x8F, \r
-                                otherwise EFI_INVALID_PARAMETER is returned. If \r
-                                the endpoint is not a BULK endpoint, EFI_INVALID_PARAMETER \r
-                                is returned. The MSB of this parameter indicates \r
-                                the endpoint direction. The number "1" stands for \r
+  @param  DeviceEndpoint        The destination USB device endpoint to which the\r
+                                device request is being sent. DeviceEndpoint must\r
+                                be between 0x01 and 0x0F or between 0x81 and 0x8F,\r
+                                otherwise EFI_INVALID_PARAMETER is returned. If\r
+                                the endpoint is not a BULK endpoint, EFI_INVALID_PARAMETER\r
+                                is returned. The MSB of this parameter indicates\r
+                                the endpoint direction. The number "1" stands for\r

                                 an IN endpoint, and "0" stands for an OUT endpoint.\r
   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
                                 device or received from USB device.\r
                                 an IN endpoint, and "0" stands for an OUT endpoint.\r
   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
                                 device or received from USB device.\r


@@ -296,19 +296,19 @@ EFI_STATUS
   transfer is typically used to transfer streaming data.\r
 \r
   @param  This                  A pointer to the EFI_USB_IO_PROTOCOL instance.\r
   transfer is typically used to transfer streaming data.\r
 \r
   @param  This                  A pointer to the EFI_USB_IO_PROTOCOL instance.\r

-  @param  DeviceEndpoint        The destination USB device endpoint to which the \r
-                                device request is being sent. DeviceEndpoint must \r
-                                be between 0x01 and 0x0F or between 0x81 and 0x8F, \r
-                                otherwise EFI_INVALID_PARAMETER is returned. If \r
-                                the endpoint is not a BULK endpoint, EFI_INVALID_PARAMETER \r
-                                is returned. The MSB of this parameter indicates \r
-                                the endpoint direction. The number "1" stands for \r
+  @param  DeviceEndpoint        The destination USB device endpoint to which the\r
+                                device request is being sent. DeviceEndpoint must\r
+                                be between 0x01 and 0x0F or between 0x81 and 0x8F,\r
+                                otherwise EFI_INVALID_PARAMETER is returned. If\r
+                                the endpoint is not a BULK endpoint, EFI_INVALID_PARAMETER\r
+                                is returned. The MSB of this parameter indicates\r
+                                the endpoint direction. The number "1" stands for\r

                                 an IN endpoint, and "0" stands for an OUT endpoint.\r
   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
                                 device or received from USB device.\r
   @param  DataLength            The size, in bytes, of the data buffer specified by Data.\r
                                 This is an optional parameter and may be NULL.\r
                                 an IN endpoint, and "0" stands for an OUT endpoint.\r
   @param  Data                  A pointer to the buffer of data that will be transmitted to USB\r
                                 device or received from USB device.\r
   @param  DataLength            The size, in bytes, of the data buffer specified by Data.\r
                                 This is an optional parameter and may be NULL.\r

-  @param  IsochronousCallback   The IsochronousCallback() function.This function is \r
+  @param  IsochronousCallback   The IsochronousCallback() function.This function is\r

                                 called if the requested isochronous transfer is completed.\r
   @param  Context               Data passed to the IsochronousCallback() function.\r
 \r
                                 called if the requested isochronous transfer is completed.\r
   @param  Context               Data passed to the IsochronousCallback() function.\r
 \r


@@ -432,9 +432,9 @@ EFI_STATUS
   @param  LangID                  The Language ID for the string being retrieved.\r
   @param  StringID                The ID of the string being retrieved.\r
   @param  String                  A pointer to a buffer allocated by this function with\r
   @param  LangID                  The Language ID for the string being retrieved.\r
   @param  StringID                The ID of the string being retrieved.\r
   @param  String                  A pointer to a buffer allocated by this function with\r

-                                  AllocatePool() to store the string.If this function \r
-                                  returns EFI_SUCCESS, it stores the string the caller \r
-                                  wants to get. The caller should release the string \r
+                                  AllocatePool() to store the string.If this function\r
+                                  returns EFI_SUCCESS, it stores the string the caller\r
+                                  wants to get. The caller should release the string\r

                                   buffer with FreePool() after the string is not used any more.\r
 \r
   @retval EFI_SUCCESS             The string was retrieved successfully.\r
                                   buffer with FreePool() after the string is not used any more.\r
 \r
   @retval EFI_SUCCESS             The string was retrieved successfully.\r


@@ -456,9 +456,9 @@ EFI_STATUS
 \r
   @param  This                    A pointer to the EFI_USB_IO_PROTOCOL instance.\r
   @param  LangIDTable             Language ID for the string the caller wants to get.\r
 \r
   @param  This                    A pointer to the EFI_USB_IO_PROTOCOL instance.\r
   @param  LangIDTable             Language ID for the string the caller wants to get.\r

-                                  This is a 16-bit ID defined by Microsoft. This \r
-                                  buffer pointer is allocated and maintained by \r
-                                  the USB Bus Driver, the caller should not modify \r
+                                  This is a 16-bit ID defined by Microsoft. This\r
+                                  buffer pointer is allocated and maintained by\r
+                                  the USB Bus Driver, the caller should not modify\r

                                   its contents.\r
   @param  TableSize               The size, in bytes, of the table LangIDTable.\r
 \r
                                   its contents.\r
   @param  TableSize               The size, in bytes, of the table LangIDTable.\r
 \r


@@ -474,11 +474,11 @@ EFI_STATUS
   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

-/// The EFI_USB_IO_PROTOCOL provides four basic transfers types described \r
-/// in the USB 1.1 Specification. These include control transfer, interrupt \r
-/// transfer, bulk transfer and isochronous transfer. The EFI_USB_IO_PROTOCOL \r
-/// also provides some basic USB device/controller management and configuration \r
-/// interfaces. A USB device driver uses the services of this protocol to manage USB devices.  \r
+/// The EFI_USB_IO_PROTOCOL provides four basic transfers types described\r
+/// in the USB 1.1 Specification. These include control transfer, interrupt\r
+/// transfer, bulk transfer and isochronous transfer. The EFI_USB_IO_PROTOCOL\r
+/// also provides some basic USB device/controller management and configuration\r
+/// interfaces. A USB device driver uses the services of this protocol to manage USB devices.\r

 ///\r
 struct _EFI_USB_IO_PROTOCOL {\r
   //\r
 ///\r
 struct _EFI_USB_IO_PROTOCOL {\r
   //\r

diff --git a/MdePkg/Include/Protocol/UserCredential.h b/MdePkg/Include/Protocol/UserCredential.h
index 227f7faf940741c83d29615706e71f4e4702df02..ae35004a1c12c374d83768593d46dfdc89c5f9e6 100644 (file)
--- a/MdePkg/Include/Protocol/UserCredential.h
+++ b/MdePkg/Include/Protocol/UserCredential.h
@@ -4,14 +4,14 @@
 \r
   Attached to a device handle, this protocol identifies a single means of identifying the user.\r
 \r
 \r
   Attached to a device handle, this protocol identifies a single means of identifying the user.\r
 \r

-  Copyright (c) 2009 - 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) 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
 \r

-  THE PROGRAM 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


@@ -31,16 +31,16 @@ typedef struct _EFI_USER_CREDENTIAL_PROTOCOL  EFI_USER_CREDENTIAL_PROTOCOL;
   Enroll a user on a credential provider.\r
 \r
   This function enrolls and deletes a user profile using this credential provider. If a user profile\r
   Enroll a user on a credential provider.\r
 \r
   This function enrolls and deletes a user profile using this credential provider. If a user profile\r

-  is successfully enrolled, it calls the User Manager Protocol function Notify() to notify the user \r
-  manager driver that credential information has changed. If an enrolled user does exist, delete the \r
+  is successfully enrolled, it calls the User Manager Protocol function Notify() to notify the user\r
+  manager driver that credential information has changed. If an enrolled user does exist, delete the\r

   user on the credential provider.\r
 \r
   @param[in] This                Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
   @param[in] User                The user profile to enroll.\r
   user on the credential provider.\r
 \r
   @param[in] This                Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
   @param[in] User                The user profile to enroll.\r

- \r
+\r

   @retval EFI_SUCCESS            User profile was successfully enrolled.\r
   @retval EFI_SUCCESS            User profile was successfully enrolled.\r

-  @retval EFI_ACCESS_DENIED      Current user profile does not permit enrollment on the user profile \r
-                                 handle. Either the user profile cannot enroll on any user profile or \r
+  @retval EFI_ACCESS_DENIED      Current user profile does not permit enrollment on the user profile\r
+                                 handle. Either the user profile cannot enroll on any user profile or\r

                                  cannot enroll on a user profile other than the current user profile.\r
   @retval EFI_UNSUPPORTED        This credential provider does not support enrollment in the pre-OS.\r
   @retval EFI_DEVICE_ERROR       The new credential could not be created because of a device error.\r
                                  cannot enroll on a user profile other than the current user profile.\r
   @retval EFI_UNSUPPORTED        This credential provider does not support enrollment in the pre-OS.\r
   @retval EFI_DEVICE_ERROR       The new credential could not be created because of a device error.\r


@@ -56,19 +56,19 @@ EFI_STATUS
 /**\r
   Returns the user interface information used during user identification.\r
 \r
 /**\r
   Returns the user interface information used during user identification.\r
 \r

-  This function returns information about the form used when interacting with the user during user \r
-  identification. The form is the first enabled form in the form-set class \r
-  EFI_HII_USER_CREDENTIAL_FORMSET_GUID installed on the HII handle HiiHandle. If \r
-  the user credential provider does not require a form to identify the user, then this function should \r
+  This function returns information about the form used when interacting with the user during user\r
+  identification. The form is the first enabled form in the form-set class\r
+  EFI_HII_USER_CREDENTIAL_FORMSET_GUID installed on the HII handle HiiHandle. If\r
+  the user credential provider does not require a form to identify the user, then this function should\r

   return EFI_NOT_FOUND.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
   @param[out] Hii                On return, holds the HII database handle.\r
   @param[out] FormSetId          On return, holds the identifier of the form set which contains\r
                                  the form used during user identification.\r
   return EFI_NOT_FOUND.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
   @param[out] Hii                On return, holds the HII database handle.\r
   @param[out] FormSetId          On return, holds the identifier of the form set which contains\r
                                  the form used during user identification.\r

-  @param[out] FormId             On return, holds the identifier of the form used during user \r
+  @param[out] FormId             On return, holds the identifier of the form used during user\r

                                  identification.\r
                                  identification.\r

- \r
+\r

   @retval EFI_SUCCESS            Form returned successfully.\r
   @retval EFI_NOT_FOUND          Form not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or FormSetId is NULL or FormId is NULL.\r
   @retval EFI_SUCCESS            Form returned successfully.\r
   @retval EFI_NOT_FOUND          Form not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or FormSetId is NULL or FormId is NULL.\r


@@ -85,19 +85,19 @@ EFI_STATUS
 /**\r
   Returns bitmap used to describe the credential provider type.\r
 \r
 /**\r
   Returns bitmap used to describe the credential provider type.\r
 \r

-  This optional function returns a bitmap which is less than or equal to the number of pixels specified \r
-  by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND is returned. \r
+  This optional function returns a bitmap which is less than or equal to the number of pixels specified\r
+  by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND is returned.\r

 \r
   @param[in]      This           Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
   @param[in, out] Width          On entry, points to the desired bitmap width. If NULL then no bitmap\r
 \r
   @param[in]      This           Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
   @param[in, out] Width          On entry, points to the desired bitmap width. If NULL then no bitmap\r

-                                 information will be returned. On exit, points to the width of the  \r
+                                 information will be returned. On exit, points to the width of the\r

                                  bitmap returned.\r
                                  bitmap returned.\r

-  @param[in, out] Height         On entry, points to the desired bitmap height. If NULL then no bitmap \r
-                                 information will be returned. On exit, points to the height of the  \r
+  @param[in, out] Height         On entry, points to the desired bitmap height. If NULL then no bitmap\r
+                                 information will be returned. On exit, points to the height of the\r

                                  bitmap returned\r
                                  bitmap returned\r

-  @param[out]     Hii            On return, holds the HII database handle. \r
-  @param[out]     Image          On return, holds the HII image identifier. \r
- \r
+  @param[out]     Hii            On return, holds the HII database handle.\r
+  @param[out]     Image          On return, holds the HII image identifier.\r
+\r

   @retval EFI_SUCCESS            Image identifier returned successfully.\r
   @retval EFI_NOT_FOUND          Image identifier not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or Image is NULL.\r
   @retval EFI_SUCCESS            Image identifier returned successfully.\r
   @retval EFI_NOT_FOUND          Image identifier not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or Image is NULL.\r


@@ -115,13 +115,13 @@ EFI_STATUS
 /**\r
   Returns string used to describe the credential provider type.\r
 \r
 /**\r
   Returns string used to describe the credential provider type.\r
 \r

-  This function returns a string which describes the credential provider. If no such string exists, then \r
-  EFI_NOT_FOUND is returned. \r
+  This function returns a string which describes the credential provider. If no such string exists, then\r
+  EFI_NOT_FOUND is returned.\r

 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
   @param[out] Hii                On return, holds the HII database handle.\r
   @param[out] String             On return, holds the HII string identifier.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
   @param[out] Hii                On return, holds the HII database handle.\r
   @param[out] String             On return, holds the HII string identifier.\r

- \r
+\r

   @retval EFI_SUCCESS            String identifier returned successfully.\r
   @retval EFI_NOT_FOUND          String identifier not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or String is NULL.\r
   @retval EFI_SUCCESS            String identifier returned successfully.\r
   @retval EFI_NOT_FOUND          String identifier not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or String is NULL.\r


@@ -137,21 +137,21 @@ EFI_STATUS
 /**\r
   Return the user identifier associated with the currently authenticated user.\r
 \r
 /**\r
   Return the user identifier associated with the currently authenticated user.\r
 \r

-  This function returns the user identifier of the user authenticated by this credential provider. This \r
-  function is called after the credential-related information has been submitted on a form OR after a \r
+  This function returns the user identifier of the user authenticated by this credential provider. This\r
+  function is called after the credential-related information has been submitted on a form OR after a\r

   call to Default() has returned that this credential is ready to log on.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
   call to Default() has returned that this credential is ready to log on.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r

-  @param[in]  User               The user profile handle of the user profile currently being considered \r
-                                 by the user identity manager. If NULL, then no user profile is currently \r
+  @param[in]  User               The user profile handle of the user profile currently being considered\r
+                                 by the user identity manager. If NULL, then no user profile is currently\r

                                  under consideration.\r
                                  under consideration.\r

-  @param[out] Identifier         On return, points to the user identifier. \r
- \r
+  @param[out] Identifier         On return, points to the user identifier.\r
+\r

   @retval EFI_SUCCESS            User identifier returned successfully.\r
   @retval EFI_NOT_READY          No user identifier can be returned.\r
   @retval EFI_ACCESS_DENIED      The user has been locked out of this user credential.\r
   @retval EFI_SUCCESS            User identifier returned successfully.\r
   @retval EFI_NOT_READY          No user identifier can be returned.\r
   @retval EFI_ACCESS_DENIED      The user has been locked out of this user credential.\r

-  @retval EFI_NOT_FOUND          User is not NULL, and the specified user handle can't be found in user \r
-                                 profile database \r
+  @retval EFI_NOT_FOUND          User is not NULL, and the specified user handle can't be found in user\r
+                                 profile database\r

   @retval EFI_INVALID_PARAMETER  Identifier is NULL.\r
 **/\r
 typedef\r
   @retval EFI_INVALID_PARAMETER  Identifier is NULL.\r
 **/\r
 typedef\r


@@ -165,13 +165,13 @@ EFI_STATUS
 /**\r
   Indicate that user interface interaction has begun for the specified credential.\r
 \r
 /**\r
   Indicate that user interface interaction has begun for the specified credential.\r
 \r

-  This function is called when a credential provider is selected by the user. If AutoLogon returns \r
-  FALSE, then the user interface will be constructed by the User Identity Manager. \r
+  This function is called when a credential provider is selected by the user. If AutoLogon returns\r
+  FALSE, then the user interface will be constructed by the User Identity Manager.\r

 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r

-  @param[out] AutoLogon          On return, points to the credential provider's capabilities after \r
-                                 the credential provider has been selected by the user. \r
- \r
+  @param[out] AutoLogon          On return, points to the credential provider's capabilities after\r
+                                 the credential provider has been selected by the user.\r
+\r

   @retval EFI_SUCCESS            Credential provider successfully selected.\r
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.\r
 **/\r
   @retval EFI_SUCCESS            Credential provider successfully selected.\r
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.\r
 **/\r


@@ -180,7 +180,7 @@ EFI_STATUS
 (EFIAPI *EFI_CREDENTIAL_SELECT)(\r
   IN CONST EFI_USER_CREDENTIAL_PROTOCOL  *This,\r
   OUT      EFI_CREDENTIAL_LOGON_FLAGS    *AutoLogon\r
 (EFIAPI *EFI_CREDENTIAL_SELECT)(\r
   IN CONST EFI_USER_CREDENTIAL_PROTOCOL  *This,\r
   OUT      EFI_CREDENTIAL_LOGON_FLAGS    *AutoLogon\r

-  ); \r
+  );\r

 \r
 /**\r
   Indicate that user interface interaction has ended for the specified credential.\r
 \r
 /**\r
   Indicate that user interface interaction has ended for the specified credential.\r


@@ -188,7 +188,7 @@ EFI_STATUS
   This function is called when a credential provider is deselected by the user.\r
 \r
   @param[in] This        Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
   This function is called when a credential provider is deselected by the user.\r
 \r
   @param[in] This        Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r

- \r
+\r

   @retval EFI_SUCCESS    Credential provider successfully deselected.\r
 **/\r
 typedef\r
   @retval EFI_SUCCESS    Credential provider successfully deselected.\r
 **/\r
 typedef\r


@@ -200,16 +200,16 @@ EFI_STATUS
 /**\r
   Return the default logon behavior for this user credential.\r
 \r
 /**\r
   Return the default logon behavior for this user credential.\r
 \r

-  This function reports the default login behavior regarding this credential provider.  \r
+  This function reports the default login behavior regarding this credential provider.\r

 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r

-  @param[out] AutoLogon          On return, holds whether the credential provider should be \r
-                                 used by default to automatically log on the user.  \r
- \r
+  @param[out] AutoLogon          On return, holds whether the credential provider should be\r
+                                 used by default to automatically log on the user.\r
+\r

   @retval EFI_SUCCESS            Default information successfully returned.\r
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.\r
 **/\r
   @retval EFI_SUCCESS            Default information successfully returned.\r
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.\r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_CREDENTIAL_DEFAULT)(\r
   IN  CONST EFI_USER_CREDENTIAL_PROTOCOL        *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_CREDENTIAL_DEFAULT)(\r
   IN  CONST EFI_USER_CREDENTIAL_PROTOCOL        *This,\r


@@ -219,22 +219,22 @@ EFI_STATUS
 /**\r
   Return information attached to the credential provider.\r
 \r
 /**\r
   Return information attached to the credential provider.\r
 \r

-  This function returns user information. \r
+  This function returns user information.\r

 \r
   @param[in]     This           Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
 \r
   @param[in]     This           Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r

-  @param[in]     UserInfo       Handle of the user information data record. \r
-  @param[out]    Info           On entry, points to a buffer of at least *InfoSize bytes. On exit, holds the user \r
-                                information. If the buffer is too small to hold the information, then \r
-                                EFI_BUFFER_TOO_SMALL is returned and InfoSize is updated to contain the \r
+  @param[in]     UserInfo       Handle of the user information data record.\r
+  @param[out]    Info           On entry, points to a buffer of at least *InfoSize bytes. On exit, holds the user\r
+                                information. If the buffer is too small to hold the information, then\r
+                                EFI_BUFFER_TOO_SMALL is returned and InfoSize is updated to contain the\r

                                 number of bytes actually required.\r
                                 number of bytes actually required.\r

-  @param[in,out] InfoSize       On entry, points to the size of Info. On return, points to the size of the user \r
-                                information. \r
- \r
+  @param[in,out] InfoSize       On entry, points to the size of Info. On return, points to the size of the user\r
+                                information.\r
+\r

   @retval EFI_SUCCESS           Information returned successfully.\r
   @retval EFI_SUCCESS           Information returned successfully.\r

-  @retval EFI_BUFFER_TOO_SMALL  The size specified by InfoSize is too small to hold all of the user \r
+  @retval EFI_BUFFER_TOO_SMALL  The size specified by InfoSize is too small to hold all of the user\r

                                 information. The size required is returned in *InfoSize.\r
   @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle.\r
                                 information. The size required is returned in *InfoSize.\r
   @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle.\r

-  @retval EFI_INVALID_PARAMETER Info is NULL or InfoSize is NULL.                                \r
+  @retval EFI_INVALID_PARAMETER Info is NULL or InfoSize is NULL.\r

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


@@ -248,15 +248,15 @@ EFI_STATUS
 /**\r
   Enumerate all of the user information records on the credential provider.\r
 \r
 /**\r
   Enumerate all of the user information records on the credential provider.\r
 \r

-  This function returns the next user information record. To retrieve the first user information record \r
-  handle, point UserInfo at a NULL. Each subsequent call will retrieve another user information \r
-  record handle until there are no more, at which point UserInfo will point to NULL. \r
+  This function returns the next user information record. To retrieve the first user information record\r
+  handle, point UserInfo at a NULL. Each subsequent call will retrieve another user information\r
+  record handle until there are no more, at which point UserInfo will point to NULL.\r

 \r
   @param[in]     This            Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r
 \r
   @param[in]     This            Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.\r

-  @param[in,out] UserInfo        On entry, points to the previous user information handle or NULL to  \r
-                                 start enumeration. On exit, points to the next user information handle \r
+  @param[in,out] UserInfo        On entry, points to the previous user information handle or NULL to\r
+                                 start enumeration. On exit, points to the next user information handle\r

                                  or NULL if there is no more user information.\r
                                  or NULL if there is no more user information.\r

- \r
+\r

   @retval EFI_SUCCESS            User information returned.\r
   @retval EFI_NOT_FOUND          No more user information found.\r
   @retval EFI_INVALID_PARAMETER  UserInfo is NULL.\r
   @retval EFI_SUCCESS            User information returned.\r
   @retval EFI_NOT_FOUND          No more user information found.\r
   @retval EFI_INVALID_PARAMETER  UserInfo is NULL.\r


@@ -279,7 +279,7 @@ struct _EFI_USER_CREDENTIAL_PROTOCOL {
   EFI_CREDENTIAL_TILE           Tile;\r
   EFI_CREDENTIAL_TITLE          Title;\r
   EFI_CREDENTIAL_USER           User;\r
   EFI_CREDENTIAL_TILE           Tile;\r
   EFI_CREDENTIAL_TITLE          Title;\r
   EFI_CREDENTIAL_USER           User;\r

-  EFI_CREDENTIAL_SELECT         Select;   \r
+  EFI_CREDENTIAL_SELECT         Select;\r

   EFI_CREDENTIAL_DESELECT       Deselect;\r
   EFI_CREDENTIAL_DEFAULT        Default;\r
   EFI_CREDENTIAL_GET_INFO       GetInfo;\r
   EFI_CREDENTIAL_DESELECT       Deselect;\r
   EFI_CREDENTIAL_DEFAULT        Default;\r
   EFI_CREDENTIAL_GET_INFO       GetInfo;\r

diff --git a/MdePkg/Include/Protocol/UserCredential2.h b/MdePkg/Include/Protocol/UserCredential2.h
index b023dd6864f0d7aca8da0bcb9a3e6cd5e5a4c902..1ab831c7fcd12e67a19d2a171c4d5ff73d9e067d 100644 (file)
--- a/MdePkg/Include/Protocol/UserCredential2.h
+++ b/MdePkg/Include/Protocol/UserCredential2.h
@@ -3,14 +3,14 @@
 \r
   Attached to a device handle, this protocol identifies a single means of identifying the user.\r
 \r
 \r
   Attached to a device handle, this protocol identifies a single means of identifying the user.\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
+  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
 \r

-  THE PROGRAM 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,16 +29,16 @@ typedef struct _EFI_USER_CREDENTIAL2_PROTOCOL  EFI_USER_CREDENTIAL2_PROTOCOL;
 /**\r
   Enroll a user on a credential provider.\r
 \r
 /**\r
   Enroll a user on a credential provider.\r
 \r

-  This function enrolls a user on this credential provider. If the user exists on this credential \r
-  provider, update the user information on this credential provider; otherwise add the user information \r
+  This function enrolls a user on this credential provider. If the user exists on this credential\r
+  provider, update the user information on this credential provider; otherwise add the user information\r

   on credential provider.\r
 \r
   @param[in] This                Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   @param[in] User                The user profile to enroll.\r
   on credential provider.\r
 \r
   @param[in] This                Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   @param[in] User                The user profile to enroll.\r

- \r
+\r

   @retval EFI_SUCCESS            User profile was successfully enrolled.\r
   @retval EFI_SUCCESS            User profile was successfully enrolled.\r

-  @retval EFI_ACCESS_DENIED      Current user profile does not permit enrollment on the user profile \r
-                                 handle. Either the user profile cannot enroll on any user profile or \r
+  @retval EFI_ACCESS_DENIED      Current user profile does not permit enrollment on the user profile\r
+                                 handle. Either the user profile cannot enroll on any user profile or\r

                                  cannot enroll on a user profile other than the current user profile.\r
   @retval EFI_UNSUPPORTED        This credential provider does not support enrollment in the pre-OS.\r
   @retval EFI_DEVICE_ERROR       The new credential could not be created because of a device error.\r
                                  cannot enroll on a user profile other than the current user profile.\r
   @retval EFI_UNSUPPORTED        This credential provider does not support enrollment in the pre-OS.\r
   @retval EFI_DEVICE_ERROR       The new credential could not be created because of a device error.\r


@@ -54,19 +54,19 @@ EFI_STATUS
 /**\r
   Returns the user interface information used during user identification.\r
 \r
 /**\r
   Returns the user interface information used during user identification.\r
 \r

-  This function returns information about the form used when interacting with the user during user \r
-  identification. The form is the first enabled form in the form-set class \r
-  EFI_HII_USER_CREDENTIAL_FORMSET_GUID installed on the HII handle HiiHandle. If \r
-  the user credential provider does not require a form to identify the user, then this function should \r
+  This function returns information about the form used when interacting with the user during user\r
+  identification. The form is the first enabled form in the form-set class\r
+  EFI_HII_USER_CREDENTIAL_FORMSET_GUID installed on the HII handle HiiHandle. If\r
+  the user credential provider does not require a form to identify the user, then this function should\r

   return EFI_NOT_FOUND.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   @param[out] Hii                On return, holds the HII database handle.\r
   @param[out] FormSetId          On return, holds the identifier of the form set which contains\r
                                  the form used during user identification.\r
   return EFI_NOT_FOUND.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   @param[out] Hii                On return, holds the HII database handle.\r
   @param[out] FormSetId          On return, holds the identifier of the form set which contains\r
                                  the form used during user identification.\r

-  @param[out] FormId             On return, holds the identifier of the form used during user \r
+  @param[out] FormId             On return, holds the identifier of the form used during user\r

                                  identification.\r
                                  identification.\r

- \r
+\r

   @retval EFI_SUCCESS            Form returned successfully.\r
   @retval EFI_NOT_FOUND          Form not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or FormSetId is NULL or FormId is NULL.\r
   @retval EFI_SUCCESS            Form returned successfully.\r
   @retval EFI_NOT_FOUND          Form not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or FormSetId is NULL or FormId is NULL.\r


@@ -83,19 +83,19 @@ EFI_STATUS
 /**\r
   Returns bitmap used to describe the credential provider type.\r
 \r
 /**\r
   Returns bitmap used to describe the credential provider type.\r
 \r

-  This optional function returns a bitmap which is less than or equal to the number of pixels specified \r
-  by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND is returned. \r
+  This optional function returns a bitmap which is less than or equal to the number of pixels specified\r
+  by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND is returned.\r

 \r
   @param[in]      This           Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   @param[in, out] Width          On entry, points to the desired bitmap width. If NULL then no bitmap\r
 \r
   @param[in]      This           Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   @param[in, out] Width          On entry, points to the desired bitmap width. If NULL then no bitmap\r

-                                 information will be returned. On exit, points to the width of the  \r
+                                 information will be returned. On exit, points to the width of the\r

                                  bitmap returned.\r
                                  bitmap returned.\r

-  @param[in, out] Height         On entry, points to the desired bitmap height. If NULL then no bitmap \r
-                                 information will be returned. On exit, points to the height of the  \r
+  @param[in, out] Height         On entry, points to the desired bitmap height. If NULL then no bitmap\r
+                                 information will be returned. On exit, points to the height of the\r

                                  bitmap returned\r
                                  bitmap returned\r

-  @param[out]     Hii            On return, holds the HII database handle. \r
-  @param[out]     Image          On return, holds the HII image identifier. \r
- \r
+  @param[out]     Hii            On return, holds the HII database handle.\r
+  @param[out]     Image          On return, holds the HII image identifier.\r
+\r

   @retval EFI_SUCCESS            Image identifier returned successfully.\r
   @retval EFI_NOT_FOUND          Image identifier not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or Image is NULL.\r
   @retval EFI_SUCCESS            Image identifier returned successfully.\r
   @retval EFI_NOT_FOUND          Image identifier not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or Image is NULL.\r


@@ -113,13 +113,13 @@ EFI_STATUS
 /**\r
   Returns string used to describe the credential provider type.\r
 \r
 /**\r
   Returns string used to describe the credential provider type.\r
 \r

-  This function returns a string which describes the credential provider. If no such string exists, then \r
-  EFI_NOT_FOUND is returned. \r
+  This function returns a string which describes the credential provider. If no such string exists, then\r
+  EFI_NOT_FOUND is returned.\r

 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   @param[out] Hii                On return, holds the HII database handle.\r
   @param[out] String             On return, holds the HII string identifier.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   @param[out] Hii                On return, holds the HII database handle.\r
   @param[out] String             On return, holds the HII string identifier.\r

- \r
+\r

   @retval EFI_SUCCESS            String identifier returned successfully.\r
   @retval EFI_NOT_FOUND          String identifier not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or String is NULL.\r
   @retval EFI_SUCCESS            String identifier returned successfully.\r
   @retval EFI_NOT_FOUND          String identifier not returned.\r
   @retval EFI_INVALID_PARAMETER  Hii is NULL or String is NULL.\r


@@ -135,21 +135,21 @@ EFI_STATUS
 /**\r
   Return the user identifier associated with the currently authenticated user.\r
 \r
 /**\r
   Return the user identifier associated with the currently authenticated user.\r
 \r

-  This function returns the user identifier of the user authenticated by this credential provider. This \r
-  function is called after the credential-related information has been submitted on a form OR after a \r
+  This function returns the user identifier of the user authenticated by this credential provider. This\r
+  function is called after the credential-related information has been submitted on a form OR after a\r

   call to Default() has returned that this credential is ready to log on.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   call to Default() has returned that this credential is ready to log on.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r

-  @param[in]  User               The user profile handle of the user profile currently being considered \r
-                                 by the user identity manager. If NULL, then no user profile is currently \r
+  @param[in]  User               The user profile handle of the user profile currently being considered\r
+                                 by the user identity manager. If NULL, then no user profile is currently\r

                                  under consideration.\r
                                  under consideration.\r

-  @param[out] Identifier         On return, points to the user identifier. \r
- \r
+  @param[out] Identifier         On return, points to the user identifier.\r
+\r

   @retval EFI_SUCCESS            User identifier returned successfully.\r
   @retval EFI_NOT_READY          No user identifier can be returned.\r
   @retval EFI_ACCESS_DENIED      The user has been locked out of this user credential.\r
   @retval EFI_SUCCESS            User identifier returned successfully.\r
   @retval EFI_NOT_READY          No user identifier can be returned.\r
   @retval EFI_ACCESS_DENIED      The user has been locked out of this user credential.\r

-  @retval EFI_NOT_FOUND          User is not NULL, and the specified user handle can't be found in user \r
-                                 profile database \r
+  @retval EFI_NOT_FOUND          User is not NULL, and the specified user handle can't be found in user\r
+                                 profile database\r

   @retval EFI_INVALID_PARAMETER  Identifier is NULL.\r
 **/\r
 typedef\r
   @retval EFI_INVALID_PARAMETER  Identifier is NULL.\r
 **/\r
 typedef\r


@@ -163,13 +163,13 @@ EFI_STATUS
 /**\r
   Indicate that user interface interaction has begun for the specified credential.\r
 \r
 /**\r
   Indicate that user interface interaction has begun for the specified credential.\r
 \r

-  This function is called when a credential provider is selected by the user. If AutoLogon returns \r
-  FALSE, then the user interface will be constructed by the User Identity Manager. \r
+  This function is called when a credential provider is selected by the user. If AutoLogon returns\r
+  FALSE, then the user interface will be constructed by the User Identity Manager.\r

 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r

-  @param[out] AutoLogon          On return, points to the credential provider's capabilities after \r
-                                 the credential provider has been selected by the user. \r
- \r
+  @param[out] AutoLogon          On return, points to the credential provider's capabilities after\r
+                                 the credential provider has been selected by the user.\r
+\r

   @retval EFI_SUCCESS            Credential provider successfully selected.\r
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.\r
 **/\r
   @retval EFI_SUCCESS            Credential provider successfully selected.\r
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.\r
 **/\r


@@ -178,7 +178,7 @@ EFI_STATUS
 (EFIAPI *EFI_CREDENTIAL2_SELECT)(\r
   IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,\r
   OUT      EFI_CREDENTIAL_LOGON_FLAGS    *AutoLogon\r
 (EFIAPI *EFI_CREDENTIAL2_SELECT)(\r
   IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,\r
   OUT      EFI_CREDENTIAL_LOGON_FLAGS    *AutoLogon\r

-  ); \r
+  );\r

 \r
 /**\r
   Indicate that user interface interaction has ended for the specified credential.\r
 \r
 /**\r
   Indicate that user interface interaction has ended for the specified credential.\r


@@ -186,7 +186,7 @@ EFI_STATUS
   This function is called when a credential provider is deselected by the user.\r
 \r
   @param[in] This        Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   This function is called when a credential provider is deselected by the user.\r
 \r
   @param[in] This        Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r

- \r
+\r

   @retval EFI_SUCCESS    Credential provider successfully deselected.\r
 **/\r
 typedef\r
   @retval EFI_SUCCESS    Credential provider successfully deselected.\r
 **/\r
 typedef\r


@@ -198,16 +198,16 @@ EFI_STATUS
 /**\r
   Return the default logon behavior for this user credential.\r
 \r
 /**\r
   Return the default logon behavior for this user credential.\r
 \r

-  This function reports the default login behavior regarding this credential provider.  \r
+  This function reports the default login behavior regarding this credential provider.\r

 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r

-  @param[out] AutoLogon          On return, holds whether the credential provider should be \r
-                                 used by default to automatically log on the user.  \r
- \r
+  @param[out] AutoLogon          On return, holds whether the credential provider should be\r
+                                 used by default to automatically log on the user.\r
+\r

   @retval EFI_SUCCESS            Default information successfully returned.\r
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.\r
 **/\r
   @retval EFI_SUCCESS            Default information successfully returned.\r
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.\r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_CREDENTIAL2_DEFAULT)(\r
   IN  CONST EFI_USER_CREDENTIAL2_PROTOCOL       *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_CREDENTIAL2_DEFAULT)(\r
   IN  CONST EFI_USER_CREDENTIAL2_PROTOCOL       *This,\r


@@ -217,22 +217,22 @@ EFI_STATUS
 /**\r
   Return information attached to the credential provider.\r
 \r
 /**\r
   Return information attached to the credential provider.\r
 \r

-  This function returns user information. \r
+  This function returns user information.\r

 \r
   @param[in]     This           Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
 \r
   @param[in]     This           Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r

-  @param[in]     UserInfo       Handle of the user information data record. \r
-  @param[out]    Info           On entry, points to a buffer of at least *InfoSize bytes. On exit, holds the user \r
-                                information. If the buffer is too small to hold the information, then \r
-                                EFI_BUFFER_TOO_SMALL is returned and InfoSize is updated to contain the \r
+  @param[in]     UserInfo       Handle of the user information data record.\r
+  @param[out]    Info           On entry, points to a buffer of at least *InfoSize bytes. On exit, holds the user\r
+                                information. If the buffer is too small to hold the information, then\r
+                                EFI_BUFFER_TOO_SMALL is returned and InfoSize is updated to contain the\r

                                 number of bytes actually required.\r
                                 number of bytes actually required.\r

-  @param[in,out] InfoSize       On entry, points to the size of Info. On return, points to the size of the user \r
-                                information. \r
- \r
+  @param[in,out] InfoSize       On entry, points to the size of Info. On return, points to the size of the user\r
+                                information.\r
+\r

   @retval EFI_SUCCESS           Information returned successfully.\r
   @retval EFI_SUCCESS           Information returned successfully.\r

-  @retval EFI_BUFFER_TOO_SMALL  The size specified by InfoSize is too small to hold all of the user \r
+  @retval EFI_BUFFER_TOO_SMALL  The size specified by InfoSize is too small to hold all of the user\r

                                 information. The size required is returned in *InfoSize.\r
   @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle.\r
                                 information. The size required is returned in *InfoSize.\r
   @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle.\r

-  @retval EFI_INVALID_PARAMETER Info is NULL or InfoSize is NULL.                                \r
+  @retval EFI_INVALID_PARAMETER Info is NULL or InfoSize is NULL.\r

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


@@ -246,15 +246,15 @@ EFI_STATUS
 /**\r
   Enumerate all of the user information records on the credential provider.\r
 \r
 /**\r
   Enumerate all of the user information records on the credential provider.\r
 \r

-  This function returns the next user information record. To retrieve the first user information record \r
-  handle, point UserInfo at a NULL. Each subsequent call will retrieve another user information \r
-  record handle until there are no more, at which point UserInfo will point to NULL. \r
+  This function returns the next user information record. To retrieve the first user information record\r
+  handle, point UserInfo at a NULL. Each subsequent call will retrieve another user information\r
+  record handle until there are no more, at which point UserInfo will point to NULL.\r

 \r
   @param[in]     This            Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
 \r
   @param[in]     This            Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r

-  @param[in,out] UserInfo        On entry, points to the previous user information handle or NULL to  \r
-                                 start enumeration. On exit, points to the next user information handle \r
+  @param[in,out] UserInfo        On entry, points to the previous user information handle or NULL to\r
+                                 start enumeration. On exit, points to the next user information handle\r

                                  or NULL if there is no more user information.\r
                                  or NULL if there is no more user information.\r

- \r
+\r

   @retval EFI_SUCCESS            User information returned.\r
   @retval EFI_NOT_FOUND          No more user information found.\r
   @retval EFI_INVALID_PARAMETER  UserInfo is NULL.\r
   @retval EFI_SUCCESS            User information returned.\r
   @retval EFI_NOT_FOUND          No more user information found.\r
   @retval EFI_INVALID_PARAMETER  UserInfo is NULL.\r


@@ -269,21 +269,21 @@ EFI_STATUS
 /**\r
   Delete a user on this credential provider.\r
 \r
 /**\r
   Delete a user on this credential provider.\r
 \r

-  This function deletes a user on this credential provider. \r
+  This function deletes a user on this credential provider.\r

 \r
   @param[in]     This            Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   @param[in]     User            The user profile handle to delete.\r
 \r
   @retval EFI_SUCCESS            User profile was successfully deleted.\r
 \r
   @param[in]     This            Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.\r
   @param[in]     User            The user profile handle to delete.\r
 \r
   @retval EFI_SUCCESS            User profile was successfully deleted.\r

-  @retval EFI_ACCESS_DENIED      Current user profile does not permit deletion on the user profile handle. \r
-                                 Either the user profile cannot delete on any user profile or cannot delete \r
-                                 on a user profile other than the current user profile. \r
+  @retval EFI_ACCESS_DENIED      Current user profile does not permit deletion on the user profile handle.\r
+                                 Either the user profile cannot delete on any user profile or cannot delete\r
+                                 on a user profile other than the current user profile.\r

   @retval EFI_UNSUPPORTED        This credential provider does not support deletion in the pre-OS.\r
   @retval EFI_DEVICE_ERROR       The new credential could not be deleted because of a device error.\r
   @retval EFI_INVALID_PARAMETER  User does not refer to a valid user profile handle.\r
 **/\r
   @retval EFI_UNSUPPORTED        This credential provider does not support deletion in the pre-OS.\r
   @retval EFI_DEVICE_ERROR       The new credential could not be deleted because of a device error.\r
   @retval EFI_INVALID_PARAMETER  User does not refer to a valid user profile handle.\r
 **/\r

-typedef \r
-EFI_STATUS \r
+typedef\r
+EFI_STATUS\r

 (EFIAPI *EFI_CREDENTIAL2_DELETE)(\r
  IN CONST EFI_USER_CREDENTIAL2_PROTOCOL  *This,\r
  IN       EFI_USER_PROFILE_HANDLE        User\r
 (EFIAPI *EFI_CREDENTIAL2_DELETE)(\r
  IN CONST EFI_USER_CREDENTIAL2_PROTOCOL  *This,\r
  IN       EFI_USER_PROFILE_HANDLE        User\r


@@ -300,13 +300,13 @@ struct _EFI_USER_CREDENTIAL2_PROTOCOL {
   EFI_CREDENTIAL2_TILE          Tile;\r
   EFI_CREDENTIAL2_TITLE         Title;\r
   EFI_CREDENTIAL2_USER          User;\r
   EFI_CREDENTIAL2_TILE          Tile;\r
   EFI_CREDENTIAL2_TITLE         Title;\r
   EFI_CREDENTIAL2_USER          User;\r

-  EFI_CREDENTIAL2_SELECT        Select;   \r
+  EFI_CREDENTIAL2_SELECT        Select;\r

   EFI_CREDENTIAL2_DESELECT      Deselect;\r
   EFI_CREDENTIAL2_DEFAULT       Default;\r
   EFI_CREDENTIAL2_GET_INFO      GetInfo;\r
   EFI_CREDENTIAL2_GET_NEXT_INFO GetNextInfo;\r
   EFI_CREDENTIAL_CAPABILITIES   Capabilities;\r
   EFI_CREDENTIAL2_DESELECT      Deselect;\r
   EFI_CREDENTIAL2_DEFAULT       Default;\r
   EFI_CREDENTIAL2_GET_INFO      GetInfo;\r
   EFI_CREDENTIAL2_GET_NEXT_INFO GetNextInfo;\r
   EFI_CREDENTIAL_CAPABILITIES   Capabilities;\r

-  EFI_CREDENTIAL2_DELETE        Delete; \r
+  EFI_CREDENTIAL2_DELETE        Delete;\r

 };\r
 \r
 extern EFI_GUID gEfiUserCredential2ProtocolGuid;\r
 };\r
 \r
 extern EFI_GUID gEfiUserCredential2ProtocolGuid;\r

diff --git a/MdePkg/Include/Protocol/UserManager.h b/MdePkg/Include/Protocol/UserManager.h
index 8c9f662228455f61f59dcfe19c3b46b78ce6e9fb..32950ae23f8dac9f7632183df1e378919245da73 100644 (file)
--- a/MdePkg/Include/Protocol/UserManager.h
+++ b/MdePkg/Include/Protocol/UserManager.h
@@ -3,14 +3,14 @@
 \r
   This protocol manages user profiles.\r
 \r
 \r
   This protocol manages user profiles.\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
+  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
 \r

-  THE PROGRAM 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


@@ -53,7 +53,7 @@ typedef UINT16 EFI_USER_INFO_ATTRIBS;
 ///\r
 typedef struct {\r
   ///\r
 ///\r
 typedef struct {\r
   ///\r

-  /// The user credential identifier associated with this user information or else Nil if the \r
+  /// The user credential identifier associated with this user information or else Nil if the\r

   /// information is not associated with any specific credential.\r
   ///\r
   EFI_GUID               Credential;\r
   /// information is not associated with any specific credential.\r
   ///\r
   EFI_GUID               Credential;\r


@@ -95,7 +95,7 @@ typedef UINT64   EFI_CREDENTIAL_CAPABILITIES;
 #define EFI_CREDENTIAL_CAPABILITIES_ENROLL  0x0000000000000001\r
 \r
 ///\r
 #define EFI_CREDENTIAL_CAPABILITIES_ENROLL  0x0000000000000001\r
 \r
 ///\r

-/// Credential logon flags \r
+/// Credential logon flags\r

 ///\r
 typedef UINT32 EFI_CREDENTIAL_LOGON_FLAGS;\r
 #define EFI_CREDENTIAL_LOGON_FLAG_AUTO                0x00000001\r
 ///\r
 typedef UINT32 EFI_CREDENTIAL_LOGON_FLAGS;\r
 #define EFI_CREDENTIAL_LOGON_FLAG_AUTO                0x00000001\r


@@ -159,7 +159,7 @@ typedef CHAR16 *EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME;
 ///\r
 #define EFI_USER_INFO_PKCS11_RECORD                   0x0A\r
 ///\r
 ///\r
 #define EFI_USER_INFO_PKCS11_RECORD                   0x0A\r
 ///\r

-/// Provides standard biometric information in the format specified by the ISO 19785 (Common \r
+/// Provides standard biometric information in the format specified by the ISO 19785 (Common\r

 /// Biometric Exchange Formats Framework) specification.\r
 ///\r
 #define EFI_USER_INFO_CBEFF_RECORD                    0x0B\r
 /// Biometric Exchange Formats Framework) specification.\r
 ///\r
 #define EFI_USER_INFO_CBEFF_RECORD                    0x0B\r


@@ -170,7 +170,7 @@ typedef VOID *EFI_USER_INFO_CBEFF;
 #define EFI_USER_INFO_FAR_RECORD                      0x0C\r
 typedef UINT8 EFI_USER_INFO_FAR;\r
 ///\r
 #define EFI_USER_INFO_FAR_RECORD                      0x0C\r
 typedef UINT8 EFI_USER_INFO_FAR;\r
 ///\r

-/// Indicates how many attempts the user has to with a particular credential before the system prevents \r
+/// Indicates how many attempts the user has to with a particular credential before the system prevents\r

 /// further attempts.\r
 ///\r
 #define EFI_USER_INFO_RETRY_RECORD                    0x0D\r
 /// further attempts.\r
 ///\r
 #define EFI_USER_INFO_RETRY_RECORD                    0x0D\r


@@ -192,12 +192,12 @@ typedef EFI_USER_INFO_ACCESS_CONTROL EFI_USER_INFO_ACCESS_POLICY;
 ///\r
 \r
 ///\r
 ///\r
 \r
 ///\r

-/// Forbids the user from booting or loading executables from the specified device path or any child \r
+/// Forbids the user from booting or loading executables from the specified device path or any child\r

 /// device paths.\r
 ///\r
 #define EFI_USER_INFO_ACCESS_FORBID_LOAD              0x00000001\r
 ///\r
 /// device paths.\r
 ///\r
 #define EFI_USER_INFO_ACCESS_FORBID_LOAD              0x00000001\r
 ///\r

-/// Permits the user from booting or loading executables from the specified device path or any child \r
+/// Permits the user from booting or loading executables from the specified device path or any child\r

 /// device paths.\r
 /// Note: in-consistency between code and the UEFI 2.3 specification here.\r
 /// The definition EFI_USER_INFO_ACCESS_PERMIT_BOOT in the specification should be typo and wait for\r
 /// device paths.\r
 /// Note: in-consistency between code and the UEFI 2.3 specification here.\r
 /// The definition EFI_USER_INFO_ACCESS_PERMIT_BOOT in the specification should be typo and wait for\r


@@ -258,7 +258,7 @@ typedef UINT32 EFI_USER_INFO_ACCESS_BOOT_ORDER_HDR;
 ///\r
 #define EFI_USER_INFO_ACCESS_BOOT_ORDER_REPLACE       0x00000002\r
 ///\r
 ///\r
 #define EFI_USER_INFO_ACCESS_BOOT_ORDER_REPLACE       0x00000002\r
 ///\r

-/// The Boot Manager will not attempt find a default boot device \r
+/// The Boot Manager will not attempt find a default boot device\r

 /// when the default boot order is does not lead to a bootable device.\r
 ///\r
 #define EFI_USER_INFO_ACCESS_BOOT_ORDER_NODEFAULT     0x00000010\r
 /// when the default boot order is does not lead to a bootable device.\r
 ///\r
 #define EFI_USER_INFO_ACCESS_BOOT_ORDER_NODEFAULT     0x00000010\r


@@ -269,7 +269,7 @@ typedef UINT32 EFI_USER_INFO_ACCESS_BOOT_ORDER_HDR;
 #define EFI_USER_INFO_IDENTITY_POLICY_RECORD          0x0F\r
 \r
 typedef struct {\r
 #define EFI_USER_INFO_IDENTITY_POLICY_RECORD          0x0F\r
 \r
 typedef struct {\r

-  UINT32  Type;    ///< Specifies either an operator or a data item. \r
+  UINT32  Type;    ///< Specifies either an operator or a data item.\r

   UINT32  Length;  ///< The length of this block, in bytes, including this header.\r
 } EFI_USER_INFO_IDENTITY_POLICY;\r
 \r
   UINT32  Length;  ///< The length of this block, in bytes, including this header.\r
 } EFI_USER_INFO_IDENTITY_POLICY;\r
 \r


@@ -303,13 +303,13 @@ typedef struct _EFI_USER_MANAGER_PROTOCOL  EFI_USER_MANAGER_PROTOCOL;
 /**\r
   Create a new user profile.\r
 \r
 /**\r
   Create a new user profile.\r
 \r

-  This function creates a new user profile with only a new user identifier attached and returns its \r
+  This function creates a new user profile with only a new user identifier attached and returns its\r

   handle. The user profile is non-volatile, but the handle User can change across reboots.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
   handle. The user profile is non-volatile, but the handle User can change across reboots.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r

-  @param[out] User               On return, points to the new user profile handle. \r
+  @param[out] User               On return, points to the new user profile handle.\r

                                  The user profile handle is unique only during this boot.\r
                                  The user profile handle is unique only during this boot.\r

- \r
+\r

   @retval EFI_SUCCESS            User profile was successfully created.\r
   @retval EFI_ACCESS_DENIED      Current user does not have sufficient permissions to create a user profile.\r
   @retval EFI_UNSUPPORTED        Creation of new user profiles is not supported.\r
   @retval EFI_SUCCESS            User profile was successfully created.\r
   @retval EFI_ACCESS_DENIED      Current user does not have sufficient permissions to create a user profile.\r
   @retval EFI_UNSUPPORTED        Creation of new user profiles is not supported.\r


@@ -326,7 +326,7 @@ EFI_STATUS
   Delete an existing user profile.\r
 \r
   @param[in] This                Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
   Delete an existing user profile.\r
 \r
   @param[in] This                Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r

-  @param[in] User                User profile handle. \r
+  @param[in] User                User profile handle.\r

 \r
   @retval EFI_SUCCESS            User profile was successfully deleted.\r
   @retval EFI_ACCESS_DENIED      Current user does not have sufficient permissions to delete a user\r
 \r
   @retval EFI_SUCCESS            User profile was successfully deleted.\r
   @retval EFI_ACCESS_DENIED      Current user does not have sufficient permissions to delete a user\r


@@ -344,16 +344,16 @@ EFI_STATUS
 /**\r
   Enumerate all of the enrolled users on the platform.\r
 \r
 /**\r
   Enumerate all of the enrolled users on the platform.\r
 \r

-  This function returns the next enrolled user profile. To retrieve the first user profile handle, point \r
-  User at a NULL. Each subsequent call will retrieve another user profile handle until there are no \r
-  more, at which point User will point to NULL. \r
+  This function returns the next enrolled user profile. To retrieve the first user profile handle, point\r
+  User at a NULL. Each subsequent call will retrieve another user profile handle until there are no\r
+  more, at which point User will point to NULL.\r

 \r
   @param[in]     This            Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
 \r
   @param[in]     This            Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r

-  @param[in,out] User            On entry, points to the previous user profile handle or NULL to \r
+  @param[in,out] User            On entry, points to the previous user profile handle or NULL to\r

                                  start enumeration. On exit, points to the next user profile handle\r
                                  or NULL if there are no more user profiles.\r
 \r
                                  start enumeration. On exit, points to the next user profile handle\r
                                  or NULL if there are no more user profiles.\r
 \r

-  @retval EFI_SUCCESS            Next enrolled user profile successfully returned. \r
+  @retval EFI_SUCCESS            Next enrolled user profile successfully returned.\r

   @retval EFI_ACCESS_DENIED      Next enrolled user profile was not successfully returned.\r
   @retval EFI_INVALID_PARAMETER  The User parameter is NULL.\r
 **/\r
   @retval EFI_ACCESS_DENIED      Next enrolled user profile was not successfully returned.\r
   @retval EFI_INVALID_PARAMETER  The User parameter is NULL.\r
 **/\r


@@ -370,7 +370,7 @@ EFI_STATUS
   @param[in]  This               Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
   @param[out] CurrentUser        On return, points to the current user profile handle.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
   @param[out] CurrentUser        On return, points to the current user profile handle.\r
 \r

-  @retval EFI_SUCCESS            Current user profile handle returned successfully. \r
+  @retval EFI_SUCCESS            Current user profile handle returned successfully.\r

   @retval EFI_INVALID_PARAMETER  The CurrentUser parameter is NULL.\r
 **/\r
 typedef\r
   @retval EFI_INVALID_PARAMETER  The CurrentUser parameter is NULL.\r
 **/\r
 typedef\r


@@ -384,9 +384,9 @@ EFI_STATUS
   Identify a user.\r
 \r
   Identify the user and, if authenticated, returns the user handle and changes the current user profile.\r
   Identify a user.\r
 \r
   Identify the user and, if authenticated, returns the user handle and changes the current user profile.\r

-  All user information marked as private in a previously selected profile is no longer available for \r
-  inspection. \r
-  Whenever the current user profile is changed then the an event with the GUID \r
+  All user information marked as private in a previously selected profile is no longer available for\r
+  inspection.\r
+  Whenever the current user profile is changed then the an event with the GUID\r

   EFI_EVENT_GROUP_USER_PROFILE_CHANGED is signaled.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
   EFI_EVENT_GROUP_USER_PROFILE_CHANGED is signaled.\r
 \r
   @param[in]  This               Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r


@@ -406,26 +406,26 @@ EFI_STATUS
 /**\r
   Find a user using a user information record.\r
 \r
 /**\r
   Find a user using a user information record.\r
 \r

-  This function searches all user profiles for the specified user information record. The search starts \r
-  with the user information record handle following UserInfo and continues until either the \r
+  This function searches all user profiles for the specified user information record. The search starts\r
+  with the user information record handle following UserInfo and continues until either the\r

   information is found or there are no more user profiles.\r
   information is found or there are no more user profiles.\r

-  A match occurs when the Info.InfoType field matches the user information record type and the \r
+  A match occurs when the Info.InfoType field matches the user information record type and the\r

   user information record data matches the portion of Info.\r
 \r
   @param[in]     This      Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
   user information record data matches the portion of Info.\r
 \r
   @param[in]     This      Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r

-  @param[in,out] User      On entry, points to the previously returned user profile handle or NULL to start \r
-                           searching with the first user profile. On return, points to the user profile handle or \r
+  @param[in,out] User      On entry, points to the previously returned user profile handle or NULL to start\r
+                           searching with the first user profile. On return, points to the user profile handle or\r

                            NULL if not found.\r
                            NULL if not found.\r

-  @param[in,out] UserInfo  On entry, points to the previously returned user information handle or NULL to start \r
-                           searching with the first. On return, points to the user information handle of the user \r
-                           information record or NULL if not found. Can be NULL, in which case only one user \r
-                           information record per user can be returned. \r
-  @param[in]     Info      Points to the buffer containing the user information to be compared to the user \r
-                           information record. If the user information record data is empty, then only the user \r
-                           information record type is compared. \r
+  @param[in,out] UserInfo  On entry, points to the previously returned user information handle or NULL to start\r
+                           searching with the first. On return, points to the user information handle of the user\r
+                           information record or NULL if not found. Can be NULL, in which case only one user\r
+                           information record per user can be returned.\r
+  @param[in]     Info      Points to the buffer containing the user information to be compared to the user\r
+                           information record. If the user information record data is empty, then only the user\r
+                           information record type is compared.\r

                            If InfoSize is 0, then the user information record must be empty.\r
 \r
                            If InfoSize is 0, then the user information record must be empty.\r
 \r

-  @param[in]     InfoSize  The size of Info, in bytes. \r
+  @param[in]     InfoSize  The size of Info, in bytes.\r

 \r
   @retval EFI_SUCCESS           User information was found. User points to the user profile handle and UserInfo\r
                                 points to the user information handle.\r
 \r
   @retval EFI_SUCCESS           User information was found. User points to the user profile handle and UserInfo\r
                                 points to the user information handle.\r


@@ -445,15 +445,15 @@ EFI_STATUS
 /**\r
   Called by credential provider to notify of information change.\r
 \r
 /**\r
   Called by credential provider to notify of information change.\r
 \r

-  This function allows the credential provider to notify the User Identity Manager when user status  \r
+  This function allows the credential provider to notify the User Identity Manager when user status\r

   has changed.\r
   has changed.\r

-  If the User Identity Manager doesn't support asynchronous changes in credentials, then this function \r
-  should return EFI_UNSUPPORTED. \r
-  If current user does not exist, and the credential provider can identify a user, then make the user \r
+  If the User Identity Manager doesn't support asynchronous changes in credentials, then this function\r
+  should return EFI_UNSUPPORTED.\r
+  If current user does not exist, and the credential provider can identify a user, then make the user\r

   to be current user and signal the EFI_EVENT_GROUP_USER_PROFILE_CHANGED event.\r
   to be current user and signal the EFI_EVENT_GROUP_USER_PROFILE_CHANGED event.\r

-  If current user already exists, and the credential provider can identify another user, then switch \r
+  If current user already exists, and the credential provider can identify another user, then switch\r

   current user to the newly identified user, and signal the EFI_EVENT_GROUP_USER_PROFILE_CHANGED event.\r
   current user to the newly identified user, and signal the EFI_EVENT_GROUP_USER_PROFILE_CHANGED event.\r

-  If current user was identified by this credential provider and now the credential provider cannot identify \r
+  If current user was identified by this credential provider and now the credential provider cannot identify\r

   current user, then logout current user and signal the EFI_EVENT_GROUP_USER_PROFILE_CHANGED event.\r
 \r
   @param[in] This          Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
   current user, then logout current user and signal the EFI_EVENT_GROUP_USER_PROFILE_CHANGED event.\r
 \r
   @param[in] This          Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r


@@ -474,30 +474,30 @@ EFI_STATUS
 /**\r
   Return information attached to the user.\r
 \r
 /**\r
   Return information attached to the user.\r
 \r

-  This function returns user information. The format of the information is described in User \r
-  Information. The function may return EFI_ACCESS_DENIED if the information is marked private \r
-  and the handle specified by User is not the current user profile. The function may return \r
-  EFI_ACCESS_DENIED if the information is marked protected and the information is associated \r
+  This function returns user information. The format of the information is described in User\r
+  Information. The function may return EFI_ACCESS_DENIED if the information is marked private\r
+  and the handle specified by User is not the current user profile. The function may return\r
+  EFI_ACCESS_DENIED if the information is marked protected and the information is associated\r

   with a credential provider for which the user has not been authenticated.\r
 \r
   @param[in]     This           Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
   with a credential provider for which the user has not been authenticated.\r
 \r
   @param[in]     This           Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r

-  @param[in]     User           Handle of the user whose profile will be retrieved. \r
-  @param[in]     UserInfo       Handle of the user information data record.   \r
-  @param[out]    Info           On entry, points to a buffer of at least *InfoSize bytes. On exit, holds the user \r
-                                information. If the buffer is too small to hold the information, then \r
-                                EFI_BUFFER_TOO_SMALL is returned and InfoSize is updated to contain the \r
-                                number of bytes actually required. \r
-  @param[in,out] InfoSize       On entry, points to the size of Info. On return, points to the size of the user \r
-                                information. \r
+  @param[in]     User           Handle of the user whose profile will be retrieved.\r
+  @param[in]     UserInfo       Handle of the user information data record.\r
+  @param[out]    Info           On entry, points to a buffer of at least *InfoSize bytes. On exit, holds the user\r
+                                information. If the buffer is too small to hold the information, then\r
+                                EFI_BUFFER_TOO_SMALL is returned and InfoSize is updated to contain the\r
+                                number of bytes actually required.\r
+  @param[in,out] InfoSize       On entry, points to the size of Info. On return, points to the size of the user\r
+                                information.\r

 \r
   @retval EFI_SUCCESS           Information returned successfully.\r
   @retval EFI_ACCESS_DENIED     The information about the specified user cannot be accessed by the current user.\r
 \r
   @retval EFI_SUCCESS           Information returned successfully.\r
   @retval EFI_ACCESS_DENIED     The information about the specified user cannot be accessed by the current user.\r

-  @retval EFI_BUFFER_TOO_SMALL  The number of bytes specified by *InfoSize is too small to hold \r
+  @retval EFI_BUFFER_TOO_SMALL  The number of bytes specified by *InfoSize is too small to hold\r

                                 the returned data. The actual size required is returned in *InfoSize.\r
   @retval EFI_NOT_FOUND         User does not refer to a valid user profile or UserInfo does not refer to a valid\r
                                 user info handle.\r
   @retval EFI_INVALID_PARAMETER Info is NULL or InfoSize is NULL.\r
                                 the returned data. The actual size required is returned in *InfoSize.\r
   @retval EFI_NOT_FOUND         User does not refer to a valid user profile or UserInfo does not refer to a valid\r
                                 user info handle.\r
   @retval EFI_INVALID_PARAMETER Info is NULL or InfoSize is NULL.\r

-**/  \r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_USER_PROFILE_GET_INFO)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_USER_PROFILE_GET_INFO)(\r


@@ -511,33 +511,33 @@ EFI_STATUS
 /**\r
   Add or update user information.\r
 \r
 /**\r
   Add or update user information.\r
 \r

-  This function changes user information.  If NULL is pointed to by UserInfo, then a new user \r
-  information record is created and its handle is returned in UserInfo. Otherwise, the existing one is \r
+  This function changes user information.  If NULL is pointed to by UserInfo, then a new user\r
+  information record is created and its handle is returned in UserInfo. Otherwise, the existing one is\r

   replaced.\r
   replaced.\r

-  If EFI_USER_INFO_IDENTITY_POLICY_RECORD is changed, it is the caller's responsibility to keep it to \r
+  If EFI_USER_INFO_IDENTITY_POLICY_RECORD is changed, it is the caller's responsibility to keep it to\r

   be synced with the information on credential providers.\r
   be synced with the information on credential providers.\r

-  If EFI_USER_INFO_EXCLUSIVE is specified in Info and a user information record of the same \r
-  type already exists in the user profile, then EFI_ACCESS_DENIED will be returned and \r
+  If EFI_USER_INFO_EXCLUSIVE is specified in Info and a user information record of the same\r
+  type already exists in the user profile, then EFI_ACCESS_DENIED will be returned and\r

   UserInfo will point to the handle of the existing record.\r
 \r
   @param[in]     This             Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
   UserInfo will point to the handle of the existing record.\r
 \r
   @param[in]     This             Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r

-  @param[in]     User             Handle of the user whose profile will be retrieved. \r
-  @param[in,out] UserInfo         Handle of the user information data record.   \r
-  @param[in]     Info             On entry, points to a buffer of at least *InfoSize bytes. On exit, holds the user \r
-                                  information. If the buffer is too small to hold the information, then \r
-                                  EFI_BUFFER_TOO_SMALL is returned and InfoSize is updated to contain the \r
-                                  number of bytes actually required. \r
-  @param[in]     InfoSize         On entry, points to the size of Info. On return, points to the size of the user \r
-                                  information. \r
+  @param[in]     User             Handle of the user whose profile will be retrieved.\r
+  @param[in,out] UserInfo         Handle of the user information data record.\r
+  @param[in]     Info             On entry, points to a buffer of at least *InfoSize bytes. On exit, holds the user\r
+                                  information. If the buffer is too small to hold the information, then\r
+                                  EFI_BUFFER_TOO_SMALL is returned and InfoSize is updated to contain the\r
+                                  number of bytes actually required.\r
+  @param[in]     InfoSize         On entry, points to the size of Info. On return, points to the size of the user\r
+                                  information.\r

 \r
   @retval EFI_SUCCESS             Information returned successfully.\r
   @retval EFI_ACCESS_DENIED       The record is exclusive.\r
 \r
   @retval EFI_SUCCESS             Information returned successfully.\r
   @retval EFI_ACCESS_DENIED       The record is exclusive.\r

-  @retval EFI_SECURITY_VIOLATION  The current user does not have permission to change the specified \r
+  @retval EFI_SECURITY_VIOLATION  The current user does not have permission to change the specified\r

                                   user profile or user information record.\r
   @retval EFI_NOT_FOUND           User does not refer to a valid user profile or UserInfo does not refer to a valid\r
                                   user info handle.\r
                                   user profile or user information record.\r
   @retval EFI_NOT_FOUND           User does not refer to a valid user profile or UserInfo does not refer to a valid\r
                                   user info handle.\r

-  @retval EFI_INVALID_PARAMETER   UserInfo is NULL or Info is NULL. \r
-**/  \r
+  @retval EFI_INVALID_PARAMETER   UserInfo is NULL or Info is NULL.\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_USER_PROFILE_SET_INFO)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_USER_PROFILE_SET_INFO)(\r


@@ -559,8 +559,8 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS        User information deleted successfully.\r
   @retval EFI_NOT_FOUND      User information record UserInfo does not exist in the user profile.\r
 \r
   @retval EFI_SUCCESS        User information deleted successfully.\r
   @retval EFI_NOT_FOUND      User information record UserInfo does not exist in the user profile.\r

-  @retval EFI_ACCESS_DENIED  The current user does not have permission to delete this user information. \r
-**/ \r
+  @retval EFI_ACCESS_DENIED  The current user does not have permission to delete this user information.\r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_USER_PROFILE_DELETE_INFO)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_USER_PROFILE_DELETE_INFO)(\r


@@ -572,9 +572,9 @@ EFI_STATUS
 /**\r
   Enumerate user information of all the enrolled users on the platform.\r
 \r
 /**\r
   Enumerate user information of all the enrolled users on the platform.\r
 \r

-  This function returns the next user information record. To retrieve the first user information record \r
-  handle, point UserInfo at a NULL. Each subsequent call will retrieve another user information \r
-  record handle until there are no more, at which point UserInfo will point to NULL. \r
+  This function returns the next user information record. To retrieve the first user information record\r
+  handle, point UserInfo at a NULL. Each subsequent call will retrieve another user information\r
+  record handle until there are no more, at which point UserInfo will point to NULL.\r

 \r
   @param[in]     This           Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
   @param[in]     User           Handle of the user whose information will be deleted.\r
 \r
   @param[in]     This           Points to this instance of the EFI_USER_MANAGER_PROTOCOL.\r
   @param[in]     User           Handle of the user whose information will be deleted.\r


@@ -583,7 +583,7 @@ EFI_STATUS
   @retval EFI_SUCCESS           User information returned.\r
   @retval EFI_NOT_FOUND         No more user information found.\r
   @retval EFI_INVALID_PARAMETER UserInfo is NULL.\r
   @retval EFI_SUCCESS           User information returned.\r
   @retval EFI_NOT_FOUND         No more user information found.\r
   @retval EFI_INVALID_PARAMETER UserInfo is NULL.\r

-**/ \r
+**/\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_USER_PROFILE_GET_NEXT_INFO)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_USER_PROFILE_GET_NEXT_INFO)(\r

diff --git a/MdePkg/Include/Protocol/Variable.h b/MdePkg/Include/Protocol/Variable.h
index 43b40c6d9f664adf1365e412d440dc881870cef2..6fe27792896281e15353880b280ce6c56c92fda2 100644 (file)
--- a/MdePkg/Include/Protocol/Variable.h
+++ b/MdePkg/Include/Protocol/Variable.h
@@ -1,33 +1,33 @@
 /** @file\r
   Variable Architectural Protocol as defined in PI Specification VOLUME 2 DXE\r
 \r
 /** @file\r
   Variable Architectural Protocol as defined in PI Specification VOLUME 2 DXE\r
 \r

-  This provides the services required to get and set environment variables. This \r
-  protocol must be produced by a runtime DXE driver and may be consumed only by \r
-  the DXE Foundation. The DXE driver that produces this protocol must be a runtime \r
-  driver. This driver is responsible for initializing the GetVariable(), \r
+  This provides the services required to get and set environment variables. This\r
+  protocol must be produced by a runtime DXE driver and may be consumed only by\r
+  the DXE Foundation. The DXE driver that produces this protocol must be a runtime\r
+  driver. This driver is responsible for initializing the GetVariable(),\r

   GetNextVariableName(), and SetVariable() fields of the UEFI Runtime Services Table.\r
 \r
   GetNextVariableName(), and SetVariable() fields of the UEFI Runtime Services Table.\r
 \r

-  After the three fields of the UEFI Runtime Services Table have been initialized, \r
-  the driver must install the EFI_VARIABLE_ARCH_PROTOCOL_GUID on a new handle with \r
-  a NULL interface pointer. The installation of this protocol informs the DXE Foundation \r
-  that the read-only and the volatile environment variable related services are \r
-  now available and that the DXE Foundation must update the 32-bit CRC of the UEFI \r
-  Runtime Services Table. The full complement of environment variable services are \r
-  not available until both this protocol and EFI_VARIABLE_WRITE_ARCH_PROTOCOL are \r
-  installed. DXE drivers that require read-only access or read/write access to volatile \r
-  environment variables must have this architectural protocol in their dependency \r
-  expressions. DXE drivers that require write access to nonvolatile environment \r
-  variables must have the EFI_VARIABLE_WRITE_ARCH_PROTOCOL in their dependency \r
+  After the three fields of the UEFI Runtime Services Table have been initialized,\r
+  the driver must install the EFI_VARIABLE_ARCH_PROTOCOL_GUID on a new handle with\r
+  a NULL interface pointer. The installation of this protocol informs the DXE Foundation\r
+  that the read-only and the volatile environment variable related services are\r
+  now available and that the DXE Foundation must update the 32-bit CRC of the UEFI\r
+  Runtime Services Table. The full complement of environment variable services are\r
+  not available until both this protocol and EFI_VARIABLE_WRITE_ARCH_PROTOCOL are\r
+  installed. DXE drivers that require read-only access or read/write access to volatile\r
+  environment variables must have this architectural protocol in their dependency\r
+  expressions. DXE drivers that require write access to nonvolatile environment\r
+  variables must have the EFI_VARIABLE_WRITE_ARCH_PROTOCOL in their dependency\r

   expressions.\r
 \r
   expressions.\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
+  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


@@ -42,4 +42,4 @@
 \r
 extern EFI_GUID gEfiVariableArchProtocolGuid;\r
 \r
 \r
 extern EFI_GUID gEfiVariableArchProtocolGuid;\r
 \r

-#endif \r
+#endif\r

diff --git a/MdePkg/Include/Protocol/VariableWrite.h b/MdePkg/Include/Protocol/VariableWrite.h
index 5a4c15852dff68acc77b339b6c79c210024d616d..1e55b2fc54ef89067a16b6b5c79f17f10da3a9b9 100644 (file)
--- a/MdePkg/Include/Protocol/VariableWrite.h
+++ b/MdePkg/Include/Protocol/VariableWrite.h
@@ -1,33 +1,33 @@
 /** @file\r
   Variable Write Architectural Protocol as defined in PI Specification VOLUME 2 DXE\r
 \r
 /** @file\r
   Variable Write Architectural Protocol as defined in PI Specification VOLUME 2 DXE\r
 \r

-  This provides the services required to set nonvolatile environment variables. \r
-  This protocol must be produced by a runtime DXE driver and may be consumed only \r
+  This provides the services required to set nonvolatile environment variables.\r
+  This protocol must be produced by a runtime DXE driver and may be consumed only\r

   by the DXE Foundation.\r
 \r
   by the DXE Foundation.\r
 \r

-  The DXE driver that produces this protocol must be a runtime driver. This driver \r
+  The DXE driver that produces this protocol must be a runtime driver. This driver\r

   may update the SetVariable() field of the UEFI Runtime Services Table.\r
   may update the SetVariable() field of the UEFI Runtime Services Table.\r

-  \r
-  After the UEFI Runtime Services Table has been initialized, the driver must \r
-  install the EFI_VARIABLE_WRITE_ARCH_PROTOCOL_GUID on a new handle with a NULL \r
-  interface pointer. The installation of this protocol informs the DXE Foundation \r
-  that the write services for nonvolatile environment variables are now available \r
-  and that the DXE Foundation must update the 32-bit CRC of the UEFI Runtime Services \r
-  Table. The full complement of environment variable services are not available \r
-  until both this protocol and EFI_VARIABLE_ARCH_PROTOCOL are installed. DXE drivers \r
+\r
+  After the UEFI Runtime Services Table has been initialized, the driver must\r
+  install the EFI_VARIABLE_WRITE_ARCH_PROTOCOL_GUID on a new handle with a NULL\r
+  interface pointer. The installation of this protocol informs the DXE Foundation\r
+  that the write services for nonvolatile environment variables are now available\r
+  and that the DXE Foundation must update the 32-bit CRC of the UEFI Runtime Services\r
+  Table. The full complement of environment variable services are not available\r
+  until both this protocol and EFI_VARIABLE_ARCH_PROTOCOL are installed. DXE drivers\r

   that require read-only access or read/write access to volatile environment variables\r
   must have the EFI_VARIABLE_WRITE_ARCH_PROTOCOL in their dependency expressions.\r
   that require read-only access or read/write access to volatile environment variables\r
   must have the EFI_VARIABLE_WRITE_ARCH_PROTOCOL in their dependency expressions.\r

-  DXE drivers that require write access to nonvolatile environment variables must \r
-  have this architectural protocol in their dependency expressions.  \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
+  DXE drivers that require write access to nonvolatile environment variables must\r
+  have this architectural protocol in their dependency expressions.\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


@@ -42,4 +42,4 @@
 \r
 extern EFI_GUID gEfiVariableWriteArchProtocolGuid;\r
 \r
 \r
 extern EFI_GUID gEfiVariableWriteArchProtocolGuid;\r
 \r

-#endif \r
+#endif\r

diff --git a/MdePkg/Include/Protocol/VlanConfig.h b/MdePkg/Include/Protocol/VlanConfig.h
index 79153e711f411d4244cebad2918673998fb1e88c..c234269d681383fddc55cad8b0ffa6c45230f2bb 100644 (file)
--- a/MdePkg/Include/Protocol/VlanConfig.h
+++ b/MdePkg/Include/Protocol/VlanConfig.h
@@ -1,7 +1,7 @@
 /** @file\r
   EFI VLAN Config protocol is to provide manageability interface for VLAN configuration.\r
 \r
 /** @file\r
   EFI VLAN Config protocol is to provide manageability interface for VLAN configuration.\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


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

-  @par Revision Reference:          \r
+  @par Revision Reference:\r

   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r
   This Protocol is introduced in UEFI Specification 2.2\r
 \r
 **/\r


@@ -37,28 +37,28 @@ typedef struct {
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Create a VLAN device or modify the configuration parameter of an \r
+  Create a VLAN device or modify the configuration parameter of an\r

   already-configured VLAN.\r
 \r
   The Set() function is used to create a new VLAN device or change the VLAN\r
   already-configured VLAN.\r
 \r
   The Set() function is used to create a new VLAN device or change the VLAN\r

-  configuration parameters. If the VlanId hasn't been configured in the \r
+  configuration parameters. If the VlanId hasn't been configured in the\r

   physical Ethernet device, a new VLAN device will be created. If a VLAN with\r
   this VlanId is already configured, then related configuration will be updated\r
   physical Ethernet device, a new VLAN device will be created. If a VLAN with\r
   this VlanId is already configured, then related configuration will be updated\r

-  as the input parameters. \r
- \r
+  as the input parameters.\r
+\r

   If VlanId is zero, the VLAN device will send and receive untagged frames.\r
   Otherwise, the VLAN device will send and receive VLAN-tagged frames containing the VlanId.\r
   If VlanId is out of scope of (0-4094), EFI_INVALID_PARAMETER is returned.\r
   If VlanId is zero, the VLAN device will send and receive untagged frames.\r
   Otherwise, the VLAN device will send and receive VLAN-tagged frames containing the VlanId.\r
   If VlanId is out of scope of (0-4094), EFI_INVALID_PARAMETER is returned.\r

-  If Priority is out of the scope of (0-7), then EFI_INVALID_PARAMETER is returned. \r
-  If there is not enough system memory to perform the registration, then \r
+  If Priority is out of the scope of (0-7), then EFI_INVALID_PARAMETER is returned.\r
+  If there is not enough system memory to perform the registration, then\r

   EFI_OUT_OF_RESOURCES is returned.\r
 \r
   @param[in] This                Points to the EFI_VLAN_CONFIG_PROTOCOL.\r
   EFI_OUT_OF_RESOURCES is returned.\r
 \r
   @param[in] This                Points to the EFI_VLAN_CONFIG_PROTOCOL.\r

-  @param[in] VlanId              A unique identifier (1-4094) of the VLAN which is being created \r
+  @param[in] VlanId              A unique identifier (1-4094) of the VLAN which is being created\r

                                  or modified, or zero (0).\r
                                  or modified, or zero (0).\r

-  @param[in] Priority            3 bit priority in VLAN header. Priority 0 is default value. If \r
+  @param[in] Priority            3 bit priority in VLAN header. Priority 0 is default value. If\r

                                  VlanId is zero (0), Priority is ignored.\r
                                  VlanId is zero (0), Priority is ignored.\r

-                                 \r
+\r

   @retval EFI_SUCCESS            The VLAN is successfully configured.\r
   @retval EFI_INVALID_PARAMETER  One or more of following conditions is TRUE:\r
                                  - This is NULL.\r
   @retval EFI_SUCCESS            The VLAN is successfully configured.\r
   @retval EFI_INVALID_PARAMETER  One or more of following conditions is TRUE:\r
                                  - This is NULL.\r


@@ -79,14 +79,14 @@ EFI_STATUS
   Find configuration information for specified VLAN or all configured VLANs.\r
 \r
   The Find() function is used to find the configuration information for matching\r
   Find configuration information for specified VLAN or all configured VLANs.\r
 \r
   The Find() function is used to find the configuration information for matching\r

-  VLAN and allocate a buffer into which those entries are copied. \r
+  VLAN and allocate a buffer into which those entries are copied.\r

 \r
   @param[in]  This               Points to the EFI_VLAN_CONFIG_PROTOCOL.\r
   @param[in]  VlanId             Pointer to VLAN identifier. Set to NULL to find all\r
                                  configured VLANs.\r
   @param[out] NumberOfVlan       The number of VLANs which is found by the specified criteria.\r
   @param[out] Entries            The buffer which receive the VLAN configuration.\r
 \r
   @param[in]  This               Points to the EFI_VLAN_CONFIG_PROTOCOL.\r
   @param[in]  VlanId             Pointer to VLAN identifier. Set to NULL to find all\r
                                  configured VLANs.\r
   @param[out] NumberOfVlan       The number of VLANs which is found by the specified criteria.\r
   @param[out] Entries            The buffer which receive the VLAN configuration.\r

-                                 \r
+\r

   @retval EFI_SUCCESS            The VLAN is successfully found.\r
   @retval EFI_INVALID_PARAMETER  One or more of following conditions is TRUE:\r
                                  - This is NULL.\r
   @retval EFI_SUCCESS            The VLAN is successfully found.\r
   @retval EFI_INVALID_PARAMETER  One or more of following conditions is TRUE:\r
                                  - This is NULL.\r


@@ -106,13 +106,13 @@ EFI_STATUS
 /**\r
   Remove the configured VLAN device.\r
 \r
 /**\r
   Remove the configured VLAN device.\r
 \r

-  The Remove() function is used to remove the specified VLAN device. \r
+  The Remove() function is used to remove the specified VLAN device.\r

   If the VlanId is out of the scope of (0-4094), EFI_INVALID_PARAMETER is returned.\r
   If the VlanId is out of the scope of (0-4094), EFI_INVALID_PARAMETER is returned.\r

-  If specified VLAN hasn't been previously configured, EFI_NOT_FOUND is returned.   \r
+  If specified VLAN hasn't been previously configured, EFI_NOT_FOUND is returned.\r

 \r
   @param[in] This                Points to the EFI_VLAN_CONFIG_PROTOCOL.\r
   @param[in] VlanId              Identifier (0-4094) of the VLAN to be removed.\r
 \r
   @param[in] This                Points to the EFI_VLAN_CONFIG_PROTOCOL.\r
   @param[in] VlanId              Identifier (0-4094) of the VLAN to be removed.\r

-                                 \r
+\r

   @retval EFI_SUCCESS            The VLAN is successfully removed.\r
   @retval EFI_INVALID_PARAMETER  One or more of following conditions is TRUE:\r
                                  - This is NULL.\r
   @retval EFI_SUCCESS            The VLAN is successfully removed.\r
   @retval EFI_INVALID_PARAMETER  One or more of following conditions is TRUE:\r
                                  - This is NULL.\r


@@ -129,7 +129,7 @@ EFI_STATUS
 \r
 ///\r
 /// EFI_VLAN_CONFIG_PROTOCOL\r
 \r
 ///\r
 /// EFI_VLAN_CONFIG_PROTOCOL\r

-/// provide manageability interface for VLAN setting. The intended \r
+/// provide manageability interface for VLAN setting. The intended\r

 /// VLAN tagging implementation is IEEE802.1Q.\r
 ///\r
 struct _EFI_VLAN_CONFIG_PROTOCOL {\r
 /// VLAN tagging implementation is IEEE802.1Q.\r
 ///\r
 struct _EFI_VLAN_CONFIG_PROTOCOL {\r

diff --git a/MdePkg/Include/Protocol/WatchdogTimer.h b/MdePkg/Include/Protocol/WatchdogTimer.h
index 36ec8599661582aa51e0098390ddc9d69200ec82..079ee55e5ca974de0df3107ba35457601cd0d19d 100644 (file)
--- a/MdePkg/Include/Protocol/WatchdogTimer.h
+++ b/MdePkg/Include/Protocol/WatchdogTimer.h
@@ -3,14 +3,14 @@
 \r
   Used to provide system watchdog timer services\r
 \r
 \r
   Used to provide system watchdog timer services\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
 #ifndef __ARCH_PROTOCOL_WATCHDOG_TIMER_H__\r
 **/\r
 \r
 #ifndef __ARCH_PROTOCOL_WATCHDOG_TIMER_H__\r


@@ -28,7 +28,7 @@
 typedef struct _EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  EFI_WATCHDOG_TIMER_ARCH_PROTOCOL;\r
 \r
 /**\r
 typedef struct _EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  EFI_WATCHDOG_TIMER_ARCH_PROTOCOL;\r
 \r
 /**\r

-  A function of this type is called when the watchdog timer fires if a \r
+  A function of this type is called when the watchdog timer fires if a\r

   handler has been registered.\r
 \r
   @param  Time             The time in 100 ns units that has passed since the watchdog\r
   handler has been registered.\r
 \r
   @param  Time             The time in 100 ns units that has passed since the watchdog\r


@@ -45,15 +45,15 @@ VOID
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function registers a handler that is to be invoked when the watchdog \r
-  timer fires.  By default, the EFI_WATCHDOG_TIMER protocol will call the \r
-  Runtime Service ResetSystem() when the watchdog timer fires.  If a \r
-  NotifyFunction is registered, then the NotifyFunction will be called before \r
-  the Runtime Service ResetSystem() is called.  If NotifyFunction is NULL, then \r
-  the watchdog handler is unregistered.  If a watchdog handler is registered, \r
-  then EFI_SUCCESS is returned.  If an attempt is made to register a handler \r
-  when a handler is already registered, then EFI_ALREADY_STARTED is returned.  \r
-  If an attempt is made to uninstall a handler when a handler is not installed, \r
+  This function registers a handler that is to be invoked when the watchdog\r
+  timer fires.  By default, the EFI_WATCHDOG_TIMER protocol will call the\r
+  Runtime Service ResetSystem() when the watchdog timer fires.  If a\r
+  NotifyFunction is registered, then the NotifyFunction will be called before\r
+  the Runtime Service ResetSystem() is called.  If NotifyFunction is NULL, then\r
+  the watchdog handler is unregistered.  If a watchdog handler is registered,\r
+  then EFI_SUCCESS is returned.  If an attempt is made to register a handler\r
+  when a handler is already registered, then EFI_ALREADY_STARTED is returned.\r
+  If an attempt is made to uninstall a handler when a handler is not installed,\r

   then return EFI_INVALID_PARAMETER.\r
 \r
   @param  This             The EFI_WATCHDOG_TIMER_ARCH_PROTOCOL instance.\r
   then return EFI_INVALID_PARAMETER.\r
 \r
   @param  This             The EFI_WATCHDOG_TIMER_ARCH_PROTOCOL instance.\r


@@ -68,7 +68,7 @@ VOID
                                 previously registered.\r
 \r
 **/\r
                                 previously registered.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_WATCHDOG_TIMER_REGISTER_HANDLER)(\r
   IN EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_WATCHDOG_TIMER_REGISTER_HANDLER)(\r
   IN EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  *This,\r


@@ -76,8 +76,8 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function sets the amount of time to wait before firing the watchdog \r
-  timer to TimerPeriod 100 nS units.  If TimerPeriod is 0, then the watchdog \r
+  This function sets the amount of time to wait before firing the watchdog\r
+  timer to TimerPeriod 100 nS units.  If TimerPeriod is 0, then the watchdog\r

   timer is disabled.\r
 \r
   @param  This             The EFI_WATCHDOG_TIMER_ARCH_PROTOCOL instance.\r
   timer is disabled.\r
 \r
   @param  This             The EFI_WATCHDOG_TIMER_ARCH_PROTOCOL instance.\r


@@ -91,7 +91,7 @@ EFI_STATUS
                                 error.\r
 \r
 **/\r
                                 error.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_WATCHDOG_TIMER_SET_TIMER_PERIOD)(\r
   IN EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_WATCHDOG_TIMER_SET_TIMER_PERIOD)(\r
   IN EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  *This,\r


@@ -99,8 +99,8 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function retrieves the amount of time the system will wait before firing \r
-  the watchdog timer.  This period is returned in TimerPeriod, and EFI_SUCCESS \r
+  This function retrieves the amount of time the system will wait before firing\r
+  the watchdog timer.  This period is returned in TimerPeriod, and EFI_SUCCESS\r

   is returned.  If TimerPeriod is NULL, then EFI_INVALID_PARAMETER is returned.\r
 \r
   @param  This             The EFI_WATCHDOG_TIMER_ARCH_PROTOCOL instance.\r
   is returned.  If TimerPeriod is NULL, then EFI_INVALID_PARAMETER is returned.\r
 \r
   @param  This             The EFI_WATCHDOG_TIMER_ARCH_PROTOCOL instance.\r


@@ -113,7 +113,7 @@ EFI_STATUS
   @retval EFI_INVALID_PARAMETER TimerPeriod is NULL.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER TimerPeriod is NULL.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_WATCHDOG_TIMER_GET_TIMER_PERIOD)(\r
   IN  EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_WATCHDOG_TIMER_GET_TIMER_PERIOD)(\r
   IN  EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  *This,\r


@@ -122,14 +122,14 @@ EFI_STATUS
 \r
 \r
 ///\r
 \r
 \r
 ///\r

-/// This protocol provides the services required to implement the Boot Service \r
-/// SetWatchdogTimer().  It provides a service to set the amount of time to wait \r
-/// before firing the watchdog timer, and it also provides a service to register \r
-/// a handler that is invoked when the watchdog timer fires.  This protocol can \r
-/// implement the watchdog timer by using the event and timer Boot Services, or \r
-/// it can make use of custom hardware.  When the watchdog timer fires, control \r
-/// will be passed to a handler if one has been registered.  If no handler has \r
-/// been registered, or the registered handler returns, then the system will be \r
+/// This protocol provides the services required to implement the Boot Service\r
+/// SetWatchdogTimer().  It provides a service to set the amount of time to wait\r
+/// before firing the watchdog timer, and it also provides a service to register\r
+/// a handler that is invoked when the watchdog timer fires.  This protocol can\r
+/// implement the watchdog timer by using the event and timer Boot Services, or\r
+/// it can make use of custom hardware.  When the watchdog timer fires, control\r
+/// will be passed to a handler if one has been registered.  If no handler has\r
+/// been registered, or the registered handler returns, then the system will be\r

 /// reset by calling the Runtime Service ResetSystem().\r
 ///\r
 struct _EFI_WATCHDOG_TIMER_ARCH_PROTOCOL {\r
 /// reset by calling the Runtime Service ResetSystem().\r
 ///\r
 struct _EFI_WATCHDOG_TIMER_ARCH_PROTOCOL {\r

diff --git a/MdePkg/Include/Uefi.h b/MdePkg/Include/Uefi.h
index 7b349bb62b85aad1fecd78bede96dfea67910e22..98dd6b3e8f0c01d7504d59156536f3c2629fc3a7 100644 (file)
--- a/MdePkg/Include/Uefi.h
+++ b/MdePkg/Include/Uefi.h
@@ -2,17 +2,17 @@
 \r
   Root include file for Mde Package UEFI, UEFI_APPLICATION type modules.\r
 \r
 \r
   Root include file for Mde Package UEFI, UEFI_APPLICATION type modules.\r
 \r

-  This is the include file for any module of type UEFI and UEFI_APPLICATION. Uefi modules only use \r
-  types defined via this include file and can be ported easily to any \r
-  environment. \r
+  This is the include file for any module of type UEFI and UEFI_APPLICATION. Uefi modules only use\r
+  types defined via this include file and can be ported easily to any\r
+  environment.\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
-    \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/MdePkg/Include/Uefi/UefiAcpiDataTable.h b/MdePkg/Include/Uefi/UefiAcpiDataTable.h
index ae4942b69b4733cd1afa632cb86ad528889ecc2e..b02e811ecc63960eba973df0730879a5b5404640 100644 (file)
--- a/MdePkg/Include/Uefi/UefiAcpiDataTable.h
+++ b/MdePkg/Include/Uefi/UefiAcpiDataTable.h
@@ -1,13 +1,13 @@
 /** @file\r
   UEFI ACPI Data Table Definition.\r
 \r
 /** @file\r
   UEFI ACPI Data Table Definition.\r
 \r

-Copyright (c) 2011 - 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) 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
-    \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/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiBaseType.h
index d9556cd2ec4e44e02a5819c9562341e4624f0c77..401db7f620b394cbbcae74a18f57e64cdbf10b23 100644 (file)
--- a/MdePkg/Include/Uefi/UefiBaseType.h
+++ b/MdePkg/Include/Uefi/UefiBaseType.h
@@ -1,15 +1,15 @@
 /** @file\r
   Defines data types and constants introduced in UEFI.\r
 \r
 /** @file\r
   Defines data types and constants introduced in UEFI.\r
 \r

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

 Portions copyright (c) 2011 - 2016, ARM Ltd. All rights reserved.<BR>\r
 \r
 Portions copyright (c) 2011 - 2016, ARM Ltd. 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
+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


@@ -114,44 +114,44 @@ typedef union {
 \r
 ///\r
 /// Enumeration of EFI_STATUS.\r
 \r
 ///\r
 /// Enumeration of EFI_STATUS.\r

-///@{ \r
-#define EFI_SUCCESS               RETURN_SUCCESS              \r
-#define EFI_LOAD_ERROR            RETURN_LOAD_ERROR           \r
-#define EFI_INVALID_PARAMETER     RETURN_INVALID_PARAMETER    \r
-#define EFI_UNSUPPORTED           RETURN_UNSUPPORTED          \r
-#define EFI_BAD_BUFFER_SIZE       RETURN_BAD_BUFFER_SIZE      \r
-#define EFI_BUFFER_TOO_SMALL      RETURN_BUFFER_TOO_SMALL     \r
-#define EFI_NOT_READY             RETURN_NOT_READY            \r
-#define EFI_DEVICE_ERROR          RETURN_DEVICE_ERROR         \r
-#define EFI_WRITE_PROTECTED       RETURN_WRITE_PROTECTED      \r
-#define EFI_OUT_OF_RESOURCES      RETURN_OUT_OF_RESOURCES     \r
-#define EFI_VOLUME_CORRUPTED      RETURN_VOLUME_CORRUPTED     \r
-#define EFI_VOLUME_FULL           RETURN_VOLUME_FULL          \r
-#define EFI_NO_MEDIA              RETURN_NO_MEDIA             \r
-#define EFI_MEDIA_CHANGED         RETURN_MEDIA_CHANGED        \r
-#define EFI_NOT_FOUND             RETURN_NOT_FOUND            \r
-#define EFI_ACCESS_DENIED         RETURN_ACCESS_DENIED        \r
-#define EFI_NO_RESPONSE           RETURN_NO_RESPONSE          \r
-#define EFI_NO_MAPPING            RETURN_NO_MAPPING           \r
-#define EFI_TIMEOUT               RETURN_TIMEOUT              \r
-#define EFI_NOT_STARTED           RETURN_NOT_STARTED          \r
-#define EFI_ALREADY_STARTED       RETURN_ALREADY_STARTED      \r
-#define EFI_ABORTED               RETURN_ABORTED              \r
-#define EFI_ICMP_ERROR            RETURN_ICMP_ERROR           \r
-#define EFI_TFTP_ERROR            RETURN_TFTP_ERROR           \r
-#define EFI_PROTOCOL_ERROR        RETURN_PROTOCOL_ERROR       \r
-#define EFI_INCOMPATIBLE_VERSION  RETURN_INCOMPATIBLE_VERSION \r
-#define EFI_SECURITY_VIOLATION    RETURN_SECURITY_VIOLATION   \r
-#define EFI_CRC_ERROR             RETURN_CRC_ERROR   \r
+///@{\r
+#define EFI_SUCCESS               RETURN_SUCCESS\r
+#define EFI_LOAD_ERROR            RETURN_LOAD_ERROR\r
+#define EFI_INVALID_PARAMETER     RETURN_INVALID_PARAMETER\r
+#define EFI_UNSUPPORTED           RETURN_UNSUPPORTED\r
+#define EFI_BAD_BUFFER_SIZE       RETURN_BAD_BUFFER_SIZE\r
+#define EFI_BUFFER_TOO_SMALL      RETURN_BUFFER_TOO_SMALL\r
+#define EFI_NOT_READY             RETURN_NOT_READY\r
+#define EFI_DEVICE_ERROR          RETURN_DEVICE_ERROR\r
+#define EFI_WRITE_PROTECTED       RETURN_WRITE_PROTECTED\r
+#define EFI_OUT_OF_RESOURCES      RETURN_OUT_OF_RESOURCES\r
+#define EFI_VOLUME_CORRUPTED      RETURN_VOLUME_CORRUPTED\r
+#define EFI_VOLUME_FULL           RETURN_VOLUME_FULL\r
+#define EFI_NO_MEDIA              RETURN_NO_MEDIA\r
+#define EFI_MEDIA_CHANGED         RETURN_MEDIA_CHANGED\r
+#define EFI_NOT_FOUND             RETURN_NOT_FOUND\r
+#define EFI_ACCESS_DENIED         RETURN_ACCESS_DENIED\r
+#define EFI_NO_RESPONSE           RETURN_NO_RESPONSE\r
+#define EFI_NO_MAPPING            RETURN_NO_MAPPING\r
+#define EFI_TIMEOUT               RETURN_TIMEOUT\r
+#define EFI_NOT_STARTED           RETURN_NOT_STARTED\r
+#define EFI_ALREADY_STARTED       RETURN_ALREADY_STARTED\r
+#define EFI_ABORTED               RETURN_ABORTED\r
+#define EFI_ICMP_ERROR            RETURN_ICMP_ERROR\r
+#define EFI_TFTP_ERROR            RETURN_TFTP_ERROR\r
+#define EFI_PROTOCOL_ERROR        RETURN_PROTOCOL_ERROR\r
+#define EFI_INCOMPATIBLE_VERSION  RETURN_INCOMPATIBLE_VERSION\r
+#define EFI_SECURITY_VIOLATION    RETURN_SECURITY_VIOLATION\r
+#define EFI_CRC_ERROR             RETURN_CRC_ERROR\r

 #define EFI_END_OF_MEDIA          RETURN_END_OF_MEDIA\r
 #define EFI_END_OF_FILE           RETURN_END_OF_FILE\r
 #define EFI_INVALID_LANGUAGE      RETURN_INVALID_LANGUAGE\r
 #define EFI_COMPROMISED_DATA      RETURN_COMPROMISED_DATA\r
 #define EFI_HTTP_ERROR            RETURN_HTTP_ERROR\r
 \r
 #define EFI_END_OF_MEDIA          RETURN_END_OF_MEDIA\r
 #define EFI_END_OF_FILE           RETURN_END_OF_FILE\r
 #define EFI_INVALID_LANGUAGE      RETURN_INVALID_LANGUAGE\r
 #define EFI_COMPROMISED_DATA      RETURN_COMPROMISED_DATA\r
 #define EFI_HTTP_ERROR            RETURN_HTTP_ERROR\r
 \r

-#define EFI_WARN_UNKNOWN_GLYPH    RETURN_WARN_UNKNOWN_GLYPH   \r
-#define EFI_WARN_DELETE_FAILURE   RETURN_WARN_DELETE_FAILURE  \r
-#define EFI_WARN_WRITE_FAILURE    RETURN_WARN_WRITE_FAILURE   \r
+#define EFI_WARN_UNKNOWN_GLYPH    RETURN_WARN_UNKNOWN_GLYPH\r
+#define EFI_WARN_DELETE_FAILURE   RETURN_WARN_DELETE_FAILURE\r
+#define EFI_WARN_WRITE_FAILURE    RETURN_WARN_WRITE_FAILURE\r

 #define EFI_WARN_BUFFER_TOO_SMALL RETURN_WARN_BUFFER_TOO_SMALL\r
 #define EFI_WARN_STALE_DATA       RETURN_WARN_STALE_DATA\r
 #define EFI_WARN_FILE_SYSTEM      RETURN_WARN_FILE_SYSTEM\r
 #define EFI_WARN_BUFFER_TOO_SMALL RETURN_WARN_BUFFER_TOO_SMALL\r
 #define EFI_WARN_STALE_DATA       RETURN_WARN_STALE_DATA\r
 #define EFI_WARN_FILE_SYSTEM      RETURN_WARN_FILE_SYSTEM\r


@@ -159,7 +159,7 @@ typedef union {
 \r
 ///\r
 /// Define macro to encode the status code.\r
 \r
 ///\r
 /// Define macro to encode the status code.\r

-/// \r
+///\r

 #define EFIERR(_a)                ENCODE_ERROR(_a)\r
 \r
 #define EFI_ERROR(A)              RETURN_ERROR(A)\r
 #define EFIERR(_a)                ENCODE_ERROR(_a)\r
 \r
 #define EFI_ERROR(A)              RETURN_ERROR(A)\r


@@ -168,7 +168,7 @@ typedef union {
 /// ICMP error definitions\r
 ///@{\r
 #define EFI_NETWORK_UNREACHABLE   EFIERR(100)\r
 /// ICMP error definitions\r
 ///@{\r
 #define EFI_NETWORK_UNREACHABLE   EFIERR(100)\r

-#define EFI_HOST_UNREACHABLE      EFIERR(101) \r
+#define EFI_HOST_UNREACHABLE      EFIERR(101)\r

 #define EFI_PROTOCOL_UNREACHABLE  EFIERR(102)\r
 #define EFI_PORT_UNREACHABLE      EFIERR(103)\r
 ///@}\r
 #define EFI_PROTOCOL_UNREACHABLE  EFIERR(102)\r
 #define EFI_PORT_UNREACHABLE      EFIERR(103)\r
 ///@}\r


@@ -193,8 +193,8 @@ typedef union {
 /**\r
   Macro that converts a size, in bytes, to a number of EFI_PAGESs.\r
 \r
 /**\r
   Macro that converts a size, in bytes, to a number of EFI_PAGESs.\r
 \r

-  @param  Size      A size in bytes.  This parameter is assumed to be type UINTN.  \r
-                    Passing in a parameter that is larger than UINTN may produce \r
+  @param  Size      A size in bytes.  This parameter is assumed to be type UINTN.\r
+                    Passing in a parameter that is larger than UINTN may produce\r

                     unexpected results.\r
 \r
   @return  The number of EFI_PAGESs associated with the number of bytes specified\r
                     unexpected results.\r
 \r
   @return  The number of EFI_PAGESs associated with the number of bytes specified\r


@@ -206,13 +206,13 @@ typedef union {
 /**\r
   Macro that converts a number of EFI_PAGEs to a size in bytes.\r
 \r
 /**\r
   Macro that converts a number of EFI_PAGEs to a size in bytes.\r
 \r

-  @param  Pages     The number of EFI_PAGES.  This parameter is assumed to be \r
-                    type UINTN.  Passing in a parameter that is larger than \r
+  @param  Pages     The number of EFI_PAGES.  This parameter is assumed to be\r
+                    type UINTN.  Passing in a parameter that is larger than\r

                     UINTN may produce unexpected results.\r
 \r
                     UINTN may produce unexpected results.\r
 \r

-  @return  The number of bytes associated with the number of EFI_PAGEs specified \r
+  @return  The number of bytes associated with the number of EFI_PAGEs specified\r

            by Pages.\r
            by Pages.\r

-  \r
+\r

 **/\r
 #define EFI_PAGES_TO_SIZE(Pages)  ((Pages) << EFI_PAGE_SHIFT)\r
 \r
 **/\r
 #define EFI_PAGES_TO_SIZE(Pages)  ((Pages) << EFI_PAGE_SHIFT)\r
 \r


@@ -252,21 +252,21 @@ typedef union {
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
   (((Machine) == EFI_IMAGE_MACHINE_IA32) || ((Machine) == EFI_IMAGE_MACHINE_EBC))\r
 \r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
   (((Machine) == EFI_IMAGE_MACHINE_IA32) || ((Machine) == EFI_IMAGE_MACHINE_EBC))\r
 \r

-#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_X64) \r
+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_X64)\r

 \r
 #elif defined (MDE_CPU_IPF)\r
 \r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
   (((Machine) == EFI_IMAGE_MACHINE_IA64) || ((Machine) == EFI_IMAGE_MACHINE_EBC))\r
 \r
 \r
 #elif defined (MDE_CPU_IPF)\r
 \r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
   (((Machine) == EFI_IMAGE_MACHINE_IA64) || ((Machine) == EFI_IMAGE_MACHINE_EBC))\r
 \r

-#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) \r
+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE)\r

 \r
 #elif defined (MDE_CPU_X64)\r
 \r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
   (((Machine) == EFI_IMAGE_MACHINE_X64) || ((Machine) == EFI_IMAGE_MACHINE_EBC))\r
 \r
 \r
 #elif defined (MDE_CPU_X64)\r
 \r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
   (((Machine) == EFI_IMAGE_MACHINE_X64) || ((Machine) == EFI_IMAGE_MACHINE_EBC))\r
 \r

-#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_IA32) \r
+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_IA32)\r

 \r
 #elif defined (MDE_CPU_ARM)\r
 \r
 \r
 #elif defined (MDE_CPU_ARM)\r
 \r


@@ -285,11 +285,11 @@ typedef union {
 \r
 ///\r
 /// This is just to make sure you can cross compile with the EBC compiler.\r
 \r
 ///\r
 /// This is just to make sure you can cross compile with the EBC compiler.\r

-/// It does not make sense to have a PE loader coded in EBC. \r
+/// It does not make sense to have a PE loader coded in EBC.\r

 ///\r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_EBC)\r
 \r
 ///\r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_EBC)\r
 \r

-#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) \r
+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE)\r

 \r
 #else\r
 #error Unknown Processor Type\r
 \r
 #else\r
 #error Unknown Processor Type\r

diff --git a/MdePkg/Include/Uefi/UefiGpt.h b/MdePkg/Include/Uefi/UefiGpt.h
index f2d0fa0b09f69c85fd5f81edc0b2f6bc70600379..f635b0539082cf261d60a3e5b99703ddf6b280a6 100644 (file)
--- a/MdePkg/Include/Uefi/UefiGpt.h
+++ b/MdePkg/Include/Uefi/UefiGpt.h
@@ -1,13 +1,13 @@
 /** @file\r
   EFI Guid Partition Table Format Definition.\r
 \r
 /** @file\r
   EFI Guid Partition Table Format Definition.\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
-    \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


@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define PRIMARY_PART_HEADER_LBA 1\r
 ///\r
 /// EFI Partition Table Signature: "EFI PART".\r
 #define PRIMARY_PART_HEADER_LBA 1\r
 ///\r
 /// EFI Partition Table Signature: "EFI PART".\r

-/// \r
+///\r

 #define EFI_PTAB_HEADER_ID      SIGNATURE_64 ('E','F','I',' ','P','A','R','T')\r
 \r
 #pragma pack(1)\r
 #define EFI_PTAB_HEADER_ID      SIGNATURE_64 ('E','F','I',' ','P','A','R','T')\r
 \r
 #pragma pack(1)\r


@@ -119,7 +119,7 @@ typedef struct {
   ///             this partition. By not producing an EFI_BLOCK_IO_PROTOCOL partition, file system\r
   ///             mappings will not be created for this partition in UEFI.\r
   /// Bit 2:      This bit is set aside to let systems with traditional PC-AT BIOS firmware implementations\r
   ///             this partition. By not producing an EFI_BLOCK_IO_PROTOCOL partition, file system\r
   ///             mappings will not be created for this partition in UEFI.\r
   /// Bit 2:      This bit is set aside to let systems with traditional PC-AT BIOS firmware implementations\r

-  ///             inform certain limited, special-purpose software running on these systems that a GPT \r
+  ///             inform certain limited, special-purpose software running on these systems that a GPT\r

   ///             partition may be bootable. The UEFI boot manager must ignore this bit when selecting\r
   ///             a UEFI-compliant application, e.g., an OS loader.\r
   /// Bits 3-47:  Undefined and must be zero. Reserved for expansion by future versions of the UEFI\r
   ///             partition may be bootable. The UEFI boot manager must ignore this bit when selecting\r
   ///             a UEFI-compliant application, e.g., an OS loader.\r
   /// Bits 3-47:  Undefined and must be zero. Reserved for expansion by future versions of the UEFI\r

diff --git a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
index ae5602f0f80279bb58d844b83a99f7bec630ed8a..b6fa4decb3ac0c347600cac604bfb082c2ba4f8e 100644 (file)
--- a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
+++ b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
@@ -3,15 +3,15 @@
   IFR is primarily consumed by the EFI presentation engine, and produced by EFI\r
   internal application and drivers as well as all add-in card option-ROM drivers\r
 \r
   IFR is primarily consumed by the EFI presentation engine, and produced by EFI\r
   internal application and drivers as well as all add-in card option-ROM drivers\r
 \r

-Copyright (c) 2006 - 2016, 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 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
-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
   @par Revision Reference:\r
   These definitions are from UEFI 2.1 and 2.2.\r
 \r
   @par Revision Reference:\r
   These definitions are from UEFI 2.1 and 2.2.\r


@@ -67,7 +67,7 @@ typedef struct {
 \r
 //\r
 // Value of HII package type\r
 \r
 //\r
 // Value of HII package type\r

-// \r
+//\r

 #define EFI_HII_PACKAGE_TYPE_ALL             0x00\r
 #define EFI_HII_PACKAGE_TYPE_GUID            0x01\r
 #define EFI_HII_PACKAGE_FORMS                0x02\r
 #define EFI_HII_PACKAGE_TYPE_ALL             0x00\r
 #define EFI_HII_PACKAGE_TYPE_GUID            0x01\r
 #define EFI_HII_PACKAGE_FORMS                0x02\r


@@ -100,7 +100,7 @@ typedef struct {
 ///\r
 typedef struct {\r
   ///\r
 ///\r
 typedef struct {\r
   ///\r

-  /// The Unicode representation of the glyph. The term weight is the \r
+  /// The Unicode representation of the glyph. The term weight is the\r

   /// technical term for a character code.\r
   ///\r
   CHAR16                 UnicodeWeight;\r
   /// technical term for a character code.\r
   ///\r
   CHAR16                 UnicodeWeight;\r


@@ -109,7 +109,7 @@ typedef struct {
   ///\r
   UINT8                  Attributes;\r
   ///\r
   ///\r
   UINT8                  Attributes;\r
   ///\r

-  /// The column major glyph representation of the character. Bits \r
+  /// The column major glyph representation of the character. Bits\r

   /// with values of one indicate that the corresponding pixel is to be\r
   /// on when normally displayed; those with zero are off.\r
   ///\r
   /// with values of one indicate that the corresponding pixel is to be\r
   /// on when normally displayed; those with zero are off.\r
   ///\r


@@ -117,12 +117,12 @@ typedef struct {
 } EFI_NARROW_GLYPH;\r
 \r
 ///\r
 } EFI_NARROW_GLYPH;\r
 \r
 ///\r

-/// The EFI_WIDE_GLYPH has a preferred dimension (w x h) of 16 x 19 pixels, which is large enough \r
+/// The EFI_WIDE_GLYPH has a preferred dimension (w x h) of 16 x 19 pixels, which is large enough\r

 /// to accommodate logographic characters.\r
 ///\r
 typedef struct {\r
   ///\r
 /// to accommodate logographic characters.\r
 ///\r
 typedef struct {\r
   ///\r

-  /// The Unicode representation of the glyph. The term weight is the \r
+  /// The Unicode representation of the glyph. The term weight is the\r

   /// technical term for a character code.\r
   ///\r
   CHAR16                 UnicodeWeight;\r
   /// technical term for a character code.\r
   ///\r
   CHAR16                 UnicodeWeight;\r


@@ -131,20 +131,20 @@ typedef struct {
   ///\r
   UINT8                  Attributes;\r
   ///\r
   ///\r
   UINT8                  Attributes;\r
   ///\r

-  /// The column major glyph representation of the character. Bits \r
-  /// with values of one indicate that the corresponding pixel is to be \r
+  /// The column major glyph representation of the character. Bits\r
+  /// with values of one indicate that the corresponding pixel is to be\r

   /// on when normally displayed; those with zero are off.\r
   ///\r
   UINT8                  GlyphCol1[EFI_GLYPH_HEIGHT];\r
   ///\r
   /// on when normally displayed; those with zero are off.\r
   ///\r
   UINT8                  GlyphCol1[EFI_GLYPH_HEIGHT];\r
   ///\r

-  /// The column major glyph representation of the character. Bits \r
-  /// with values of one indicate that the corresponding pixel is to be \r
+  /// The column major glyph representation of the character. Bits\r
+  /// with values of one indicate that the corresponding pixel is to be\r

   /// on when normally displayed; those with zero are off.\r
   ///\r
   UINT8                  GlyphCol2[EFI_GLYPH_HEIGHT];\r
   ///\r
   /// on when normally displayed; those with zero are off.\r
   ///\r
   UINT8                  GlyphCol2[EFI_GLYPH_HEIGHT];\r
   ///\r

-  /// Ensures that sizeof (EFI_WIDE_GLYPH) is twice the \r
-  /// sizeof (EFI_NARROW_GLYPH). The contents of Pad must \r
+  /// Ensures that sizeof (EFI_WIDE_GLYPH) is twice the\r
+  /// sizeof (EFI_NARROW_GLYPH). The contents of Pad must\r

   /// be zero.\r
   ///\r
   UINT8                  Pad[3];\r
   /// be zero.\r
   ///\r
   UINT8                  Pad[3];\r


@@ -268,7 +268,7 @@ typedef struct _EFI_HII_GIBT_GLYPH_BLOCK {
 typedef struct _EFI_HII_GIBT_GLYPHS_BLOCK {\r
   EFI_HII_GLYPH_BLOCK    Header;\r
   EFI_HII_GLYPH_INFO     Cell;\r
 typedef struct _EFI_HII_GIBT_GLYPHS_BLOCK {\r
   EFI_HII_GLYPH_BLOCK    Header;\r
   EFI_HII_GLYPH_INFO     Cell;\r

-  UINT16                 Count;  \r
+  UINT16                 Count;\r

   UINT8                  BitmapData[1];\r
 } EFI_HII_GIBT_GLYPHS_BLOCK;\r
 \r
   UINT8                  BitmapData[1];\r
 } EFI_HII_GIBT_GLYPHS_BLOCK;\r
 \r


@@ -845,7 +845,7 @@ typedef struct _EFI_IFR_DEFAULTSTORE {
 } EFI_IFR_DEFAULTSTORE;\r
 \r
 //\r
 } EFI_IFR_DEFAULTSTORE;\r
 \r
 //\r

-// Default Identifier of default store \r
+// Default Identifier of default store\r

 //\r
 #define EFI_HII_DEFAULT_CLASS_STANDARD       0x0000\r
 #define EFI_HII_DEFAULT_CLASS_MANUFACTURING  0x0001\r
 //\r
 #define EFI_HII_DEFAULT_CLASS_STANDARD       0x0000\r
 #define EFI_HII_DEFAULT_CLASS_MANUFACTURING  0x0001\r


@@ -1498,12 +1498,12 @@ typedef struct _EFI_IFR_SECURITY {
 \r
 typedef struct _EFI_IFR_FORM_MAP_METHOD {\r
   ///\r
 \r
 typedef struct _EFI_IFR_FORM_MAP_METHOD {\r
   ///\r

-  /// The string identifier which provides the human-readable name of \r
+  /// The string identifier which provides the human-readable name of\r

   /// the configuration method for this standards map form.\r
   ///\r
   EFI_STRING_ID            MethodTitle;\r
   ///\r
   /// the configuration method for this standards map form.\r
   ///\r
   EFI_STRING_ID            MethodTitle;\r
   ///\r

-  /// Identifier which uniquely specifies the configuration methods \r
+  /// Identifier which uniquely specifies the configuration methods\r

   /// associated with this standards map form.\r
   ///\r
   EFI_GUID                 MethodIdentifier;\r
   /// associated with this standards map form.\r
   ///\r
   EFI_GUID                 MethodIdentifier;\r


@@ -1511,8 +1511,8 @@ typedef struct _EFI_IFR_FORM_MAP_METHOD {
 \r
 typedef struct _EFI_IFR_FORM_MAP {\r
   ///\r
 \r
 typedef struct _EFI_IFR_FORM_MAP {\r
   ///\r

-  /// The sequence that defines the type of opcode as well as the length \r
-  /// of the opcode being defined. Header.OpCode = EFI_IFR_FORM_MAP_OP. \r
+  /// The sequence that defines the type of opcode as well as the length\r
+  /// of the opcode being defined. Header.OpCode = EFI_IFR_FORM_MAP_OP.\r

   ///\r
   EFI_IFR_OP_HEADER        Header;\r
   ///\r
   ///\r
   EFI_IFR_OP_HEADER        Header;\r
   ///\r


@@ -1527,13 +1527,13 @@ typedef struct _EFI_IFR_FORM_MAP {
 \r
 typedef struct _EFI_IFR_SET {\r
   ///\r
 \r
 typedef struct _EFI_IFR_SET {\r
   ///\r

-  /// The sequence that defines the type of opcode as well as the length \r
-  /// of the opcode being defined. Header.OpCode = EFI_IFR_SET_OP. \r
+  /// The sequence that defines the type of opcode as well as the length\r
+  /// of the opcode being defined. Header.OpCode = EFI_IFR_SET_OP.\r

   ///\r
   EFI_IFR_OP_HEADER  Header;\r
   ///\r
   ///\r
   EFI_IFR_OP_HEADER  Header;\r
   ///\r

-  /// Specifies the identifier of a previously declared variable store to \r
-  /// use when storing the question's value. \r
+  /// Specifies the identifier of a previously declared variable store to\r
+  /// use when storing the question's value.\r

   ///\r
   EFI_VARSTORE_ID    VarStoreId;\r
   union {\r
   ///\r
   EFI_VARSTORE_ID    VarStoreId;\r
   union {\r


@@ -1547,20 +1547,20 @@ typedef struct _EFI_IFR_SET {
     UINT16           VarOffset;\r
   }                  VarStoreInfo;\r
   ///\r
     UINT16           VarOffset;\r
   }                  VarStoreInfo;\r
   ///\r

-  /// Specifies the type used for storage. \r
+  /// Specifies the type used for storage.\r

   ///\r
   UINT8              VarStoreType;\r
 } EFI_IFR_SET;\r
 \r
 typedef struct _EFI_IFR_GET {\r
   ///\r
   ///\r
   UINT8              VarStoreType;\r
 } EFI_IFR_SET;\r
 \r
 typedef struct _EFI_IFR_GET {\r
   ///\r

-  /// The sequence that defines the type of opcode as well as the length \r
-  /// of the opcode being defined. Header.OpCode = EFI_IFR_GET_OP. \r
+  /// The sequence that defines the type of opcode as well as the length\r
+  /// of the opcode being defined. Header.OpCode = EFI_IFR_GET_OP.\r

   ///\r
   EFI_IFR_OP_HEADER  Header;\r
   ///\r
   ///\r
   EFI_IFR_OP_HEADER  Header;\r
   ///\r

-  /// Specifies the identifier of a previously declared variable store to \r
-  /// use when retrieving the value. \r
+  /// Specifies the identifier of a previously declared variable store to\r
+  /// use when retrieving the value.\r

   ///\r
   EFI_VARSTORE_ID    VarStoreId;\r
   union {\r
   ///\r
   EFI_VARSTORE_ID    VarStoreId;\r
   union {\r


@@ -1574,7 +1574,7 @@ typedef struct _EFI_IFR_GET {
     UINT16           VarOffset;\r
   }                  VarStoreInfo;\r
   ///\r
     UINT16           VarOffset;\r
   }                  VarStoreInfo;\r
   ///\r

-  /// Specifies the type used for storage. \r
+  /// Specifies the type used for storage.\r

   ///\r
   UINT8              VarStoreType;\r
 } EFI_IFR_GET;\r
   ///\r
   UINT8              VarStoreType;\r
 } EFI_IFR_GET;\r


@@ -1598,9 +1598,9 @@ typedef struct _EFI_IFR_MAP {
 ///\r
 /// Each enumeration values maps a physical key on a keyboard.\r
 ///\r
 ///\r
 /// Each enumeration values maps a physical key on a keyboard.\r
 ///\r

-typedef enum {    \r
+typedef enum {\r

   EfiKeyLCtrl,\r
   EfiKeyLCtrl,\r

-  EfiKeyA0, \r
+  EfiKeyA0,\r

   EfiKeyLAlt,\r
   EfiKeySpaceBar,\r
   EfiKeyA2,\r
   EfiKeyLAlt,\r
   EfiKeySpaceBar,\r
   EfiKeyA2,\r


@@ -1728,8 +1728,8 @@ typedef struct {
   ///\r
   CHAR16                  ShiftedAltGrUnicode;\r
   ///\r
   ///\r
   CHAR16                  ShiftedAltGrUnicode;\r
   ///\r

-  /// Modifier keys are defined to allow for special functionality that is not necessarily \r
-  /// accomplished by a printable character. Many of these modifier keys are flags to toggle \r
+  /// Modifier keys are defined to allow for special functionality that is not necessarily\r
+  /// accomplished by a printable character. Many of these modifier keys are flags to toggle\r

   /// certain state bits on and off inside of a keyboard driver.\r
   ///\r
   UINT16                  Modifier;\r
   /// certain state bits on and off inside of a keyboard driver.\r
   ///\r
   UINT16                  Modifier;\r


@@ -1737,7 +1737,7 @@ typedef struct {
 } EFI_KEY_DESCRIPTOR;\r
 \r
 ///\r
 } EFI_KEY_DESCRIPTOR;\r
 \r
 ///\r

-/// A key which is affected by all the standard shift modifiers.  \r
+/// A key which is affected by all the standard shift modifiers.\r

 /// Most keys would be expected to have this bit active.\r
 ///\r
 #define EFI_AFFECTED_BY_STANDARD_SHIFT       0x0001\r
 /// Most keys would be expected to have this bit active.\r
 ///\r
 #define EFI_AFFECTED_BY_STANDARD_SHIFT       0x0001\r


@@ -1830,7 +1830,7 @@ typedef struct {
 ///\r
 typedef struct _EFI_IFR_ANIMATION {\r
   ///\r
 ///\r
 typedef struct _EFI_IFR_ANIMATION {\r
   ///\r

-  /// Standard opcode header, where Header.OpCode is \r
+  /// Standard opcode header, where Header.OpCode is\r

   /// EFI_IFR_ANIMATION_OP.\r
   ///\r
   EFI_IFR_OP_HEADER        Header;\r
   /// EFI_IFR_ANIMATION_OP.\r
   ///\r
   EFI_IFR_OP_HEADER        Header;\r


@@ -1849,7 +1849,7 @@ typedef struct _EFI_HII_ANIMATION_PACKAGE_HDR {
   ///\r
   EFI_HII_PACKAGE_HEADER  Header;\r
   ///\r
   ///\r
   EFI_HII_PACKAGE_HEADER  Header;\r
   ///\r

-  /// Offset, relative to this header, of the animation information. If \r
+  /// Offset, relative to this header, of the animation information. If\r

   /// this is zero, then there are no animation sequences in the package.\r
   ///\r
   UINT32                  AnimationInfoOffset;\r
   /// this is zero, then there are no animation sequences in the package.\r
   ///\r
   UINT32                  AnimationInfoOffset;\r


@@ -1933,23 +1933,23 @@ typedef struct _EFI_HII_AIBT_EXT4_BLOCK {
 \r
 typedef struct _EFI_HII_ANIMATION_CELL {\r
   ///\r
 \r
 typedef struct _EFI_HII_ANIMATION_CELL {\r
   ///\r

-  /// The X offset from the upper left hand corner of the logical \r
+  /// The X offset from the upper left hand corner of the logical\r

   /// window to position the indexed image.\r
   ///\r
   UINT16                    OffsetX;\r
   ///\r
   /// window to position the indexed image.\r
   ///\r
   UINT16                    OffsetX;\r
   ///\r

-  /// The Y offset from the upper left hand corner of the logical \r
+  /// The Y offset from the upper left hand corner of the logical\r

   /// window to position the indexed image.\r
   ///\r
   UINT16                    OffsetY;\r
   ///\r
   /// window to position the indexed image.\r
   ///\r
   UINT16                    OffsetY;\r
   ///\r

-  /// The image to display at the specified offset from the upper left \r
+  /// The image to display at the specified offset from the upper left\r

   /// hand corner of the logical window.\r
   ///\r
   EFI_IMAGE_ID              ImageId;\r
   ///\r
   /// hand corner of the logical window.\r
   ///\r
   EFI_IMAGE_ID              ImageId;\r
   ///\r

-  /// The number of milliseconds to delay after displaying the indexed \r
-  /// image and before continuing on to the next linked image.  If value \r
+  /// The number of milliseconds to delay after displaying the indexed\r
+  /// image and before continuing on to the next linked image.  If value\r

   /// is zero, no delay.\r
   ///\r
   UINT16                    Delay;\r
   /// is zero, no delay.\r
   ///\r
   UINT16                    Delay;\r


@@ -1961,11 +1961,11 @@ typedef struct _EFI_HII_ANIMATION_CELL {
 ///\r
 typedef struct _EFI_HII_AIBT_OVERLAY_IMAGES_BLOCK {\r
   ///\r
 ///\r
 typedef struct _EFI_HII_AIBT_OVERLAY_IMAGES_BLOCK {\r
   ///\r

-  /// This is image that is to be reference by the image protocols, if the \r
-  /// animation function is not supported or disabled. This image can \r
-  /// be one particular image from the animation sequence (if any one \r
-  /// of the animation frames has a complete image) or an alternate \r
-  /// image that can be displayed alone. If the value is zero, no image \r
+  /// This is image that is to be reference by the image protocols, if the\r
+  /// animation function is not supported or disabled. This image can\r
+  /// be one particular image from the animation sequence (if any one\r
+  /// of the animation frames has a complete image) or an alternate\r
+  /// image that can be displayed alone. If the value is zero, no image\r

   /// is displayed.\r
   ///\r
   EFI_IMAGE_ID            DftImageId;\r
   /// is displayed.\r
   ///\r
   EFI_IMAGE_ID            DftImageId;\r


@@ -1978,7 +1978,7 @@ typedef struct _EFI_HII_AIBT_OVERLAY_IMAGES_BLOCK {
   ///\r
   UINT16                  Height;\r
   ///\r
   ///\r
   UINT16                  Height;\r
   ///\r

-  /// The number of EFI_HII_ANIMATION_CELL contained in the \r
+  /// The number of EFI_HII_ANIMATION_CELL contained in the\r

   /// animation sequence.\r
   ///\r
   UINT16                  CellCount;\r
   /// animation sequence.\r
   ///\r
   UINT16                  CellCount;\r


@@ -1990,16 +1990,16 @@ typedef struct _EFI_HII_AIBT_OVERLAY_IMAGES_BLOCK {
 \r
 ///\r
 /// An animation block to describe an animation sequence that does not cycle,\r
 \r
 ///\r
 /// An animation block to describe an animation sequence that does not cycle,\r

-/// and where the logical window is cleared to the specified color before \r
+/// and where the logical window is cleared to the specified color before\r

 /// the next image is displayed.\r
 ///\r
 typedef struct _EFI_HII_AIBT_CLEAR_IMAGES_BLOCK {\r
   ///\r
 /// the next image is displayed.\r
 ///\r
 typedef struct _EFI_HII_AIBT_CLEAR_IMAGES_BLOCK {\r
   ///\r

-  /// This is image that is to be reference by the image protocols, if the \r
-  /// animation function is not supported or disabled. This image can \r
-  /// be one particular image from the animation sequence (if any one \r
-  /// of the animation frames has a complete image) or an alternate \r
-  /// image that can be displayed alone. If the value is zero, no image \r
+  /// This is image that is to be reference by the image protocols, if the\r
+  /// animation function is not supported or disabled. This image can\r
+  /// be one particular image from the animation sequence (if any one\r
+  /// of the animation frames has a complete image) or an alternate\r
+  /// image that can be displayed alone. If the value is zero, no image\r

   /// is displayed.\r
   ///\r
   EFI_IMAGE_ID       DftImageId;\r
   /// is displayed.\r
   ///\r
   EFI_IMAGE_ID       DftImageId;\r


@@ -2012,12 +2012,12 @@ typedef struct _EFI_HII_AIBT_CLEAR_IMAGES_BLOCK {
   ///\r
   UINT16             Height;\r
   ///\r
   ///\r
   UINT16             Height;\r
   ///\r

-  /// The number of EFI_HII_ANIMATION_CELL contained in the \r
+  /// The number of EFI_HII_ANIMATION_CELL contained in the\r

   /// animation sequence.\r
   ///\r
   UINT16             CellCount;\r
   ///\r
   /// animation sequence.\r
   ///\r
   UINT16             CellCount;\r
   ///\r

-  /// The color to clear the logical window to before displaying the \r
+  /// The color to clear the logical window to before displaying the\r

   /// indexed image.\r
   ///\r
   EFI_HII_RGB_PIXEL  BackgndColor;\r
   /// indexed image.\r
   ///\r
   EFI_HII_RGB_PIXEL  BackgndColor;\r


@@ -2029,16 +2029,16 @@ typedef struct _EFI_HII_AIBT_CLEAR_IMAGES_BLOCK {
 \r
 ///\r
 /// An animation block to describe an animation sequence that does not cycle,\r
 \r
 ///\r
 /// An animation block to describe an animation sequence that does not cycle,\r

-/// and where the screen is restored to the original state before the next \r
+/// and where the screen is restored to the original state before the next\r

 /// image is displayed.\r
 ///\r
 typedef struct _EFI_HII_AIBT_RESTORE_SCRN_BLOCK {\r
   ///\r
 /// image is displayed.\r
 ///\r
 typedef struct _EFI_HII_AIBT_RESTORE_SCRN_BLOCK {\r
   ///\r

-  /// This is image that is to be reference by the image protocols, if the \r
-  /// animation function is not supported or disabled. This image can \r
-  /// be one particular image from the animation sequence (if any one \r
-  /// of the animation frames has a complete image) or an alternate \r
-  /// image that can be displayed alone. If the value is zero, no image \r
+  /// This is image that is to be reference by the image protocols, if the\r
+  /// animation function is not supported or disabled. This image can\r
+  /// be one particular image from the animation sequence (if any one\r
+  /// of the animation frames has a complete image) or an alternate\r
+  /// image that can be displayed alone. If the value is zero, no image\r

   /// is displayed.\r
   ///\r
   EFI_IMAGE_ID            DftImageId;\r
   /// is displayed.\r
   ///\r
   EFI_IMAGE_ID            DftImageId;\r


@@ -2051,7 +2051,7 @@ typedef struct _EFI_HII_AIBT_RESTORE_SCRN_BLOCK {
   ///\r
   UINT16                  Height;\r
   ///\r
   ///\r
   UINT16                  Height;\r
   ///\r

-  /// The number of EFI_HII_ANIMATION_CELL contained in the \r
+  /// The number of EFI_HII_ANIMATION_CELL contained in the\r

   /// animation sequence.\r
   ///\r
   UINT16                  CellCount;\r
   /// animation sequence.\r
   ///\r
   UINT16                  CellCount;\r


@@ -2069,14 +2069,14 @@ typedef EFI_HII_AIBT_OVERLAY_IMAGES_BLOCK  EFI_HII_AIBT_OVERLAY_IMAGES_LOOP_BLOC
 \r
 ///\r
 /// An animation block to describe an animation sequence that continuously cycles,\r
 \r
 ///\r
 /// An animation block to describe an animation sequence that continuously cycles,\r

-/// and where the logical window is cleared to the specified color before \r
+/// and where the logical window is cleared to the specified color before\r

 /// the next image is displayed.\r
 ///\r
 typedef EFI_HII_AIBT_CLEAR_IMAGES_BLOCK    EFI_HII_AIBT_CLEAR_IMAGES_LOOP_BLOCK;\r
 \r
 ///\r
 /// An animation block to describe an animation sequence that continuously cycles,\r
 /// the next image is displayed.\r
 ///\r
 typedef EFI_HII_AIBT_CLEAR_IMAGES_BLOCK    EFI_HII_AIBT_CLEAR_IMAGES_LOOP_BLOCK;\r
 \r
 ///\r
 /// An animation block to describe an animation sequence that continuously cycles,\r

-/// and where the screen is restored to the original state before \r
+/// and where the screen is restored to the original state before\r

 /// the next image is displayed.\r
 ///\r
 typedef EFI_HII_AIBT_RESTORE_SCRN_BLOCK    EFI_HII_AIBT_RESTORE_SCRN_LOOP_BLOCK;\r
 /// the next image is displayed.\r
 ///\r
 typedef EFI_HII_AIBT_RESTORE_SCRN_BLOCK    EFI_HII_AIBT_RESTORE_SCRN_LOOP_BLOCK;\r


@@ -2086,7 +2086,7 @@ typedef EFI_HII_AIBT_RESTORE_SCRN_BLOCK    EFI_HII_AIBT_RESTORE_SCRN_LOOP_BLOCK;
 ///\r
 typedef struct _EFI_HII_AIBT_DUPLICATE_BLOCK {\r
   ///\r
 ///\r
 typedef struct _EFI_HII_AIBT_DUPLICATE_BLOCK {\r
   ///\r

-  /// The previously defined animation ID with the exact same \r
+  /// The previously defined animation ID with the exact same\r

   /// animation information.\r
   ///\r
   EFI_ANIMATION_ID  AnimationId;\r
   /// animation information.\r
   ///\r
   EFI_ANIMATION_ID  AnimationId;\r


@@ -2121,7 +2121,7 @@ typedef struct _EFI_HII_AIBT_SKIP2_BLOCK {
 /// token usages.\r
 ///\r
 ///\r
 /// token usages.\r
 ///\r
 ///\r

-/// STRING_TOKEN is not defined in UEFI specification. But it is placed \r
+/// STRING_TOKEN is not defined in UEFI specification. But it is placed\r

 /// here for the easy access by C files and VFR source files.\r
 ///\r
 #define STRING_TOKEN(t) t\r
 /// here for the easy access by C files and VFR source files.\r
 ///\r
 #define STRING_TOKEN(t) t\r

diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.h
index 67ecc4c27cc51b2797530f79dce822ecf51b6068..037b65391873a7aae35f57b41f8ba1462ebb13ee 100644 (file)
--- a/MdePkg/Include/Uefi/UefiMultiPhase.h
+++ b/MdePkg/Include/Uefi/UefiMultiPhase.h
@@ -1,7 +1,7 @@
 /** @file\r
   This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.\r
 \r
 /** @file\r
   This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.\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 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


@@ -105,7 +105,7 @@ typedef enum {
   ///\r
   EfiPalCode,\r
   ///\r
   ///\r
   EfiPalCode,\r
   ///\r

-  /// A memory region that operates as EfiConventionalMemory, \r
+  /// A memory region that operates as EfiConventionalMemory,\r

   /// however it happens to also support byte-addressable non-volatility.\r
   ///\r
   EfiPersistentMemory,\r
   /// however it happens to also support byte-addressable non-volatility.\r
   ///\r
   EfiPersistentMemory,\r

diff --git a/MdePkg/Include/Uefi/UefiPxe.h b/MdePkg/Include/Uefi/UefiPxe.h
index 249a8c2d7aae840cd63ae50b1e07c4d17c09a3e2..7fc3dc645ead3491258c1cabbc248cfa3dedc6ed 100644 (file)
--- a/MdePkg/Include/Uefi/UefiPxe.h
+++ b/MdePkg/Include/Uefi/UefiPxe.h
@@ -3,13 +3,13 @@
   structure prototypes, global variables and constants that\r
   are needed for porting PXE to EFI.\r
 \r
   structure prototypes, global variables and constants that\r
   are needed for porting PXE to EFI.\r
 \r

-Copyright (c) 2006 - 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) 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
-    \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
   @par Revision Reference:\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   @par Revision Reference:\r

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index ee016b48ded3197884adc8f914ac40f35b137c58..be1e7ec3c8edb1fe631507c173a817a0a3384dab 100644 (file)
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -5,13 +5,13 @@
   If a code construct is defined in the UEFI 2.7 specification it must be included\r
   by this include file.\r
 \r
   If a code construct is defined in the UEFI 2.7 specification it must be included\r
   by this include file.\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
-    \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


@@ -35,7 +35,7 @@ typedef enum {
   ///\r
   AllocateAnyPages,\r
   ///\r
   ///\r
   AllocateAnyPages,\r
   ///\r

-  /// Allocate any available range of pages whose uppermost address is less than \r
+  /// Allocate any available range of pages whose uppermost address is less than\r

   /// or equal to a specified maximum address.\r
   ///\r
   AllocateMaxAddress,\r
   /// or equal to a specified maximum address.\r
   ///\r
   AllocateMaxAddress,\r


@@ -79,7 +79,7 @@ typedef enum {
 #define EFI_MEMORY_XP               0x0000000000004000ULL\r
 #define EFI_MEMORY_RO               0x0000000000020000ULL\r
 //\r
 #define EFI_MEMORY_XP               0x0000000000004000ULL\r
 #define EFI_MEMORY_RO               0x0000000000020000ULL\r
 //\r

-// Physical memory persistence attribute. \r
+// Physical memory persistence attribute.\r

 // The memory region supports byte-addressable non-volatility.\r
 //\r
 #define EFI_MEMORY_NV               0x0000000000008000ULL\r
 // The memory region supports byte-addressable non-volatility.\r
 //\r
 #define EFI_MEMORY_NV               0x0000000000008000ULL\r


@@ -129,7 +129,7 @@ typedef struct {
   UINT64                NumberOfPages;\r
   ///\r
   /// Attributes of the memory region that describe the bit mask of capabilities\r
   UINT64                NumberOfPages;\r
   ///\r
   /// Attributes of the memory region that describe the bit mask of capabilities\r

-  /// for that memory region, and not necessarily the current settings for that \r
+  /// for that memory region, and not necessarily the current settings for that\r

   /// memory region.\r
   ///\r
   UINT64                Attribute;\r
   /// memory region.\r
   ///\r
   UINT64                Attribute;\r


@@ -313,8 +313,8 @@ EFI_STATUS
   @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
 typedef\r
                                 associated with the ControllerHandle or specified by the RemainingDevicePath.\r
 **/\r
 typedef\r


@@ -702,13 +702,13 @@ EFI_STATUS
   @param[in]  VendorGuid         A unique identifier for the vendor.\r
   @param[in]  Attributes         Attributes bitmask to set for the variable.\r
   @param[in]  DataSize           The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE or\r
   @param[in]  VendorGuid         A unique identifier for the vendor.\r
   @param[in]  Attributes         Attributes bitmask to set for the variable.\r
   @param[in]  DataSize           The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE or\r

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

   @param[in]  Data               The contents for the variable.\r
 \r
   @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r
   @param[in]  Data               The contents for the variable.\r
 \r
   @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r


@@ -722,7 +722,7 @@ EFI_STATUS
   @retval EFI_WRITE_PROTECTED    The variable in question cannot be deleted.\r
   @retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set,\r
                                  but the AuthInfo does NOT pass the validation check carried out by the firmware.\r
   @retval EFI_WRITE_PROTECTED    The variable in question cannot be deleted.\r
   @retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set,\r
                                  but the AuthInfo does NOT pass the validation check carried out by the firmware.\r

-  \r
+\r

   @retval EFI_NOT_FOUND          The variable trying to be updated or deleted was not found.\r
 \r
 **/\r
   @retval EFI_NOT_FOUND          The variable trying to be updated or deleted was not found.\r
 \r
 **/\r


@@ -870,10 +870,10 @@ EFI_STATUS
   @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


@@ -912,15 +912,15 @@ EFI_STATUS
 /**\r
   Terminates a loaded EFI image and returns control to boot services.\r
 \r
 /**\r
   Terminates a loaded EFI image and returns control to boot services.\r
 \r

-  @param[in]  ImageHandle       Handle that identifies the image. This parameter is passed to the \r
+  @param[in]  ImageHandle       Handle that identifies the image. This parameter is passed to the\r

                                 image on entry.\r
   @param[in]  ExitStatus        The image's exit code.\r
   @param[in]  ExitDataSize      The size, in bytes, of ExitData. Ignored if ExitStatus is EFI_SUCCESS.\r
   @param[in]  ExitData          The pointer to a data buffer that includes a Null-terminated string,\r
                                 image on entry.\r
   @param[in]  ExitStatus        The image's exit code.\r
   @param[in]  ExitDataSize      The size, in bytes, of ExitData. Ignored if ExitStatus is EFI_SUCCESS.\r
   @param[in]  ExitData          The pointer to a data buffer that includes a Null-terminated string,\r

-                                optionally followed by additional binary data. The string is a \r
-                                description that the caller may use to further indicate the reason \r
-                                for the image's exit. ExitData is only valid if ExitStatus \r
-                                is something other than EFI_SUCCESS. The ExitData buffer \r
+                                optionally followed by additional binary data. The string is a\r
+                                description that the caller may use to further indicate the reason\r
+                                for the image's exit. ExitData is only valid if ExitStatus\r
+                                is something other than EFI_SUCCESS. The ExitData buffer\r

                                 must be allocated by calling AllocatePool().\r
 \r
   @retval EFI_SUCCESS           The image specified by ImageHandle was unloaded.\r
                                 must be allocated by calling AllocatePool().\r
 \r
   @retval EFI_SUCCESS           The image specified by ImageHandle was unloaded.\r


@@ -1454,7 +1454,7 @@ typedef enum {
   ///\r
   ByRegisterNotify,\r
   ///\r
   ///\r
   ByRegisterNotify,\r
   ///\r

-  /// Retrieve the set of handles from the handle database that support a \r
+  /// Retrieve the set of handles from the handle database that support a\r

   /// specified protocol.\r
   ///\r
   ByProtocol\r
   /// specified protocol.\r
   ///\r
   ByProtocol\r


@@ -1683,10 +1683,10 @@ typedef struct {
   @retval EFI_INVALID_PARAMETER CapsuleCount is 0.\r
   @retval EFI_DEVICE_ERROR      The capsule update was started, but failed due to a device error.\r
   @retval EFI_UNSUPPORTED       The capsule type is not supported on this platform.\r
   @retval EFI_INVALID_PARAMETER CapsuleCount is 0.\r
   @retval EFI_DEVICE_ERROR      The capsule update was started, but failed due to a device error.\r
   @retval EFI_UNSUPPORTED       The capsule type is not supported on this platform.\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


@@ -1714,10 +1714,10 @@ EFI_STATUS
   @retval EFI_UNSUPPORTED       The capsule type is not supported on this platform, and\r
                                 MaximumCapsuleSize and ResetType are undefined.\r
   @retval EFI_INVALID_PARAMETER MaximumCapsuleSize is NULL.\r
   @retval EFI_UNSUPPORTED       The capsule type is not supported on this platform, and\r
                                 MaximumCapsuleSize and ResetType are undefined.\r
   @retval EFI_INVALID_PARAMETER MaximumCapsuleSize is NULL.\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

diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/ProcessorBind.h
index 38ef2665390fa2690d6f353bd4dc4a57c09e6e19..e4254285877bba28a846f2103b1aa9c4f06bb67c 100644 (file)
--- a/MdePkg/Include/X64/ProcessorBind.h
+++ b/MdePkg/Include/X64/ProcessorBind.h
@@ -1,14 +1,14 @@
 /** @file\r
   Processor or Compiler specific defines and types x64 (Intel 64, AMD64).\r
 \r
 /** @file\r
   Processor or Compiler specific defines and types x64 (Intel 64, AMD64).\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


@@ -114,17 +114,17 @@
 //\r
 \r
 //\r
 //\r
 \r
 //\r

-// This warning is for potentially uninitialized local variable, and it may cause false \r
+// This warning is for potentially uninitialized local variable, and it may cause false\r

 // positive issues in VS2013 and VS2015 build\r
 //\r
 #pragma warning ( disable : 4701 )\r
 // positive issues in VS2013 and VS2015 build\r
 //\r
 #pragma warning ( disable : 4701 )\r

-  \r
+\r

 //\r
 //\r

-// This warning is for potentially uninitialized local pointer variable, and it may cause \r
+// This warning is for potentially uninitialized local pointer variable, and it may cause\r

 // false positive issues in VS2013 and VS2015 build\r
 //\r
 #pragma warning ( disable : 4703 )\r
 // false positive issues in VS2013 and VS2015 build\r
 //\r
 #pragma warning ( disable : 4703 )\r

-  \r
+\r

 #endif\r
 \r
 #endif\r
 #endif\r
 \r
 #endif\r


@@ -294,24 +294,24 @@ typedef INT64   INTN;
 #elif defined(_MSC_EXTENSIONS)\r
   ///\r
   /// Microsoft* compiler specific method for EFIAPI calling convention.\r
 #elif defined(_MSC_EXTENSIONS)\r
   ///\r
   /// Microsoft* compiler specific method for EFIAPI calling convention.\r

-  /// \r
-  #define EFIAPI __cdecl  \r
+  ///\r
+  #define EFIAPI __cdecl\r

 #elif defined(__GNUC__)\r
   ///\r
   /// Define the standard calling convention regardless of optimization level.\r
   /// The GCC support assumes a GCC compiler that supports the EFI ABI. The EFI\r
 #elif defined(__GNUC__)\r
   ///\r
   /// Define the standard calling convention regardless of optimization level.\r
   /// The GCC support assumes a GCC compiler that supports the EFI ABI. The EFI\r

-  /// ABI is much closer to the x64 Microsoft* ABI than standard x64 (x86-64) \r
-  /// GCC ABI. Thus a standard x64 (x86-64) GCC compiler can not be used for \r
-  /// x64. Warning the assembly code in the MDE x64 does not follow the correct \r
+  /// ABI is much closer to the x64 Microsoft* ABI than standard x64 (x86-64)\r
+  /// GCC ABI. Thus a standard x64 (x86-64) GCC compiler can not be used for\r
+  /// x64. Warning the assembly code in the MDE x64 does not follow the correct\r

   /// ABI for the standard x64 (x86-64) GCC.\r
   ///\r
   /// ABI for the standard x64 (x86-64) GCC.\r
   ///\r

-  #define EFIAPI \r
+  #define EFIAPI\r

 #else\r
   ///\r
   /// The default for a non Microsoft* or GCC compiler is to assume the EFI ABI\r
 #else\r
   ///\r
   /// The default for a non Microsoft* or GCC compiler is to assume the EFI ABI\r

-  /// is the standard. \r
+  /// is the standard.\r

   ///\r
   ///\r

-  #define EFIAPI       \r
+  #define EFIAPI\r

 #endif\r
 \r
 #if defined(__GNUC__)\r
 #endif\r
 \r
 #if defined(__GNUC__)\r


@@ -324,13 +324,13 @@ typedef INT64   INTN;
 \r
 /**\r
   Return the pointer to the first instruction of a function given a function pointer.\r
 \r
 /**\r
   Return the pointer to the first instruction of a function given a function pointer.\r

-  On x64 CPU architectures, these two pointer values are the same, \r
+  On x64 CPU architectures, these two pointer values are the same,\r

   so the implementation of this macro is very simple.\r
   so the implementation of this macro is very simple.\r

-  \r
+\r

   @param  FunctionPointer   A pointer to a function.\r
 \r
   @return The pointer to the first instruction of a function given a function pointer.\r
   @param  FunctionPointer   A pointer to a function.\r
 \r
   @return The pointer to the first instruction of a function given a function pointer.\r

-  \r
+\r

 **/\r
 #define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)\r
 \r
 **/\r
 #define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)\r
 \r

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/ArmCache.c b/MdePkg/Library/BaseCacheMaintenanceLib/ArmCache.c
index 79c84a09824dbee1e9a58314a37f54a52cef3ad3..95373b6cf975af06c4674df532cc51c3d8b9547d 100644 (file)
--- a/MdePkg/Library/BaseCacheMaintenanceLib/ArmCache.c
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/ArmCache.c
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  Cache Maintenance Functions. These functions vary by ARM architecture so the MdePkg \r
-  versions are null functions used to make sure things will compile. \r
+  Cache Maintenance Functions. These functions vary by ARM architecture so the MdePkg\r
+  versions are null functions used to make sure things will compile.\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

   Portions copyright (c) 2008 - 2009, Apple 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
   Portions copyright (c) 2008 - 2009, Apple 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

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
index d659161f33bc54f42c7a3c732cf19344dde3ce77..d562db12d06d2d5e890f28f6b18e3492b358ad01 100644 (file)
--- a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
@@ -4,7 +4,7 @@
 #  Cache Maintenance Library that uses Base Library services to maintain caches.\r
 #  This library assumes there are no chipset dependencies required to maintain caches.\r
 #\r
 #  Cache Maintenance Library that uses Base Library services to maintain caches.\r
 #  This library assumes there are no chipset dependencies required to maintain caches.\r
 #\r

-#  Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 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


@@ -24,7 +24,7 @@
   FILE_GUID                      = 123dd843-57c9-4158-8418-ce68b3944ce7\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.1\r
   FILE_GUID                      = 123dd843-57c9-4158-8418-ce68b3944ce7\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.1\r

-  LIBRARY_CLASS                  = CacheMaintenanceLib \r
+  LIBRARY_CLASS                  = CacheMaintenanceLib\r

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

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c b/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
index 24e985174ec0440ef9dbcc2ab10fe0c67ab36d34..904533d4bfc1a885fb5baf7e7550824e27df2b07 100644 (file)
--- a/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
@@ -1,7 +1,7 @@
 /** @file\r
   Cache Maintenance Functions.\r
 \r
 /** @file\r
   Cache Maintenance 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


@@ -194,7 +194,7 @@ InvalidateDataCache (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // Invalidation of the entire data cache without writing back is not supported \r
+  // Invalidation of the entire data cache without writing back is not supported\r

   // on IPF architecture, so a write back and invalidate operation is performed.\r
   //\r
   WriteBackInvalidateDataCache ();\r
   // on IPF architecture, so a write back and invalidate operation is performed.\r
   //\r
   WriteBackInvalidateDataCache ();\r

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/X86Cache.c b/MdePkg/Library/BaseCacheMaintenanceLib/X86Cache.c
index 147a9a78e48dcaf47a73bc0025f2649f383bd348..42049144a4c782fbd0b47c98c9a514553da54df6 100644 (file)
--- a/MdePkg/Library/BaseCacheMaintenanceLib/X86Cache.c
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/X86Cache.c
@@ -1,7 +1,7 @@
 /** @file\r
   Cache Maintenance Functions.\r
 \r
 /** @file\r
   Cache Maintenance Functions.\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


@@ -135,7 +135,7 @@ WriteBackInvalidateDataCacheRange (
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Address));\r
 \r
   //\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Address));\r
 \r
   //\r

-  // If the CPU does not support CLFLUSH instruction, \r
+  // If the CPU does not support CLFLUSH instruction,\r

   // then promote flush range to flush entire cache.\r
   //\r
   AsmCpuid (0x01, NULL, &RegEbx, NULL, &RegEdx);\r
   // then promote flush range to flush entire cache.\r
   //\r
   AsmCpuid (0x01, NULL, &RegEbx, NULL, &RegEdx);\r

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S
index 960fd990a104a1311c86e1e0ac1af627f938ab30..c0f1e095f0d73b4c2e06251ab5a43c035d7f6871 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S
@@ -1,8 +1,8 @@
-#------------------------------------------------------------------------------ \r
+#------------------------------------------------------------------------------\r

 #\r
 # CpuFlushTlb() for ARM\r
 #\r
 #\r
 # CpuFlushTlb() for ARM\r
 #\r

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

 # Portions copyright (c) 2008 - 2009, Apple 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
 # Portions copyright (c) 2008 - 2009, Apple 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

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm
index 76313ab6071f0f21797ba51c4b51636e022e8736..b6d21c7c5bb03a7fa057d6a5e7a64236010da9b9 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm
@@ -1,8 +1,8 @@
-;------------------------------------------------------------------------------ \r
+;------------------------------------------------------------------------------\r

 ;\r
 ; CpuFlushTlb() for ARM\r
 ;\r
 ;\r
 ; CpuFlushTlb() for ARM\r
 ;\r

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

 ; Portions copyright (c) 2008 - 2009, Apple 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
 ; Portions copyright (c) 2008 - 2009, Apple 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


@@ -29,7 +29,7 @@
 ;  VOID\r
 ;  );\r
 ;\r
 ;  VOID\r
 ;  );\r
 ;\r

-CpuFlushTlb \r
+CpuFlushTlb\r

     MOV r0,#0\r
     MCR p15,0,r0,c8,c5,0        ;Invalidate all the unlocked entried in TLB\r
     BX LR\r
     MOV r0,#0\r
     MCR p15,0,r0,c8,c5,0        ;Invalidate all the unlocked entried in TLB\r
     BX LR\r

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S
index 2c859306db0891c75cbfab7bab230f0d0905fc6f..06caf1a3b86acbc84505b0c815106796e502269d 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S
@@ -1,4 +1,4 @@
-#------------------------------------------------------------------------------ \r
+#------------------------------------------------------------------------------\r

 #\r
 # CpuSleep() for ARMv7\r
 #\r
 #\r
 # CpuSleep() for ARMv7\r
 #\r


@@ -8,7 +8,7 @@
 #\r
 # But this is a no-op on ARMv7\r
 #\r
 #\r
 # But this is a no-op on ARMv7\r
 #\r

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

 # Portions copyright (c) 2008 - 2009, Apple 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
 # Portions copyright (c) 2008 - 2009, Apple 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

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm
index a51e2cd9dd02fa3e9e80f8d0f37242b1fb49f0b4..2d6090c07d104d374ec13a3be135f4a8cba3507b 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm
@@ -1,4 +1,4 @@
-;------------------------------------------------------------------------------ \r
+;------------------------------------------------------------------------------\r

 ;\r
 ; CpuSleep() for ARMv7\r
 ;\r
 ;\r
 ; CpuSleep() for ARMv7\r
 ;\r


@@ -8,7 +8,7 @@
 ;\r
 ; But this is a no-op on ARMv7\r
 ;\r
 ;\r
 ; But this is a no-op on ARMv7\r
 ;\r

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

 ; Portions copyright (c) 2008 - 2011, Apple 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
 ; Portions copyright (c) 2008 - 2011, Apple 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

diff --git a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
index 84564e00d727dd672392128006c7d1f16b8673e3..53cb3cf45da6c8e9f8e0f2f917396ae660bbc0da 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
+++ b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
@@ -25,7 +25,7 @@
   FILE_GUID                      = 4FBD2538-249C-4b50-8F4A-A9E66609CBF6\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 4FBD2538-249C-4b50-8F4A-A9E66609CBF6\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = CpuLib \r
+  LIBRARY_CLASS                  = CpuLib\r

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


@@ -33,23 +33,23 @@
 #\r
 \r
 [Sources.IA32]\r
 #\r
 \r
 [Sources.IA32]\r

-  Ia32/CpuSleep.c | MSFT \r
-  Ia32/CpuFlushTlb.c | MSFT \r
+  Ia32/CpuSleep.c | MSFT\r
+  Ia32/CpuFlushTlb.c | MSFT\r

 \r
   Ia32/CpuSleep.nasm| INTEL\r
   Ia32/CpuFlushTlb.nasm| INTEL\r
 \r
 \r
   Ia32/CpuSleep.nasm| INTEL\r
   Ia32/CpuFlushTlb.nasm| INTEL\r
 \r

-  Ia32/CpuSleepGcc.c | GCC \r
-  Ia32/CpuFlushTlbGcc.c | GCC \r
+  Ia32/CpuSleepGcc.c | GCC\r
+  Ia32/CpuFlushTlbGcc.c | GCC\r

 \r
 [Sources.X64]\r
   X64/CpuFlushTlb.nasm\r
   X64/CpuSleep.nasm\r
 \r
   X64/CpuSleep.nasm| GCC\r
 \r
 [Sources.X64]\r
   X64/CpuFlushTlb.nasm\r
   X64/CpuSleep.nasm\r
 \r
   X64/CpuSleep.nasm| GCC\r

-  X64/CpuSleep.S | GCC \r
+  X64/CpuSleep.S | GCC\r

   X64/CpuFlushTlb.nasm| GCC\r
   X64/CpuFlushTlb.nasm| GCC\r

-  X64/CpuFlushTlb.S | GCC \r
+  X64/CpuFlushTlb.S | GCC\r

 \r
 [Sources.IPF]\r
   Ipf/CpuFlushTlb.s\r
 \r
 [Sources.IPF]\r
   Ipf/CpuFlushTlb.s\r


@@ -60,11 +60,11 @@
 \r
 [Sources.ARM]\r
   Arm/CpuFlushTlb.asm | RVCT\r
 \r
 [Sources.ARM]\r
   Arm/CpuFlushTlb.asm | RVCT\r

-  Arm/CpuSleep.asm    | RVCT  \r
+  Arm/CpuSleep.asm    | RVCT\r

   Arm/CpuFlushTlb.asm | MSFT\r
   Arm/CpuSleep.asm    | MSFT\r
   Arm/CpuFlushTlb.S   | GCC\r
   Arm/CpuFlushTlb.asm | MSFT\r
   Arm/CpuSleep.asm    | MSFT\r
   Arm/CpuFlushTlb.S   | GCC\r

-  Arm/CpuSleep.S      | GCC  \r
+  Arm/CpuSleep.S      | GCC\r

 \r
 [Sources.AARCH64]\r
   AArch64/CpuFlushTlb.S   | GCC\r
 \r
 [Sources.AARCH64]\r
   AArch64/CpuFlushTlb.S   | GCC\r

diff --git a/MdePkg/Library/BaseCpuLib/X64/CpuFlushTlb.S b/MdePkg/Library/BaseCpuLib/X64/CpuFlushTlb.S
index 852ce14abe0debf06d4f3ff9ef3d2fca94e72bce..05d916a589ceee442b5f96bdb827d8560658aed3 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/X64/CpuFlushTlb.S
+++ b/MdePkg/Library/BaseCpuLib/X64/CpuFlushTlb.S
@@ -1,5 +1,5 @@
-#------------------------------------------------------------------------------ \r
-# Copyright (c) 2006 - 2008, 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/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
index a203e187cf6610a57ea1f84b1911ed5f38951d53..123e78a44f358a049fcb69e988d9185e7cf2b8bd 100644 (file)
--- a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+++ b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Debug Library with empty functions.\r
 #\r
 ## @file\r
 #  Debug Library with empty functions.\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


@@ -20,7 +20,7 @@
   FILE_GUID                      = 9ba1d976-0624-41a3-8650-28165e8d9ae8\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 9ba1d976-0624-41a3-8650-28165e8d9ae8\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = DebugLib \r
+  LIBRARY_CLASS                  = DebugLib\r

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

diff --git a/MdePkg/Library/BaseDebugLibNull/DebugLib.c b/MdePkg/Library/BaseDebugLibNull/DebugLib.c
index e88b887d603dba3b6982892632a6c59458872fd9..1a7d4aba79c2ad7e7699e3d36c9d25df31e9a10f 100644 (file)
--- a/MdePkg/Library/BaseDebugLibNull/DebugLib.c
+++ b/MdePkg/Library/BaseDebugLibNull/DebugLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Null Base Debug Library instance with empty functions.\r
 \r
 /** @file\r
   Null Base Debug Library instance with empty functions.\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


@@ -18,15 +18,15 @@
 /**\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
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      Format string for the debug message to print.\r
   associated variable argument list to the debug output device.\r
 \r
   If Format is NULL, then ASSERT().\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


@@ -42,14 +42,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


@@ -76,14 +76,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  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r
 \r
   @param   Buffer  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r

-  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. \r
+  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue.\r

 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r
 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r


@@ -102,7 +102,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


@@ -119,10 +119,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


@@ -139,10 +139,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


@@ -159,10 +159,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/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
index 823511b22f6bccd7683ae7b1b27ba793439ee529..870634c204ec9287f6d2ab022ea2740ca94b040c 100644 (file)
--- a/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
+++ b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
@@ -2,7 +2,7 @@
 #  Instance of Debug Library based on Serial Port Library.\r
 #  It uses Print Library to produce formatted output strings to seiral port device.\r
 #\r
 #  Instance of Debug Library based on Serial Port Library.\r
 #  It uses Print Library to produce formatted output strings to seiral port device.\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
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -21,7 +21,7 @@
   FILE_GUID                      = BB83F95F-EDBC-4884-A520-CD42AF388FAE\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = BB83F95F-EDBC-4884-A520-CD42AF388FAE\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = DebugLib \r
+  LIBRARY_CLASS                  = DebugLib\r

   CONSTRUCTOR                    = BaseDebugLibSerialPortConstructor\r
 \r
 #\r
   CONSTRUCTOR                    = BaseDebugLibSerialPortConstructor\r
 \r
 #\r

diff --git a/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c b/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
index 8ab084721e9332b601591ec4dfb2793ac7cbf966..ffb84b39e59344cb8850185ce1fd7a243f63fe89 100644 (file)
--- a/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
+++ b/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
@@ -1,20 +1,20 @@
 /** @file\r
   Base Debug library instance base on Serial Port library.\r
   It uses PrintLib to send debug messages to serial port device.\r
 /** @file\r
   Base Debug library instance base on Serial Port library.\r
   It uses PrintLib to send debug messages to serial port device.\r

-  \r
-  NOTE: If the Serial Port library enables hardware flow control, then a call \r
-  to DebugPrint() or DebugAssert() may hang if writes to the serial port are \r
+\r
+  NOTE: If the Serial Port library enables hardware flow control, then a call\r
+  to DebugPrint() or DebugAssert() may hang if writes to the serial port are\r

   being blocked.  This may occur if a key(s) are pressed in a terminal emulator\r
   being blocked.  This may occur if a key(s) are pressed in a terminal emulator\r

-  used to monitor the DEBUG() and ASSERT() messages. \r
+  used to monitor the DEBUG() and ASSERT() messages.\r

 \r
 \r

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


@@ -28,7 +28,7 @@
 #include <Library/DebugPrintErrorLevelLib.h>\r
 \r
 //\r
 #include <Library/DebugPrintErrorLevelLib.h>\r
 \r
 //\r

-// Define the maximum debug and assert message length that this library supports \r
+// Define the maximum debug and assert message length that this library supports\r

 //\r
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100\r
 \r
 //\r
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100\r
 \r


@@ -50,15 +50,15 @@ BaseDebugLibSerialPortConstructor (
 /**\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
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      Format string for the debug message to print.\r
   associated variable argument list to the debug output device.\r
 \r
   If Format is NULL, then ASSERT().\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


@@ -93,21 +93,21 @@ DebugPrint (
   VA_END (Marker);\r
 \r
   //\r
   VA_END (Marker);\r
 \r
   //\r

-  // Send the print string to a Serial Port \r
+  // Send the print string to a Serial Port\r

   //\r
   SerialPortWrite ((UINT8 *)Buffer, AsciiStrLen (Buffer));\r
 }\r
 \r
 \r
 /**\r
   //\r
   SerialPortWrite ((UINT8 *)Buffer, AsciiStrLen (Buffer));\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


@@ -154,14 +154,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  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r
 \r
   @param   Buffer  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r

-  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. \r
+  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue.\r

 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r
 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r


@@ -188,7 +188,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


@@ -205,10 +205,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


@@ -225,10 +225,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


@@ -245,10 +245,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/MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.c b/MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.c
index 7af127f99f1cc4882c98bccd5f63427fb88dd1fd..c31cbde68a057eceb0808c9560862ba37585f42e 100644 (file)
--- a/MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.c
+++ b/MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.c
@@ -1,9 +1,9 @@
 /** @file\r
 /** @file\r

-  Debug Print Error Level library instance that retrieves the current error \r
-  level from PcdDebugPrintErrorLevel.  This generic library instance does not \r
+  Debug Print Error Level library instance that retrieves the current error\r
+  level from PcdDebugPrintErrorLevel.  This generic library instance does not\r

   support the setting of the global debug print error level mask for the platform.\r
 \r
   support the setting of the global debug print error level mask for the platform.\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


@@ -38,9 +38,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

diff --git a/MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf b/MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
index 7f611b0b9b05ab614e39da6f3526da689deb7ddf..99cc9eb6498976ba8e9f4ebdd6e2ab18408a8185 100644 (file)
--- a/MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
+++ b/MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
@@ -1,8 +1,8 @@
 ## @file\r
 #  Debug Print Error Level library instance based on PcdDebugPrintErrorLevel.\r
 ## @file\r
 #  Debug Print Error Level library instance based on PcdDebugPrintErrorLevel.\r

-#  It retrieves the current error level from PcdDebugPrintErrorLevel.  \r
+#  It retrieves the current error level from PcdDebugPrintErrorLevel.\r

 #\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


@@ -34,7 +34,7 @@
 \r
 [LibraryClasses]\r
   PcdLib\r
 \r
 [LibraryClasses]\r
   PcdLib\r

-  \r
+\r

 [Pcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel  ## CONSUMES\r
 \r
 [Pcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel  ## CONSUMES\r
 \r

diff --git a/MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.c b/MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.c
index 28996f310b9ebc6d4b47e887ac06338aa8d960bb..b02663a64d860a1ac42ad88b7509a62cd5abcaba 100644 (file)
--- a/MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.c
+++ b/MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Provide generic extract guided section functions.\r
 \r
 /** @file\r
   Provide generic extract guided section functions.\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


@@ -30,8 +30,8 @@ typedef struct {
 } EXTRACT_GUIDED_SECTION_HANDLER_INFO;\r
 \r
 /**\r
 } EXTRACT_GUIDED_SECTION_HANDLER_INFO;\r
 \r
 /**\r

-  HandlerInfo table address is set by PcdGuidedExtractHandlerTableAddress, which is used to store \r
-  the registered guid and Handler list. When it is initialized, it will be directly returned. \r
+  HandlerInfo table address is set by PcdGuidedExtractHandlerTableAddress, which is used to store\r
+  the registered guid and Handler list. When it is initialized, it will be directly returned.\r

   Or, HandlerInfo table will be initialized in this function.\r
 \r
   @param[in, out]  InfoPointer   The pointer to the handler information structure.\r
   Or, HandlerInfo table will be initialized in this function.\r
 \r
   @param[in, out]  InfoPointer   The pointer to the handler information structure.\r


@@ -45,7 +45,7 @@ GetExtractGuidedSectionHandlerInfo (
   )\r
 {\r
   EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r
   )\r
 {\r
   EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r

-  \r
+\r

   //\r
   // Set the available memory address to handler info.\r
   //\r
   //\r
   // Set the available memory address to handler info.\r
   //\r


@@ -84,12 +84,12 @@ GetExtractGuidedSectionHandlerInfo (
   HandlerInfo->NumberOfExtractHandler     = 0;\r
   HandlerInfo->ExtractHandlerGuidTable    = (GUID *) (HandlerInfo + 1);\r
   HandlerInfo->ExtractDecodeHandlerTable  = (EXTRACT_GUIDED_SECTION_DECODE_HANDLER *) (\r
   HandlerInfo->NumberOfExtractHandler     = 0;\r
   HandlerInfo->ExtractHandlerGuidTable    = (GUID *) (HandlerInfo + 1);\r
   HandlerInfo->ExtractDecodeHandlerTable  = (EXTRACT_GUIDED_SECTION_DECODE_HANDLER *) (\r

-                                              (UINT8 *)HandlerInfo->ExtractHandlerGuidTable + \r
+                                              (UINT8 *)HandlerInfo->ExtractHandlerGuidTable +\r

                                               PcdGet32 (PcdMaximumGuidedExtractHandler) * sizeof (GUID)\r
                                              );\r
   HandlerInfo->ExtractGetInfoHandlerTable = (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER *) (\r
                                               PcdGet32 (PcdMaximumGuidedExtractHandler) * sizeof (GUID)\r
                                              );\r
   HandlerInfo->ExtractGetInfoHandlerTable = (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER *) (\r

-                                              (UINT8 *)HandlerInfo->ExtractDecodeHandlerTable + \r
-                                              PcdGet32 (PcdMaximumGuidedExtractHandler) * \r
+                                              (UINT8 *)HandlerInfo->ExtractDecodeHandlerTable +\r
+                                              PcdGet32 (PcdMaximumGuidedExtractHandler) *\r

                                               sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER)\r
                                              );\r
   *InfoPointer = HandlerInfo;\r
                                               sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER)\r
                                              );\r
   *InfoPointer = HandlerInfo;\r


@@ -101,7 +101,7 @@ GetExtractGuidedSectionHandlerInfo (
 \r
   Sets ExtractHandlerGuidTable so it points at a callee allocated array of registered GUIDs.\r
   The total number of GUIDs in the array are returned. Since the array of GUIDs is callee allocated\r
 \r
   Sets ExtractHandlerGuidTable so it points at a callee allocated array of registered GUIDs.\r
   The total number of GUIDs in the array are returned. Since the array of GUIDs is callee allocated\r

-  and caller must treat this array of GUIDs as read-only data. \r
+  and caller must treat this array of GUIDs as read-only data.\r

   If ExtractHandlerGuidTable is NULL, then ASSERT().\r
 \r
   @param[out]  ExtractHandlerGuidTable  A pointer to the array of GUIDs that have been registered through\r
   If ExtractHandlerGuidTable is NULL, then ASSERT().\r
 \r
   @param[out]  ExtractHandlerGuidTable  A pointer to the array of GUIDs that have been registered through\r


@@ -145,7 +145,7 @@ ExtractGuidedSectionGetGuidList (
   Registers the handlers specified by GetInfoHandler and DecodeHandler with the GUID specified by SectionGuid.\r
   If the GUID value specified by SectionGuid has already been registered, then return RETURN_ALREADY_STARTED.\r
   If there are not enough resources available to register the handlers  then RETURN_OUT_OF_RESOURCES is returned.\r
   Registers the handlers specified by GetInfoHandler and DecodeHandler with the GUID specified by SectionGuid.\r
   If the GUID value specified by SectionGuid has already been registered, then return RETURN_ALREADY_STARTED.\r
   If there are not enough resources available to register the handlers  then RETURN_OUT_OF_RESOURCES is returned.\r

-  \r
+\r

   If SectionGuid is NULL, then ASSERT().\r
   If GetInfoHandler is NULL, then ASSERT().\r
   If DecodeHandler is NULL, then ASSERT().\r
   If SectionGuid is NULL, then ASSERT().\r
   If GetInfoHandler is NULL, then ASSERT().\r
   If DecodeHandler is NULL, then ASSERT().\r


@@ -156,7 +156,7 @@ ExtractGuidedSectionGetGuidList (
                              size of the decoded buffer and the size of an optional scratch buffer\r
                              required to actually decode the data in a GUIDed section.\r
   @param[in]  DecodeHandler  The pointer to a function that decodes a GUIDed section into a caller\r
                              size of the decoded buffer and the size of an optional scratch buffer\r
                              required to actually decode the data in a GUIDed section.\r
   @param[in]  DecodeHandler  The pointer to a function that decodes a GUIDed section into a caller\r

-                             allocated output buffer. \r
+                             allocated output buffer.\r

 \r
   @retval  RETURN_SUCCESS           The handlers were registered.\r
   @retval  RETURN_OUT_OF_RESOURCES  There are not enough resources available to register the handlers.\r
 \r
   @retval  RETURN_SUCCESS           The handlers were registered.\r
   @retval  RETURN_OUT_OF_RESOURCES  There are not enough resources available to register the handlers.\r


@@ -210,7 +210,7 @@ ExtractGuidedSectionRegisterHandlers (
   if (HandlerInfo->NumberOfExtractHandler >= PcdGet32 (PcdMaximumGuidedExtractHandler)) {\r
     return RETURN_OUT_OF_RESOURCES;\r
   }\r
   if (HandlerInfo->NumberOfExtractHandler >= PcdGet32 (PcdMaximumGuidedExtractHandler)) {\r
     return RETURN_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   //\r
   // Register new Handler and guid value.\r
   //\r
   //\r
   // Register new Handler and guid value.\r
   //\r


@@ -227,14 +227,14 @@ ExtractGuidedSectionRegisterHandlers (
   The selected handler is used to retrieve and return the size of the decoded buffer and the size of an\r
   optional scratch buffer required to actually decode the data in a GUIDed section.\r
 \r
   The selected handler is used to retrieve and return the size of the decoded buffer and the size of an\r
   optional 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 any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r
   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r

-  then RETURN_UNSUPPORTED is returned.  \r
-  If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler \r
+  then RETURN_UNSUPPORTED is returned.\r
+  If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r

   of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to retrieve the OututBufferSize, ScratchSize, and Attributes values. The return status from the handler of\r
   type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER is returned.\r
   of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to retrieve the OututBufferSize, ScratchSize, and Attributes values. The return status from the handler of\r
   type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER is returned.\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


@@ -261,14 +261,14 @@ ExtractGuidedSectionGetInfo (
   IN  CONST VOID    *InputSection,\r
   OUT       UINT32  *OutputBufferSize,\r
   OUT       UINT32  *ScratchBufferSize,\r
   IN  CONST VOID    *InputSection,\r
   OUT       UINT32  *OutputBufferSize,\r
   OUT       UINT32  *ScratchBufferSize,\r

-  OUT       UINT16  *SectionAttribute   \r
+  OUT       UINT16  *SectionAttribute\r

   )\r
 {\r
   UINT32                              Index;\r
   RETURN_STATUS                       Status;\r
   EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r
   EFI_GUID                            *SectionDefinitionGuid;\r
   )\r
 {\r
   UINT32                              Index;\r
   RETURN_STATUS                       Status;\r
   EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r
   EFI_GUID                            *SectionDefinitionGuid;\r

-  \r
+\r

   //\r
   // Check input parameter\r
   //\r
   //\r
   // Check input parameter\r
   //\r


@@ -310,7 +310,7 @@ ExtractGuidedSectionGetInfo (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Not found, the input guided section is not supported. \r
+  // Not found, the input guided section is not supported.\r

   //\r
   return RETURN_UNSUPPORTED;\r
 }\r
   //\r
   return RETURN_UNSUPPORTED;\r
 }\r


@@ -321,26 +321,26 @@ ExtractGuidedSectionGetInfo (
   The selected handler is used to decode the data in a GUIDed section and return the result in a caller\r
   allocated output buffer.\r
 \r
   The selected handler is used to decode the data in a GUIDed section and return the result in a caller\r
   allocated output buffer.\r
 \r

-  Decodes the GUIDed section specified by InputSection.  \r
+  Decodes the GUIDed section specified by InputSection.\r

   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r
   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r

-  then RETURN_UNSUPPORTED is returned.  \r
+  then RETURN_UNSUPPORTED is returned.\r

   If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r
   of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to decode InputSection 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 data in InputSection,\r
   then OutputBuffer is set to point at the data in InputSection.  Otherwise, the decoded data will be placed in a caller\r
   allocated buffer specified by OutputBuffer.    This function is responsible for computing the  EFI_AUTH_STATUS_PLATFORM_OVERRIDE\r
   If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r
   of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to decode InputSection 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 data in InputSection,\r
   then OutputBuffer is set to point at the data in InputSection.  Otherwise, the decoded data will be placed in a caller\r
   allocated buffer specified by OutputBuffer.    This function is responsible for computing the  EFI_AUTH_STATUS_PLATFORM_OVERRIDE\r

-  bit of in AuthenticationStatus.  The return status from the handler of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER is returned. \r
-   \r
+  bit of in AuthenticationStatus.  The return status from the handler of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER is returned.\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

-  If AuthenticationStatus is NULL, then ASSERT().  \r
+  If AuthenticationStatus is NULL, then ASSERT().\r

 \r
   @param[in]  InputSection   A pointer to a GUIDed section of an FFS formatted file.\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[in]  ScratchBuffer  A caller allocated buffer that may be required by this function as a scratch buffer to perform the decode operation. \r
-  @param[out] AuthenticationStatus \r
+  @param[out] OutputBuffer   A pointer to a buffer that contains the result of a decode operation.\r
+  @param[in]  ScratchBuffer  A caller allocated buffer that may be required by this function 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. See the definition\r
                              of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI\r
                              Specification.\r
                              A pointer to the authentication status of the decoded output buffer. See the definition\r
                              of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI\r
                              Specification.\r


@@ -356,14 +356,14 @@ ExtractGuidedSectionDecode (
   IN  CONST VOID    *InputSection,\r
   OUT       VOID    **OutputBuffer,\r
   IN        VOID    *ScratchBuffer,        OPTIONAL\r
   IN  CONST VOID    *InputSection,\r
   OUT       VOID    **OutputBuffer,\r
   IN        VOID    *ScratchBuffer,        OPTIONAL\r

-  OUT       UINT32  *AuthenticationStatus  \r
+  OUT       UINT32  *AuthenticationStatus\r

   )\r
 {\r
   UINT32                              Index;\r
   RETURN_STATUS                       Status;\r
   EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r
   EFI_GUID                            *SectionDefinitionGuid;\r
   )\r
 {\r
   UINT32                              Index;\r
   RETURN_STATUS                       Status;\r
   EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r
   EFI_GUID                            *SectionDefinitionGuid;\r

-  \r
+\r

   //\r
   // Check input parameter\r
   //\r
   //\r
   // Check input parameter\r
   //\r


@@ -373,7 +373,7 @@ ExtractGuidedSectionDecode (
 \r
   //\r
   // Get all registered handler information.\r
 \r
   //\r
   // Get all registered handler information.\r

-  //  \r
+  //\r

   Status = GetExtractGuidedSectionHandlerInfo (&HandlerInfo);\r
   if (RETURN_ERROR (Status)) {\r
     return Status;\r
   Status = GetExtractGuidedSectionHandlerInfo (&HandlerInfo);\r
   if (RETURN_ERROR (Status)) {\r
     return Status;\r


@@ -404,29 +404,29 @@ ExtractGuidedSectionDecode (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Not found, the input guided section is not supported. \r
+  // Not found, the input guided section is not supported.\r

   //\r
   return RETURN_UNSUPPORTED;\r
 }\r
 \r
 /**\r
   //\r
   return RETURN_UNSUPPORTED;\r
 }\r
 \r
 /**\r

-  Retrieves handlers of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER and \r
+  Retrieves handlers of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER and\r

   EXTRACT_GUIDED_SECTION_DECODE_HANDLER for a specific GUID section type.\r
   EXTRACT_GUIDED_SECTION_DECODE_HANDLER for a specific GUID section type.\r

-  \r
-  Retrieves the handlers associated with SectionGuid and returns them in \r
+\r
+  Retrieves the handlers associated with SectionGuid and returns them in\r

   GetInfoHandler and DecodeHandler.\r
 \r
   GetInfoHandler and DecodeHandler.\r
 \r

-  If the GUID value specified by SectionGuid has not been registered, then \r
+  If the GUID value specified by SectionGuid has not been registered, then\r

   return RETURN_NOT_FOUND.\r
   return RETURN_NOT_FOUND.\r

-  \r
+\r

   If SectionGuid is NULL, then ASSERT().\r
 \r
   If SectionGuid is NULL, then ASSERT().\r
 \r

-  @param[in]  SectionGuid    A pointer to the GUID associated with the handlersof the GUIDed \r
+  @param[in]  SectionGuid    A pointer to the GUID associated with the handlersof the GUIDed\r

                              section type being retrieved.\r
                              section type being retrieved.\r

-  @param[out] GetInfoHandler Pointer to a function that examines a GUIDed section and returns \r
-                             the size of the decoded buffer and the size of an optional scratch \r
-                             buffer required to actually decode the data in a GUIDed section.  \r
-                             This is an optional parameter that may be NULL. If it is NULL, then \r
+  @param[out] GetInfoHandler Pointer to a function that examines a GUIDed section and returns\r
+                             the size of the decoded buffer and the size of an optional scratch\r
+                             buffer required to actually decode the data in a GUIDed section.\r
+                             This is an optional parameter that may be NULL. If it is NULL, then\r

                              the previously registered handler is not returned.\r
   @param[out] DecodeHandler  Pointer to a function that decodes a GUIDed section into a caller\r
                              allocated output buffer. This is an optional parameter that may be NULL.\r
                              the previously registered handler is not returned.\r
   @param[out] DecodeHandler  Pointer to a function that decodes a GUIDed section into a caller\r
                              allocated output buffer. This is an optional parameter that may be NULL.\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/AArch64/ArmVirtMmio.S b/MdePkg/Library/BaseIoLibIntrinsic/AArch64/ArmVirtMmio.S
index 85f59324270c8df08e376c65cffc247cac7a2260..bfdcb596f368eaf137fd80a2ce96140ee115719f 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/AArch64/ArmVirtMmio.S
+++ b/MdePkg/Library/BaseIoLibIntrinsic/AArch64/ArmVirtMmio.S
@@ -1,148 +1,148 @@
-#
-#  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
-#
-#  This program and the accompanying materials are licensed and made available
-#  under the terms and conditions of the BSD License which accompanies this
-#  distribution.  The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
-
-.text
-.align 3
-
-GCC_ASM_EXPORT(MmioRead8Internal)
-GCC_ASM_EXPORT(MmioWrite8Internal)
-GCC_ASM_EXPORT(MmioRead16Internal)
-GCC_ASM_EXPORT(MmioWrite16Internal)
-GCC_ASM_EXPORT(MmioRead32Internal)
-GCC_ASM_EXPORT(MmioWrite32Internal)
-GCC_ASM_EXPORT(MmioRead64Internal)
-GCC_ASM_EXPORT(MmioWrite64Internal)
-
-//
-//  Reads an 8-bit MMIO register.
-//
-//  Reads the 8-bit MMIO register specified by Address. The 8-bit read value is
-//  returned. This function must guarantee that all MMIO read and write
-//  operations are serialized.
-//
-//  @param  Address The MMIO register to read.
-//
-//  @return The value read.
-//
-ASM_PFX(MmioRead8Internal):
-  ldrb    w0, [x0]
-  dmb     ld
-  ret
-
-//
-//  Writes an 8-bit MMIO register.
-//
-//  Writes the 8-bit MMIO register specified by Address with the value specified
-//  by Value and returns Value. This function must guarantee that all MMIO read
-//  and write operations are serialized.
-//
-//  @param  Address The MMIO register to write.
-//  @param  Value   The value to write to the MMIO register.
-//
-ASM_PFX(MmioWrite8Internal):
-  dmb     st
-  strb    w1, [x0]
-  ret
-
-//
-//  Reads a 16-bit MMIO register.
-//
-//  Reads the 16-bit MMIO register specified by Address. The 16-bit read value is
-//  returned. This function must guarantee that all MMIO read and write
-//  operations are serialized.
-//
-//  @param  Address The MMIO register to read.
-//
-//  @return The value read.
-//
-ASM_PFX(MmioRead16Internal):
-  ldrh    w0, [x0]
-  dmb     ld
-  ret
-
-//
-//  Writes a 16-bit MMIO register.
-//
-//  Writes the 16-bit MMIO register specified by Address with the value specified
-//  by Value and returns Value. This function must guarantee that all MMIO read
-//  and write operations are serialized.
-//
-//  @param  Address The MMIO register to write.
-//  @param  Value   The value to write to the MMIO register.
-//
-ASM_PFX(MmioWrite16Internal):
-  dmb     st
-  strh    w1, [x0]
-  ret
-
-//
-//  Reads a 32-bit MMIO register.
-//
-//  Reads the 32-bit MMIO register specified by Address. The 32-bit read value is
-//  returned. This function must guarantee that all MMIO read and write
-//  operations are serialized.
-//
-//  @param  Address The MMIO register to read.
-//
-//  @return The value read.
-//
-ASM_PFX(MmioRead32Internal):
-  ldr     w0, [x0]
-  dmb     ld
-  ret
-
-//
-//  Writes a 32-bit MMIO register.
-//
-//  Writes the 32-bit MMIO register specified by Address with the value specified
-//  by Value and returns Value. This function must guarantee that all MMIO read
-//  and write operations are serialized.
-//
-//  @param  Address The MMIO register to write.
-//  @param  Value   The value to write to the MMIO register.
-//
-ASM_PFX(MmioWrite32Internal):
-  dmb     st
-  str     w1, [x0]
-  ret
-
-//
-//  Reads a 64-bit MMIO register.
-//
-//  Reads the 64-bit MMIO register specified by Address. The 64-bit read value is
-//  returned. This function must guarantee that all MMIO read and write
-//  operations are serialized.
-//
-//  @param  Address The MMIO register to read.
-//
-//  @return The value read.
-//
-ASM_PFX(MmioRead64Internal):
-  ldr     x0, [x0]
-  dmb     ld
-  ret
-
-//
-//  Writes a 64-bit MMIO register.
-//
-//  Writes the 64-bit MMIO register specified by Address with the value specified
-//  by Value and returns Value. This function must guarantee that all MMIO read
-//  and write operations are serialized.
-//
-//  @param  Address The MMIO register to write.
-//  @param  Value   The value to write to the MMIO register.
-//
-ASM_PFX(MmioWrite64Internal):
-  dmb     st
-  str     x1, [x0]
-  ret
+#\r
+#  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.\r
+#\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
+.text\r
+.align 3\r
+\r
+GCC_ASM_EXPORT(MmioRead8Internal)\r
+GCC_ASM_EXPORT(MmioWrite8Internal)\r
+GCC_ASM_EXPORT(MmioRead16Internal)\r
+GCC_ASM_EXPORT(MmioWrite16Internal)\r
+GCC_ASM_EXPORT(MmioRead32Internal)\r
+GCC_ASM_EXPORT(MmioWrite32Internal)\r
+GCC_ASM_EXPORT(MmioRead64Internal)\r
+GCC_ASM_EXPORT(MmioWrite64Internal)\r
+\r
+//\r
+//  Reads an 8-bit MMIO register.\r
+//\r
+//  Reads the 8-bit MMIO register specified by Address. The 8-bit read value is\r
+//  returned. This function must guarantee that all MMIO read and write\r
+//  operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to read.\r
+//\r
+//  @return The value read.\r
+//\r
+ASM_PFX(MmioRead8Internal):\r
+  ldrb    w0, [x0]\r
+  dmb     ld\r
+  ret\r
+\r
+//\r
+//  Writes an 8-bit MMIO register.\r
+//\r
+//  Writes the 8-bit MMIO register specified by Address with the value specified\r
+//  by Value and returns Value. This function must guarantee that all MMIO read\r
+//  and write operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to write.\r
+//  @param  Value   The value to write to the MMIO register.\r
+//\r
+ASM_PFX(MmioWrite8Internal):\r
+  dmb     st\r
+  strb    w1, [x0]\r
+  ret\r
+\r
+//\r
+//  Reads a 16-bit MMIO register.\r
+//\r
+//  Reads the 16-bit MMIO register specified by Address. The 16-bit read value is\r
+//  returned. This function must guarantee that all MMIO read and write\r
+//  operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to read.\r
+//\r
+//  @return The value read.\r
+//\r
+ASM_PFX(MmioRead16Internal):\r
+  ldrh    w0, [x0]\r
+  dmb     ld\r
+  ret\r
+\r
+//\r
+//  Writes a 16-bit MMIO register.\r
+//\r
+//  Writes the 16-bit MMIO register specified by Address with the value specified\r
+//  by Value and returns Value. This function must guarantee that all MMIO read\r
+//  and write operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to write.\r
+//  @param  Value   The value to write to the MMIO register.\r
+//\r
+ASM_PFX(MmioWrite16Internal):\r
+  dmb     st\r
+  strh    w1, [x0]\r
+  ret\r
+\r
+//\r
+//  Reads a 32-bit MMIO register.\r
+//\r
+//  Reads the 32-bit MMIO register specified by Address. The 32-bit read value is\r
+//  returned. This function must guarantee that all MMIO read and write\r
+//  operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to read.\r
+//\r
+//  @return The value read.\r
+//\r
+ASM_PFX(MmioRead32Internal):\r
+  ldr     w0, [x0]\r
+  dmb     ld\r
+  ret\r
+\r
+//\r
+//  Writes a 32-bit MMIO register.\r
+//\r
+//  Writes the 32-bit MMIO register specified by Address with the value specified\r
+//  by Value and returns Value. This function must guarantee that all MMIO read\r
+//  and write operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to write.\r
+//  @param  Value   The value to write to the MMIO register.\r
+//\r
+ASM_PFX(MmioWrite32Internal):\r
+  dmb     st\r
+  str     w1, [x0]\r
+  ret\r
+\r
+//\r
+//  Reads a 64-bit MMIO register.\r
+//\r
+//  Reads the 64-bit MMIO register specified by Address. The 64-bit read value is\r
+//  returned. This function must guarantee that all MMIO read and write\r
+//  operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to read.\r
+//\r
+//  @return The value read.\r
+//\r
+ASM_PFX(MmioRead64Internal):\r
+  ldr     x0, [x0]\r
+  dmb     ld\r
+  ret\r
+\r
+//\r
+//  Writes a 64-bit MMIO register.\r
+//\r
+//  Writes the 64-bit MMIO register specified by Address with the value specified\r
+//  by Value and returns Value. This function must guarantee that all MMIO read\r
+//  and write operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to write.\r
+//  @param  Value   The value to write to the MMIO register.\r
+//\r
+ASM_PFX(MmioWrite64Internal):\r
+  dmb     st\r
+  str     x1, [x0]\r
+  ret\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/AArch64/ArmVirtMmio.asm b/MdePkg/Library/BaseIoLibIntrinsic/AArch64/ArmVirtMmio.asm
index bd235a5dd441734d36bc273efb19d6f7db6a36c0..847f783844f7c8e19cd7589b1fd1c4089e949128 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/AArch64/ArmVirtMmio.asm
+++ b/MdePkg/Library/BaseIoLibIntrinsic/AArch64/ArmVirtMmio.asm
@@ -1,149 +1,149 @@
-;
-;  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
-;
-;  This program and the accompanying materials are licensed and made available
-;  under the terms and conditions of the BSD License which accompanies this
-;  distribution.  The full text of the license may be found at
-;  http:;opensource.org/licenses/bsd-license.php
-;
-;  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-;  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-;
-
-
-AREA IoLibMmio, CODE, READONLY
-
-EXPORT MmioRead8Internal
-EXPORT MmioWrite8Internal
-EXPORT MmioRead16Internal
-EXPORT MmioWrite16Internal
-EXPORT MmioRead32Internal
-EXPORT MmioWrite32Internal
-EXPORT MmioRead64Internal
-EXPORT MmioWrite64Internal
-
-;
-;  Reads an 8-bit MMIO register.
-;
-;  Reads the 8-bit MMIO register specified by Address. The 8-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead8Internal
-  ldrb    w0, [x0]
-  dmb     ld
-  ret
-
-;
-;  Writes an 8-bit MMIO register.
-;
-;  Writes the 8-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite8Internal
-  dmb     st
-  strb    w1, [x0]
-  ret
-
-;
-;  Reads a 16-bit MMIO register.
-;
-;  Reads the 16-bit MMIO register specified by Address. The 16-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead16Internal
-  ldrh    w0, [x0]
-  dmb     ld
-  ret
-
-;
-;  Writes a 16-bit MMIO register.
-;
-;  Writes the 16-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite16Internal
-  dmb     st
-  strh    w1, [x0]
-  ret
-
-;
-;  Reads a 32-bit MMIO register.
-;
-;  Reads the 32-bit MMIO register specified by Address. The 32-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead32Internal
-  ldr     w0, [x0]
-  dmb     ld
-  ret
-
-;
-;  Writes a 32-bit MMIO register.
-;
-;  Writes the 32-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite32Internal
-  dmb     st
-  str     w1, [x0]
-  ret
-
-;
-;  Reads a 64-bit MMIO register.
-;
-;  Reads the 64-bit MMIO register specified by Address. The 64-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead64Internal
-  ldr    x0, [x0]
-  dmb    ld
-  ret
-
-;
-;  Writes a 64-bit MMIO register.
-;
-;  Writes the 64-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite64Internal
-  dmb     st
-  str     x1, [x0]
-  ret
-
-  END
+;\r
+;  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.\r
+;\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
+AREA IoLibMmio, CODE, READONLY\r
+\r
+EXPORT MmioRead8Internal\r
+EXPORT MmioWrite8Internal\r
+EXPORT MmioRead16Internal\r
+EXPORT MmioWrite16Internal\r
+EXPORT MmioRead32Internal\r
+EXPORT MmioWrite32Internal\r
+EXPORT MmioRead64Internal\r
+EXPORT MmioWrite64Internal\r
+\r
+;\r
+;  Reads an 8-bit MMIO register.\r
+;\r
+;  Reads the 8-bit MMIO register specified by Address. The 8-bit read value is\r
+;  returned. This function must guarantee that all MMIO read and write\r
+;  operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to read.\r
+;\r
+;  @return The value read.\r
+;\r
+MmioRead8Internal\r
+  ldrb    w0, [x0]\r
+  dmb     ld\r
+  ret\r
+\r
+;\r
+;  Writes an 8-bit MMIO register.\r
+;\r
+;  Writes the 8-bit MMIO register specified by Address with the value specified\r
+;  by Value and returns Value. This function must guarantee that all MMIO read\r
+;  and write operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to write.\r
+;  @param  Value   The value to write to the MMIO register.\r
+;\r
+MmioWrite8Internal\r
+  dmb     st\r
+  strb    w1, [x0]\r
+  ret\r
+\r
+;\r
+;  Reads a 16-bit MMIO register.\r
+;\r
+;  Reads the 16-bit MMIO register specified by Address. The 16-bit read value is\r
+;  returned. This function must guarantee that all MMIO read and write\r
+;  operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to read.\r
+;\r
+;  @return The value read.\r
+;\r
+MmioRead16Internal\r
+  ldrh    w0, [x0]\r
+  dmb     ld\r
+  ret\r
+\r
+;\r
+;  Writes a 16-bit MMIO register.\r
+;\r
+;  Writes the 16-bit MMIO register specified by Address with the value specified\r
+;  by Value and returns Value. This function must guarantee that all MMIO read\r
+;  and write operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to write.\r
+;  @param  Value   The value to write to the MMIO register.\r
+;\r
+MmioWrite16Internal\r
+  dmb     st\r
+  strh    w1, [x0]\r
+  ret\r
+\r
+;\r
+;  Reads a 32-bit MMIO register.\r
+;\r
+;  Reads the 32-bit MMIO register specified by Address. The 32-bit read value is\r
+;  returned. This function must guarantee that all MMIO read and write\r
+;  operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to read.\r
+;\r
+;  @return The value read.\r
+;\r
+MmioRead32Internal\r
+  ldr     w0, [x0]\r
+  dmb     ld\r
+  ret\r
+\r
+;\r
+;  Writes a 32-bit MMIO register.\r
+;\r
+;  Writes the 32-bit MMIO register specified by Address with the value specified\r
+;  by Value and returns Value. This function must guarantee that all MMIO read\r
+;  and write operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to write.\r
+;  @param  Value   The value to write to the MMIO register.\r
+;\r
+MmioWrite32Internal\r
+  dmb     st\r
+  str     w1, [x0]\r
+  ret\r
+\r
+;\r
+;  Reads a 64-bit MMIO register.\r
+;\r
+;  Reads the 64-bit MMIO register specified by Address. The 64-bit read value is\r
+;  returned. This function must guarantee that all MMIO read and write\r
+;  operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to read.\r
+;\r
+;  @return The value read.\r
+;\r
+MmioRead64Internal\r
+  ldr    x0, [x0]\r
+  dmb    ld\r
+  ret\r
+\r
+;\r
+;  Writes a 64-bit MMIO register.\r
+;\r
+;  Writes the 64-bit MMIO register specified by Address with the value specified\r
+;  by Value and returns Value. This function must guarantee that all MMIO read\r
+;  and write operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to write.\r
+;  @param  Value   The value to write to the MMIO register.\r
+;\r
+MmioWrite64Internal\r
+  dmb     st\r
+  str     x1, [x0]\r
+  ret\r
+\r
+  END\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.S b/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.S
index 1e91e87fb88700aa643143497e126a4ad027a558..3ad22bd5706dc0b792d30a96627437a50728297a 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.S
+++ b/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.S
@@ -1,145 +1,145 @@
-#
-#  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
-#
-#  This program and the accompanying materials are licensed and made available
-#  under the terms and conditions of the BSD License which accompanies this
-#  distribution.  The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
-
-GCC_ASM_EXPORT(MmioRead8Internal)
-GCC_ASM_EXPORT(MmioWrite8Internal)
-GCC_ASM_EXPORT(MmioRead16Internal)
-GCC_ASM_EXPORT(MmioWrite16Internal)
-GCC_ASM_EXPORT(MmioRead32Internal)
-GCC_ASM_EXPORT(MmioWrite32Internal)
-GCC_ASM_EXPORT(MmioRead64Internal)
-GCC_ASM_EXPORT(MmioWrite64Internal)
-
-//
-//  Reads an 8-bit MMIO register.
-//
-//  Reads the 8-bit MMIO register specified by Address. The 8-bit read value is
-//  returned. This function must guarantee that all MMIO read and write
-//  operations are serialized.
-//
-//  @param  Address The MMIO register to read.
-//
-//  @return The value read.
-//
-ASM_PFX(MmioRead8Internal):
-  ldrb    r0, [r0]
-  dmb
-  bx      lr
-
-//
-//  Writes an 8-bit MMIO register.
-//
-//  Writes the 8-bit MMIO register specified by Address with the value specified
-//  by Value and returns Value. This function must guarantee that all MMIO read
-//  and write operations are serialized.
-//
-//  @param  Address The MMIO register to write.
-//  @param  Value   The value to write to the MMIO register.
-//
-ASM_PFX(MmioWrite8Internal):
-  dmb     st
-  strb    r1, [r0]
-  bx      lr
-
-//
-//  Reads a 16-bit MMIO register.
-//
-//  Reads the 16-bit MMIO register specified by Address. The 16-bit read value is
-//  returned. This function must guarantee that all MMIO read and write
-//  operations are serialized.
-//
-//  @param  Address The MMIO register to read.
-//
-//  @return The value read.
-//
-ASM_PFX(MmioRead16Internal):
-  ldrh    r0, [r0]
-  dmb
-  bx      lr
-
-//
-//  Writes a 16-bit MMIO register.
-//
-//  Writes the 16-bit MMIO register specified by Address with the value specified
-//  by Value and returns Value. This function must guarantee that all MMIO read
-//  and write operations are serialized.
-//
-//  @param  Address The MMIO register to write.
-//  @param  Value   The value to write to the MMIO register.
-//
-ASM_PFX(MmioWrite16Internal):
-  dmb     st
-  strh    r1, [r0]
-  bx      lr
-
-//
-//  Reads a 32-bit MMIO register.
-//
-//  Reads the 32-bit MMIO register specified by Address. The 32-bit read value is
-//  returned. This function must guarantee that all MMIO read and write
-//  operations are serialized.
-//
-//  @param  Address The MMIO register to read.
-//
-//  @return The value read.
-//
-ASM_PFX(MmioRead32Internal):
-  ldr     r0, [r0]
-  dmb
-  bx      lr
-
-//
-//  Writes a 32-bit MMIO register.
-//
-//  Writes the 32-bit MMIO register specified by Address with the value specified
-//  by Value and returns Value. This function must guarantee that all MMIO read
-//  and write operations are serialized.
-//
-//  @param  Address The MMIO register to write.
-//  @param  Value   The value to write to the MMIO register.
-//
-ASM_PFX(MmioWrite32Internal):
-  dmb     st
-  str     r1, [r0]
-  bx      lr
-
-//
-//  Reads a 64-bit MMIO register.
-//
-//  Reads the 64-bit MMIO register specified by Address. The 64-bit read value is
-//  returned. This function must guarantee that all MMIO read and write
-//  operations are serialized.
-//
-//  @param  Address The MMIO register to read.
-//
-//  @return The value read.
-//
-ASM_PFX(MmioRead64Internal):
-  ldrd    r0, r1, [r0]
-  dmb
-  bx      lr
-
-//
-//  Writes a 64-bit MMIO register.
-//
-//  Writes the 64-bit MMIO register specified by Address with the value specified
-//  by Value and returns Value. This function must guarantee that all MMIO read
-//  and write operations are serialized.
-//
-//  @param  Address The MMIO register to write.
-//  @param  Value   The value to write to the MMIO register.
-//
-ASM_PFX(MmioWrite64Internal):
-  dmb     st
-  strd    r2, r3, [r0]
-  bx      lr
+#\r
+#  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.\r
+#\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
+GCC_ASM_EXPORT(MmioRead8Internal)\r
+GCC_ASM_EXPORT(MmioWrite8Internal)\r
+GCC_ASM_EXPORT(MmioRead16Internal)\r
+GCC_ASM_EXPORT(MmioWrite16Internal)\r
+GCC_ASM_EXPORT(MmioRead32Internal)\r
+GCC_ASM_EXPORT(MmioWrite32Internal)\r
+GCC_ASM_EXPORT(MmioRead64Internal)\r
+GCC_ASM_EXPORT(MmioWrite64Internal)\r
+\r
+//\r
+//  Reads an 8-bit MMIO register.\r
+//\r
+//  Reads the 8-bit MMIO register specified by Address. The 8-bit read value is\r
+//  returned. This function must guarantee that all MMIO read and write\r
+//  operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to read.\r
+//\r
+//  @return The value read.\r
+//\r
+ASM_PFX(MmioRead8Internal):\r
+  ldrb    r0, [r0]\r
+  dmb\r
+  bx      lr\r
+\r
+//\r
+//  Writes an 8-bit MMIO register.\r
+//\r
+//  Writes the 8-bit MMIO register specified by Address with the value specified\r
+//  by Value and returns Value. This function must guarantee that all MMIO read\r
+//  and write operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to write.\r
+//  @param  Value   The value to write to the MMIO register.\r
+//\r
+ASM_PFX(MmioWrite8Internal):\r
+  dmb     st\r
+  strb    r1, [r0]\r
+  bx      lr\r
+\r
+//\r
+//  Reads a 16-bit MMIO register.\r
+//\r
+//  Reads the 16-bit MMIO register specified by Address. The 16-bit read value is\r
+//  returned. This function must guarantee that all MMIO read and write\r
+//  operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to read.\r
+//\r
+//  @return The value read.\r
+//\r
+ASM_PFX(MmioRead16Internal):\r
+  ldrh    r0, [r0]\r
+  dmb\r
+  bx      lr\r
+\r
+//\r
+//  Writes a 16-bit MMIO register.\r
+//\r
+//  Writes the 16-bit MMIO register specified by Address with the value specified\r
+//  by Value and returns Value. This function must guarantee that all MMIO read\r
+//  and write operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to write.\r
+//  @param  Value   The value to write to the MMIO register.\r
+//\r
+ASM_PFX(MmioWrite16Internal):\r
+  dmb     st\r
+  strh    r1, [r0]\r
+  bx      lr\r
+\r
+//\r
+//  Reads a 32-bit MMIO register.\r
+//\r
+//  Reads the 32-bit MMIO register specified by Address. The 32-bit read value is\r
+//  returned. This function must guarantee that all MMIO read and write\r
+//  operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to read.\r
+//\r
+//  @return The value read.\r
+//\r
+ASM_PFX(MmioRead32Internal):\r
+  ldr     r0, [r0]\r
+  dmb\r
+  bx      lr\r
+\r
+//\r
+//  Writes a 32-bit MMIO register.\r
+//\r
+//  Writes the 32-bit MMIO register specified by Address with the value specified\r
+//  by Value and returns Value. This function must guarantee that all MMIO read\r
+//  and write operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to write.\r
+//  @param  Value   The value to write to the MMIO register.\r
+//\r
+ASM_PFX(MmioWrite32Internal):\r
+  dmb     st\r
+  str     r1, [r0]\r
+  bx      lr\r
+\r
+//\r
+//  Reads a 64-bit MMIO register.\r
+//\r
+//  Reads the 64-bit MMIO register specified by Address. The 64-bit read value is\r
+//  returned. This function must guarantee that all MMIO read and write\r
+//  operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to read.\r
+//\r
+//  @return The value read.\r
+//\r
+ASM_PFX(MmioRead64Internal):\r
+  ldrd    r0, r1, [r0]\r
+  dmb\r
+  bx      lr\r
+\r
+//\r
+//  Writes a 64-bit MMIO register.\r
+//\r
+//  Writes the 64-bit MMIO register specified by Address with the value specified\r
+//  by Value and returns Value. This function must guarantee that all MMIO read\r
+//  and write operations are serialized.\r
+//\r
+//  @param  Address The MMIO register to write.\r
+//  @param  Value   The value to write to the MMIO register.\r
+//\r
+ASM_PFX(MmioWrite64Internal):\r
+  dmb     st\r
+  strd    r2, r3, [r0]\r
+  bx      lr\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm b/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm
index cff99b86a99cdfc16263d15eea77e74aeaafe6bb..e1a3d68a430c97d348a54ae590b1a82289696118 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm
+++ b/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm
@@ -1,149 +1,149 @@
-;
-;  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
-;
-;  This program and the accompanying materials are licensed and made available
-;  under the terms and conditions of the BSD License which accompanies this
-;  distribution.  The full text of the license may be found at
-;  http:;opensource.org/licenses/bsd-license.php
-;
-;  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-;  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-;
-
-
-AREA IoLibMmio, CODE, READONLY
-
-EXPORT MmioRead8Internal
-EXPORT MmioWrite8Internal
-EXPORT MmioRead16Internal
-EXPORT MmioWrite16Internal
-EXPORT MmioRead32Internal
-EXPORT MmioWrite32Internal
-EXPORT MmioRead64Internal
-EXPORT MmioWrite64Internal
-
-;
-;  Reads an 8-bit MMIO register.
-;
-;  Reads the 8-bit MMIO register specified by Address. The 8-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead8Internal
-  ldrb    r0, [r0]
-  dmb
-  bx      lr
-
-;
-;  Writes an 8-bit MMIO register.
-;
-;  Writes the 8-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite8Internal
-  dmb     st
-  strb    r1, [r0]
-  bx      lr
-
-;
-;  Reads a 16-bit MMIO register.
-;
-;  Reads the 16-bit MMIO register specified by Address. The 16-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead16Internal
-  ldrh    r0, [r0]
-  dmb
-  bx      lr
-
-;
-;  Writes a 16-bit MMIO register.
-;
-;  Writes the 16-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite16Internal
-  dmb     st
-  strh    r1, [r0]
-  bx      lr
-
-;
-;  Reads a 32-bit MMIO register.
-;
-;  Reads the 32-bit MMIO register specified by Address. The 32-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead32Internal
-  ldr     r0, [r0]
-  dmb
-  bx      lr
-
-;
-;  Writes a 32-bit MMIO register.
-;
-;  Writes the 32-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite32Internal
-  dmb     st
-  str     r1, [r0]
-  bx      lr
-
-;
-;  Reads a 64-bit MMIO register.
-;
-;  Reads the 64-bit MMIO register specified by Address. The 64-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead64Internal
-  ldrd    r0, r1, [r0]
-  dmb
-  bx      lr
-
-;
-;  Writes a 64-bit MMIO register.
-;
-;  Writes the 64-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite64Internal
-  dmb     st
-  strd    r2, r3, [r0]
-  bx      lr
-
-  END
+;\r
+;  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.\r
+;\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
+AREA IoLibMmio, CODE, READONLY\r
+\r
+EXPORT MmioRead8Internal\r
+EXPORT MmioWrite8Internal\r
+EXPORT MmioRead16Internal\r
+EXPORT MmioWrite16Internal\r
+EXPORT MmioRead32Internal\r
+EXPORT MmioWrite32Internal\r
+EXPORT MmioRead64Internal\r
+EXPORT MmioWrite64Internal\r
+\r
+;\r
+;  Reads an 8-bit MMIO register.\r
+;\r
+;  Reads the 8-bit MMIO register specified by Address. The 8-bit read value is\r
+;  returned. This function must guarantee that all MMIO read and write\r
+;  operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to read.\r
+;\r
+;  @return The value read.\r
+;\r
+MmioRead8Internal\r
+  ldrb    r0, [r0]\r
+  dmb\r
+  bx      lr\r
+\r
+;\r
+;  Writes an 8-bit MMIO register.\r
+;\r
+;  Writes the 8-bit MMIO register specified by Address with the value specified\r
+;  by Value and returns Value. This function must guarantee that all MMIO read\r
+;  and write operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to write.\r
+;  @param  Value   The value to write to the MMIO register.\r
+;\r
+MmioWrite8Internal\r
+  dmb     st\r
+  strb    r1, [r0]\r
+  bx      lr\r
+\r
+;\r
+;  Reads a 16-bit MMIO register.\r
+;\r
+;  Reads the 16-bit MMIO register specified by Address. The 16-bit read value is\r
+;  returned. This function must guarantee that all MMIO read and write\r
+;  operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to read.\r
+;\r
+;  @return The value read.\r
+;\r
+MmioRead16Internal\r
+  ldrh    r0, [r0]\r
+  dmb\r
+  bx      lr\r
+\r
+;\r
+;  Writes a 16-bit MMIO register.\r
+;\r
+;  Writes the 16-bit MMIO register specified by Address with the value specified\r
+;  by Value and returns Value. This function must guarantee that all MMIO read\r
+;  and write operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to write.\r
+;  @param  Value   The value to write to the MMIO register.\r
+;\r
+MmioWrite16Internal\r
+  dmb     st\r
+  strh    r1, [r0]\r
+  bx      lr\r
+\r
+;\r
+;  Reads a 32-bit MMIO register.\r
+;\r
+;  Reads the 32-bit MMIO register specified by Address. The 32-bit read value is\r
+;  returned. This function must guarantee that all MMIO read and write\r
+;  operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to read.\r
+;\r
+;  @return The value read.\r
+;\r
+MmioRead32Internal\r
+  ldr     r0, [r0]\r
+  dmb\r
+  bx      lr\r
+\r
+;\r
+;  Writes a 32-bit MMIO register.\r
+;\r
+;  Writes the 32-bit MMIO register specified by Address with the value specified\r
+;  by Value and returns Value. This function must guarantee that all MMIO read\r
+;  and write operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to write.\r
+;  @param  Value   The value to write to the MMIO register.\r
+;\r
+MmioWrite32Internal\r
+  dmb     st\r
+  str     r1, [r0]\r
+  bx      lr\r
+\r
+;\r
+;  Reads a 64-bit MMIO register.\r
+;\r
+;  Reads the 64-bit MMIO register specified by Address. The 64-bit read value is\r
+;  returned. This function must guarantee that all MMIO read and write\r
+;  operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to read.\r
+;\r
+;  @return The value read.\r
+;\r
+MmioRead64Internal\r
+  ldrd    r0, r1, [r0]\r
+  dmb\r
+  bx      lr\r
+\r
+;\r
+;  Writes a 64-bit MMIO register.\r
+;\r
+;  Writes the 64-bit MMIO register specified by Address with the value specified\r
+;  by Value and returns Value. This function must guarantee that all MMIO read\r
+;  and write operations are serialized.\r
+;\r
+;  @param  Address The MMIO register to write.\r
+;  @param  Value   The value to write to the MMIO register.\r
+;\r
+MmioWrite64Internal\r
+  dmb     st\r
+  strd    r2, r3, [r0]\r
+  bx      lr\r
+\r
+  END\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
index 6c4d7ccfb7afa03acf5781b214c8c77e17e1905d..791d7fa59c43d7e8d25062ba31e1e7cd193ef6f2 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -26,7 +26,7 @@
   FILE_GUID                      = 926c9cd0-4bb8-479b-9ac4-8a2a23f85307\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 926c9cd0-4bb8-479b-9ac4-8a2a23f85307\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = IoLib \r
+  LIBRARY_CLASS                  = IoLib\r

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

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf
index 0eec896c8e2902d6f42d1ba278ea7de6fcf338f6..da846704d5a84cefbb1f99749fe5d7328b8b5254 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf
@@ -4,7 +4,7 @@
 #  I/O Library that uses compiler intrinsics to perform IN and OUT instructions\r
 #  for IA-32 and x64.\r
 #\r
 #  I/O Library that uses compiler intrinsics to perform IN and OUT instructions\r
 #  for IA-32 and x64.\r
 #\r

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

 #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 #  Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 #\r
 #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 #  Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 #\r


@@ -24,7 +24,7 @@
   FILE_GUID                      = 93742f95-6e71-4581-b600-8e1da443f95a\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 93742f95-6e71-4581-b600-8e1da443f95a\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = IoLib \r
+  LIBRARY_CLASS                  = IoLib\r

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

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
index ab1ddf4c424ef633d521301e02c9686ffbc37bab..1342fc1eca4d93f21ef94b49ea23383b84878aa8 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
@@ -4,7 +4,7 @@
   All assertions for bit field operations are handled bit field functions in the\r
   Base Library.\r
 \r
   All assertions for bit field operations are handled bit field functions in the\r
   Base 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


@@ -80,7 +80,7 @@ IoAnd8 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 8-bit I/O port.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 8-bit I/O port.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -146,7 +146,7 @@ IoBitFieldRead8 (
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r
   by the StartBit and the EndBit. All other bits in the destination I/O\r
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r
   by the StartBit and the EndBit. All other bits in the destination I/O\r

-  register are preserved. The value written to the I/O port is returned. \r
+  register are preserved. The value written to the I/O port is returned.\r

 \r
   If 8-bit I/O port operations are not supported, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r
 \r
   If 8-bit I/O port operations are not supported, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r


@@ -348,7 +348,7 @@ IoOr16 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
 \r
   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
 \r


@@ -366,7 +366,7 @@ IoAnd16 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 16-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads a 16-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 16-bit I/O port.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 16-bit I/O port.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -378,7 +378,7 @@ IoAnd16 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
   @param  OrData  The value to OR with the result of the AND operation.\r
   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
   @param  OrData  The value to OR with the result of the AND operation.\r


@@ -659,7 +659,7 @@ IoAnd32 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 32-bit I/O port.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 32-bit I/O port.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -952,7 +952,7 @@ IoAnd64 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 64-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads a 64-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 64-bit I/O port.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 64-bit I/O port.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -1190,7 +1190,7 @@ IoBitFieldAndThenOr64 (
   Reads an 8-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 8-bit MMIO register.\r
 \r
   Reads an 8-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 8-bit MMIO register.\r
 \r

-  Reads the 8-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 8-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1243,7 +1243,7 @@ MmioAnd8 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 8-bit MMIO register.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 8-bit MMIO register.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1347,7 +1347,7 @@ MmioBitFieldWrite8 (
   Reads a bit field in an 8-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 8-bit MMIO register.\r
 \r
   Reads a bit field in an 8-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 8-bit MMIO register.\r
 \r

-  Reads the 8-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 8-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1477,7 +1477,7 @@ MmioBitFieldAndThenOr8 (
   Reads a 16-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 16-bit MMIO register.\r
 \r
   Reads a 16-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 16-bit MMIO register.\r
 \r

-  Reads the 16-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 16-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1532,7 +1532,7 @@ MmioAnd16 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 16-bit MMIO register.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 16-bit MMIO register.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1638,7 +1638,7 @@ MmioBitFieldWrite16 (
   Reads a bit field in a 16-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 16-bit MMIO register.\r
 \r
   Reads a bit field in a 16-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 16-bit MMIO register.\r
 \r

-  Reads the 16-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 16-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1771,7 +1771,7 @@ MmioBitFieldAndThenOr16 (
   Reads a 32-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 32-bit MMIO register.\r
 \r
   Reads a 32-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 32-bit MMIO register.\r
 \r

-  Reads the 32-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 32-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1826,7 +1826,7 @@ MmioAnd32 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 32-bit MMIO register.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 32-bit MMIO register.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1932,7 +1932,7 @@ MmioBitFieldWrite32 (
   Reads a bit field in a 32-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 32-bit MMIO register.\r
 \r
   Reads a bit field in a 32-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 32-bit MMIO register.\r
 \r

-  Reads the 32-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 32-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -2065,7 +2065,7 @@ MmioBitFieldAndThenOr32 (
   Reads a 64-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 64-bit MMIO register.\r
 \r
   Reads a 64-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 64-bit MMIO register.\r
 \r

-  Reads the 64-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 64-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -2120,7 +2120,7 @@ MmioAnd64 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 64-bit MMIO register.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 64-bit MMIO register.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2226,7 +2226,7 @@ MmioBitFieldWrite64 (
   Reads a bit field in a 64-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 64-bit MMIO register.\r
 \r
   Reads a bit field in a 64-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 64-bit MMIO register.\r
 \r

-  Reads the 64-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 64-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
index f6bd81911481fa39033392b16f5843661512cd5b..7f34ecd2689ea210f61b14aa5ffc958c52f3fb93 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Common I/O Library routines.\r
 \r
 /** @file\r
   Common I/O Library routines.\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


@@ -107,7 +107,7 @@ MmioRead8 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r


@@ -169,7 +169,7 @@ MmioRead16 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r


@@ -185,7 +185,7 @@ MmioWrite16 (
   MemoryFence ();\r
   *(volatile UINT16*)Address = Value;\r
   MemoryFence ();\r
   MemoryFence ();\r
   *(volatile UINT16*)Address = Value;\r
   MemoryFence ();\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -213,11 +213,11 @@ MmioRead32 (
   UINT32                            Value;\r
 \r
   ASSERT ((Address & 3) == 0);\r
   UINT32                            Value;\r
 \r
   ASSERT ((Address & 3) == 0);\r

-  \r
+\r

   MemoryFence ();\r
   Value = *(volatile UINT32*)Address;\r
   MemoryFence ();\r
   MemoryFence ();\r
   Value = *(volatile UINT32*)Address;\r
   MemoryFence ();\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -233,7 +233,7 @@ MmioRead32 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r


@@ -245,11 +245,11 @@ MmioWrite32 (
   )\r
 {\r
   ASSERT ((Address & 3) == 0);\r
   )\r
 {\r
   ASSERT ((Address & 3) == 0);\r

-  \r
+\r

   MemoryFence ();\r
   *(volatile UINT32*)Address = Value;\r
   MemoryFence ();\r
   MemoryFence ();\r
   *(volatile UINT32*)Address = Value;\r
   MemoryFence ();\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -277,7 +277,7 @@ MmioRead64 (
   UINT64                            Value;\r
 \r
   ASSERT ((Address & 7) == 0);\r
   UINT64                            Value;\r
 \r
   ASSERT ((Address & 7) == 0);\r

-  \r
+\r

   MemoryFence ();\r
   Value = *(volatile UINT64*)Address;\r
   MemoryFence ();\r
   MemoryFence ();\r
   Value = *(volatile UINT64*)Address;\r
   MemoryFence ();\r


@@ -307,11 +307,11 @@ MmioWrite64 (
   )\r
 {\r
   ASSERT ((Address & 7) == 0);\r
   )\r
 {\r
   ASSERT ((Address & 7) == 0);\r

-  \r
+\r

   MemoryFence ();\r
   *(volatile UINT64*)Address = Value;\r
   MemoryFence ();\r
   MemoryFence ();\r
   *(volatile UINT64*)Address = Value;\r
   MemoryFence ();\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibArm.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibArm.c
index 5ce12ca56ae283ff154010a31a6497f4c37220ca..a84b80d98ddbc77e34fa78213d2ef013862e1e6a 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibArm.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibArm.c
@@ -1,7 +1,7 @@
 /** @file\r
 /** @file\r

-  I/O Library for ARM. \r
+  I/O Library for ARM.\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

   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
   Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
   Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
index 40a9a8e146c46f32887e9b27e1cbac08f8ae7a5b..5c8f68b893cc9faf9dac0b83e03674771493009e 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
@@ -10,7 +10,7 @@
   We don't advocate putting compiler specifics in libraries or drivers but there\r
   is no other way to make this work.\r
 \r
   We don't advocate putting compiler specifics in libraries or drivers but there\r
   is no other way to make this work.\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


@@ -116,7 +116,7 @@ IoRead16 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r


@@ -145,7 +145,7 @@ IoWrite16 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r
   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r


@@ -174,7 +174,7 @@ IoRead32 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
index 87bc4cf0059e0538c877b4a1c03bdf399eff04f1..3036084f0caf9603f3b8a96959d3936f90876fab 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
@@ -2,7 +2,7 @@
   I/O Library. This file has compiler specifics for ICC as there\r
   is no ANSI C standard for doing IO.\r
 \r
   I/O Library. This file has compiler specifics for ICC as there\r
   is no ANSI C standard for doing IO.\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 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
   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


@@ -73,7 +73,7 @@ IoWrite8 (
     mov dx, word ptr [Port]\r
     out dx, al\r
   }\r
     mov dx, word ptr [Port]\r
     out dx, al\r
   }\r

-  return Value; \r
+  return Value;\r

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


@@ -119,7 +119,7 @@ IoRead16 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r


@@ -153,7 +153,7 @@ IoWrite16 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r
   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r


@@ -174,7 +174,7 @@ IoRead32 (
     in  eax, dx\r
     mov dword ptr [Data], eax\r
   }\r
     in  eax, dx\r
     mov dword ptr [Data], eax\r
   }\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -187,7 +187,7 @@ IoRead32 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r


@@ -202,7 +202,7 @@ IoWrite32 (
   )\r
 {\r
   ASSERT ((Port & 3) == 0);\r
   )\r
 {\r
   ASSERT ((Port & 3) == 0);\r

-  \r
+\r

   __asm {\r
     mov eax, dword ptr [Value]\r
     mov dx, word ptr [Port]\r
   __asm {\r
     mov eax, dword ptr [Value]\r
     mov dx, word ptr [Port]\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
index b84134b75739b67243ed676df4e294b68d0ae875..dc00594fab93cf13bf849db6426a99fe10341cad 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
@@ -1,7 +1,7 @@
 /** @file\r
   Common I/O Library routines.\r
 \r
 /** @file\r
   Common I/O Library routines.\r
 \r

-  Copyright (c) 2006 - 2008, 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 @@
 \r
   This function translates I/O port address to memory address by adding the 64MB\r
   aligned I/O Port space to the I/O address.\r
 \r
   This function translates I/O port address to memory address by adding the 64MB\r
   aligned I/O Port space to the I/O address.\r

-  If I/O Port space base is not 64MB aligned, then ASSERT ().  \r
+  If I/O Port space base is not 64MB aligned, then ASSERT ().\r

 \r
   @param  Port  The I/O port to read.\r
 \r
 \r
   @param  Port  The I/O port to read.\r
 \r


@@ -46,7 +46,7 @@ InternalGetMemoryMapAddress (
 \r
   //\r
   // Make sure that the I/O Port space base is 64MB aligned.\r
 \r
   //\r
   // Make sure that the I/O Port space base is 64MB aligned.\r

-  // \r
+  //\r

   ASSERT ((IoBlockBaseAddress & 0x3ffffff) == 0);\r
   Address += IoBlockBaseAddress;\r
 \r
   ASSERT ((IoBlockBaseAddress & 0x3ffffff) == 0);\r
   Address += IoBlockBaseAddress;\r
 \r


@@ -109,7 +109,7 @@ IoRead16 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r
   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r


@@ -184,7 +184,7 @@ IoWrite8 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r


@@ -210,7 +210,7 @@ IoWrite16 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r


@@ -508,7 +508,7 @@ MmioRead16 (
 \r
   //\r
   // Make sure that Address is 16-bit aligned.\r
 \r
   //\r
   // Make sure that Address is 16-bit aligned.\r

-  // \r
+  //\r

   ASSERT ((Address & 1) == 0);\r
 \r
   Address |= BIT63;\r
   ASSERT ((Address & 1) == 0);\r
 \r
   Address |= BIT63;\r


@@ -545,7 +545,7 @@ MmioRead32 (
 \r
   //\r
   // Make sure that Address is 32-bit aligned.\r
 \r
   //\r
   // Make sure that Address is 32-bit aligned.\r

-  // \r
+  //\r

   ASSERT ((Address & 3) == 0);\r
 \r
   Address |= BIT63;\r
   ASSERT ((Address & 3) == 0);\r
 \r
   Address |= BIT63;\r


@@ -582,7 +582,7 @@ MmioRead64 (
 \r
   //\r
   // Make sure that Address is 64-bit aligned.\r
 \r
   //\r
   // Make sure that Address is 64-bit aligned.\r

-  // \r
+  //\r

   ASSERT ((Address & 7) == 0);\r
 \r
   Address |= BIT63;\r
   ASSERT ((Address & 7) == 0);\r
 \r
   Address |= BIT63;\r


@@ -606,7 +606,7 @@ MmioRead64 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r


@@ -638,7 +638,7 @@ MmioWrite8 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r


@@ -651,7 +651,7 @@ MmioWrite16 (
 {\r
   //\r
   // Make sure that Address is 16-bit aligned.\r
 {\r
   //\r
   // Make sure that Address is 16-bit aligned.\r

-  // \r
+  //\r

   ASSERT ((Address & 1) == 0);\r
 \r
   Address |= BIT63;\r
   ASSERT ((Address & 1) == 0);\r
 \r
   Address |= BIT63;\r


@@ -675,7 +675,7 @@ MmioWrite16 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r


@@ -688,7 +688,7 @@ MmioWrite32 (
 {\r
   //\r
   // Make sure that Address is 32-bit aligned.\r
 {\r
   //\r
   // Make sure that Address is 32-bit aligned.\r

-  // \r
+  //\r

   ASSERT ((Address & 3) == 0);\r
 \r
   Address |= BIT63;\r
   ASSERT ((Address & 3) == 0);\r
 \r
   Address |= BIT63;\r


@@ -723,7 +723,7 @@ MmioWrite64 (
 {\r
   //\r
   // Make sure that Address is 64-bit aligned.\r
 {\r
   //\r
   // Make sure that Address is 64-bit aligned.\r

-  // \r
+  //\r

   ASSERT ((Address & 7) == 0);\r
 \r
   Address |= BIT63;\r
   ASSERT ((Address & 7) == 0);\r
 \r
   Address |= BIT63;\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
index f4aebfa5f67354ccd8ba7ab432726e3803d0e7a4..5daf3f3e925eb9cb4796f55a6893d39432c64b81 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
@@ -1,7 +1,7 @@
 /** @file\r
   I/O Library MMIO Buffer Functions.\r
 \r
 /** @file\r
   I/O Library MMIO Buffer Functions.\r
 \r

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


@@ -17,11 +17,11 @@
 /**\r
   Copy data from the MMIO region to system memory by using 8-bit access.\r
 \r
 /**\r
   Copy data from the MMIO region to system memory by using 8-bit access.\r
 \r

-  Copy data from the MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 8-bit access. The total \r
+  Copy data from the MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 8-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -44,9 +44,9 @@ MmioReadBuffer8 (
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length-- != 0) {\r
     *(Buffer++) = MmioRead8 (StartAddress++);\r
   }\r
   while (Length-- != 0) {\r
     *(Buffer++) = MmioRead8 (StartAddress++);\r
   }\r


@@ -57,13 +57,13 @@ MmioReadBuffer8 (
 /**\r
   Copy data from the MMIO region to system memory by using 16-bit access.\r
 \r
 /**\r
   Copy data from the MMIO region to system memory by using 16-bit access.\r
 \r

-  Copy data from the MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 16-bit access. The total \r
+  Copy data from the MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 16-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -87,15 +87,15 @@ MmioReadBuffer16 (
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT16) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT16) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     *(Buffer++) = MmioRead16 (StartAddress);\r
     StartAddress += sizeof (UINT16);\r
   while (Length != 0) {\r
     *(Buffer++) = MmioRead16 (StartAddress);\r
     StartAddress += sizeof (UINT16);\r


@@ -108,13 +108,13 @@ MmioReadBuffer16 (
 /**\r
   Copy data from the MMIO region to system memory by using 32-bit access.\r
 \r
 /**\r
   Copy data from the MMIO region to system memory by using 32-bit access.\r
 \r

-  Copy data from the MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 32-bit access. The total \r
+  Copy data from the MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 32-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -138,15 +138,15 @@ MmioReadBuffer32 (
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT32) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT32) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     *(Buffer++) = MmioRead32 (StartAddress);\r
     StartAddress += sizeof (UINT32);\r
   while (Length != 0) {\r
     *(Buffer++) = MmioRead32 (StartAddress);\r
     StartAddress += sizeof (UINT32);\r


@@ -159,13 +159,13 @@ MmioReadBuffer32 (
 /**\r
   Copy data from the MMIO region to system memory by using 64-bit access.\r
 \r
 /**\r
   Copy data from the MMIO region to system memory by using 64-bit access.\r
 \r

-  Copy data from the MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 64-bit access. The total \r
+  Copy data from the MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 64-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r


@@ -189,15 +189,15 @@ MmioReadBuffer64 (
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT64) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT64) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     *(Buffer++) = MmioRead64 (StartAddress);\r
     StartAddress += sizeof (UINT64);\r
   while (Length != 0) {\r
     *(Buffer++) = MmioRead64 (StartAddress);\r
     StartAddress += sizeof (UINT64);\r


@@ -211,11 +211,11 @@ MmioReadBuffer64 (
 /**\r
   Copy data from system memory to the MMIO region by using 8-bit access.\r
 \r
 /**\r
   Copy data from system memory to the MMIO region by using 8-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to the MMIO region specified \r
-  by starting address StartAddress by using 8-bit access. The total number \r
+  Copy data from system memory specified by Buffer to the MMIO region specified\r
+  by starting address StartAddress by using 8-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -238,27 +238,27 @@ MmioWriteBuffer8 (
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r

- \r
+\r

   ReturnBuffer = (UINT8 *) Buffer;\r
   ReturnBuffer = (UINT8 *) Buffer;\r

-  \r
+\r

   while (Length-- != 0) {\r
      MmioWrite8 (StartAddress++, *(Buffer++));\r
   }\r
 \r
   return ReturnBuffer;\r
   while (Length-- != 0) {\r
      MmioWrite8 (StartAddress++, *(Buffer++));\r
   }\r
 \r
   return ReturnBuffer;\r

- \r
+\r

 }\r
 \r
 /**\r
   Copy data from system memory to the MMIO region by using 16-bit access.\r
 \r
 }\r
 \r
 /**\r
   Copy data from system memory to the MMIO region by using 16-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to the MMIO region specified \r
-  by starting address StartAddress by using 16-bit access. The total number \r
+  Copy data from system memory specified by Buffer to the MMIO region specified\r
+  by starting address StartAddress by using 16-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -283,7 +283,7 @@ MmioWriteBuffer16 (
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r


@@ -291,10 +291,10 @@ MmioWriteBuffer16 (
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT16 *) Buffer;\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT16 *) Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     MmioWrite16 (StartAddress, *(Buffer++));\r
   while (Length != 0) {\r
     MmioWrite16 (StartAddress, *(Buffer++));\r

-    \r
+\r

     StartAddress += sizeof (UINT16);\r
     Length -= sizeof (UINT16);\r
   }\r
     StartAddress += sizeof (UINT16);\r
     Length -= sizeof (UINT16);\r
   }\r


@@ -306,13 +306,13 @@ MmioWriteBuffer16 (
 /**\r
   Copy data from system memory to the MMIO region by using 32-bit access.\r
 \r
 /**\r
   Copy data from system memory to the MMIO region by using 32-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to the MMIO region specified \r
-  by starting address StartAddress by using 32-bit access. The total number \r
+  Copy data from system memory specified by Buffer to the MMIO region specified\r
+  by starting address StartAddress by using 32-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -337,7 +337,7 @@ MmioWriteBuffer32 (
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r


@@ -345,10 +345,10 @@ MmioWriteBuffer32 (
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT32 *) Buffer;\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT32 *) Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     MmioWrite32 (StartAddress, *(Buffer++));\r
   while (Length != 0) {\r
     MmioWrite32 (StartAddress, *(Buffer++));\r

-    \r
+\r

     StartAddress += sizeof (UINT32);\r
     Length -= sizeof (UINT32);\r
   }\r
     StartAddress += sizeof (UINT32);\r
     Length -= sizeof (UINT32);\r
   }\r


@@ -359,13 +359,13 @@ MmioWriteBuffer32 (
 /**\r
   Copy data from system memory to the MMIO region by using 64-bit access.\r
 \r
 /**\r
   Copy data from system memory to the MMIO region by using 64-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to the MMIO region specified \r
-  by starting address StartAddress by using 64-bit access. The total number \r
+  Copy data from system memory specified by Buffer to the MMIO region specified\r
+  by starting address StartAddress by using 64-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r


@@ -390,7 +390,7 @@ MmioWriteBuffer64 (
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r


@@ -398,10 +398,10 @@ MmioWriteBuffer64 (
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT64 *) Buffer;\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT64 *) Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     MmioWrite64 (StartAddress, *(Buffer++));\r
   while (Length != 0) {\r
     MmioWrite64 (StartAddress, *(Buffer++));\r

-    \r
+\r

     StartAddress += sizeof (UINT64);\r
     Length -= sizeof (UINT64);\r
   }\r
     StartAddress += sizeof (UINT64);\r
     Length -= sizeof (UINT64);\r
   }\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
index 83bad5e6a801ff1a6104652c1c74461631ccc13a..dd496944692b60bde90ca25aff3c0c325e5e2f81 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
@@ -8,7 +8,7 @@
   We don't advocate putting compiler specifics in libraries or drivers but there\r
   is no other way to make this work.\r
 \r
   We don't advocate putting compiler specifics in libraries or drivers but there\r
   is no other way to make this work.\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


@@ -146,7 +146,7 @@ IoRead16 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r


@@ -176,7 +176,7 @@ IoWrite16 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r
   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r


@@ -206,7 +206,7 @@ IoRead32 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r

diff --git a/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.S b/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.S
index b6b80a1326d05f46733eb8ae515774f442647265..953457a04023c5e4d0871ab19686d859dea41496 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.S
+++ b/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.S
@@ -1,8 +1,8 @@
-#------------------------------------------------------------------------------ \r
+#------------------------------------------------------------------------------\r

 #\r
 # CpuBreakpoint() for ARM\r
 #\r
 #\r
 # CpuBreakpoint() for ARM\r
 #\r

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

 # Portions copyright (c) 2008 - 2009, Apple 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
 # Portions copyright (c) 2008 - 2009, Apple 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


@@ -32,5 +32,5 @@ GCC_ASM_EXPORT(CpuBreakpoint)
 #  );\r
 #\r
 ASM_PFX(CpuBreakpoint):\r
 #  );\r
 #\r
 ASM_PFX(CpuBreakpoint):\r

-    swi  0xdbdbdb  \r
+    swi  0xdbdbdb\r

     bx   lr\r
     bx   lr\r

diff --git a/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.asm b/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.asm
index e7490b09d3dc657e378920053cb17959e0d3d590..5969d0622642c138299aeb4e83399df37bde51ec 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.asm
+++ b/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.asm
@@ -1,8 +1,8 @@
-;------------------------------------------------------------------------------ \r
+;------------------------------------------------------------------------------\r

 ;\r
 ; CpuBreakpoint() for ARM\r
 ;\r
 ;\r
 ; CpuBreakpoint() for ARM\r
 ;\r

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

 ; Portions copyright (c) 2008 - 2009, Apple 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
 ; Portions copyright (c) 2008 - 2009, Apple 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


@@ -37,5 +37,5 @@
 CpuBreakpoint\r
     swi   0xdbdbdb\r
     bx    lr\r
 CpuBreakpoint\r
     swi   0xdbdbdb\r
     bx    lr\r

-    \r
+\r

   END\r
   END\r

diff --git a/MdePkg/Library/BaseLib/Arm/CpuPause.asm b/MdePkg/Library/BaseLib/Arm/CpuPause.asm
index 195660996f4cd9e9c60fce88f2286199564b558b..dd874844a31c3df158b8246c82e9743264bb44a7 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/CpuPause.asm
+++ b/MdePkg/Library/BaseLib/Arm/CpuPause.asm
@@ -1,8 +1,8 @@
-;------------------------------------------------------------------------------ \r
+;------------------------------------------------------------------------------\r

 ;\r
 ; CpuPause() for ARM\r
 ;\r
 ;\r
 ; CpuPause() for ARM\r
 ;\r

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

 ; Portions copyright (c) 2008 - 2009, Apple 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
 ; Portions copyright (c) 2008 - 2009, Apple 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

diff --git a/MdePkg/Library/BaseLib/Arm/DisableInterrupts.S b/MdePkg/Library/BaseLib/Arm/DisableInterrupts.S
index e5740862d73f636717516adfa2ada834fa0d9a02..8305c9d0f1cc3511b843c9ba866050ff132b902f 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/DisableInterrupts.S
+++ b/MdePkg/Library/BaseLib/Arm/DisableInterrupts.S
@@ -1,8 +1,8 @@
-#------------------------------------------------------------------------------ \r
+#------------------------------------------------------------------------------\r

 #\r
 # DisableInterrupts() for ARM\r
 #\r
 #\r
 # DisableInterrupts() for ARM\r
 #\r

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

 # Portions copyright (c) 2008 - 2009, Apple 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
 # Portions copyright (c) 2008 - 2009, Apple 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

diff --git a/MdePkg/Library/BaseLib/Arm/DisableInterrupts.asm b/MdePkg/Library/BaseLib/Arm/DisableInterrupts.asm
index 4fd8de45f66ed3526ec040455a6631a5bdbddab9..f32a9482d5b0e65e5e71f9c2336c9183fcaaf387 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/DisableInterrupts.asm
+++ b/MdePkg/Library/BaseLib/Arm/DisableInterrupts.asm
@@ -1,8 +1,8 @@
-;------------------------------------------------------------------------------ \r
+;------------------------------------------------------------------------------\r

 ;\r
 ; DisableInterrupts() for ARM\r
 ;\r
 ;\r
 ; DisableInterrupts() for ARM\r
 ;\r

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

 ; Portions copyright (c) 2008 - 2009, Apple 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
 ; Portions copyright (c) 2008 - 2009, Apple 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


@@ -33,5 +33,5 @@ DisableInterrupts
     ORR     R0,R0,#0x80             ;Disable IRQ interrupts\r
     MSR     CPSR_c,R0\r
     BX      LR\r
     ORR     R0,R0,#0x80             ;Disable IRQ interrupts\r
     MSR     CPSR_c,R0\r
     BX      LR\r

-    \r
+\r

     END\r
     END\r

diff --git a/MdePkg/Library/BaseLib/Arm/EnableInterrupts.S b/MdePkg/Library/BaseLib/Arm/EnableInterrupts.S
index 9f3a28af9487eef9ba8dc9768f61c92bad8c9405..38349a5da3e7fbd4263cd69ff92c8eb4255c83c0 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/EnableInterrupts.S
+++ b/MdePkg/Library/BaseLib/Arm/EnableInterrupts.S
@@ -1,8 +1,8 @@
-#------------------------------------------------------------------------------ \r
+#------------------------------------------------------------------------------\r

 #\r
 # EnableInterrupts() for ARM\r
 #\r
 #\r
 # EnableInterrupts() for ARM\r
 #\r

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

 # Portions copyright (c) 2008 - 2009, Apple 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
 # Portions copyright (c) 2008 - 2009, Apple 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

diff --git a/MdePkg/Library/BaseLib/Arm/EnableInterrupts.asm b/MdePkg/Library/BaseLib/Arm/EnableInterrupts.asm
index e758224439049c18163bf9472b647da4a4668596..96d7a790f5566d522654536d4dd8cb8d05bfdef1 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/EnableInterrupts.asm
+++ b/MdePkg/Library/BaseLib/Arm/EnableInterrupts.asm
@@ -1,8 +1,8 @@
-;------------------------------------------------------------------------------ \r
+;------------------------------------------------------------------------------\r

 ;\r
 ; EnableInterrupts() for ARM\r
 ;\r
 ;\r
 ; EnableInterrupts() for ARM\r
 ;\r

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

 ; Portions copyright (c) 2008 - 2009, Apple 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
 ; Portions copyright (c) 2008 - 2009, Apple 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


@@ -33,5 +33,5 @@ EnableInterrupts
     BIC     R0,R0,#0x80             ;Enable IRQ interrupts\r
     MSR     CPSR_c,R0\r
     BX      LR\r
     BIC     R0,R0,#0x80             ;Enable IRQ interrupts\r
     MSR     CPSR_c,R0\r
     BX      LR\r

-    \r
+\r

     END\r
     END\r

diff --git a/MdePkg/Library/BaseLib/Arm/GetInterruptsState.S b/MdePkg/Library/BaseLib/Arm/GetInterruptsState.S
index 94b3596fc6453813f4a92d7aaed2290a853bb83c..c0c632b460bdc1998c19231f5fa4acfed95d9d5a 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/GetInterruptsState.S
+++ b/MdePkg/Library/BaseLib/Arm/GetInterruptsState.S
@@ -1,8 +1,8 @@
-#------------------------------------------------------------------------------ \r
+#------------------------------------------------------------------------------\r

 #\r
 # GetInterruptState() function for ARM\r
 #\r
 #\r
 # GetInterruptState() function for ARM\r
 #\r

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

 # Portions copyright (c) 2008 - 2009, Apple 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
 # Portions copyright (c) 2008 - 2009, Apple 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

diff --git a/MdePkg/Library/BaseLib/Arm/GetInterruptsState.asm b/MdePkg/Library/BaseLib/Arm/GetInterruptsState.asm
index 1e2e49c211cd2e8d936f61fad0dd21baa2136dde..f9ddca707dbdfcc1561f59f3e34fa9ce4f907c3d 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/GetInterruptsState.asm
+++ b/MdePkg/Library/BaseLib/Arm/GetInterruptsState.asm
@@ -1,8 +1,8 @@
-;------------------------------------------------------------------------------ \r
+;------------------------------------------------------------------------------\r

 ;\r
 ; GetInterruptState() function for ARM\r
 ;\r
 ;\r
 ; GetInterruptState() function for ARM\r
 ;\r

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

 ; Portions copyright (c) 2008 - 2009, Apple 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
 ; Portions copyright (c) 2008 - 2009, Apple 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


@@ -41,5 +41,5 @@ GetInterruptState
     MOVEQ   R0, #1\r
     MOVNE   R0, #0\r
     BX      LR\r
     MOVEQ   R0, #1\r
     MOVNE   R0, #0\r
     BX      LR\r

-    \r
+\r

     END\r
     END\r

diff --git a/MdePkg/Library/BaseLib/Arm/InternalSwitchStack.c b/MdePkg/Library/BaseLib/Arm/InternalSwitchStack.c
index 9f395bbd395478144d86233835ff71942d389e08..1f71bb759d2a28956729ad4b39bdb4538af8dc5c 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/InternalSwitchStack.c
+++ b/MdePkg/Library/BaseLib/Arm/InternalSwitchStack.c
@@ -1,7 +1,7 @@
 /** @file\r
   SwitchStack() function for ARM.\r
 \r
 /** @file\r
   SwitchStack() function for ARM.\r
 \r

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

   Portions copyright (c) 2008 - 2009, Apple 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
   Portions copyright (c) 2008 - 2009, Apple 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


@@ -39,7 +39,7 @@ InternalSwitchStackAsm (
   IN      VOID                      *NewStack\r
   );\r
 \r
   IN      VOID                      *NewStack\r
   );\r
 \r

-  \r
+\r

 /**\r
   Transfers control to a function starting with a new stack.\r
 \r
 /**\r
   Transfers control to a function starting with a new stack.\r
 \r

diff --git a/MdePkg/Library/BaseLib/Arm/Math64.S b/MdePkg/Library/BaseLib/Arm/Math64.S
index e2512621fe1a7ce8a25c10207e5a5beefbbc33ce..4faa02464947f14e6d680f6da61413495004dde2 100755 (executable)
--- a/MdePkg/Library/BaseLib/Arm/Math64.S
+++ b/MdePkg/Library/BaseLib/Arm/Math64.S
@@ -1,8 +1,8 @@
-#------------------------------------------------------------------------------ \r
+#------------------------------------------------------------------------------\r

 #\r
 #\r

-# Replacement for Math64.c that is coded to use older GCC intrinsics. \r
+# Replacement for Math64.c that is coded to use older GCC intrinsics.\r

 # Doing this reduces the number of intrinsics that are required when\r
 # Doing this reduces the number of intrinsics that are required when\r

-# you port to a new version of gcc. \r
+# you port to a new version of gcc.\r

 #\r
 # Need to split this into multple files to size optimize the image.\r
 #\r
 #\r
 # Need to split this into multple files to size optimize the image.\r
 #\r


@@ -17,253 +17,253 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
 #\r
 #------------------------------------------------------------------------------\r
 \r

-       .text\r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathLShiftU64)\r
+  .text\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathLShiftU64)\r

 \r
 ASM_PFX(InternalMathLShiftU64):\r
 \r
 ASM_PFX(InternalMathLShiftU64):\r

-       stmfd   sp!, {r4, r5, r6}\r
-       mov     r6, r1\r
-       rsb     ip, r2, #32\r
-       mov     r4, r6, asl r2\r
-       subs    r1, r2, #32\r
-       orr     r4, r4, r0, lsr ip\r
-       mov     r3, r0, asl r2\r
-       movpl   r4, r0, asl r1\r
-       mov     r5, r0\r
-       mov     r0, r3\r
-       mov     r1, r4\r
-       ldmfd   sp!, {r4, r5, r6}\r
-       bx      lr\r
-\r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathRShiftU64)\r
+  stmfd  sp!, {r4, r5, r6}\r
+  mov  r6, r1\r
+  rsb  ip, r2, #32\r
+  mov  r4, r6, asl r2\r
+  subs  r1, r2, #32\r
+  orr  r4, r4, r0, lsr ip\r
+  mov  r3, r0, asl r2\r
+  movpl  r4, r0, asl r1\r
+  mov  r5, r0\r
+  mov  r0, r3\r
+  mov  r1, r4\r
+  ldmfd  sp!, {r4, r5, r6}\r
+  bx  lr\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathRShiftU64)\r

 \r
 ASM_PFX(InternalMathRShiftU64):\r
 \r
 ASM_PFX(InternalMathRShiftU64):\r

-       stmfd   sp!, {r4, r5, r6}\r
-       mov     r5, r0\r
-       rsb     ip, r2, #32\r
-       mov     r3, r5, lsr r2\r
-       subs    r0, r2, #32\r
-       orr     r3, r3, r1, asl ip\r
-       mov     r4, r1, lsr r2\r
-       movpl   r3, r1, lsr r0\r
-       mov     r6, r1\r
-       mov     r0, r3\r
-       mov     r1, r4\r
-       ldmfd   sp!, {r4, r5, r6}\r
-       bx      lr\r
-\r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathARShiftU64)\r
+  stmfd  sp!, {r4, r5, r6}\r
+  mov  r5, r0\r
+  rsb  ip, r2, #32\r
+  mov  r3, r5, lsr r2\r
+  subs  r0, r2, #32\r
+  orr  r3, r3, r1, asl ip\r
+  mov  r4, r1, lsr r2\r
+  movpl  r3, r1, lsr r0\r
+  mov  r6, r1\r
+  mov  r0, r3\r
+  mov  r1, r4\r
+  ldmfd  sp!, {r4, r5, r6}\r
+  bx  lr\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathARShiftU64)\r

 \r
 ASM_PFX(InternalMathARShiftU64):\r
 \r
 ASM_PFX(InternalMathARShiftU64):\r

-       stmfd   sp!, {r4, r5, r6}\r
-       mov     r5, r0\r
-       rsb     ip, r2, #32\r
-       mov     r3, r5, lsr r2\r
-       subs    r0, r2, #32\r
-       orr     r3, r3, r1, asl ip\r
-       mov     r4, r1, asr r2\r
-       movpl   r3, r1, asr r0\r
-       mov     r6, r1\r
-       mov     r0, r3\r
-       mov     r1, r4\r
-       ldmfd   sp!, {r4, r5, r6}\r
-       bx      lr\r
-\r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathLRotU64)\r
+  stmfd  sp!, {r4, r5, r6}\r
+  mov  r5, r0\r
+  rsb  ip, r2, #32\r
+  mov  r3, r5, lsr r2\r
+  subs  r0, r2, #32\r
+  orr  r3, r3, r1, asl ip\r
+  mov  r4, r1, asr r2\r
+  movpl  r3, r1, asr r0\r
+  mov  r6, r1\r
+  mov  r0, r3\r
+  mov  r1, r4\r
+  ldmfd  sp!, {r4, r5, r6}\r
+  bx  lr\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathLRotU64)\r

 \r
 ASM_PFX(InternalMathLRotU64):\r
 \r
 ASM_PFX(InternalMathLRotU64):\r

-       stmfd   sp!, {r4, r5, r6, r7, lr}\r
-       add     r7, sp, #12\r
-       mov     r6, r1\r
-       rsb     ip, r2, #32\r
-       mov     r4, r6, asl r2\r
-       rsb     lr, r2, #64\r
-       subs    r1, r2, #32\r
-       orr     r4, r4, r0, lsr ip\r
-       mov     r3, r0, asl r2\r
-       movpl   r4, r0, asl r1\r
-       sub     ip, r2, #32\r
-       mov     r5, r0\r
-       mov     r0, r0, lsr lr\r
-       rsbs    r2, r2, #32\r
-       orr     r0, r0, r6, asl ip\r
-       mov     r1, r6, lsr lr\r
-       movpl   r0, r6, lsr r2\r
-       orr     r1, r1, r4\r
-       orr     r0, r0, r3\r
-       ldmfd   sp!, {r4, r5, r6, r7, pc}\r
-\r
-\r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathRRotU64)\r
+  stmfd  sp!, {r4, r5, r6, r7, lr}\r
+  add  r7, sp, #12\r
+  mov  r6, r1\r
+  rsb  ip, r2, #32\r
+  mov  r4, r6, asl r2\r
+  rsb  lr, r2, #64\r
+  subs  r1, r2, #32\r
+  orr  r4, r4, r0, lsr ip\r
+  mov  r3, r0, asl r2\r
+  movpl  r4, r0, asl r1\r
+  sub  ip, r2, #32\r
+  mov  r5, r0\r
+  mov  r0, r0, lsr lr\r
+  rsbs  r2, r2, #32\r
+  orr  r0, r0, r6, asl ip\r
+  mov  r1, r6, lsr lr\r
+  movpl  r0, r6, lsr r2\r
+  orr  r1, r1, r4\r
+  orr  r0, r0, r3\r
+  ldmfd  sp!, {r4, r5, r6, r7, pc}\r
+\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathRRotU64)\r

 \r
 ASM_PFX(InternalMathRRotU64):\r
 \r
 ASM_PFX(InternalMathRRotU64):\r

-       stmfd   sp!, {r4, r5, r6, r7, lr}\r
-       add     r7, sp, #12\r
-       mov     r5, r0\r
-       rsb     ip, r2, #32\r
-       mov     r3, r5, lsr r2\r
-       rsb     lr, r2, #64\r
-       subs    r0, r2, #32\r
-       orr     r3, r3, r1, asl ip\r
-       mov     r4, r1, lsr r2\r
-       movpl   r3, r1, lsr r0\r
-       sub     ip, r2, #32\r
-       mov     r6, r1\r
-       mov     r1, r1, asl lr\r
-       rsbs    r2, r2, #32\r
-       orr     r1, r1, r5, lsr ip\r
-       mov     r0, r5, asl lr\r
-       movpl   r1, r5, asl r2\r
-       orr     r0, r0, r3\r
-       orr     r1, r1, r4\r
-       ldmfd   sp!, {r4, r5, r6, r7, pc}\r
-\r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathMultU64x32)\r
+  stmfd  sp!, {r4, r5, r6, r7, lr}\r
+  add  r7, sp, #12\r
+  mov  r5, r0\r
+  rsb  ip, r2, #32\r
+  mov  r3, r5, lsr r2\r
+  rsb  lr, r2, #64\r
+  subs  r0, r2, #32\r
+  orr  r3, r3, r1, asl ip\r
+  mov  r4, r1, lsr r2\r
+  movpl  r3, r1, lsr r0\r
+  sub  ip, r2, #32\r
+  mov  r6, r1\r
+  mov  r1, r1, asl lr\r
+  rsbs  r2, r2, #32\r
+  orr  r1, r1, r5, lsr ip\r
+  mov  r0, r5, asl lr\r
+  movpl  r1, r5, asl r2\r
+  orr  r0, r0, r3\r
+  orr  r1, r1, r4\r
+  ldmfd  sp!, {r4, r5, r6, r7, pc}\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathMultU64x32)\r

 \r
 ASM_PFX(InternalMathMultU64x32):\r
 \r
 ASM_PFX(InternalMathMultU64x32):\r

-       stmfd   sp!, {r7, lr}\r
-       add     r7, sp, #0\r
-       mov     r3, #0\r
-       mov     ip, r0\r
-       mov     lr, r1\r
-       umull   r0, r1, ip, r2\r
-       mla     r1, lr, r2, r1\r
-       mla     r1, ip, r3, r1\r
-       ldmfd   sp!, {r7, pc}\r
-\r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathMultU64x64)\r
+  stmfd  sp!, {r7, lr}\r
+  add  r7, sp, #0\r
+  mov  r3, #0\r
+  mov  ip, r0\r
+  mov  lr, r1\r
+  umull  r0, r1, ip, r2\r
+  mla  r1, lr, r2, r1\r
+  mla  r1, ip, r3, r1\r
+  ldmfd  sp!, {r7, pc}\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathMultU64x64)\r

 \r
 ASM_PFX(InternalMathMultU64x64):\r
 \r
 ASM_PFX(InternalMathMultU64x64):\r

-       stmfd   sp!, {r7, lr}\r
-       add     r7, sp, #0\r
-       mov     ip, r0\r
-       mov     lr, r1\r
-       umull   r0, r1, ip, r2\r
-       mla     r1, lr, r2, r1\r
-       mla     r1, ip, r3, r1\r
-       ldmfd   sp!, {r7, pc}\r
-\r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathDivU64x32)\r
+  stmfd  sp!, {r7, lr}\r
+  add  r7, sp, #0\r
+  mov  ip, r0\r
+  mov  lr, r1\r
+  umull  r0, r1, ip, r2\r
+  mla  r1, lr, r2, r1\r
+  mla  r1, ip, r3, r1\r
+  ldmfd  sp!, {r7, pc}\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathDivU64x32)\r

 \r
 ASM_PFX(InternalMathDivU64x32):\r
 \r
 ASM_PFX(InternalMathDivU64x32):\r

-       stmfd   sp!, {r7, lr}\r
-       add     r7, sp, #0\r
-       mov     r3, #0\r
-       bl      ASM_PFX(__udivdi3)\r
-       ldmfd   sp!, {r7, pc}\r
-       \r
-       \r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathModU64x32)\r
+  stmfd  sp!, {r7, lr}\r
+  add  r7, sp, #0\r
+  mov  r3, #0\r
+  bl   ASM_PFX(__udivdi3)\r
+  ldmfd  sp!, {r7, pc}\r
+\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathModU64x32)\r

 \r
 ASM_PFX(InternalMathModU64x32):\r
 \r
 ASM_PFX(InternalMathModU64x32):\r

-       stmfd   sp!, {r7, lr}\r
-       add     r7, sp, #0\r
-       mov     r3, #0\r
-       bl      ASM_PFX(__umoddi3)\r
-       ldmfd   sp!, {r7, pc}\r
-       \r
-       \r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathDivRemU64x32)\r
+  stmfd  sp!, {r7, lr}\r
+  add  r7, sp, #0\r
+  mov  r3, #0\r
+  bl   ASM_PFX(__umoddi3)\r
+  ldmfd  sp!, {r7, pc}\r
+\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathDivRemU64x32)\r

 \r
 ASM_PFX(InternalMathDivRemU64x32):\r
 \r
 ASM_PFX(InternalMathDivRemU64x32):\r

-       stmfd   sp!, {r4, r5, r6, r7, lr}\r
-       add     r7, sp, #12\r
-       stmfd   sp!, {r10, r11}\r
-       subs    r6, r3, #0\r
-       mov     r10, r0\r
-       mov     r11, r1\r
-       moveq   r4, r2\r
-       moveq   r5, #0\r
-       beq     L22\r
-       mov     r4, r2\r
-       mov     r5, #0\r
-       mov     r3, #0\r
-       bl      ASM_PFX(__umoddi3)\r
-       str     r0, [r6, #0]\r
+  stmfd  sp!, {r4, r5, r6, r7, lr}\r
+  add  r7, sp, #12\r
+  stmfd  sp!, {r10, r11}\r
+  subs  r6, r3, #0\r
+  mov  r10, r0\r
+  mov  r11, r1\r
+  moveq  r4, r2\r
+  moveq  r5, #0\r
+  beq  L22\r
+  mov  r4, r2\r
+  mov  r5, #0\r
+  mov  r3, #0\r
+  bl   ASM_PFX(__umoddi3)\r
+  str  r0, [r6, #0]\r

 L22:\r
 L22:\r

-       mov     r0, r10\r
-       mov     r1, r11\r
-       mov     r2, r4\r
-       mov     r3, r5\r
-       bl      ASM_PFX(__udivdi3)\r
-       ldmfd   sp!, {r10, r11}\r
-       ldmfd   sp!, {r4, r5, r6, r7, pc}\r
-       \r
-       \r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathDivRemU64x64)\r
+  mov  r0, r10\r
+  mov  r1, r11\r
+  mov  r2, r4\r
+  mov  r3, r5\r
+  bl   ASM_PFX(__udivdi3)\r
+  ldmfd  sp!, {r10, r11}\r
+  ldmfd  sp!, {r4, r5, r6, r7, pc}\r
+\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathDivRemU64x64)\r

 \r
 ASM_PFX(InternalMathDivRemU64x64):\r
 \r
 ASM_PFX(InternalMathDivRemU64x64):\r

-       stmfd   sp!, {r4, r5, r6, r7, lr}\r
-       add     r7, sp, #12\r
-       stmfd   sp!, {r10, r11}\r
-       ldr     r6, [sp, #28]\r
-       mov     r4, r0\r
-       cmp     r6, #0\r
-       mov     r5, r1\r
-       mov     r10, r2\r
-       mov     r11, r3\r
-       beq     L26\r
-       bl      ASM_PFX(__umoddi3)\r
-       stmia   r6, {r0-r1}\r
+  stmfd  sp!, {r4, r5, r6, r7, lr}\r
+  add  r7, sp, #12\r
+  stmfd  sp!, {r10, r11}\r
+  ldr  r6, [sp, #28]\r
+  mov  r4, r0\r
+  cmp  r6, #0\r
+  mov  r5, r1\r
+  mov  r10, r2\r
+  mov  r11, r3\r
+  beq  L26\r
+  bl   ASM_PFX(__umoddi3)\r
+  stmia  r6, {r0-r1}\r

 L26:\r
 L26:\r

-       mov     r0, r4\r
-       mov     r1, r5\r
-       mov     r2, r10\r
-       mov     r3, r11\r
-       bl      ASM_PFX(__udivdi3)\r
-       ldmfd   sp!, {r10, r11}\r
-       ldmfd   sp!, {r4, r5, r6, r7, pc}\r
-       \r
-       \r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathDivRemS64x64)\r
+  mov  r0, r4\r
+  mov  r1, r5\r
+  mov  r2, r10\r
+  mov  r3, r11\r
+  bl   ASM_PFX(__udivdi3)\r
+  ldmfd  sp!, {r10, r11}\r
+  ldmfd  sp!, {r4, r5, r6, r7, pc}\r
+\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathDivRemS64x64)\r

 \r
 ASM_PFX(InternalMathDivRemS64x64):\r
 \r
 ASM_PFX(InternalMathDivRemS64x64):\r

-       stmfd   sp!, {r4, r5, r6, r7, lr}\r
-       add     r7, sp, #12\r
-       stmfd   sp!, {r10, r11}\r
-       ldr     r6, [sp, #28]\r
-       mov     r4, r0\r
-       cmp     r6, #0\r
-       mov     r5, r1\r
-       mov     r10, r2\r
-       mov     r11, r3\r
-       beq     L30\r
-       bl      ASM_PFX(__moddi3)\r
-       stmia   r6, {r0-r1}\r
+  stmfd  sp!, {r4, r5, r6, r7, lr}\r
+  add  r7, sp, #12\r
+  stmfd  sp!, {r10, r11}\r
+  ldr  r6, [sp, #28]\r
+  mov  r4, r0\r
+  cmp  r6, #0\r
+  mov  r5, r1\r
+  mov  r10, r2\r
+  mov  r11, r3\r
+  beq  L30\r
+  bl   ASM_PFX(__moddi3)\r
+  stmia  r6, {r0-r1}\r

 L30:\r
 L30:\r

-       mov     r0, r4\r
-       mov     r1, r5\r
-       mov     r2, r10\r
-       mov     r3, r11\r
-       bl      ASM_PFX(__divdi3)\r
-       ldmfd   sp!, {r10, r11}\r
-       ldmfd   sp!, {r4, r5, r6, r7, pc}\r
-       \r
-       \r
-       .align 2\r
-       GCC_ASM_EXPORT(InternalMathSwapBytes64)\r
+  mov  r0, r4\r
+  mov  r1, r5\r
+  mov  r2, r10\r
+  mov  r3, r11\r
+  bl   ASM_PFX(__divdi3)\r
+  ldmfd  sp!, {r10, r11}\r
+  ldmfd  sp!, {r4, r5, r6, r7, pc}\r
+\r
+\r
+  .align 2\r
+  GCC_ASM_EXPORT(InternalMathSwapBytes64)\r

 \r
 ASM_PFX(InternalMathSwapBytes64):\r
 \r
 ASM_PFX(InternalMathSwapBytes64):\r

-       stmfd   sp!, {r4, r5, r7, lr}\r
-       mov     r5, r1\r
-       bl      ASM_PFX(SwapBytes32)\r
-       mov     r4, r0\r
-       mov     r0, r5\r
-       bl      ASM_PFX(SwapBytes32)\r
-       mov     r1, r4\r
-       ldmfd   sp!, {r4, r5, r7, pc}\r
+  stmfd  sp!, {r4, r5, r7, lr}\r
+  mov  r5, r1\r
+  bl  ASM_PFX(SwapBytes32)\r
+  mov  r4, r0\r
+  mov  r0, r5\r
+  bl  ASM_PFX(SwapBytes32)\r
+  mov  r1, r4\r
+  ldmfd  sp!, {r4, r5, r7, pc}\r

 \r
 \r
 \r
 \r

-ASM_FUNCTION_REMOVE_IF_UNREFERENCED
\ No newline at end of file
+ASM_FUNCTION_REMOVE_IF_UNREFERENCED\r

diff --git a/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.S b/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.S
index 2ea88029c9f357948df64ea2cc2636dba3dd1c05..7864d377f3fab280677d332fca24cbfd3a25d0b1 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.S
+++ b/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.S
@@ -1,6 +1,6 @@
-#------------------------------------------------------------------------------ \r
+#------------------------------------------------------------------------------\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

 # Portions copyright (c) 2008 - 2009, Apple 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
 # Portions copyright (c) 2008 - 2009, Apple 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

diff --git a/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm b/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm
index 3346ee86787870f2623c86274eea3ec0dc85ad08..7656fb156bc0e61e6f6145cbd674829f0c8e3255 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm
+++ b/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm
@@ -1,6 +1,6 @@
-;------------------------------------------------------------------------------ \r
+;------------------------------------------------------------------------------\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

 ; Portions copyright (c) 2008 - 2009, Apple 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
 ; Portions copyright (c) 2008 - 2009, Apple 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

diff --git a/MdePkg/Library/BaseLib/Arm/SwitchStack.S b/MdePkg/Library/BaseLib/Arm/SwitchStack.S
index 2c15eb88323fb82f2baefef5aa97a37094eedcdd..48ef7249bc2cc4ce5de7e9651fdf6418d188f1d4 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/SwitchStack.S
+++ b/MdePkg/Library/BaseLib/Arm/SwitchStack.S
@@ -1,6 +1,6 @@
-//------------------------------------------------------------------------------ \r
+//------------------------------------------------------------------------------\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

 // Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 // Portions copyright (c) 2011, ARM Limited. All rights reserved.<BR>\r
 // This program and the accompanying materials\r
 // Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 // Portions copyright (c) 2011, ARM Limited. All rights reserved.<BR>\r
 // This program and the accompanying materials\r


@@ -12,13 +12,13 @@
 // 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

 .text\r
 .align 5\r
 \r
 GCC_ASM_EXPORT(InternalSwitchStackAsm)\r
 .text\r
 .align 5\r
 \r
 GCC_ASM_EXPORT(InternalSwitchStackAsm)\r

-GCC_ASM_EXPORT(CpuPause)            \r
-  \r
+GCC_ASM_EXPORT(CpuPause)\r
+\r

 /**\r
 //\r
 //  This allows the caller to switch the stack and goes to the new entry point\r
 /**\r
 //\r
 //  This allows the caller to switch the stack and goes to the new entry point\r

diff --git a/MdePkg/Library/BaseLib/Arm/SwitchStack.asm b/MdePkg/Library/BaseLib/Arm/SwitchStack.asm
index 6517757bf703dd05f4d957b9be5cebab230029c4..998ed5238b845168d76aca0ca7034eec5fdefc48 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/SwitchStack.asm
+++ b/MdePkg/Library/BaseLib/Arm/SwitchStack.asm
@@ -1,6 +1,6 @@
-;------------------------------------------------------------------------------ \r
+;------------------------------------------------------------------------------\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

 ; Portions copyright (c) 2008 - 2009, Apple 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
 ; Portions copyright (c) 2008 - 2009, Apple 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


@@ -11,11 +11,11 @@
 ; 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

     EXPORT InternalSwitchStackAsm\r
     EXPORT InternalSwitchStackAsm\r

-            \r
+\r

     AREA   Switch_Stack, CODE, READONLY\r
     AREA   Switch_Stack, CODE, READONLY\r

-  \r
+\r

 ;/**\r
 ;  This allows the caller to switch the stack and goes to the new entry point\r
 ;\r
 ;/**\r
 ;  This allows the caller to switch the stack and goes to the new entry point\r
 ;\r

diff --git a/MdePkg/Library/BaseLib/Arm/Unaligned.c b/MdePkg/Library/BaseLib/Arm/Unaligned.c
index 34f1732a76e052addc97e5158a8b60a77ada2715..84883cf9dc928477e5f5cfc1384c83f905376518 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/Unaligned.c
+++ b/MdePkg/Library/BaseLib/Arm/Unaligned.c
@@ -1,9 +1,9 @@
 /** @file\r
   Unaligned access functions of BaseLib for ARM.\r
 /** @file\r
   Unaligned access functions of BaseLib for ARM.\r

-  \r
+\r

   volatile was added to work around optimization issues.\r
 \r
   volatile was added to work around optimization issues.\r
 \r

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

   Portions copyright (c) 2008 - 2009, Apple 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
   Portions copyright (c) 2008 - 2009, Apple 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

diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 12e883cbb887f8c5ccaeef668cb0dc97411c6fb0..a1b5ec4b7574eb867cb46fd8d311ed2d20efaed2 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -22,7 +22,7 @@
   FILE_GUID                      = 27d67720-ea68-48ae-93da-a3a074c90e30\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.1\r
   FILE_GUID                      = 27d67720-ea68-48ae-93da-a3a074c90e30\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.1\r

-  LIBRARY_CLASS                  = BaseLib \r
+  LIBRARY_CLASS                  = BaseLib\r

 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r
 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r


@@ -69,94 +69,94 @@
 [Sources.Ia32]\r
   Ia32/WriteTr.nasm\r
 \r
 [Sources.Ia32]\r
   Ia32/WriteTr.nasm\r
 \r

-  Ia32/Wbinvd.c | MSFT \r
-  Ia32/WriteMm7.c | MSFT \r
-  Ia32/WriteMm6.c | MSFT \r
-  Ia32/WriteMm5.c | MSFT \r
-  Ia32/WriteMm4.c | MSFT \r
-  Ia32/WriteMm3.c | MSFT \r
-  Ia32/WriteMm2.c | MSFT \r
-  Ia32/WriteMm1.c | MSFT \r
-  Ia32/WriteMm0.c | MSFT \r
-  Ia32/WriteLdtr.c | MSFT \r
-  Ia32/WriteIdtr.c | MSFT \r
-  Ia32/WriteGdtr.c | MSFT \r
-  Ia32/WriteDr7.c | MSFT \r
-  Ia32/WriteDr6.c | MSFT \r
-  Ia32/WriteDr5.c | MSFT \r
-  Ia32/WriteDr4.c | MSFT \r
-  Ia32/WriteDr3.c | MSFT \r
-  Ia32/WriteDr2.c | MSFT \r
-  Ia32/WriteDr1.c | MSFT \r
-  Ia32/WriteDr0.c | MSFT \r
-  Ia32/WriteCr4.c | MSFT \r
-  Ia32/WriteCr3.c | MSFT \r
-  Ia32/WriteCr2.c | MSFT \r
-  Ia32/WriteCr0.c | MSFT \r
-  Ia32/WriteMsr64.c | MSFT \r
-  Ia32/SwapBytes64.c | MSFT \r
-  Ia32/SetJump.c | MSFT \r
-  Ia32/RRotU64.c | MSFT \r
-  Ia32/RShiftU64.c | MSFT \r
-  Ia32/ReadPmc.c | MSFT \r
-  Ia32/ReadTsc.c | MSFT \r
-  Ia32/ReadLdtr.c | MSFT \r
-  Ia32/ReadIdtr.c | MSFT \r
-  Ia32/ReadGdtr.c | MSFT \r
-  Ia32/ReadTr.c | MSFT \r
-  Ia32/ReadSs.c | MSFT \r
-  Ia32/ReadGs.c | MSFT \r
-  Ia32/ReadFs.c | MSFT \r
-  Ia32/ReadEs.c | MSFT \r
-  Ia32/ReadDs.c | MSFT \r
-  Ia32/ReadCs.c | MSFT \r
-  Ia32/ReadMsr64.c | MSFT \r
-  Ia32/ReadMm7.c | MSFT \r
-  Ia32/ReadMm6.c | MSFT \r
-  Ia32/ReadMm5.c | MSFT \r
-  Ia32/ReadMm4.c | MSFT \r
-  Ia32/ReadMm3.c | MSFT \r
-  Ia32/ReadMm2.c | MSFT \r
-  Ia32/ReadMm1.c | MSFT \r
-  Ia32/ReadMm0.c | MSFT \r
-  Ia32/ReadEflags.c | MSFT \r
-  Ia32/ReadDr7.c | MSFT \r
-  Ia32/ReadDr6.c | MSFT \r
-  Ia32/ReadDr5.c | MSFT \r
-  Ia32/ReadDr4.c | MSFT \r
-  Ia32/ReadDr3.c | MSFT \r
-  Ia32/ReadDr2.c | MSFT \r
-  Ia32/ReadDr1.c | MSFT \r
-  Ia32/ReadDr0.c | MSFT \r
-  Ia32/ReadCr4.c | MSFT \r
-  Ia32/ReadCr3.c | MSFT \r
-  Ia32/ReadCr2.c | MSFT \r
-  Ia32/ReadCr0.c | MSFT \r
-  Ia32/Mwait.c | MSFT \r
-  Ia32/Monitor.c | MSFT \r
-  Ia32/ModU64x32.c | MSFT \r
-  Ia32/MultU64x64.c | MSFT \r
-  Ia32/MultU64x32.c | MSFT \r
-  Ia32/LShiftU64.c | MSFT \r
-  Ia32/LRotU64.c | MSFT \r
-  Ia32/LongJump.c | MSFT \r
-  Ia32/Invd.c | MSFT \r
-  Ia32/FxRestore.c | MSFT \r
-  Ia32/FxSave.c | MSFT \r
-  Ia32/FlushCacheLine.c | MSFT \r
-  Ia32/EnablePaging32.c | MSFT \r
-  Ia32/EnableInterrupts.c | MSFT \r
-  Ia32/EnableDisableInterrupts.c | MSFT \r
+  Ia32/Wbinvd.c | MSFT\r
+  Ia32/WriteMm7.c | MSFT\r
+  Ia32/WriteMm6.c | MSFT\r
+  Ia32/WriteMm5.c | MSFT\r
+  Ia32/WriteMm4.c | MSFT\r
+  Ia32/WriteMm3.c | MSFT\r
+  Ia32/WriteMm2.c | MSFT\r
+  Ia32/WriteMm1.c | MSFT\r
+  Ia32/WriteMm0.c | MSFT\r
+  Ia32/WriteLdtr.c | MSFT\r
+  Ia32/WriteIdtr.c | MSFT\r
+  Ia32/WriteGdtr.c | MSFT\r
+  Ia32/WriteDr7.c | MSFT\r
+  Ia32/WriteDr6.c | MSFT\r
+  Ia32/WriteDr5.c | MSFT\r
+  Ia32/WriteDr4.c | MSFT\r
+  Ia32/WriteDr3.c | MSFT\r
+  Ia32/WriteDr2.c | MSFT\r
+  Ia32/WriteDr1.c | MSFT\r
+  Ia32/WriteDr0.c | MSFT\r
+  Ia32/WriteCr4.c | MSFT\r
+  Ia32/WriteCr3.c | MSFT\r
+  Ia32/WriteCr2.c | MSFT\r
+  Ia32/WriteCr0.c | MSFT\r
+  Ia32/WriteMsr64.c | MSFT\r
+  Ia32/SwapBytes64.c | MSFT\r
+  Ia32/SetJump.c | MSFT\r
+  Ia32/RRotU64.c | MSFT\r
+  Ia32/RShiftU64.c | MSFT\r
+  Ia32/ReadPmc.c | MSFT\r
+  Ia32/ReadTsc.c | MSFT\r
+  Ia32/ReadLdtr.c | MSFT\r
+  Ia32/ReadIdtr.c | MSFT\r
+  Ia32/ReadGdtr.c | MSFT\r
+  Ia32/ReadTr.c | MSFT\r
+  Ia32/ReadSs.c | MSFT\r
+  Ia32/ReadGs.c | MSFT\r
+  Ia32/ReadFs.c | MSFT\r
+  Ia32/ReadEs.c | MSFT\r
+  Ia32/ReadDs.c | MSFT\r
+  Ia32/ReadCs.c | MSFT\r
+  Ia32/ReadMsr64.c | MSFT\r
+  Ia32/ReadMm7.c | MSFT\r
+  Ia32/ReadMm6.c | MSFT\r
+  Ia32/ReadMm5.c | MSFT\r
+  Ia32/ReadMm4.c | MSFT\r
+  Ia32/ReadMm3.c | MSFT\r
+  Ia32/ReadMm2.c | MSFT\r
+  Ia32/ReadMm1.c | MSFT\r
+  Ia32/ReadMm0.c | MSFT\r
+  Ia32/ReadEflags.c | MSFT\r
+  Ia32/ReadDr7.c | MSFT\r
+  Ia32/ReadDr6.c | MSFT\r
+  Ia32/ReadDr5.c | MSFT\r
+  Ia32/ReadDr4.c | MSFT\r
+  Ia32/ReadDr3.c | MSFT\r
+  Ia32/ReadDr2.c | MSFT\r
+  Ia32/ReadDr1.c | MSFT\r
+  Ia32/ReadDr0.c | MSFT\r
+  Ia32/ReadCr4.c | MSFT\r
+  Ia32/ReadCr3.c | MSFT\r
+  Ia32/ReadCr2.c | MSFT\r
+  Ia32/ReadCr0.c | MSFT\r
+  Ia32/Mwait.c | MSFT\r
+  Ia32/Monitor.c | MSFT\r
+  Ia32/ModU64x32.c | MSFT\r
+  Ia32/MultU64x64.c | MSFT\r
+  Ia32/MultU64x32.c | MSFT\r
+  Ia32/LShiftU64.c | MSFT\r
+  Ia32/LRotU64.c | MSFT\r
+  Ia32/LongJump.c | MSFT\r
+  Ia32/Invd.c | MSFT\r
+  Ia32/FxRestore.c | MSFT\r
+  Ia32/FxSave.c | MSFT\r
+  Ia32/FlushCacheLine.c | MSFT\r
+  Ia32/EnablePaging32.c | MSFT\r
+  Ia32/EnableInterrupts.c | MSFT\r
+  Ia32/EnableDisableInterrupts.c | MSFT\r

   Ia32/DivU64x64Remainder.nasm| MSFT\r
   Ia32/DivU64x64Remainder.nasm| MSFT\r

-  Ia32/DivU64x32Remainder.c | MSFT \r
-  Ia32/DivU64x32.c | MSFT \r
-  Ia32/DisablePaging32.c | MSFT \r
-  Ia32/DisableInterrupts.c | MSFT \r
-  Ia32/CpuPause.c | MSFT \r
-  Ia32/CpuIdEx.c | MSFT \r
-  Ia32/CpuId.c | MSFT \r
-  Ia32/CpuBreakpoint.c | MSFT \r
-  Ia32/ARShiftU64.c | MSFT \r
+  Ia32/DivU64x32Remainder.c | MSFT\r
+  Ia32/DivU64x32.c | MSFT\r
+  Ia32/DisablePaging32.c | MSFT\r
+  Ia32/DisableInterrupts.c | MSFT\r
+  Ia32/CpuPause.c | MSFT\r
+  Ia32/CpuIdEx.c | MSFT\r
+  Ia32/CpuId.c | MSFT\r
+  Ia32/CpuBreakpoint.c | MSFT\r
+  Ia32/ARShiftU64.c | MSFT\r

   Ia32/Thunk16.nasm | MSFT\r
   Ia32/EnablePaging64.nasm| MSFT\r
   Ia32/EnableCache.c | MSFT\r
   Ia32/Thunk16.nasm | MSFT\r
   Ia32/EnablePaging64.nasm| MSFT\r
   Ia32/EnableCache.c | MSFT\r


@@ -258,52 +258,52 @@
   Ia32/RdRand.nasm| INTEL\r
 \r
   Ia32/GccInline.c | GCC\r
   Ia32/RdRand.nasm| INTEL\r
 \r
   Ia32/GccInline.c | GCC\r

-  Ia32/Thunk16.nasm | GCC \r
-  Ia32/Thunk16.S | XCODE \r
+  Ia32/Thunk16.nasm | GCC\r
+  Ia32/Thunk16.S | XCODE\r

   Ia32/EnableDisableInterrupts.nasm| GCC\r
   Ia32/EnableDisableInterrupts.nasm| GCC\r

-  Ia32/EnableDisableInterrupts.S | GCC \r
+  Ia32/EnableDisableInterrupts.S | GCC\r

   Ia32/EnablePaging64.nasm| GCC\r
   Ia32/EnablePaging64.nasm| GCC\r

-  Ia32/EnablePaging64.S | GCC \r
+  Ia32/EnablePaging64.S | GCC\r

   Ia32/DisablePaging32.nasm| GCC\r
   Ia32/DisablePaging32.nasm| GCC\r

-  Ia32/DisablePaging32.S | GCC \r
+  Ia32/DisablePaging32.S | GCC\r

   Ia32/EnablePaging32.nasm| GCC\r
   Ia32/EnablePaging32.nasm| GCC\r

-  Ia32/EnablePaging32.S | GCC \r
+  Ia32/EnablePaging32.S | GCC\r

   Ia32/Mwait.nasm| GCC\r
   Ia32/Mwait.nasm| GCC\r

-  Ia32/Mwait.S | GCC \r
+  Ia32/Mwait.S | GCC\r

   Ia32/Monitor.nasm| GCC\r
   Ia32/Monitor.nasm| GCC\r

-  Ia32/Monitor.S | GCC \r
+  Ia32/Monitor.S | GCC\r

   Ia32/CpuIdEx.nasm| GCC\r
   Ia32/CpuIdEx.nasm| GCC\r

-  Ia32/CpuIdEx.S | GCC \r
+  Ia32/CpuIdEx.S | GCC\r

   Ia32/CpuId.nasm| GCC\r
   Ia32/CpuId.nasm| GCC\r

-  Ia32/CpuId.S | GCC \r
+  Ia32/CpuId.S | GCC\r

   Ia32/LongJump.nasm| GCC\r
   Ia32/LongJump.nasm| GCC\r

-  Ia32/LongJump.S | GCC \r
+  Ia32/LongJump.S | GCC\r

   Ia32/SetJump.nasm| GCC\r
   Ia32/SetJump.nasm| GCC\r

-  Ia32/SetJump.S | GCC \r
+  Ia32/SetJump.S | GCC\r

   Ia32/SwapBytes64.nasm| GCC\r
   Ia32/SwapBytes64.nasm| GCC\r

-  Ia32/SwapBytes64.S | GCC \r
+  Ia32/SwapBytes64.S | GCC\r

   Ia32/DivU64x64Remainder.nasm| GCC\r
   Ia32/DivU64x64Remainder.nasm| GCC\r

-  Ia32/DivU64x64Remainder.S | GCC \r
+  Ia32/DivU64x64Remainder.S | GCC\r

   Ia32/DivU64x32Remainder.nasm| GCC\r
   Ia32/DivU64x32Remainder.nasm| GCC\r

-  Ia32/DivU64x32Remainder.S | GCC \r
+  Ia32/DivU64x32Remainder.S | GCC\r

   Ia32/ModU64x32.nasm| GCC\r
   Ia32/ModU64x32.nasm| GCC\r

-  Ia32/ModU64x32.S | GCC \r
+  Ia32/ModU64x32.S | GCC\r

   Ia32/DivU64x32.nasm| GCC\r
   Ia32/DivU64x32.nasm| GCC\r

-  Ia32/DivU64x32.S | GCC \r
+  Ia32/DivU64x32.S | GCC\r

   Ia32/MultU64x64.nasm| GCC\r
   Ia32/MultU64x64.nasm| GCC\r

-  Ia32/MultU64x64.S | GCC \r
+  Ia32/MultU64x64.S | GCC\r

   Ia32/MultU64x32.nasm| GCC\r
   Ia32/MultU64x32.nasm| GCC\r

-  Ia32/MultU64x32.S | GCC \r
+  Ia32/MultU64x32.S | GCC\r

   Ia32/RRotU64.nasm| GCC\r
   Ia32/RRotU64.nasm| GCC\r

-  Ia32/RRotU64.S | GCC \r
+  Ia32/RRotU64.S | GCC\r

   Ia32/LRotU64.nasm| GCC\r
   Ia32/LRotU64.nasm| GCC\r

-  Ia32/LRotU64.S | GCC \r
+  Ia32/LRotU64.S | GCC\r

   Ia32/ARShiftU64.nasm| GCC\r
   Ia32/ARShiftU64.nasm| GCC\r

-  Ia32/ARShiftU64.S | GCC \r
+  Ia32/ARShiftU64.S | GCC\r

   Ia32/RShiftU64.nasm| GCC\r
   Ia32/RShiftU64.nasm| GCC\r

-  Ia32/RShiftU64.S | GCC \r
+  Ia32/RShiftU64.S | GCC\r

   Ia32/LShiftU64.nasm| GCC\r
   Ia32/LShiftU64.nasm| GCC\r

-  Ia32/LShiftU64.S | GCC \r
+  Ia32/LShiftU64.S | GCC\r

   Ia32/EnableCache.nasm| GCC\r
   Ia32/EnableCache.S | GCC\r
   Ia32/DisableCache.nasm| GCC\r
   Ia32/EnableCache.nasm| GCC\r
   Ia32/EnableCache.S | GCC\r
   Ia32/DisableCache.nasm| GCC\r


@@ -347,9 +347,9 @@
   X64/DisableCache.nasm\r
   X64/WriteTr.nasm\r
 \r
   X64/DisableCache.nasm\r
   X64/WriteTr.nasm\r
 \r

-  X64/CpuBreakpoint.c | MSFT \r
-  X64/WriteMsr64.c | MSFT \r
-  X64/ReadMsr64.c | MSFT \r
+  X64/CpuBreakpoint.c | MSFT\r
+  X64/WriteMsr64.c | MSFT\r
+  X64/ReadMsr64.c | MSFT\r

   X64/RdRand.nasm| MSFT\r
   X64/CpuPause.nasm| MSFT\r
   X64/EnableDisableInterrupts.nasm| MSFT\r
   X64/RdRand.nasm| MSFT\r
   X64/CpuPause.nasm| MSFT\r
   X64/EnableDisableInterrupts.nasm| MSFT\r


@@ -514,28 +514,28 @@
   X86RdRand.c\r
   X86PatchInstruction.c\r
   X64/GccInline.c | GCC\r
   X86RdRand.c\r
   X86PatchInstruction.c\r
   X64/GccInline.c | GCC\r

-  X64/Thunk16.S | XCODE \r
+  X64/Thunk16.S | XCODE\r

   X64/SwitchStack.nasm| GCC\r
   X64/SwitchStack.nasm| GCC\r

-  X64/SwitchStack.S | GCC \r
+  X64/SwitchStack.S | GCC\r

   X64/SetJump.nasm| GCC\r
   X64/SetJump.nasm| GCC\r

-  X64/SetJump.S | GCC \r
+  X64/SetJump.S | GCC\r

   X64/LongJump.nasm| GCC\r
   X64/LongJump.nasm| GCC\r

-  X64/LongJump.S | GCC \r
+  X64/LongJump.S | GCC\r

   X64/EnableDisableInterrupts.nasm| GCC\r
   X64/EnableDisableInterrupts.nasm| GCC\r

-  X64/EnableDisableInterrupts.S | GCC \r
+  X64/EnableDisableInterrupts.S | GCC\r

   X64/DisablePaging64.nasm| GCC\r
   X64/DisablePaging64.nasm| GCC\r

-  X64/DisablePaging64.S | GCC \r
+  X64/DisablePaging64.S | GCC\r

   X64/CpuId.nasm| GCC\r
   X64/CpuId.nasm| GCC\r

-  X64/CpuId.S | GCC \r
+  X64/CpuId.S | GCC\r

   X64/CpuIdEx.nasm| GCC\r
   X64/CpuIdEx.nasm| GCC\r

-  X64/CpuIdEx.S | GCC \r
+  X64/CpuIdEx.S | GCC\r

   X64/EnableCache.nasm| GCC\r
   X64/EnableCache.S | GCC\r
   X64/DisableCache.nasm| GCC\r
   X64/DisableCache.S | GCC\r
   X64/RdRand.nasm| GCC\r
   X64/RdRand.S | GCC\r
   X64/EnableCache.nasm| GCC\r
   X64/EnableCache.S | GCC\r
   X64/DisableCache.nasm| GCC\r
   X64/DisableCache.S | GCC\r
   X64/RdRand.nasm| GCC\r
   X64/RdRand.S | GCC\r

-  ChkStkGcc.c  | GCC \r
+  ChkStkGcc.c  | GCC\r

 \r
 [Sources.IPF]\r
   Ipf/AccessGp.s\r
 \r
 [Sources.IPF]\r
   Ipf/AccessGp.s\r

diff --git a/MdePkg/Library/BaseLib/BitField.c b/MdePkg/Library/BaseLib/BitField.c
index eb9e276acc7132ce9043314500b7e132cd0f972f..d2d3150f2a08675387ac195c86c4e0ba4123814a 100644 (file)
--- a/MdePkg/Library/BaseLib/BitField.c
+++ b/MdePkg/Library/BaseLib/BitField.c
@@ -1,7 +1,7 @@
 /** @file\r
   Bit field functions of BaseLib.\r
 \r
 /** @file\r
   Bit field functions of BaseLib.\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


@@ -69,13 +69,13 @@ InternalBaseLibBitFieldOrUint (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // Higher bits in OrData those are not used must be zero. \r
+  // Higher bits in OrData those are not used must be zero.\r

   //\r
   // EndBit - StartBit + 1 might be 32 while the result right shifting 32 on a 32bit integer is undefined,\r
   // So the logic is updated to right shift (EndBit - StartBit) bits and compare the last bit directly.\r
   //\r
   ASSERT ((OrData >> (EndBit - StartBit)) == ((OrData >> (EndBit - StartBit)) & 1));\r
   //\r
   // EndBit - StartBit + 1 might be 32 while the result right shifting 32 on a 32bit integer is undefined,\r
   // So the logic is updated to right shift (EndBit - StartBit) bits and compare the last bit directly.\r
   //\r
   ASSERT ((OrData >> (EndBit - StartBit)) == ((OrData >> (EndBit - StartBit)) & 1));\r

-  \r
+\r

   //\r
   // ~((UINTN)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit]\r
   // are 1's while bit[EndBit + 1] thru the most significant bit are 0's.\r
   //\r
   // ~((UINTN)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit]\r
   // are 1's while bit[EndBit + 1] thru the most significant bit are 0's.\r


@@ -111,7 +111,7 @@ InternalBaseLibBitFieldAndUint (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // Higher bits in AndData those are not used must be zero. \r
+  // Higher bits in AndData those are not used must be zero.\r

   //\r
   // EndBit - StartBit + 1 might be 32 while the result right shifting 32 on a 32bit integer is undefined,\r
   // So the logic is updated to right shift (EndBit - StartBit) bits and compare the last bit directly.\r
   //\r
   // EndBit - StartBit + 1 might be 32 while the result right shifting 32 on a 32bit integer is undefined,\r
   // So the logic is updated to right shift (EndBit - StartBit) bits and compare the last bit directly.\r


@@ -275,7 +275,7 @@ BitFieldAnd8 (
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r

-  in Operand and the value specified by AndData, followed by a bitwise \r
+  in Operand and the value specified by AndData, followed by a bitwise\r

   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 8-bit value is returned.\r
 \r
   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 8-bit value is returned.\r
 \r


@@ -467,7 +467,7 @@ BitFieldAnd16 (
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r

-  in Operand and the value specified by AndData, followed by a bitwise \r
+  in Operand and the value specified by AndData, followed by a bitwise\r

   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 16-bit value is returned.\r
 \r
   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 16-bit value is returned.\r
 \r


@@ -659,7 +659,7 @@ BitFieldAnd32 (
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r

-  in Operand and the value specified by AndData, followed by a bitwise \r
+  in Operand and the value specified by AndData, followed by a bitwise\r

   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 32-bit value is returned.\r
 \r
   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 32-bit value is returned.\r
 \r


@@ -809,7 +809,7 @@ BitFieldOr64 (
   ASSERT (EndBit < 64);\r
   ASSERT (StartBit <= EndBit);\r
   //\r
   ASSERT (EndBit < 64);\r
   ASSERT (StartBit <= EndBit);\r
   //\r

-  // Higher bits in OrData those are not used must be zero. \r
+  // Higher bits in OrData those are not used must be zero.\r

   //\r
   // EndBit - StartBit + 1 might be 64 while the result right shifting 64 on RShiftU64() API is invalid,\r
   // So the logic is updated to right shift (EndBit - StartBit) bits and compare the last bit directly.\r
   //\r
   // EndBit - StartBit + 1 might be 64 while the result right shifting 64 on RShiftU64() API is invalid,\r
   // So the logic is updated to right shift (EndBit - StartBit) bits and compare the last bit directly.\r


@@ -857,11 +857,11 @@ BitFieldAnd64 (
 {\r
   UINT64  Value1;\r
   UINT64  Value2;\r
 {\r
   UINT64  Value1;\r
   UINT64  Value2;\r

-  \r
+\r

   ASSERT (EndBit < 64);\r
   ASSERT (StartBit <= EndBit);\r
   //\r
   ASSERT (EndBit < 64);\r
   ASSERT (StartBit <= EndBit);\r
   //\r

-  // Higher bits in AndData those are not used must be zero. \r
+  // Higher bits in AndData those are not used must be zero.\r

   //\r
   // EndBit - StartBit + 1 might be 64 while the right shifting 64 on RShiftU64() API is invalid,\r
   // So the logic is updated to right shift (EndBit - StartBit) bits and compare the last bit directly.\r
   //\r
   // EndBit - StartBit + 1 might be 64 while the right shifting 64 on RShiftU64() API is invalid,\r
   // So the logic is updated to right shift (EndBit - StartBit) bits and compare the last bit directly.\r


@@ -879,7 +879,7 @@ BitFieldAnd64 (
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r
   bitwise OR, and returns the result.\r
 \r
   Performs a bitwise AND between the bit field specified by StartBit and EndBit\r

-  in Operand and the value specified by AndData, followed by a bitwise \r
+  in Operand and the value specified by AndData, followed by a bitwise\r

   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 64-bit value is returned.\r
 \r
   OR with value specified by OrData. All other bits in Operand are\r
   preserved. The new 64-bit value is returned.\r
 \r

diff --git a/MdePkg/Library/BaseLib/CheckSum.c b/MdePkg/Library/BaseLib/CheckSum.c
index 677b36fca6d19fd107d6d7c76ea30201e93ee53b..03d49afc5e6c1babae474b07ad2c1bdf84c8ff77 100644 (file)
--- a/MdePkg/Library/BaseLib/CheckSum.c
+++ b/MdePkg/Library/BaseLib/CheckSum.c
@@ -2,7 +2,7 @@
   Utility functions to generate checksum based on 2's complement\r
   algorithm.\r
 \r
   Utility functions to generate checksum based on 2's complement\r
   algorithm.\r
 \r

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


@@ -49,7 +49,7 @@ CalculateSum8 (
   for (Sum = 0, Count = 0; Count < Length; Count++) {\r
     Sum = (UINT8) (Sum + *(Buffer + Count));\r
   }\r
   for (Sum = 0, Count = 0; Count < Length; Count++) {\r
     Sum = (UINT8) (Sum + *(Buffer + Count));\r
   }\r

-  \r
+\r

   return Sum;\r
 }\r
 \r
   return Sum;\r
 }\r
 \r


@@ -128,7 +128,7 @@ CalculateSum16 (
   for (Sum = 0, Count = 0; Count < Total; Count++) {\r
     Sum = (UINT16) (Sum + *(Buffer + Count));\r
   }\r
   for (Sum = 0, Count = 0; Count < Total; Count++) {\r
     Sum = (UINT16) (Sum + *(Buffer + Count));\r
   }\r

-  \r
+\r

   return Sum;\r
 }\r
 \r
   return Sum;\r
 }\r
 \r


@@ -210,7 +210,7 @@ CalculateSum32 (
   for (Sum = 0, Count = 0; Count < Total; Count++) {\r
     Sum = Sum + *(Buffer + Count);\r
   }\r
   for (Sum = 0, Count = 0; Count < Total; Count++) {\r
     Sum = Sum + *(Buffer + Count);\r
   }\r

-  \r
+\r

   return Sum;\r
 }\r
 \r
   return Sum;\r
 }\r
 \r


@@ -292,7 +292,7 @@ CalculateSum64 (
   for (Sum = 0, Count = 0; Count < Total; Count++) {\r
     Sum = Sum + *(Buffer + Count);\r
   }\r
   for (Sum = 0, Count = 0; Count < Total; Count++) {\r
     Sum = Sum + *(Buffer + Count);\r
   }\r

-  \r
+\r

   return Sum;\r
 }\r
 \r
   return Sum;\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseLib/ChkStkGcc.c b/MdePkg/Library/BaseLib/ChkStkGcc.c
index ecba3853b159af8d3b381a5a9232a03bfb352891..d035e9bae17215751719cc46a0c5c9b5edbd5d13 100644 (file)
--- a/MdePkg/Library/BaseLib/ChkStkGcc.c
+++ b/MdePkg/Library/BaseLib/ChkStkGcc.c
@@ -1,7 +1,7 @@
 /** @file\r
   Provides hack function for passng GCC build.\r
 \r
 /** @file\r
   Provides hack function for passng GCC build.\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


@@ -17,8 +17,8 @@
 /**\r
   Hack function for passing GCC build.\r
 **/\r
 /**\r
   Hack function for passing GCC build.\r
 **/\r

-VOID \r
-__chkstk() \r
+VOID\r
+__chkstk()\r

 {\r
 }\r
 \r
 {\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseLib/DivS64x64Remainder.c b/MdePkg/Library/BaseLib/DivS64x64Remainder.c
index bb2fddcff8740997314546cf4a76260f302f78af..424d1dceddebe0121a480f89f20fc3651ab8a9f6 100644 (file)
--- a/MdePkg/Library/BaseLib/DivS64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/DivS64x64Remainder.c
@@ -1,7 +1,7 @@
 /** @file\r
   Math worker functions.\r
 \r
 /** @file\r
   Math worker functions.\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


@@ -27,7 +27,7 @@
   function returns the 64-bit signed quotient.\r
 \r
   It is the caller's responsibility to not call this function with a Divisor of 0.\r
   function returns the 64-bit signed quotient.\r
 \r
   It is the caller's responsibility to not call this function with a Divisor of 0.\r

-  If Divisor is 0, then the quotient and remainder should be assumed to be \r
+  If Divisor is 0, then the quotient and remainder should be assumed to be\r

   the largest negative integer.\r
 \r
   If Divisor is 0, then ASSERT().\r
   the largest negative integer.\r
 \r
   If Divisor is 0, then ASSERT().\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.S b/MdePkg/Library/BaseLib/Ia32/ARShiftU64.S
index 9138c423fc0a3c83be6a4f26793939886f171eab..5e993e44b5023a157952a76f4e90f817b67934a4 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.S
+++ b/MdePkg/Library/BaseLib/Ia32/ARShiftU64.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
 #------------------------------------------------------------------------------\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


@@ -37,7 +37,7 @@ ASM_PFX(InternalMathARShiftU64):
     jnz     L0\r
     movl    %eax, %edx\r
     movl    4(%esp), %eax\r
     jnz     L0\r
     movl    %eax, %edx\r
     movl    4(%esp), %eax\r

-L0:    \r
+L0:\r

     shrdl   %cl, %edx, %eax\r
     sar     %cl, %edx\r
     ret\r
     shrdl   %cl, %edx, %eax\r
     sar     %cl, %edx\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
index f4df094195f99bc9d0cb7212e693638cac53f8d8..9ec61b134b4341e19a89b7ecc952f65544ff1ed1 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\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


@@ -57,22 +57,22 @@ L2:
     shrl    %ecx\r
     jnz     L2\r
     divl    %ebx\r
     shrl    %ecx\r
     jnz     L2\r
     divl    %ebx\r

-    movl    %eax, %ebx                  # ebx <- quotient                     \r
-    movl    28(%esp), %ecx              # ecx <- high dword of divisor        \r
+    movl    %eax, %ebx                  # ebx <- quotient\r
+    movl    28(%esp), %ecx              # ecx <- high dword of divisor\r

     mull    24(%esp)                    # edx:eax <- quotient * divisor[0..31]\r
     mull    24(%esp)                    # edx:eax <- quotient * divisor[0..31]\r

-    imull   %ebx, %ecx                  # ecx <- quotient * divisor[32..63]   \r
-    addl    %ecx, %edx                  # edx <- (quotient * divisor)[32..63] \r
-    mov     32(%esp), %ecx              # ecx <- addr for Remainder           \r
-    jc      TooLarge                    # product > 2^64                      \r
-    cmpl    %edx, %edi                  # compare high 32 bits                \r
-    ja      Correct                                                           \r
-    jb      TooLarge                    # product > dividend                  \r
-    cmpl    %eax, %esi                                                        \r
-    jae     Correct                     # product <= dividend                 \r
+    imull   %ebx, %ecx                  # ecx <- quotient * divisor[32..63]\r
+    addl    %ecx, %edx                  # edx <- (quotient * divisor)[32..63]\r
+    mov     32(%esp), %ecx              # ecx <- addr for Remainder\r
+    jc      TooLarge                    # product > 2^64\r
+    cmpl    %edx, %edi                  # compare high 32 bits\r
+    ja      Correct\r
+    jb      TooLarge                    # product > dividend\r
+    cmpl    %eax, %esi\r
+    jae     Correct                     # product <= dividend\r

 TooLarge:\r
 TooLarge:\r

-    decl    %ebx                        # adjust quotient by -1              \r
-    jecxz   Return                      # return if Remainder == NULL        \r
-    sub     24(%esp), %eax                                                   \r
+    decl    %ebx                        # adjust quotient by -1\r
+    jecxz   Return                      # return if Remainder == NULL\r
+    sub     24(%esp), %eax\r

     sbb     28(%esp), %edx              # edx:eax <- (quotient - 1) * divisor\r
 Correct:\r
     jecxz   Return\r
     sbb     28(%esp), %edx              # edx:eax <- (quotient - 1) * divisor\r
 Correct:\r
     jecxz   Return\r


@@ -81,7 +81,7 @@ Correct:
     movl    %esi, (%ecx)\r
     movl    %edi, 4(%ecx)\r
 Return:\r
     movl    %esi, (%ecx)\r
     movl    %edi, 4(%ecx)\r
 Return:\r

-    movl    %ebx, %eax                  # eax <- quotient         \r
+    movl    %ebx, %eax                  # eax <- quotient\r

     xorl    %edx, %edx                  # quotient is 32 bits long\r
     pop     %edi\r
     pop     %esi\r
     xorl    %edx, %edx                  # quotient is 32 bits long\r
     pop     %edi\r
     pop     %esi\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnableCache.S b/MdePkg/Library/BaseLib/Ia32/EnableCache.S
index bc3aa2fc1d00d1b2658c4b8e3edac058dba53864..b41dd0d22a9ea02bc511c58fccd894384edce473 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnableCache.S
+++ b/MdePkg/Library/BaseLib/Ia32/EnableCache.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\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


@@ -15,7 +15,7 @@
 #\r
 # Abstract:\r
 #\r
 #\r
 # Abstract:\r
 #\r

-#   Flush all caches with a WBINVD instruction, clear the CD bit of CR0 to 0, and clear \r
+#   Flush all caches with a WBINVD instruction, clear the CD bit of CR0 to 0, and clear\r

 #   the NW bit of CR0 to 0\r
 #\r
 # Notes:\r
 #   the NW bit of CR0 to 0\r
 #\r
 # Notes:\r

diff --git a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
index 7ac4af353f7bd2f2aca2ae6d7fe1eadea66ac3a1..9f854e1dc71f75b72f78b1b043aa36564b869e52 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
+++ b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
@@ -1,7 +1,7 @@
 /** @file\r
   AsmFlushCacheLine function\r
 \r
 /** @file\r
   AsmFlushCacheLine function\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


@@ -37,7 +37,7 @@ AsmFlushCacheLine (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // If the CPU does not support CLFLUSH instruction, \r
+  // If the CPU does not support CLFLUSH instruction,\r

   // then promote flush range to flush entire cache.\r
   //\r
   _asm {\r
   // then promote flush range to flush entire cache.\r
   //\r
   _asm {\r


@@ -52,7 +52,7 @@ NoClflush:
     wbinvd\r
 Done:\r
   }\r
     wbinvd\r
 Done:\r
   }\r

-  \r
+\r

   return LinearAddress;\r
 }\r
 \r
   return LinearAddress;\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/GccInline.c b/MdePkg/Library/BaseLib/Ia32/GccInline.c
index f52a1fe171f33c3fdd64a922dbca328771958c65..05d7de3d95e76c35c17af07755e6533e77dc0b35 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/GccInline.c
+++ b/MdePkg/Library/BaseLib/Ia32/GccInline.c
@@ -1,7 +1,7 @@
 /** @file\r
   GCC inline implementation of BaseLib processor specific functions.\r
 /** @file\r
   GCC inline implementation of BaseLib processor specific functions.\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

   Portions copyright (c) 2008 - 2009, Apple 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
   Portions copyright (c) 2008 - 2009, Apple 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


@@ -32,7 +32,7 @@ MemoryFence (
   )\r
 {\r
   // This is a little bit of overkill and it is more about the compiler that it is\r
   )\r
 {\r
   // This is a little bit of overkill and it is more about the compiler that it is\r

-  // actually processor synchronization. This is like the _ReadWriteBarrier \r
+  // actually processor synchronization. This is like the _ReadWriteBarrier\r

   // Microsoft specific intrinsic\r
   __asm__ __volatile__ ("":::"memory");\r
 }\r
   // Microsoft specific intrinsic\r
   __asm__ __volatile__ ("":::"memory");\r
 }\r


@@ -65,7 +65,7 @@ EFIAPI
 DisableInterrupts (\r
   VOID\r
   )\r
 DisableInterrupts (\r
   VOID\r
   )\r

-{  \r
+{\r

   __asm__ __volatile__ ("cli"::: "memory");\r
 }\r
 \r
   __asm__ __volatile__ ("cli"::: "memory");\r
 }\r
 \r


@@ -128,13 +128,13 @@ AsmReadMsr64 (
   )\r
 {\r
   UINT64 Data;\r
   )\r
 {\r
   UINT64 Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "rdmsr"\r
     : "=A" (Data)   // %0\r
     : "c"  (Index)  // %1\r
     );\r
   __asm__ __volatile__ (\r
     "rdmsr"\r
     : "=A" (Data)   // %0\r
     : "c"  (Index)  // %1\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -168,7 +168,7 @@ AsmWriteMsr64 (
     : "c" (Index),\r
       "A" (Value)\r
     );\r
     : "c" (Index),\r
       "A" (Value)\r
     );\r

-    \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -191,13 +191,13 @@ AsmReadEflags (
   )\r
 {\r
   UINTN Eflags;\r
   )\r
 {\r
   UINTN Eflags;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "pushfl     \n\t"\r
     "popl %0        "\r
     : "=r" (Eflags)\r
     );\r
   __asm__ __volatile__ (\r
     "pushfl     \n\t"\r
     "popl %0        "\r
     : "=r" (Eflags)\r
     );\r

-    \r
+\r

   return Eflags;\r
 }\r
 \r
   return Eflags;\r
 }\r
 \r


@@ -220,12 +220,12 @@ AsmReadCr0 (
   )\r
 {\r
   UINTN   Data;\r
   )\r
 {\r
   UINTN   Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
   __asm__ __volatile__ (\r

-    "movl %%cr0,%0" \r
+    "movl %%cr0,%0"\r

     : "=a" (Data)\r
     );\r
     : "=a" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -247,12 +247,12 @@ AsmReadCr2 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
   __asm__ __volatile__ (\r

-    "movl %%cr2, %0" \r
+    "movl %%cr2, %0"\r

     : "=r" (Data)\r
     );\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -273,12 +273,12 @@ AsmReadCr3 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "movl %%cr3, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "movl %%cr3, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -300,12 +300,12 @@ AsmReadCr4 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "movl %%cr4, %0"\r
     : "=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "movl %%cr4, %0"\r
     : "=a" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -431,12 +431,12 @@ AsmReadDr0 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "movl %%dr0, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "movl %%dr0, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -458,12 +458,12 @@ AsmReadDr1 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "movl %%dr1, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "movl %%dr1, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -485,12 +485,12 @@ AsmReadDr2 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "movl %%dr2, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "movl %%dr2, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -512,12 +512,12 @@ AsmReadDr3 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "movl %%dr3, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "movl %%dr3, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -539,12 +539,12 @@ AsmReadDr4 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "movl %%dr4, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "movl %%dr4, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -566,12 +566,12 @@ AsmReadDr5 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "movl %%dr5, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "movl %%dr5, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -593,12 +593,12 @@ AsmReadDr6 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "movl %%dr6, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "movl %%dr6, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -620,12 +620,12 @@ AsmReadDr7 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "movl %%dr7, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "movl %%dr7, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -854,12 +854,12 @@ AsmReadCs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov   %%cs, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov   %%cs, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -880,12 +880,12 @@ AsmReadDs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%ds, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%ds, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -906,12 +906,12 @@ AsmReadEs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%es, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%es, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -932,12 +932,12 @@ AsmReadFs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%fs, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%fs, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -958,12 +958,12 @@ AsmReadGs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%gs, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%gs, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -984,12 +984,12 @@ AsmReadSs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%ds, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%ds, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1010,12 +1010,12 @@ AsmReadTr (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "str  %0"\r
     : "=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "str  %0"\r
     : "=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1062,7 +1062,7 @@ InternalX86WriteGdtr (
     :\r
     : "m" (*Gdtr)\r
     );\r
     :\r
     : "m" (*Gdtr)\r
     );\r

-    \r
+\r

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


@@ -1127,12 +1127,12 @@ AsmReadLdtr (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "sldt  %0"\r
     : "=g" (Data)   // %0\r
     );\r
   __asm__ __volatile__ (\r
     "sldt  %0"\r
     : "=g" (Data)   // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1180,7 +1180,7 @@ InternalX86FxSave (
     "fxsave %0"\r
     :\r
     : "m" (*Buffer)  // %0\r
     "fxsave %0"\r
     :\r
     : "m" (*Buffer)  // %0\r

-    );    \r
+    );\r

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


@@ -1233,7 +1233,7 @@ AsmReadMm0 (
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1263,7 +1263,7 @@ AsmReadMm1 (
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1293,7 +1293,7 @@ AsmReadMm2 (
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1323,7 +1323,7 @@ AsmReadMm3 (
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1353,7 +1353,7 @@ AsmReadMm4 (
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1383,7 +1383,7 @@ AsmReadMm5 (
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1413,7 +1413,7 @@ AsmReadMm6 (
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1443,7 +1443,7 @@ AsmReadMm7 (
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r
     "pop  %%edx          \n\t"\r
     : "=A"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1465,7 +1465,7 @@ AsmWriteMm0 (
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm0"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm0"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1488,7 +1488,7 @@ AsmWriteMm1 (
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm1"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm1"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1511,7 +1511,7 @@ AsmWriteMm2 (
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm2"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm2"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1534,7 +1534,7 @@ AsmWriteMm3 (
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm3"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm3"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1557,7 +1557,7 @@ AsmWriteMm4 (
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm4"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm4"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1580,7 +1580,7 @@ AsmWriteMm5 (
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm5"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm5"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1603,7 +1603,7 @@ AsmWriteMm6 (
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm6"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm6"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1626,7 +1626,7 @@ AsmWriteMm7 (
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm7"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movq %0, %%mm7"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1648,13 +1648,13 @@ AsmReadTsc (
   )\r
 {\r
   UINT64  Data;\r
   )\r
 {\r
   UINT64  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "rdtsc"\r
     : "=A" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "rdtsc"\r
     : "=A" (Data)\r
     );\r

-  \r
-  return Data;  \r
+\r
+  return Data;\r

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


@@ -1676,14 +1676,14 @@ AsmReadPmc (
   )\r
 {\r
   UINT64  Data;\r
   )\r
 {\r
   UINT64  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "rdpmc"\r
     : "=A" (Data)\r
     : "c"  (Index)\r
     );\r
   __asm__ __volatile__ (\r
     "rdpmc"\r
     : "=A" (Data)\r
     : "c"  (Index)\r
     );\r

-  \r
-  return Data;  \r
+\r
+  return Data;\r

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


@@ -1720,7 +1720,7 @@ AsmInvd (
   )\r
 {\r
   __asm__ __volatile__ ("invd":::"memory");\r
   )\r
 {\r
   __asm__ __volatile__ ("invd":::"memory");\r

-    \r
+\r

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


@@ -1748,7 +1748,7 @@ AsmFlushCacheLine (
   UINT32  RegEdx;\r
 \r
   //\r
   UINT32  RegEdx;\r
 \r
   //\r

-  // If the CPU does not support CLFLUSH instruction, \r
+  // If the CPU does not support CLFLUSH instruction,\r

   // then promote flush range to flush entire cache.\r
   //\r
   AsmCpuid (0x01, NULL, NULL, NULL, &RegEdx);\r
   // then promote flush range to flush entire cache.\r
   //\r
   AsmCpuid (0x01, NULL, NULL, NULL, &RegEdx);\r


@@ -1760,11 +1760,11 @@ AsmFlushCacheLine (
 \r
   __asm__ __volatile__ (\r
     "clflush (%0)"\r
 \r
   __asm__ __volatile__ (\r
     "clflush (%0)"\r

-    : "+a" (LinearAddress) \r
-    : \r
+    : "+a" (LinearAddress)\r
+    :\r

     : "memory"\r
     );\r
     : "memory"\r
     );\r

-    \r
+\r

   return LinearAddress;\r
 }\r
 \r
   return LinearAddress;\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.S b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.S
index dc0cbd48347435d5d2803e15edd2f89ffe8ca700..027379efd7a0bfac96ff6f77eee33e11ff235bed 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.S
+++ b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\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

 # Portions copyright (c) 2011, Apple 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
 # Portions copyright (c) 2011, Apple 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


@@ -34,15 +34,15 @@ ASM_GLOBAL ASM_PFX(InternalSwitchStack)
 #------------------------------------------------------------------------------\r
 ASM_PFX(InternalSwitchStack):\r
   pushl %ebp\r
 #------------------------------------------------------------------------------\r
 ASM_PFX(InternalSwitchStack):\r
   pushl %ebp\r

-       movl    %esp, %ebp\r
+  movl  %esp, %ebp\r

 \r
 \r

-       movl    20(%ebp), %esp      # switch stack\r
-       subl    $8, %esp\r
+  movl  20(%ebp), %esp      # switch stack\r
+  subl  $8, %esp\r

 \r
 \r

-       movl    16(%ebp), %eax\r
-       movl    %eax, 4(%esp)\r
-       movl    12(%ebp), %eax\r
-       movl    %eax, (%esp)\r
-       pushl $0                  # keeps gdb from unwinding stack\r
-       jmp   *8(%ebp)            # call and never return \r
+  movl  16(%ebp), %eax\r
+  movl  %eax, 4(%esp)\r
+  movl  12(%ebp), %eax\r
+  movl  %eax, (%esp)\r
+  pushl $0                  # keeps gdb from unwinding stack\r
+  jmp   *8(%ebp)            # call and never return\r

 \r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32/LRotU64.S b/MdePkg/Library/BaseLib/Ia32/LRotU64.S
index ff450fa1f5cc8f029c27f14464830ee92457c424..accac8b89dc1c86d4e8b98f874e709539f5f889e 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/LRotU64.S
+++ b/MdePkg/Library/BaseLib/Ia32/LRotU64.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
 #------------------------------------------------------------------------------\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


@@ -43,6 +43,6 @@ ASM_PFX(InternalMathLRotU64):
     movl    %eax, %ecx\r
     movl    %edx, %eax\r
     movl    %ecx, %edx\r
     movl    %eax, %ecx\r
     movl    %edx, %eax\r
     movl    %ecx, %edx\r

-L0:    \r
+L0:\r

     pop     %ebx\r
     ret\r
     pop     %ebx\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/LShiftU64.S b/MdePkg/Library/BaseLib/Ia32/LShiftU64.S
index dcdbeae1d74925517a1e82ee0d29bd0796a4d3a9..90baed001c5202cc9a994deb1f5ce5ed10bcd86a 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/LShiftU64.S
+++ b/MdePkg/Library/BaseLib/Ia32/LShiftU64.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
 #------------------------------------------------------------------------------\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


@@ -37,7 +37,7 @@ ASM_PFX(InternalMathLShiftU64):
     jnz     L0\r
     movl    %edx, %eax\r
     movl    0x8(%esp), %edx\r
     jnz     L0\r
     movl    %edx, %eax\r
     movl    0x8(%esp), %edx\r

-L0:    \r
+L0:\r

     shld    %cl, %eax, %edx\r
     shl     %cl, %eax\r
     ret\r
     shld    %cl, %eax, %edx\r
     shl     %cl, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x64.S b/MdePkg/Library/BaseLib/Ia32/MultU64x64.S
index 48f4ae037eafbd298e9736aaa6328a32acd988fa..4e4fe710a730af80e09906c253ecef0aa2873e42 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x64.S
+++ b/MdePkg/Library/BaseLib/Ia32/MultU64x64.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\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


@@ -30,15 +30,15 @@ ASM_GLOBAL ASM_PFX(InternalMathMultU64x64)
 #   );\r
 #------------------------------------------------------------------------------\r
 ASM_PFX(InternalMathMultU64x64):\r
 #   );\r
 #------------------------------------------------------------------------------\r
 ASM_PFX(InternalMathMultU64x64):\r

-    push    %ebx                                     \r
-    movl    8(%esp), %ebx             # ebx <- M1[0..31]                \r
-    movl    16(%esp), %edx            # edx <- M2[0..31]                                   \r
-    movl    %ebx, %ecx                                                  \r
-    movl    %edx, %eax                \r
-    imull   20(%esp), %ebx            # ebx <- M1[0..31] * M2[32..63]   \r
-    imull   12(%esp), %edx            # edx <- M1[32..63] * M2[0..31]   \r
-    addl    %edx, %ebx                # carries are abandoned           \r
+    push    %ebx\r
+    movl    8(%esp), %ebx             # ebx <- M1[0..31]\r
+    movl    16(%esp), %edx            # edx <- M2[0..31]\r
+    movl    %ebx, %ecx\r
+    movl    %edx, %eax\r
+    imull   20(%esp), %ebx            # ebx <- M1[0..31] * M2[32..63]\r
+    imull   12(%esp), %edx            # edx <- M1[32..63] * M2[0..31]\r
+    addl    %edx, %ebx                # carries are abandoned\r

     mull    %ecx                      # edx:eax <- M1[0..31] * M2[0..31]\r
     mull    %ecx                      # edx:eax <- M1[0..31] * M2[0..31]\r

-    addl    %ebx, %edx                # carries are abandoned           \r
+    addl    %ebx, %edx                # carries are abandoned\r

     pop     %ebx\r
     ret\r
     pop     %ebx\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/RRotU64.S b/MdePkg/Library/BaseLib/Ia32/RRotU64.S
index f42f45018990b08fcfa6fde29cdc67c7a4e68363..426fcd6de35c78e9bed423e6452d4544c4177a39 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/RRotU64.S
+++ b/MdePkg/Library/BaseLib/Ia32/RRotU64.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
 #------------------------------------------------------------------------------\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


@@ -43,6 +43,6 @@ ASM_PFX(InternalMathRRotU64):
     movl    %eax, %ecx                  # switch eax & edx if Count >= 32\r
     movl    %edx, %eax\r
     movl    %ecx, %edx\r
     movl    %eax, %ecx                  # switch eax & edx if Count >= 32\r
     movl    %edx, %eax\r
     movl    %ecx, %edx\r

-L0:    \r
+L0:\r

     pop     %ebx\r
     ret\r
     pop     %ebx\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/RShiftU64.S b/MdePkg/Library/BaseLib/Ia32/RShiftU64.S
index 0bf9292281ab8c8a076b7580808a44d1d2cf7c21..28102303f25d34a495b86ac4ed969a079e13220b 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/RShiftU64.S
+++ b/MdePkg/Library/BaseLib/Ia32/RShiftU64.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
 #------------------------------------------------------------------------------\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


@@ -40,7 +40,7 @@ ASM_PFX(InternalMathRShiftU64):
     jnz     L0\r
     movl    %eax, %edx\r
     movl    0x4(%esp), %eax\r
     jnz     L0\r
     movl    %eax, %edx\r
     movl    0x4(%esp), %eax\r

-L0:    \r
+L0:\r

     shrdl   %cl, %edx, %eax\r
     shr     %cl, %edx\r
     ret\r
     shrdl   %cl, %edx, %eax\r
     shr     %cl, %edx\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ipf/Asm.h b/MdePkg/Library/BaseLib/Ipf/Asm.h
index 54345734f1330c38889f44247ed1d85b9d1af6fc..ac8d04eb00b396ddfd6e31172e980cdd0c6d76ae 100644 (file)
--- a/MdePkg/Library/BaseLib/Ipf/Asm.h
+++ b/MdePkg/Library/BaseLib/Ipf/Asm.h
@@ -1,8 +1,8 @@
-/** @file \r
+/** @file\r

 \r
     This module contains generic macros for an assembly writer.\r
 \r
 \r
     This module contains generic macros for an assembly writer.\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

diff --git a/MdePkg/Library/BaseLib/Ipf/FlushCacheRange.c b/MdePkg/Library/BaseLib/Ipf/FlushCacheRange.c
index 5286bebcab5d943c721d7e31cd57490630c619f5..7a243ca94fb2c3e8e9d812097c8bbd81a4f8a726 100644 (file)
--- a/MdePkg/Library/BaseLib/Ipf/FlushCacheRange.c
+++ b/MdePkg/Library/BaseLib/Ipf/FlushCacheRange.c
@@ -1,7 +1,7 @@
 /** @file\r
   AsmFlushCacheRange() function for IPF.\r
 \r
 /** @file\r
   AsmFlushCacheRange() function for IPF.\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,12 +19,12 @@
   Flush a range of  cache lines in the cache coherency domain of the calling\r
   CPU.\r
 \r
   Flush a range of  cache lines in the cache coherency domain of the calling\r
   CPU.\r
 \r

-  Flushes the cache lines specified by Address and Length.  If Address is not aligned \r
-  on a cache line boundary, then entire cache line containing Address is flushed.  \r
-  If Address + Length is not aligned on a cache line boundary, then the entire cache \r
-  line containing Address + Length - 1 is flushed.  This function may choose to flush \r
-  the entire cache if that is more efficient than flushing the specified range.  If \r
-  Length is 0, the no cache lines are flushed.  Address is returned.   \r
+  Flushes the cache lines specified by Address and Length.  If Address is not aligned\r
+  on a cache line boundary, then entire cache line containing Address is flushed.\r
+  If Address + Length is not aligned on a cache line boundary, then the entire cache\r
+  line containing Address + Length - 1 is flushed.  This function may choose to flush\r
+  the entire cache if that is more efficient than flushing the specified range.  If\r
+  Length is 0, the no cache lines are flushed.  Address is returned.\r

   This function is only available on IPF.\r
 \r
   If Length is greater than (MAX_ADDRESS - Address + 1), then ASSERT().\r
   This function is only available on IPF.\r
 \r
   If Length is greater than (MAX_ADDRESS - Address + 1), then ASSERT().\r

diff --git a/MdePkg/Library/BaseLib/Ipf/Ia64gen.h b/MdePkg/Library/BaseLib/Ipf/Ia64gen.h
index 3439f9e670e4420d021ef2164d01c6bc349ec441..ee6ed376ee34f8132361262b38c7a4702f33e39f 100644 (file)
--- a/MdePkg/Library/BaseLib/Ipf/Ia64gen.h
+++ b/MdePkg/Library/BaseLib/Ipf/Ia64gen.h
@@ -1,16 +1,16 @@
-/** @file \r
+/** @file\r

 \r
     Register Definition for IPF.\r
 \r
     Register Definition for IPF.\r

- \r
-Copyright (c) 2006 - 2008, 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
 \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
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r

 **/\r
 #ifndef _IA64GEN_H_\r
 #define _IA64GEN_H_\r
 **/\r
 #ifndef _IA64GEN_H_\r
 #define _IA64GEN_H_\r

diff --git a/MdePkg/Library/BaseLib/LinkedList.c b/MdePkg/Library/BaseLib/LinkedList.c
index 30fd7009e0078b98506f54431ebd116f62d01c7f..799bda39068911540a5fd62a245ccbae04eb86b4 100644 (file)
--- a/MdePkg/Library/BaseLib/LinkedList.c
+++ b/MdePkg/Library/BaseLib/LinkedList.c
@@ -1,7 +1,7 @@
 /** @file\r
   Linked List Library Functions.\r
 \r
 /** @file\r
   Linked List Library 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


@@ -59,9 +59,9 @@
 \r
   @retval   TRUE if PcdVerifyNodeInList is FALSE\r
   @retval   TRUE if DoMembershipCheck is FALSE\r
 \r
   @retval   TRUE if PcdVerifyNodeInList is FALSE\r
   @retval   TRUE if DoMembershipCheck is FALSE\r

-  @retval   TRUE if PcdVerifyNodeInList is TRUE and DoMembershipCheck is TRUE \r
+  @retval   TRUE if PcdVerifyNodeInList is TRUE and DoMembershipCheck is TRUE\r

             and Node is a member of List.\r
             and Node is a member of List.\r

-  @retval   FALSE if PcdVerifyNodeInList is TRUE and DoMembershipCheck is TRUE \r
+  @retval   FALSE if PcdVerifyNodeInList is TRUE and DoMembershipCheck is TRUE\r

             and Node is in not a member of List.\r
 \r
 **/\r
             and Node is in not a member of List.\r
 \r
 **/\r


@@ -143,7 +143,7 @@ IsNodeInList (
   Ptr   = FirstEntry;\r
 \r
   //\r
   Ptr   = FirstEntry;\r
 \r
   //\r

-  // Check to see if SecondEntry is a member of FirstEntry.  \r
+  // Check to see if SecondEntry is a member of FirstEntry.\r

   // Exit early if the number of nodes in List >= PcdMaximumLinkedListLength\r
   //\r
   do {\r
   // Exit early if the number of nodes in List >= PcdMaximumLinkedListLength\r
   //\r
   do {\r


@@ -230,7 +230,7 @@ InsertHeadList (
   // ASSERT List not too long and Entry is not one of the nodes of List\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (ListHead, Entry, FALSE);\r
   // ASSERT List not too long and Entry is not one of the nodes of List\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (ListHead, Entry, FALSE);\r

-  \r
+\r

   Entry->ForwardLink = ListHead->ForwardLink;\r
   Entry->BackLink = ListHead;\r
   Entry->ForwardLink->BackLink = Entry;\r
   Entry->ForwardLink = ListHead->ForwardLink;\r
   Entry->BackLink = ListHead;\r
   Entry->ForwardLink->BackLink = Entry;\r


@@ -247,7 +247,7 @@ InsertHeadList (
 \r
   If ListHead is NULL, then ASSERT().\r
   If Entry is NULL, then ASSERT().\r
 \r
   If ListHead is NULL, then ASSERT().\r
   If Entry is NULL, then ASSERT().\r

-  If ListHead was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or \r
+  If ListHead was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or\r

   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and prior to insertion the number\r
   of nodes in ListHead, including the ListHead node, is greater than or\r
   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and prior to insertion the number\r
   of nodes in ListHead, including the ListHead node, is greater than or\r


@@ -271,7 +271,7 @@ InsertTailList (
   // ASSERT List not too long and Entry is not one of the nodes of List\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (ListHead, Entry, FALSE);\r
   // ASSERT List not too long and Entry is not one of the nodes of List\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (ListHead, Entry, FALSE);\r

-  \r
+\r

   Entry->ForwardLink = ListHead;\r
   Entry->BackLink = ListHead->BackLink;\r
   Entry->BackLink->ForwardLink = Entry;\r
   Entry->ForwardLink = ListHead;\r
   Entry->BackLink = ListHead->BackLink;\r
   Entry->BackLink->ForwardLink = Entry;\r


@@ -282,12 +282,12 @@ InsertTailList (
 /**\r
   Retrieves the first node of a doubly-linked list.\r
 \r
 /**\r
   Retrieves the first node of a doubly-linked list.\r
 \r

-  Returns the first node of a doubly-linked list.  List must have been \r
+  Returns the first node of a doubly-linked list.  List must have been\r

   initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead().\r
   If List is empty, then List is returned.\r
 \r
   If List is NULL, then ASSERT().\r
   initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead().\r
   If List is empty, then List is returned.\r
 \r
   If List is NULL, then ASSERT().\r

-  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or \r
+  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or\r

   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r
   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r


@@ -316,13 +316,13 @@ GetFirstNode (
 /**\r
   Retrieves the next node of a doubly-linked list.\r
 \r
 /**\r
   Retrieves the next node of a doubly-linked list.\r
 \r

-  Returns the node of a doubly-linked list that follows Node.  \r
+  Returns the node of a doubly-linked list that follows Node.\r

   List must have been initialized with INTIALIZE_LIST_HEAD_VARIABLE()\r
   or InitializeListHead().  If List is empty, then List is returned.\r
 \r
   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r
   List must have been initialized with INTIALIZE_LIST_HEAD_VARIABLE()\r
   or InitializeListHead().  If List is empty, then List is returned.\r
 \r
   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r

-  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or \r
+  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or\r

   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and List contains more than\r
   PcdMaximumLinkedListLength nodes, then ASSERT().\r
   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and List contains more than\r
   PcdMaximumLinkedListLength nodes, then ASSERT().\r


@@ -351,24 +351,24 @@ GetNextNode (
 \r
 /**\r
   Retrieves the previous node of a doubly-linked list.\r
 \r
 /**\r
   Retrieves the previous node of a doubly-linked list.\r

- \r
-  Returns the node of a doubly-linked list that precedes Node.  \r
+\r
+  Returns the node of a doubly-linked list that precedes Node.\r

   List must have been initialized with INTIALIZE_LIST_HEAD_VARIABLE()\r
   or InitializeListHead().  If List is empty, then List is returned.\r
   List must have been initialized with INTIALIZE_LIST_HEAD_VARIABLE()\r
   or InitializeListHead().  If List is empty, then List is returned.\r

- \r
+\r

   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r
   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r

-  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or \r
+  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or\r

   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and List contains more than\r
   PcdMaximumLinkedListLength nodes, then ASSERT().\r
   If PcdVerifyNodeInList is TRUE and Node is not a node in List, then ASSERT().\r
   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and List contains more than\r
   PcdMaximumLinkedListLength nodes, then ASSERT().\r
   If PcdVerifyNodeInList is TRUE and Node is not a node in List, then ASSERT().\r

- \r
+\r

   @param  List  A pointer to the head node of a doubly-linked list.\r
   @param  Node  A pointer to a node in the doubly-linked list.\r
   @param  List  A pointer to the head node of a doubly-linked list.\r
   @param  Node  A pointer to a node in the doubly-linked list.\r

- \r
+\r

   @return A pointer to the previous node if one exists. Otherwise List is returned.\r
   @return A pointer to the previous node if one exists. Otherwise List is returned.\r

- \r
+\r

 **/\r
 LIST_ENTRY *\r
 EFIAPI\r
 **/\r
 LIST_ENTRY *\r
 EFIAPI\r


@@ -381,7 +381,7 @@ GetPreviousNode (
   // ASSERT List not too long and Node is one of the nodes of List\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (List, Node, TRUE);\r
   // ASSERT List not too long and Node is one of the nodes of List\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (List, Node, TRUE);\r

- \r
+\r

   return Node->BackLink;\r
 }\r
 \r
   return Node->BackLink;\r
 }\r
 \r


@@ -392,7 +392,7 @@ GetPreviousNode (
   zero nodes, this function returns TRUE. Otherwise, it returns FALSE.\r
 \r
   If ListHead is NULL, then ASSERT().\r
   zero nodes, this function returns TRUE. Otherwise, it returns FALSE.\r
 \r
   If ListHead is NULL, then ASSERT().\r

-  If ListHead was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or \r
+  If ListHead was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or\r

   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r
   InitializeListHead(), then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r


@@ -414,7 +414,7 @@ IsListEmpty (
   // ASSERT List not too long\r
   //\r
   ASSERT (InternalBaseLibIsListValid (ListHead));\r
   // ASSERT List not too long\r
   //\r
   ASSERT (InternalBaseLibIsListValid (ListHead));\r

-  \r
+\r

   return (BOOLEAN)(ListHead->ForwardLink == ListHead);\r
 }\r
 \r
   return (BOOLEAN)(ListHead->ForwardLink == ListHead);\r
 }\r
 \r


@@ -429,12 +429,12 @@ IsListEmpty (
 \r
   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r
 \r
   If List is NULL, then ASSERT().\r
   If Node is NULL, then ASSERT().\r

-  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead(), \r
+  If List was not initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead(),\r

   then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r
   PcdMaximumLinkedListLength, then ASSERT().\r
   then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes\r
   in List, including the List node, is greater than or equal to\r
   PcdMaximumLinkedListLength, then ASSERT().\r

-  If PcdVerifyNodeInList is TRUE and Node is not a node in List and Node is not \r
+  If PcdVerifyNodeInList is TRUE and Node is not a node in List and Node is not\r

   equal to List, then ASSERT().\r
 \r
   @param  List  A pointer to the head node of a doubly-linked list.\r
   equal to List, then ASSERT().\r
 \r
   @param  List  A pointer to the head node of a doubly-linked list.\r


@@ -455,7 +455,7 @@ IsNull (
   // ASSERT List not too long and Node is one of the nodes of List\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (List, Node, TRUE);\r
   // ASSERT List not too long and Node is one of the nodes of List\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (List, Node, TRUE);\r

-  \r
+\r

   return (BOOLEAN)(Node == List);\r
 }\r
 \r
   return (BOOLEAN)(Node == List);\r
 }\r
 \r


@@ -493,7 +493,7 @@ IsNodeAtEnd (
   // ASSERT List not too long and Node is one of the nodes of List\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (List, Node, TRUE);\r
   // ASSERT List not too long and Node is one of the nodes of List\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (List, Node, TRUE);\r

-  \r
+\r

   return (BOOLEAN)(!IsNull (List, Node) && List->BackLink == Node);\r
 }\r
 \r
   return (BOOLEAN)(!IsNull (List, Node) && List->BackLink == Node);\r
 }\r
 \r


@@ -505,12 +505,12 @@ IsNodeAtEnd (
   Otherwise, the location of the FirstEntry node is swapped with the location\r
   of the SecondEntry node in a doubly-linked list. SecondEntry must be in the\r
   same double linked list as FirstEntry and that double linked list must have\r
   Otherwise, the location of the FirstEntry node is swapped with the location\r
   of the SecondEntry node in a doubly-linked list. SecondEntry must be in the\r
   same double linked list as FirstEntry and that double linked list must have\r

-  been initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead(). \r
+  been initialized with INTIALIZE_LIST_HEAD_VARIABLE() or InitializeListHead().\r

   SecondEntry is returned after the nodes are swapped.\r
 \r
   If FirstEntry is NULL, then ASSERT().\r
   If SecondEntry is NULL, then ASSERT().\r
   SecondEntry is returned after the nodes are swapped.\r
 \r
   If FirstEntry is NULL, then ASSERT().\r
   If SecondEntry is NULL, then ASSERT().\r

-  If PcdVerifyNodeInList is TRUE and SecondEntry and FirstEntry are not in the \r
+  If PcdVerifyNodeInList is TRUE and SecondEntry and FirstEntry are not in the\r

   same linked list, then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes in the\r
   linked list containing the FirstEntry and SecondEntry nodes, including\r
   same linked list, then ASSERT().\r
   If PcdMaximumLinkedListLength is not zero, and the number of nodes in the\r
   linked list containing the FirstEntry and SecondEntry nodes, including\r


@@ -519,7 +519,7 @@ IsNodeAtEnd (
 \r
   @param  FirstEntry  A pointer to a node in a linked list.\r
   @param  SecondEntry A pointer to another node in the same linked list.\r
 \r
   @param  FirstEntry  A pointer to a node in a linked list.\r
   @param  SecondEntry A pointer to another node in the same linked list.\r

-  \r
+\r

   @return SecondEntry.\r
 \r
 **/\r
   @return SecondEntry.\r
 \r
 **/\r


@@ -540,7 +540,7 @@ SwapListEntries (
   // ASSERT Entry1 and Entry2 are in the same linked list\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (FirstEntry, SecondEntry, TRUE);\r
   // ASSERT Entry1 and Entry2 are in the same linked list\r
   //\r
   ASSERT_VERIFY_NODE_IN_VALID_LIST (FirstEntry, SecondEntry, TRUE);\r

-  \r
+\r

   //\r
   // Ptr is the node pointed to by FirstEntry->ForwardLink\r
   //\r
   //\r
   // Ptr is the node pointed to by FirstEntry->ForwardLink\r
   //\r


@@ -598,7 +598,7 @@ RemoveEntryList (
   )\r
 {\r
   ASSERT (!IsListEmpty (Entry));\r
   )\r
 {\r
   ASSERT (!IsListEmpty (Entry));\r

-  \r
+\r

   Entry->ForwardLink->BackLink = Entry->BackLink;\r
   Entry->BackLink->ForwardLink = Entry->ForwardLink;\r
   return Entry->ForwardLink;\r
   Entry->ForwardLink->BackLink = Entry->BackLink;\r
   Entry->BackLink->ForwardLink = Entry->ForwardLink;\r
   return Entry->ForwardLink;\r

diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index 4151e0e7ac5866d992694c8e83fb78ffed3713dc..e7fe513aeca185d02dd6fcb2036fe1e34250dab6 100644 (file)
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -1,7 +1,7 @@
 /** @file\r
   Unicode and ASCII string primitives.\r
 \r
 /** @file\r
   Unicode and ASCII string primitives.\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 @@ StrCpy (
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r

-  Copies up to a specified length from one Null-terminated Unicode string  to \r
+  Copies up to a specified length from one Null-terminated Unicode string  to\r

   another Null-terminated Unicode string and returns the new Unicode string.\r
 \r
   This function copies the contents of the Unicode string Source to the Unicode\r
   another Null-terminated Unicode string and returns the new Unicode string.\r
 \r
   This function copies the contents of the Unicode string Source to the Unicode\r


@@ -89,7 +89,7 @@ StrCpy (
   If Length > 0 and Source is NULL, then ASSERT().\r
   If Length > 0 and Source is not aligned on a 16-bit boundary, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Length > 0 and Source is NULL, then ASSERT().\r
   If Length > 0 and Source is not aligned on a 16-bit boundary, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and Length is greater than \r
+  If PcdMaximumUnicodeStringLength is not zero, and Length is greater than\r

   PcdMaximumUnicodeStringLength, then ASSERT().\r
   If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
   PcdMaximumUnicodeStringLength Unicode characters, not including the Null-terminator,\r
   PcdMaximumUnicodeStringLength, then ASSERT().\r
   If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
   PcdMaximumUnicodeStringLength Unicode characters, not including the Null-terminator,\r


@@ -188,7 +188,7 @@ StrLen (
   Returns the size of a Null-terminated Unicode string in bytes, including the\r
   Null terminator.\r
 \r
   Returns the size of a Null-terminated Unicode string in bytes, including the\r
   Null terminator.\r
 \r

-  This function returns the size, in bytes, of the Null-terminated Unicode string \r
+  This function returns the size, in bytes, of the Null-terminated Unicode string\r

   specified by String.\r
 \r
   If String is NULL, then ASSERT().\r
   specified by String.\r
 \r
   If String is NULL, then ASSERT().\r


@@ -262,7 +262,7 @@ StrCmp (
 /**\r
   Compares up to a specified length the contents of two Null-terminated Unicode strings,\r
   and returns the difference between the first mismatched Unicode characters.\r
 /**\r
   Compares up to a specified length the contents of two Null-terminated Unicode strings,\r
   and returns the difference between the first mismatched Unicode characters.\r

-  \r
+\r

   This function compares the Null-terminated Unicode string FirstString to the\r
   Null-terminated Unicode string SecondString. At most, Length Unicode\r
   characters will be compared. If Length is 0, then 0 is returned. If\r
   This function compares the Null-terminated Unicode string FirstString to the\r
   Null-terminated Unicode string SecondString. At most, Length Unicode\r
   characters will be compared. If Length is 0, then 0 is returned. If\r


@@ -382,8 +382,8 @@ StrCat (
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r

-  Concatenates up to a specified length one Null-terminated Unicode to the end \r
-  of another Null-terminated Unicode string, and returns the concatenated \r
+  Concatenates up to a specified length one Null-terminated Unicode to the end\r
+  of another Null-terminated Unicode string, and returns the concatenated\r

   Unicode string.\r
 \r
   This function concatenates two Null-terminated Unicode strings. The contents\r
   Unicode string.\r
 \r
   This function concatenates two Null-terminated Unicode strings. The contents\r


@@ -399,7 +399,7 @@ StrCat (
   If Length > 0 and Source is NULL, then ASSERT().\r
   If Length > 0 and Source is not aligned on a 16-bit boundary, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Length > 0 and Source is NULL, then ASSERT().\r
   If Length > 0 and Source is not aligned on a 16-bit boundary, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and Length is greater than \r
+  If PcdMaximumUnicodeStringLength is not zero, and Length is greater than\r

   PcdMaximumUnicodeStringLength, then ASSERT().\r
   If PcdMaximumUnicodeStringLength is not zero, and Destination contains more\r
   than PcdMaximumUnicodeStringLength Unicode characters, not including the\r
   PcdMaximumUnicodeStringLength, then ASSERT().\r
   If PcdMaximumUnicodeStringLength is not zero, and Destination contains more\r
   than PcdMaximumUnicodeStringLength Unicode characters, not including the\r


@@ -492,13 +492,13 @@ StrStr (
   while (*String != L'\0') {\r
     SearchStringTmp = SearchString;\r
     FirstMatch = String;\r
   while (*String != L'\0') {\r
     SearchStringTmp = SearchString;\r
     FirstMatch = String;\r

-    \r
-    while ((*String == *SearchStringTmp) \r
+\r
+    while ((*String == *SearchStringTmp)\r

             && (*String != L'\0')) {\r
       String++;\r
       SearchStringTmp++;\r
             && (*String != L'\0')) {\r
       String++;\r
       SearchStringTmp++;\r

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

     if (*SearchStringTmp == L'\0') {\r
       return (CHAR16 *) FirstMatch;\r
     }\r
     if (*SearchStringTmp == L'\0') {\r
       return (CHAR16 *) FirstMatch;\r
     }\r


@@ -516,7 +516,7 @@ StrStr (
 /**\r
   Check if a Unicode character is a decimal character.\r
 \r
 /**\r
   Check if a Unicode character is a decimal character.\r
 \r

-  This internal function checks if a Unicode character is a \r
+  This internal function checks if a Unicode character is a\r

   decimal character. The valid decimal character is from\r
   L'0' to L'9'.\r
 \r
   decimal character. The valid decimal character is from\r
   L'0' to L'9'.\r
 \r


@@ -536,7 +536,7 @@ InternalIsDecimalDigitCharacter (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Convert a Unicode character to upper case only if \r
+  Convert a Unicode character to upper case only if\r

   it maps to a valid small-case ASCII character.\r
 \r
   This internal function only deal with Unicode character\r
   it maps to a valid small-case ASCII character.\r
 \r
   This internal function only deal with Unicode character\r


@@ -568,7 +568,7 @@ InternalCharToUpper (
 \r
   This internal function only deal with Unicode character\r
   which maps to a valid hexadecimal ASII character, i.e.\r
 \r
   This internal function only deal with Unicode character\r
   which maps to a valid hexadecimal ASII character, i.e.\r

-  L'0' to L'9', L'a' to L'f' or L'A' to L'F'. For other \r
+  L'0' to L'9', L'a' to L'f' or L'A' to L'F'. For other\r

   Unicode character, the value returned does not make sense.\r
 \r
   @param  Char  The character to convert.\r
   Unicode character, the value returned does not make sense.\r
 \r
   @param  Char  The character to convert.\r


@@ -592,8 +592,8 @@ InternalHexCharToUintn (
 /**\r
   Check if a Unicode character is a hexadecimal character.\r
 \r
 /**\r
   Check if a Unicode character is a hexadecimal character.\r
 \r

-  This internal function checks if a Unicode character is a \r
-  decimal character.  The valid hexadecimal character is \r
+  This internal function checks if a Unicode character is a\r
+  decimal character.  The valid hexadecimal character is\r

   L'0' to L'9', L'a' to L'f', or L'A' to L'F'.\r
 \r
 \r
   L'0' to L'9', L'a' to L'f', or L'A' to L'F'.\r
 \r
 \r


@@ -703,7 +703,7 @@ StrDecimalToUint64 (
   )\r
 {\r
   UINT64     Result;\r
   )\r
 {\r
   UINT64     Result;\r

-  \r
+\r

   StrDecimalToUint64S (String, (CHAR16 **) NULL, &Result);\r
   return Result;\r
 }\r
   StrDecimalToUint64S (String, (CHAR16 **) NULL, &Result);\r
   return Result;\r
 }\r


@@ -806,7 +806,7 @@ StrHexToUint64 (
 /**\r
   Check if a ASCII character is a decimal character.\r
 \r
 /**\r
   Check if a ASCII character is a decimal character.\r
 \r

-  This internal function checks if a Unicode character is a \r
+  This internal function checks if a Unicode character is a\r

   decimal character. The valid decimal character is from\r
   '0' to '9'.\r
 \r
   decimal character. The valid decimal character is from\r
   '0' to '9'.\r
 \r


@@ -828,8 +828,8 @@ InternalAsciiIsDecimalDigitCharacter (
 /**\r
   Check if a ASCII character is a hexadecimal character.\r
 \r
 /**\r
   Check if a ASCII character is a hexadecimal character.\r
 \r

-  This internal function checks if a ASCII character is a \r
-  decimal character.  The valid hexadecimal character is \r
+  This internal function checks if a ASCII character is a\r
+  decimal character.  The valid hexadecimal character is\r

   L'0' to L'9', L'a' to L'f', or L'A' to L'F'.\r
 \r
 \r
   L'0' to L'9', L'a' to L'f', or L'A' to L'F'.\r
 \r
 \r


@@ -915,7 +915,7 @@ UnicodeStrToAsciiStr (
   ReturnValue = Destination;\r
   while (*Source != '\0') {\r
     //\r
   ReturnValue = Destination;\r
   while (*Source != '\0') {\r
     //\r

-    // If any Unicode characters in Source contain \r
+    // If any Unicode characters in Source contain\r

     // non-zero value in the upper 8 bits, then ASSERT().\r
     //\r
     ASSERT (*Source < 0x100);\r
     // non-zero value in the upper 8 bits, then ASSERT().\r
     //\r
     ASSERT (*Source < 0x100);\r


@@ -987,7 +987,7 @@ AsciiStrCpy (
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r

-  Copies up to a specified length one Null-terminated ASCII string to another \r
+  Copies up to a specified length one Null-terminated ASCII string to another\r

   Null-terminated ASCII string and returns the new ASCII string.\r
 \r
   This function copies the contents of the ASCII string Source to the ASCII\r
   Null-terminated ASCII string and returns the new ASCII string.\r
 \r
   This function copies the contents of the ASCII string Source to the ASCII\r


@@ -1000,7 +1000,7 @@ AsciiStrCpy (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero, and Length is greater than \r
+  If PcdMaximumAsciiStringLength is not zero, and Length is greater than\r

   PcdMaximumAsciiStringLength, then ASSERT().\r
   If PcdMaximumAsciiStringLength is not zero, and Source contains more than\r
   PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator,\r
   PcdMaximumAsciiStringLength, then ASSERT().\r
   If PcdMaximumAsciiStringLength is not zero, and Source contains more than\r
   PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator,\r


@@ -1176,7 +1176,7 @@ AsciiStrCmp (
 \r
   @param  Chr   one Ascii character\r
 \r
 \r
   @param  Chr   one Ascii character\r
 \r

-  @return The uppercase value of Ascii character \r
+  @return The uppercase value of Ascii character\r

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


@@ -1193,7 +1193,7 @@ InternalBaseLibAsciiToUpper (
 \r
   This internal function only deal with Unicode character\r
   which maps to a valid hexadecimal ASII character, i.e.\r
 \r
   This internal function only deal with Unicode character\r
   which maps to a valid hexadecimal ASII character, i.e.\r

-  '0' to '9', 'a' to 'f' or 'A' to 'F'. For other \r
+  '0' to '9', 'a' to 'f' or 'A' to 'F'. For other\r

   ASCII character, the value returned does not make sense.\r
 \r
   @param  Char  The character to convert.\r
   ASCII character, the value returned does not make sense.\r
 \r
   @param  Char  The character to convert.\r


@@ -1285,7 +1285,7 @@ AsciiStriCmp (
 \r
   If Length > 0 and FirstString is NULL, then ASSERT().\r
   If Length > 0 and SecondString is NULL, then ASSERT().\r
 \r
   If Length > 0 and FirstString is NULL, then ASSERT().\r
   If Length > 0 and SecondString is NULL, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero, and Length is greater than \r
+  If PcdMaximumAsciiStringLength is not zero, and Length is greater than\r

   PcdMaximumAsciiStringLength, then ASSERT().\r
   If PcdMaximumAsciiStringLength is not zero, and FirstString contains more than\r
   PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator,\r
   PcdMaximumAsciiStringLength, then ASSERT().\r
   If PcdMaximumAsciiStringLength is not zero, and FirstString contains more than\r
   PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator,\r


@@ -1297,7 +1297,7 @@ AsciiStriCmp (
   @param  FirstString   A pointer to a Null-terminated ASCII string.\r
   @param  SecondString  A pointer to a Null-terminated ASCII string.\r
   @param  Length        The maximum number of ASCII characters for compare.\r
   @param  FirstString   A pointer to a Null-terminated ASCII string.\r
   @param  SecondString  A pointer to a Null-terminated ASCII string.\r
   @param  Length        The maximum number of ASCII characters for compare.\r

-  \r
+\r

   @retval ==0       FirstString is identical to SecondString.\r
   @retval !=0       FirstString is not identical to SecondString.\r
 \r
   @retval ==0       FirstString is identical to SecondString.\r
   @retval !=0       FirstString is not identical to SecondString.\r
 \r


@@ -1386,8 +1386,8 @@ AsciiStrCat (
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r

-  Concatenates up to a specified length one Null-terminated ASCII string to \r
-  the end of another Null-terminated ASCII string, and returns the \r
+  Concatenates up to a specified length one Null-terminated ASCII string to\r
+  the end of another Null-terminated ASCII string, and returns the\r

   concatenated ASCII string.\r
 \r
   This function concatenates two Null-terminated ASCII strings. The contents\r
   concatenated ASCII string.\r
 \r
   This function concatenates two Null-terminated ASCII strings. The contents\r


@@ -1491,13 +1491,13 @@ AsciiStrStr (
   while (*String != '\0') {\r
     SearchStringTmp = SearchString;\r
     FirstMatch = String;\r
   while (*String != '\0') {\r
     SearchStringTmp = SearchString;\r
     FirstMatch = String;\r

-    \r
-    while ((*String == *SearchStringTmp) \r
+\r
+    while ((*String == *SearchStringTmp)\r

             && (*String != '\0')) {\r
       String++;\r
       SearchStringTmp++;\r
             && (*String != '\0')) {\r
       String++;\r
       SearchStringTmp++;\r

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

     if (*SearchStringTmp == '\0') {\r
       return (CHAR8 *) FirstMatch;\r
     }\r
     if (*SearchStringTmp == '\0') {\r
       return (CHAR8 *) FirstMatch;\r
     }\r


@@ -1549,7 +1549,7 @@ AsciiStrDecimalToUintn (
   )\r
 {\r
   UINTN     Result;\r
   )\r
 {\r
   UINTN     Result;\r

-  \r
+\r

   AsciiStrDecimalToUintnS (String, (CHAR8 **) NULL, &Result);\r
   return Result;\r
 }\r
   AsciiStrDecimalToUintnS (String, (CHAR8 **) NULL, &Result);\r
   return Result;\r
 }\r


@@ -1592,7 +1592,7 @@ AsciiStrDecimalToUint64 (
   )\r
 {\r
   UINT64     Result;\r
   )\r
 {\r
   UINT64     Result;\r

-  \r
+\r

   AsciiStrDecimalToUint64S (String, (CHAR8 **) NULL, &Result);\r
   return Result;\r
 }\r
   AsciiStrDecimalToUint64S (String, (CHAR8 **) NULL, &Result);\r
   return Result;\r
 }\r

diff --git a/MdePkg/Library/BaseLib/SwitchStack.c b/MdePkg/Library/BaseLib/SwitchStack.c
index 36811175af74f0b5213c402dc94597d6081d9017..8ee7013672e73e9ba4c7058e3a797eefdf6ed7ef 100644 (file)
--- a/MdePkg/Library/BaseLib/SwitchStack.c
+++ b/MdePkg/Library/BaseLib/SwitchStack.c
@@ -1,7 +1,7 @@
 /** @file\r
   Switch Stack functions.\r
 \r
 /** @file\r
   Switch Stack functions.\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


@@ -36,9 +36,9 @@
                       function.\r
   @param  NewStack    A pointer to the new stack to use for the EntryPoint\r
                       function.\r
                       function.\r
   @param  NewStack    A pointer to the new stack to use for the EntryPoint\r
                       function.\r

-  @param  ...         This variable argument list is ignored for IA32, x64, and EBC.  \r
-                      For IPF, this variable argument list is expected to contain \r
-                      a single parameter of type VOID * that specifies the new backing \r
+  @param  ...         This variable argument list is ignored for IA32, x64, and EBC.\r
+                      For IPF, this variable argument list is expected to contain\r
+                      a single parameter of type VOID * that specifies the new backing\r

                       store pointer.\r
 \r
 \r
                       store pointer.\r
 \r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/CpuIdEx.S b/MdePkg/Library/BaseLib/X64/CpuIdEx.S
index d47f53c84c9bdf3a901e781543d5d004f7a1b693..0bc2540011844167bd07f5e3d2a18b6ace05ce7c 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/CpuIdEx.S
+++ b/MdePkg/Library/BaseLib/X64/CpuIdEx.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\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


@@ -44,19 +44,19 @@ ASM_PFX(AsmCpuidEx):
     test    %r10, %r10\r
     jz      L1\r
     mov     %ecx,(%r10)\r
     test    %r10, %r10\r
     jz      L1\r
     mov     %ecx,(%r10)\r

-L1: \r
+L1:\r

     mov     %r8, %rcx\r
     jrcxz   L2\r
     movl    %eax,(%rcx)\r
     mov     %r8, %rcx\r
     jrcxz   L2\r
     movl    %eax,(%rcx)\r

-L2: \r
+L2:\r

     mov     %r9, %rcx\r
     jrcxz   L3\r
     mov     %ebx, (%rcx)\r
     mov     %r9, %rcx\r
     jrcxz   L3\r
     mov     %ebx, (%rcx)\r

-L3: \r
+L3:\r

     mov     0x40(%rsp), %rcx\r
     jrcxz   L4\r
     mov     %edx, (%rcx)\r
     mov     0x40(%rsp), %rcx\r
     jrcxz   L4\r
     mov     %edx, (%rcx)\r

-L4: \r
+L4:\r

     pop     %rax                  # restore Index to rax as return value\r
     pop     %rbx\r
     ret\r
     pop     %rax                  # restore Index to rax as return value\r
     pop     %rbx\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/X64/DisablePaging64.S b/MdePkg/Library/BaseLib/X64/DisablePaging64.S
index 676e9e175a7fae5aa5f18b867f6fb5ba8bd73c64..220a59127b84d9c2606c91b664bbe2ab307fc137 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/DisablePaging64.S
+++ b/MdePkg/Library/BaseLib/X64/DisablePaging64.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\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


@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
 #\r
 #------------------------------------------------------------------------------\r
 \r

-    \r
+\r

 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r


@@ -37,29 +37,29 @@
 \r
 ASM_GLOBAL ASM_PFX(InternalX86DisablePaging64)\r
 ASM_PFX(InternalX86DisablePaging64):\r
 \r
 ASM_GLOBAL ASM_PFX(InternalX86DisablePaging64)\r
 ASM_PFX(InternalX86DisablePaging64):\r

-    cli    \r
+    cli\r

     lea    L1(%rip), %rsi                 # rsi <- The start address of transition code\r
     mov    0x28(%rsp), %edi               # rdi <- New stack\r
     lea    _mTransitionEnd(%rip), %rax    # rax <- end of transition code\r
     sub    %rsi, %rax                     # rax <- The size of transition piece code\r
     add    $4, %rax                       # round rax up to the next 4 byte boundary\r
     and    $0xfc, %al\r
     lea    L1(%rip), %rsi                 # rsi <- The start address of transition code\r
     mov    0x28(%rsp), %edi               # rdi <- New stack\r
     lea    _mTransitionEnd(%rip), %rax    # rax <- end of transition code\r
     sub    %rsi, %rax                     # rax <- The size of transition piece code\r
     add    $4, %rax                       # round rax up to the next 4 byte boundary\r
     and    $0xfc, %al\r

-    sub    %rax, %rdi                     # rdi <- use stack to hold transition code \r
+    sub    %rax, %rdi                     # rdi <- use stack to hold transition code\r

     mov    %edi, %r10d                    # r10 <- The start address of transicition code below 4G\r
     push   %rcx                           # save rcx to stack\r
     mov    %rax, %rcx                     # rcx <- The size of transition piece code\r
     rep\r
     movsb                                 # copy transition code to (new stack - 64byte) below 4G\r
     pop    %rcx                           # restore rcx\r
     mov    %edi, %r10d                    # r10 <- The start address of transicition code below 4G\r
     push   %rcx                           # save rcx to stack\r
     mov    %rax, %rcx                     # rcx <- The size of transition piece code\r
     rep\r
     movsb                                 # copy transition code to (new stack - 64byte) below 4G\r
     pop    %rcx                           # restore rcx\r

-   \r
-    mov    %r8d, %esi \r
-    mov    %r9d, %edi \r
+\r
+    mov    %r8d, %esi\r
+    mov    %r9d, %edi\r

     mov    %r10d, %eax\r
     sub    $4, %eax\r
     push   %rcx                           # push Cs to stack\r
     mov    %r10d, %eax\r
     sub    $4, %eax\r
     push   %rcx                           # push Cs to stack\r

-    push   %r10                           # push address of transition code on stack  \r
+    push   %r10                           # push address of transition code on stack\r

     .byte  0x48, 0xcb                     # retq: Use far return to load CS register from stack\r
     .byte  0x48, 0xcb                     # retq: Use far return to load CS register from stack\r

-                                          # (Use raw byte code since some GNU assemblers generates incorrect code for "retq")  \r
+                                          # (Use raw byte code since some GNU assemblers generates incorrect code for "retq")\r

 L1:\r
     mov    %eax,%esp                      # set up new stack\r
     mov    %cr0,%rax\r
 L1:\r
     mov    %eax,%esp                      # set up new stack\r
     mov    %cr0,%rax\r


@@ -68,9 +68,9 @@ L1:
 \r
     mov    %edx,%ebx                      # save EntryPoint to ebx, for rdmsr will overwrite edx\r
     mov    $0xc0000080,%ecx\r
 \r
     mov    %edx,%ebx                      # save EntryPoint to ebx, for rdmsr will overwrite edx\r
     mov    $0xc0000080,%ecx\r

-    rdmsr  \r
+    rdmsr\r

     and    $0xfe,%ah                      # clear LME\r
     and    $0xfe,%ah                      # clear LME\r

-    wrmsr  \r
+    wrmsr\r

     mov    %cr4,%rax\r
     and    $0xdf,%al                      # clear PAE\r
     mov    %rax,%cr4\r
     mov    %cr4,%rax\r
     and    $0xdf,%al                      # clear PAE\r
     mov    %rax,%cr4\r

diff --git a/MdePkg/Library/BaseLib/X64/EnableCache.S b/MdePkg/Library/BaseLib/X64/EnableCache.S
index 9d739603c909c7bec14fdef7bf99706249080c6c..9f01f3d793e3f513f66e2e5ea926eb98a8a6c72e 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/EnableCache.S
+++ b/MdePkg/Library/BaseLib/X64/EnableCache.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\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


@@ -15,7 +15,7 @@
 #\r
 # Abstract:\r
 #\r
 #\r
 # Abstract:\r
 #\r

-#   Flush all caches with a WBINVD instruction, clear the CD bit of CR0 to 0, and clear \r
+#   Flush all caches with a WBINVD instruction, clear the CD bit of CR0 to 0, and clear\r

 #   the NW bit of CR0 to 0\r
 #\r
 # Notes:\r
 #   the NW bit of CR0 to 0\r
 #\r
 # Notes:\r

diff --git a/MdePkg/Library/BaseLib/X64/GccInline.c b/MdePkg/Library/BaseLib/X64/GccInline.c
index 3d175ee9314e82e4eaf1669ae9602abd62111904..1a69d152b45af8acf4b848ae020135f630a58ebe 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/GccInline.c
+++ b/MdePkg/Library/BaseLib/X64/GccInline.c
@@ -1,8 +1,8 @@
 /** @file\r
   GCC inline implementation of BaseLib processor specific functions.\r
 /** @file\r
   GCC inline implementation of BaseLib processor specific functions.\r

-  \r
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
-  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> \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

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under 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 @@ MemoryFence (
   )\r
 {\r
   // This is a little bit of overkill and it is more about the compiler that it is\r
   )\r
 {\r
   // This is a little bit of overkill and it is more about the compiler that it is\r

-  // actually processor synchronization. This is like the _ReadWriteBarrier \r
+  // actually processor synchronization. This is like the _ReadWriteBarrier\r

   // Microsoft specific intrinsic\r
   __asm__ __volatile__ ("":::"memory");\r
 }\r
   // Microsoft specific intrinsic\r
   __asm__ __volatile__ ("":::"memory");\r
 }\r


@@ -66,7 +66,7 @@ EFIAPI
 DisableInterrupts (\r
   VOID\r
   )\r
 DisableInterrupts (\r
   VOID\r
   )\r

-{  \r
+{\r

   __asm__ __volatile__ ("cli"::: "memory");\r
 }\r
 \r
   __asm__ __volatile__ ("cli"::: "memory");\r
 }\r
 \r


@@ -130,14 +130,14 @@ AsmReadMsr64 (
 {\r
   UINT32 LowData;\r
   UINT32 HighData;\r
 {\r
   UINT32 LowData;\r
   UINT32 HighData;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "rdmsr"\r
     : "=a" (LowData),   // %0\r
       "=d" (HighData)   // %1\r
     : "c"  (Index)      // %2\r
     );\r
   __asm__ __volatile__ (\r
     "rdmsr"\r
     : "=a" (LowData),   // %0\r
       "=d" (HighData)   // %1\r
     : "c"  (Index)      // %2\r
     );\r

-    \r
+\r

   return (((UINT64)HighData) << 32) | LowData;\r
 }\r
 \r
   return (((UINT64)HighData) << 32) | LowData;\r
 }\r
 \r


@@ -170,7 +170,7 @@ AsmWriteMsr64 (
 \r
   LowData  = (UINT32)(Value);\r
   HighData = (UINT32)(Value >> 32);\r
 \r
   LowData  = (UINT32)(Value);\r
   HighData = (UINT32)(Value >> 32);\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "wrmsr"\r
     :\r
   __asm__ __volatile__ (\r
     "wrmsr"\r
     :\r


@@ -178,7 +178,7 @@ AsmWriteMsr64 (
       "a" (LowData),\r
       "d" (HighData)\r
     );\r
       "a" (LowData),\r
       "d" (HighData)\r
     );\r

-    \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -201,13 +201,13 @@ AsmReadEflags (
   )\r
 {\r
   UINTN Eflags;\r
   )\r
 {\r
   UINTN Eflags;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "pushfq         \n\t"\r
     "pop     %0         "\r
     : "=r" (Eflags)       // %0\r
     );\r
   __asm__ __volatile__ (\r
     "pushfq         \n\t"\r
     "pop     %0         "\r
     : "=r" (Eflags)       // %0\r
     );\r

-    \r
+\r

   return Eflags;\r
 }\r
 \r
   return Eflags;\r
 }\r
 \r


@@ -230,12 +230,12 @@ AsmReadCr0 (
   )\r
 {\r
   UINTN   Data;\r
   )\r
 {\r
   UINTN   Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
   __asm__ __volatile__ (\r

-    "mov  %%cr0,%0" \r
+    "mov  %%cr0,%0"\r

     : "=r" (Data)           // %0\r
     );\r
     : "=r" (Data)           // %0\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -257,12 +257,12 @@ AsmReadCr2 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
   __asm__ __volatile__ (\r

-    "mov  %%cr2,  %0" \r
+    "mov  %%cr2,  %0"\r

     : "=r" (Data)           // %0\r
     );\r
     : "=r" (Data)           // %0\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -283,12 +283,12 @@ AsmReadCr3 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
   __asm__ __volatile__ (\r

-    "mov  %%cr3,  %0" \r
+    "mov  %%cr3,  %0"\r

     : "=r" (Data)           // %0\r
     );\r
     : "=r" (Data)           // %0\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -310,12 +310,12 @@ AsmReadCr4 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
   __asm__ __volatile__ (\r

-    "mov  %%cr4,  %0" \r
+    "mov  %%cr4,  %0"\r

     : "=r" (Data)           // %0\r
     );\r
     : "=r" (Data)           // %0\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -441,12 +441,12 @@ AsmReadDr0 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%dr0, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%dr0, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -468,12 +468,12 @@ AsmReadDr1 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%dr1, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%dr1, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -495,12 +495,12 @@ AsmReadDr2 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%dr2, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%dr2, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -522,12 +522,12 @@ AsmReadDr3 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%dr3, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%dr3, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -549,12 +549,12 @@ AsmReadDr4 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%dr4, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%dr4, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -576,12 +576,12 @@ AsmReadDr5 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%dr5, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%dr5, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -603,12 +603,12 @@ AsmReadDr6 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%dr6, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%dr6, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -630,12 +630,12 @@ AsmReadDr7 (
   )\r
 {\r
   UINTN Data;\r
   )\r
 {\r
   UINTN Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%dr7, %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%dr7, %0"\r
     : "=r" (Data)\r
     );\r

-  \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -864,12 +864,12 @@ AsmReadCs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov   %%cs, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov   %%cs, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -890,12 +890,12 @@ AsmReadDs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%ds, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%ds, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -916,12 +916,12 @@ AsmReadEs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%es, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%es, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -942,12 +942,12 @@ AsmReadFs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%fs, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%fs, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -968,12 +968,12 @@ AsmReadGs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%gs, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%gs, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -994,12 +994,12 @@ AsmReadSs (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "mov  %%ds, %0"\r
     :"=a" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "mov  %%ds, %0"\r
     :"=a" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1020,12 +1020,12 @@ AsmReadTr (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "str  %0"\r
     : "=r" (Data)\r
     );\r
   __asm__ __volatile__ (\r
     "str  %0"\r
     : "=r" (Data)\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1072,7 +1072,7 @@ InternalX86WriteGdtr (
     :\r
     : "m" (*Gdtr)\r
     );\r
     :\r
     : "m" (*Gdtr)\r
     );\r

-    \r
+\r

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


@@ -1137,12 +1137,12 @@ AsmReadLdtr (
   )\r
 {\r
   UINT16  Data;\r
   )\r
 {\r
   UINT16  Data;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "sldt  %0"\r
     : "=g" (Data)   // %0\r
     );\r
   __asm__ __volatile__ (\r
     "sldt  %0"\r
     : "=g" (Data)   // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1190,7 +1190,7 @@ InternalX86FxSave (
     "fxsave %0"\r
     :\r
     : "m" (*Buffer)  // %0\r
     "fxsave %0"\r
     :\r
     : "m" (*Buffer)  // %0\r

-    );    \r
+    );\r

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


@@ -1239,7 +1239,7 @@ AsmReadMm0 (
     "movd   %%mm0,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r
     "movd   %%mm0,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1265,7 +1265,7 @@ AsmReadMm1 (
     "movd   %%mm1,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r
     "movd   %%mm1,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1291,7 +1291,7 @@ AsmReadMm2 (
     "movd  %%mm2,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r
     "movd  %%mm2,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1317,7 +1317,7 @@ AsmReadMm3 (
     "movd  %%mm3,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r
     "movd  %%mm3,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1343,7 +1343,7 @@ AsmReadMm4 (
     "movd  %%mm4,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r
     "movd  %%mm4,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1369,7 +1369,7 @@ AsmReadMm5 (
     "movd  %%mm5,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r
     "movd  %%mm5,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1395,7 +1395,7 @@ AsmReadMm6 (
     "movd  %%mm6,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r
     "movd  %%mm6,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1421,7 +1421,7 @@ AsmReadMm7 (
     "movd  %%mm7,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r
     "movd  %%mm7,  %0    \n\t"\r
     : "=r"  (Data)       // %0\r
     );\r

-    \r
+\r

   return Data;\r
 }\r
 \r
   return Data;\r
 }\r
 \r


@@ -1443,7 +1443,7 @@ AsmWriteMm0 (
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm0"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm0"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1466,7 +1466,7 @@ AsmWriteMm1 (
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm1"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm1"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1489,7 +1489,7 @@ AsmWriteMm2 (
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm2"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm2"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1512,7 +1512,7 @@ AsmWriteMm3 (
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm3"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm3"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1535,7 +1535,7 @@ AsmWriteMm4 (
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm4"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm4"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1558,7 +1558,7 @@ AsmWriteMm5 (
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm5"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm5"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1581,7 +1581,7 @@ AsmWriteMm6 (
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm6"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm6"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1604,7 +1604,7 @@ AsmWriteMm7 (
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm7"  // %0\r
 {\r
   __asm__ __volatile__ (\r
     "movd  %0, %%mm7"  // %0\r

-    :  \r
+    :\r

     : "m" (Value)\r
     );\r
 }\r
     : "m" (Value)\r
     );\r
 }\r


@@ -1627,14 +1627,14 @@ AsmReadTsc (
 {\r
   UINT32  LowData;\r
   UINT32  HiData;\r
 {\r
   UINT32  LowData;\r
   UINT32  HiData;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "rdtsc"\r
     : "=a" (LowData),\r
       "=d" (HiData)\r
     );\r
   __asm__ __volatile__ (\r
     "rdtsc"\r
     : "=a" (LowData),\r
       "=d" (HiData)\r
     );\r

-  \r
-  return (((UINT64)HiData) << 32) | LowData;  \r
+\r
+  return (((UINT64)HiData) << 32) | LowData;\r

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


@@ -1657,15 +1657,15 @@ AsmReadPmc (
 {\r
   UINT32  LowData;\r
   UINT32  HiData;\r
 {\r
   UINT32  LowData;\r
   UINT32  HiData;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "rdpmc"\r
     : "=a" (LowData),\r
       "=d" (HiData)\r
     : "c"  (Index)\r
     );\r
   __asm__ __volatile__ (\r
     "rdpmc"\r
     : "=a" (LowData),\r
       "=d" (HiData)\r
     : "c"  (Index)\r
     );\r

-  \r
-  return (((UINT64)HiData) << 32) | LowData;  \r
+\r
+  return (((UINT64)HiData) << 32) | LowData;\r

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


@@ -1700,7 +1700,7 @@ AsmMonitor (
       "c" (Ecx),\r
       "d" (Edx)\r
     );\r
       "c" (Ecx),\r
       "d" (Edx)\r
     );\r

-    \r
+\r

   return Eax;\r
 }\r
 \r
   return Eax;\r
 }\r
 \r


@@ -1728,12 +1728,12 @@ AsmMwait (
 {\r
   __asm__ __volatile__ (\r
     "mwait"\r
 {\r
   __asm__ __volatile__ (\r
     "mwait"\r

-    : \r
+    :\r

     : "a"  (Eax),\r
       "c"  (Ecx)\r
     );\r
     : "a"  (Eax),\r
       "c"  (Ecx)\r
     );\r

-    \r
-  return Eax;    \r
+\r
+  return Eax;\r

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


@@ -1768,7 +1768,7 @@ AsmInvd (
   )\r
 {\r
   __asm__ __volatile__ ("invd":::"memory");\r
   )\r
 {\r
   __asm__ __volatile__ ("invd":::"memory");\r

-    \r
+\r

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


@@ -1796,10 +1796,10 @@ AsmFlushCacheLine (
   __asm__ __volatile__ (\r
     "clflush (%0)"\r
     :\r
   __asm__ __volatile__ (\r
     "clflush (%0)"\r
     :\r

-    : "r" (LinearAddress) \r
+    : "r" (LinearAddress)\r

     : "memory"\r
     );\r
     : "memory"\r
     );\r

-    \r
+\r

     return LinearAddress;\r
 }\r
 \r
     return LinearAddress;\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/LongJump.S b/MdePkg/Library/BaseLib/X64/LongJump.S
index f20446fcf01fa1683ec5574c4bd2815118d56a05..5256529f06213dd6e25aa4d4d7abeca396950744 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/LongJump.S
+++ b/MdePkg/Library/BaseLib/X64/LongJump.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\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


@@ -49,6 +49,6 @@ ASM_PFX(InternalLongJump):
     movdqu  0xB8(%rcx), %xmm12\r
     movdqu  0xC8(%rcx), %xmm13\r
     movdqu  0xD8(%rcx), %xmm14\r
     movdqu  0xB8(%rcx), %xmm12\r
     movdqu  0xC8(%rcx), %xmm13\r
     movdqu  0xD8(%rcx), %xmm14\r

-    movdqu  0xE8(%rcx), %xmm15  \r
+    movdqu  0xE8(%rcx), %xmm15\r

     mov     %rdx, %rax          # set return value\r
     jmp     *0x48(%rcx)\r
     mov     %rdx, %rax          # set return value\r
     jmp     *0x48(%rcx)\r

diff --git a/MdePkg/Library/BaseLib/X64/SetJump.S b/MdePkg/Library/BaseLib/X64/SetJump.S
index ea9e225a938e657461ddbf1ddff3435250f13900..582f67168146f17a4f43b5a06ebe45f7f2e5c520 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/SetJump.S
+++ b/MdePkg/Library/BaseLib/X64/SetJump.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\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


@@ -39,7 +39,7 @@ ASM_PFX(SetJump):
     mov    %rdx,0x48(%rcx)\r
     # save non-volatile fp registers\r
     stmxcsr 0x50(%rcx)\r
     mov    %rdx,0x48(%rcx)\r
     # save non-volatile fp registers\r
     stmxcsr 0x50(%rcx)\r

-    movdqu  %xmm6, 0x58(%rcx) \r
+    movdqu  %xmm6, 0x58(%rcx)\r

     movdqu  %xmm7, 0x68(%rcx)\r
     movdqu  %xmm8, 0x78(%rcx)\r
     movdqu  %xmm9, 0x88(%rcx)\r
     movdqu  %xmm7, 0x68(%rcx)\r
     movdqu  %xmm8, 0x78(%rcx)\r
     movdqu  %xmm9, 0x88(%rcx)\r


@@ -48,6 +48,6 @@ ASM_PFX(SetJump):
     movdqu  %xmm12, 0xB8(%rcx)\r
     movdqu  %xmm13, 0xC8(%rcx)\r
     movdqu  %xmm14, 0xD8(%rcx)\r
     movdqu  %xmm12, 0xB8(%rcx)\r
     movdqu  %xmm13, 0xC8(%rcx)\r
     movdqu  %xmm14, 0xD8(%rcx)\r

-    movdqu  %xmm15, 0xE8(%rcx)     \r
+    movdqu  %xmm15, 0xE8(%rcx)\r

     xor    %rax,%rax\r
     jmpq   *%rdx\r
     xor    %rax,%rax\r
     jmpq   *%rdx\r

diff --git a/MdePkg/Library/BaseLib/X64/SwitchStack.S b/MdePkg/Library/BaseLib/X64/SwitchStack.S
index dc8d80e40b9e4cf8df50938de3914f20a8ff976d..5ce2612a7b4d98b55cfa90f214c2efeabdc83fd2 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/SwitchStack.S
+++ b/MdePkg/Library/BaseLib/X64/SwitchStack.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\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


@@ -37,9 +37,9 @@
 #------------------------------------------------------------------------------\r
 ASM_GLOBAL ASM_PFX(InternalSwitchStack)\r
 ASM_PFX(InternalSwitchStack):\r
 #------------------------------------------------------------------------------\r
 ASM_GLOBAL ASM_PFX(InternalSwitchStack)\r
 ASM_PFX(InternalSwitchStack):\r

-         pushq   %rbp            \r
-       movq    %rsp, %rbp\r
-    \r
+    pushq   %rbp\r
+    movq    %rsp, %rbp\r
+\r

     mov     %rcx, %rax  // Shift registers for new call\r
     mov     %rdx, %rcx\r
     mov     %r8, %rdx\r
     mov     %rcx, %rax  // Shift registers for new call\r
     mov     %rdx, %rcx\r
     mov     %r8, %rdx\r

diff --git a/MdePkg/Library/BaseLib/X64/Thunk16.S b/MdePkg/Library/BaseLib/X64/Thunk16.S
index f592a2868c261dc4bdc90dc1b1ebcc6d6864bfc7..fd03b97b567e0cc75dea165dd2927239993b93b4 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/Thunk16.S
+++ b/MdePkg/Library/BaseLib/X64/Thunk16.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
 #------------------------------------------------------------------------------\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


@@ -49,7 +49,7 @@ ASM_GLOBAL ASM_PFX(InternalAsmThunk16)
 .set  IA32_REGS_SIZE, 56\r
 \r
     .data\r
 .set  IA32_REGS_SIZE, 56\r
 \r
     .data\r

-    \r
+\r

 .set Lm16Size, ASM_PFX(InternalAsmThunk16) - ASM_PFX(m16Start)\r
 ASM_PFX(m16Size):         .word      Lm16Size\r
 .set  LmThunk16Attr, L_ThunkAttr - ASM_PFX(m16Start)\r
 .set Lm16Size, ASM_PFX(InternalAsmThunk16) - ASM_PFX(m16Start)\r
 ASM_PFX(m16Size):         .word      Lm16Size\r
 .set  LmThunk16Attr, L_ThunkAttr - ASM_PFX(m16Start)\r


@@ -85,7 +85,7 @@ ASM_PFX(BackFromUserCode):
     .byte 0xe                           # push cs\r
     .byte 0x66\r
     call    L_Base                       # push eip\r
     .byte 0xe                           # push cs\r
     .byte 0x66\r
     call    L_Base                       # push eip\r

-L_Base: \r
+L_Base:\r

     .byte 0x66\r
     pushq   $0                          # reserved high order 32 bits of EFlags\r
     .byte 0x66, 0x9c                    # pushfd actually\r
     .byte 0x66\r
     pushq   $0                          # reserved high order 32 bits of EFlags\r
     .byte 0x66, 0x9c                    # pushfd actually\r


@@ -102,13 +102,13 @@ L_ThunkAttr:  .space  4
     movl    $0x15cd2401,%eax            # mov ax, 2401h & int 15h\r
     cli                                 # disable interrupts\r
     jnc     L_2\r
     movl    $0x15cd2401,%eax            # mov ax, 2401h & int 15h\r
     cli                                 # disable interrupts\r
     jnc     L_2\r

-L_1: \r
+L_1:\r

     testb   $THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL, %dl\r
     jz      L_2\r
     inb     $0x92,%al\r
     orb     $2,%al\r
     outb    %al, $0x92                   # deactivate A20M#\r
     testb   $THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL, %dl\r
     jz      L_2\r
     inb     $0x92,%al\r
     orb     $2,%al\r
     outb    %al, $0x92                   # deactivate A20M#\r

-L_2: \r
+L_2:\r

     xorw    %ax, %ax                     # xor eax, eax\r
     movl    %ss, %eax                    # mov ax, ss\r
     lea     IA32_REGS_SIZE(%esp), %bp\r
     xorw    %ax, %ax                     # xor eax, eax\r
     movl    %ss, %eax                    # mov ax, ss\r
     lea     IA32_REGS_SIZE(%esp), %bp\r


@@ -180,13 +180,13 @@ ASM_PFX(ToUserCode):
     movw    %bx,%sp                     # set up 16-bit stack pointer\r
     .byte 0x66                          # make the following call 32-bit\r
     call    L_Base1                       # push eip\r
     movw    %bx,%sp                     # set up 16-bit stack pointer\r
     .byte 0x66                          # make the following call 32-bit\r
     call    L_Base1                       # push eip\r

-L_Base1: \r
+L_Base1:\r

     popw    %bp                         # ebp <- address of L_Base1\r
     pushq   (IA32_REGS_SIZE + 2)(%esp)\r
     lea     0x0c(%rsi), %eax\r
     pushq   %rax\r
     lret                                # execution begins at next instruction\r
     popw    %bp                         # ebp <- address of L_Base1\r
     pushq   (IA32_REGS_SIZE + 2)(%esp)\r
     lea     0x0c(%rsi), %eax\r
     pushq   %rax\r
     lret                                # execution begins at next instruction\r

-L_RealMode: \r
+L_RealMode:\r

     .byte 0x66,0x2e                     # CS and operand size override\r
     lidt    (_16Idtr - L_Base1)(%rsi)\r
     .byte 0x66,0x61                     # popad\r
     .byte 0x66,0x2e                     # CS and operand size override\r
     lidt    (_16Idtr - L_Base1)(%rsi)\r
     .byte 0x66,0x61                     # popad\r


@@ -243,7 +243,7 @@ ASM_PFX(InternalAsmThunk16):
     pushq   %rbx\r
     pushq   %rsi\r
     pushq   %rdi\r
     pushq   %rbx\r
     pushq   %rsi\r
     pushq   %rdi\r

-    \r
+\r

     movl    %ds, %ebx\r
     pushq   %rbx      # Save ds segment register on the stack\r
     movl    %es, %ebx\r
     movl    %ds, %ebx\r
     pushq   %rbx      # Save ds segment register on the stack\r
     movl    %es, %ebx\r


@@ -257,7 +257,7 @@ ASM_PFX(InternalAsmThunk16):
     movzwl  _SS(%rsi), %r8d\r
     movl    _ESP(%rsi), %edi\r
     lea     -(IA32_REGS_SIZE + 4)(%edi), %rdi\r
     movzwl  _SS(%rsi), %r8d\r
     movl    _ESP(%rsi), %edi\r
     lea     -(IA32_REGS_SIZE + 4)(%edi), %rdi\r

-    imul    $16, %r8d, %eax \r
+    imul    $16, %r8d, %eax\r

     movl    %edi,%ebx                   # ebx <- stack for 16-bit code\r
     pushq   $(IA32_REGS_SIZE / 4)\r
     addl    %eax,%edi                   # edi <- linear address of 16-bit stack\r
     movl    %edi,%ebx                   # ebx <- stack for 16-bit code\r
     pushq   $(IA32_REGS_SIZE / 4)\r
     addl    %eax,%edi                   # edi <- linear address of 16-bit stack\r


@@ -268,26 +268,26 @@ ASM_PFX(InternalAsmThunk16):
     movl    %edx,%eax                   # eax <- transition code address\r
     andl    $0xf,%edx\r
     shll    $12,%eax                    # segment address in high order 16 bits\r
     movl    %edx,%eax                   # eax <- transition code address\r
     andl    $0xf,%edx\r
     shll    $12,%eax                    # segment address in high order 16 bits\r

-    .set LBackFromUserCodeDelta, ASM_PFX(BackFromUserCode) - ASM_PFX(m16Start) \r
+    .set LBackFromUserCodeDelta, ASM_PFX(BackFromUserCode) - ASM_PFX(m16Start)\r

     lea     (LBackFromUserCodeDelta)(%rdx), %ax\r
     stosl                               # [edi] <- return address of user code\r
     sgdt    0x60(%rsp)                  # save GDT stack in argument space\r
     lea     (LBackFromUserCodeDelta)(%rdx), %ax\r
     stosl                               # [edi] <- return address of user code\r
     sgdt    0x60(%rsp)                  # save GDT stack in argument space\r

-    movzwq  0x60(%rsp), %r10            # r10 <- GDT limit \r
-    lea     ((ASM_PFX(InternalAsmThunk16) - L_SavedCr4) + 0xf)(%rcx), %r11 \r
-    andq    $0xfffffffffffffff0, %r11   # r11 <- 16-byte aligned shadowed GDT table in real mode buffer      \r
-    \r
+    movzwq  0x60(%rsp), %r10            # r10 <- GDT limit\r
+    lea     ((ASM_PFX(InternalAsmThunk16) - L_SavedCr4) + 0xf)(%rcx), %r11\r
+    andq    $0xfffffffffffffff0, %r11   # r11 <- 16-byte aligned shadowed GDT table in real mode buffer\r
+\r

     movw    %r10w, (SavedGdt - L_SavedCr4)(%rcx)       # save the limit of shadowed GDT table\r
     movq    %r11, (SavedGdt - L_SavedCr4 + 0x2)(%rcx)  # save the base address of shadowed GDT table\r
     movw    %r10w, (SavedGdt - L_SavedCr4)(%rcx)       # save the limit of shadowed GDT table\r
     movq    %r11, (SavedGdt - L_SavedCr4 + 0x2)(%rcx)  # save the base address of shadowed GDT table\r

-    \r
+\r

     movq    0x62(%rsp) ,%rsi            # rsi <- the original GDT base address\r
     movq    0x62(%rsp) ,%rsi            # rsi <- the original GDT base address\r

-    xchg   %r10, %rcx                   # save rcx to r10 and initialize rcx to be the limit of GDT table \r
+    xchg   %r10, %rcx                   # save rcx to r10 and initialize rcx to be the limit of GDT table\r

     incq   %rcx                         # rcx <- the size of memory to copy\r
     xchg   %r11, %rdi                   # save rdi to r11 and initialize rdi to the base address of shadowed GDT table\r
     rep\r
     movsb                               # perform memory copy to shadow GDT table\r
     movq   %r10, %rcx                   # restore the orignal rcx before memory copy\r
     movq   %r11, %rdi                   # restore the original rdi before memory copy\r
     incq   %rcx                         # rcx <- the size of memory to copy\r
     xchg   %r11, %rdi                   # save rdi to r11 and initialize rdi to the base address of shadowed GDT table\r
     rep\r
     movsb                               # perform memory copy to shadow GDT table\r
     movq   %r10, %rcx                   # restore the orignal rcx before memory copy\r
     movq   %r11, %rdi                   # restore the original rdi before memory copy\r

-       \r
+\r

     sidt    0x50(%rsp)\r
     movq    %cr0, %rax\r
     .set LSavedCrDelta, L_SavedCr0 - L_SavedCr4\r
     sidt    0x50(%rsp)\r
     movq    %cr0, %rax\r
     .set LSavedCrDelta, L_SavedCr0 - L_SavedCr4\r


@@ -311,21 +311,21 @@ ASM_PFX(InternalAsmThunk16):
     .byte   0xff, 0x69                  #  jmp (_EntryPoint - L_SavedCr4)(%rcx)\r
     .set    Ltemp1, _EntryPoint - L_SavedCr4\r
     .byte   Ltemp1\r
     .byte   0xff, 0x69                  #  jmp (_EntryPoint - L_SavedCr4)(%rcx)\r
     .set    Ltemp1, _EntryPoint - L_SavedCr4\r
     .byte   Ltemp1\r

-L_RetFromRealMode: \r
+L_RetFromRealMode:\r

     popfq\r
     lgdt    0x60(%rsp)                  # restore protected mode GDTR\r
     lidt    0x50(%rsp)                  # restore protected mode IDTR\r
     lea     -IA32_REGS_SIZE(%rbp), %eax\r
     .byte 0x0f, 0xa9                    # pop gs\r
     .byte 0x0f, 0xa1                    # pop fs\r
     popfq\r
     lgdt    0x60(%rsp)                  # restore protected mode GDTR\r
     lidt    0x50(%rsp)                  # restore protected mode IDTR\r
     lea     -IA32_REGS_SIZE(%rbp), %eax\r
     .byte 0x0f, 0xa9                    # pop gs\r
     .byte 0x0f, 0xa1                    # pop fs\r

-    \r
+\r

     popq     %rbx\r
     movl     %ebx, %ss\r
     popq     %rbx\r
     movl     %ebx, %es\r
     popq     %rbx\r
     movl     %ebx, %ds\r
     popq     %rbx\r
     movl     %ebx, %ss\r
     popq     %rbx\r
     movl     %ebx, %es\r
     popq     %rbx\r
     movl     %ebx, %ds\r

-    \r
+\r

     popq    %rdi\r
     popq    %rsi\r
     popq    %rbx\r
     popq    %rdi\r
     popq    %rsi\r
     popq    %rbx\r

diff --git a/MdePkg/Library/BaseLib/X64/Thunk16.nasm b/MdePkg/Library/BaseLib/X64/Thunk16.nasm
index cfa55d44cbb3706c9a779fd25210866637cff4ea..4678dcc5401455a0fdad25859be653fe51408c63 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/Thunk16.nasm
+++ b/MdePkg/Library/BaseLib/X64/Thunk16.nasm
@@ -3,7 +3,7 @@
 \r
 ;------------------------------------------------------------------------------\r
 ;\r
 \r
 ;------------------------------------------------------------------------------\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


@@ -240,14 +240,14 @@ BITS    64
     push    rbx\r
     push    rsi\r
     push    rdi\r
     push    rbx\r
     push    rsi\r
     push    rdi\r

-    \r
+\r

     mov     ebx, ds\r
     push    rbx          ; Save ds segment register on the stack\r
     mov     ebx, es\r
     push    rbx          ; Save es segment register on the stack\r
     mov     ebx, ss\r
     push    rbx          ; Save ss segment register on the stack\r
     mov     ebx, ds\r
     push    rbx          ; Save ds segment register on the stack\r
     mov     ebx, es\r
     push    rbx          ; Save es segment register on the stack\r
     mov     ebx, ss\r
     push    rbx          ; Save ss segment register on the stack\r

-    \r
+\r

     push    fs\r
     push    gs\r
     mov     rsi, rcx\r
     push    fs\r
     push    gs\r
     mov     rsi, rcx\r


@@ -266,15 +266,15 @@ BITS    64
     shl     eax, 12                     ; segment address in high order 16 bits\r
     lea     ax, [rdx + (_BackFromUserCode - ASM_PFX(m16Start))]  ; offset address\r
     stosd                               ; [edi] <- return address of user code\r
     shl     eax, 12                     ; segment address in high order 16 bits\r
     lea     ax, [rdx + (_BackFromUserCode - ASM_PFX(m16Start))]  ; offset address\r
     stosd                               ; [edi] <- return address of user code\r

-  \r
+\r

     sgdt    [rsp + 60h]       ; save GDT stack in argument space\r
     sgdt    [rsp + 60h]       ; save GDT stack in argument space\r

-    movzx   r10, word [rsp + 60h]   ; r10 <- GDT limit \r
+    movzx   r10, word [rsp + 60h]   ; r10 <- GDT limit\r

     lea     r11, [rcx + (ASM_PFX(InternalAsmThunk16) - _BackFromUserCode.SavedCr4End) + 0xf]\r
     and     r11, ~0xf            ; r11 <- 16-byte aligned shadowed GDT table in real mode buffer\r
     lea     r11, [rcx + (ASM_PFX(InternalAsmThunk16) - _BackFromUserCode.SavedCr4End) + 0xf]\r
     and     r11, ~0xf            ; r11 <- 16-byte aligned shadowed GDT table in real mode buffer\r

-    \r
+\r

     mov     [rcx + (SavedGdt - _BackFromUserCode.SavedCr4End)], r10w      ; save the limit of shadowed GDT table\r
     mov     [rcx + (SavedGdt - _BackFromUserCode.SavedCr4End) + 2], r11  ; save the base address of shadowed GDT table\r
     mov     [rcx + (SavedGdt - _BackFromUserCode.SavedCr4End)], r10w      ; save the limit of shadowed GDT table\r
     mov     [rcx + (SavedGdt - _BackFromUserCode.SavedCr4End) + 2], r11  ; save the base address of shadowed GDT table\r

-    \r
+\r

     mov     rsi, [rsp + 62h]  ; rsi <- the original GDT base address\r
     xchg    rcx, r10                    ; save rcx to r10 and initialize rcx to be the limit of GDT table\r
     inc     rcx                         ; rcx <- the size of memory to copy\r
     mov     rsi, [rsp + 62h]  ; rsi <- the original GDT base address\r
     xchg    rcx, r10                    ; save rcx to r10 and initialize rcx to be the limit of GDT table\r
     inc     rcx                         ; rcx <- the size of memory to copy\r


@@ -282,7 +282,7 @@ BITS    64
     rep     movsb                       ; perform memory copy to shadow GDT table\r
     mov     rcx, r10                    ; restore the orignal rcx before memory copy\r
     mov     rdi, r11                    ; restore the original rdi before memory copy\r
     rep     movsb                       ; perform memory copy to shadow GDT table\r
     mov     rcx, r10                    ; restore the orignal rcx before memory copy\r
     mov     rdi, r11                    ; restore the original rdi before memory copy\r

-    \r
+\r

     sidt    [rsp + 50h]       ; save IDT stack in argument space\r
     mov     rax, cr0\r
     mov     [rcx + (_BackFromUserCode.SavedCr0End - 4 - _BackFromUserCode.SavedCr4End)], eax\r
     sidt    [rsp + 50h]       ; save IDT stack in argument space\r
     mov     rax, cr0\r
     mov     [rcx + (_BackFromUserCode.SavedCr0End - 4 - _BackFromUserCode.SavedCr4End)], eax\r

diff --git a/MdePkg/Library/BaseLib/X86Msr.c b/MdePkg/Library/BaseLib/X86Msr.c
index 9430980401b4f571a4a52429b37ebf32ee2cb2d0..916941e11bdeade3964c5ac7e132ef9979c0cc2f 100644 (file)
--- a/MdePkg/Library/BaseLib/X86Msr.c
+++ b/MdePkg/Library/BaseLib/X86Msr.c
@@ -1,7 +1,7 @@
 /** @file\r
   IA-32/x64 MSR functions.\r
 \r
 /** @file\r
   IA-32/x64 MSR functions.\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


@@ -196,8 +196,8 @@ AsmMsrBitFieldRead32 (
   Writes Value to a bit field in the lower 32-bits of a 64-bit MSR. The bit\r
   field is specified by the StartBit and the EndBit. All other bits in the\r
   destination MSR are preserved. The lower 32-bits of the MSR written is\r
   Writes Value to a bit field in the lower 32-bits of a 64-bit MSR. The bit\r
   field is specified by the StartBit and the EndBit. All other bits in the\r
   destination MSR are preserved. The lower 32-bits of the MSR written is\r

-  returned. The caller must either guarantee that Index and the data written \r
-  is valid, or the caller must set up exception handlers to catch the exceptions. \r
+  returned. The caller must either guarantee that Index and the data written\r
+  is valid, or the caller must set up exception handlers to catch the exceptions.\r

   This function is only available on IA-32 and x64.\r
 \r
   If StartBit is greater than 31, then ASSERT().\r
   This function is only available on IA-32 and x64.\r
 \r
   If StartBit is greater than 31, then ASSERT().\r


@@ -420,7 +420,7 @@ AsmMsrAnd64 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 64-bit MSR, performs a bitwise AND followed by a bitwise \r
+  Reads a 64-bit MSR, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 64-bit MSR.\r
 \r
   Reads the 64-bit MSR specified by Index, performs a bitwise AND between read\r
   OR, and writes the result back to the 64-bit MSR.\r
 \r
   Reads the 64-bit MSR specified by Index, performs a bitwise AND between read\r


@@ -489,8 +489,8 @@ AsmMsrBitFieldRead64 (
 \r
   Writes Value to a bit field in a 64-bit MSR. The bit field is specified by\r
   the StartBit and the EndBit. All other bits in the destination MSR are\r
 \r
   Writes Value to a bit field in a 64-bit MSR. The bit field is specified by\r
   the StartBit and the EndBit. All other bits in the destination MSR are\r

-  preserved. The MSR written is returned. The caller must either guarantee \r
-  that Index and the data written is valid, or the caller must set up exception \r
+  preserved. The MSR written is returned. The caller must either guarantee\r
+  that Index and the data written is valid, or the caller must set up exception\r

   handlers to catch the exceptions. This function is only available on IA-32 and x64.\r
 \r
   If StartBit is greater than 63, then ASSERT().\r
   handlers to catch the exceptions. This function is only available on IA-32 and x64.\r
 \r
   If StartBit is greater than 63, then ASSERT().\r

diff --git a/MdePkg/Library/BaseLib/X86Thunk.c b/MdePkg/Library/BaseLib/X86Thunk.c
index dac1d19374f565f56d03c0486b8bf4c8acd09913..b668e602ec45018e2a5f1db080c1759a5afdc462 100644 (file)
--- a/MdePkg/Library/BaseLib/X86Thunk.c
+++ b/MdePkg/Library/BaseLib/X86Thunk.c
@@ -1,7 +1,7 @@
 /** @file\r
   Real Mode Thunk Functions for IA32 and x64.\r
 \r
 /** @file\r
   Real Mode Thunk Functions for IA32 and x64.\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


@@ -86,7 +86,7 @@ AsmGetThunk16Properties (
   Prepares all structures a code required to use AsmThunk16().\r
 \r
   Prepares all structures and code required to use AsmThunk16().\r
   Prepares all structures a code required to use AsmThunk16().\r
 \r
   Prepares all structures and code required to use AsmThunk16().\r

-  \r
+\r

   This interface is limited to be used in either physical mode or virtual modes with paging enabled where the\r
   virtual to physical mappings for ThunkContext.RealModeBuffer is mapped 1:1.\r
 \r
   This interface is limited to be used in either physical mode or virtual modes with paging enabled where the\r
   virtual to physical mappings for ThunkContext.RealModeBuffer is mapped 1:1.\r
 \r


@@ -168,48 +168,48 @@ AsmPrepareThunk16 (
   AsmPrepareThunk16() must be called with ThunkContext before this function is used.\r
   This function must be called with interrupts disabled.\r
 \r
   AsmPrepareThunk16() must be called with ThunkContext before this function is used.\r
   This function must be called with interrupts disabled.\r
 \r

-  The register state from the RealModeState field of ThunkContext is restored just prior \r
-  to calling the 16-bit real mode entry point.  This includes the EFLAGS field of RealModeState, \r
+  The register state from the RealModeState field of ThunkContext is restored just prior\r
+  to calling the 16-bit real mode entry point.  This includes the EFLAGS field of RealModeState,\r

   which is used to set the interrupt state when a 16-bit real mode entry point is called.\r
   Control is transferred to the 16-bit real mode entry point specified by the CS and Eip fields of RealModeState.\r
   which is used to set the interrupt state when a 16-bit real mode entry point is called.\r
   Control is transferred to the 16-bit real mode entry point specified by the CS and Eip fields of RealModeState.\r

-  The stack is initialized to the SS and ESP fields of RealModeState.  Any parameters passed to \r
-  the 16-bit real mode code must be populated by the caller at SS:ESP prior to calling this function.  \r
+  The stack is initialized to the SS and ESP fields of RealModeState.  Any parameters passed to\r
+  the 16-bit real mode code must be populated by the caller at SS:ESP prior to calling this function.\r

   The 16-bit real mode entry point is invoked with a 16-bit CALL FAR instruction,\r
   The 16-bit real mode entry point is invoked with a 16-bit CALL FAR instruction,\r

-  so when accessing stack contents, the 16-bit real mode code must account for the 16-bit segment \r
-  and 16-bit offset of the return address that were pushed onto the stack. The 16-bit real mode entry \r
-  point must exit with a RETF instruction. The register state is captured into RealModeState immediately \r
+  so when accessing stack contents, the 16-bit real mode code must account for the 16-bit segment\r
+  and 16-bit offset of the return address that were pushed onto the stack. The 16-bit real mode entry\r
+  point must exit with a RETF instruction. The register state is captured into RealModeState immediately\r

   after the RETF instruction is executed.\r
   after the RETF instruction is executed.\r

-  \r
-  If EFLAGS specifies interrupts enabled, or any of the 16-bit real mode code enables interrupts, \r
-  or any of the 16-bit real mode code makes a SW interrupt, then the caller is responsible for making sure \r
-  the IDT at address 0 is initialized to handle any HW or SW interrupts that may occur while in 16-bit real mode. \r
-  \r
-  If EFLAGS specifies interrupts enabled, or any of the 16-bit real mode code enables interrupts, \r
-  then the caller is responsible for making sure the 8259 PIC is in a state compatible with 16-bit real mode.  \r
+\r
+  If EFLAGS specifies interrupts enabled, or any of the 16-bit real mode code enables interrupts,\r
+  or any of the 16-bit real mode code makes a SW interrupt, then the caller is responsible for making sure\r
+  the IDT at address 0 is initialized to handle any HW or SW interrupts that may occur while in 16-bit real mode.\r
+\r
+  If EFLAGS specifies interrupts enabled, or any of the 16-bit real mode code enables interrupts,\r
+  then the caller is responsible for making sure the 8259 PIC is in a state compatible with 16-bit real mode.\r

   This includes the base vectors, the interrupt masks, and the edge/level trigger mode.\r
   This includes the base vectors, the interrupt masks, and the edge/level trigger mode.\r

-  \r
-  If THUNK_ATTRIBUTE_BIG_REAL_MODE is set in the ThunkAttributes field of ThunkContext, then the user code \r
+\r
+  If THUNK_ATTRIBUTE_BIG_REAL_MODE is set in the ThunkAttributes field of ThunkContext, then the user code\r

   is invoked in big real mode.  Otherwise, the user code is invoked in 16-bit real mode with 64KB segment limits.\r
   is invoked in big real mode.  Otherwise, the user code is invoked in 16-bit real mode with 64KB segment limits.\r

-  \r
-  If neither THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 nor THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL are set in \r
-  ThunkAttributes, then it is assumed that the user code did not enable the A20 mask, and no attempt is made to \r
+\r
+  If neither THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 nor THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL are set in\r
+  ThunkAttributes, then it is assumed that the user code did not enable the A20 mask, and no attempt is made to\r

   disable the A20 mask.\r
   disable the A20 mask.\r

-  \r
-  If THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 is set and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL is clear in \r
-  ThunkAttributes, then attempt to use the INT 15 service to disable the A20 mask.  If this INT 15 call fails, \r
+\r
+  If THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 is set and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL is clear in\r
+  ThunkAttributes, then attempt to use the INT 15 service to disable the A20 mask.  If this INT 15 call fails,\r

   then attempt to disable the A20 mask by directly accessing the 8042 keyboard controller I/O ports.\r
   then attempt to disable the A20 mask by directly accessing the 8042 keyboard controller I/O ports.\r

-  \r
-  If THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 is clear and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL is set in \r
+\r
+  If THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 is clear and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL is set in\r

   ThunkAttributes, then attempt to disable the A20 mask by directly accessing the 8042 keyboard controller I/O ports.\r
   ThunkAttributes, then attempt to disable the A20 mask by directly accessing the 8042 keyboard controller I/O ports.\r

-    \r
+\r

   If ThunkContext is NULL, then ASSERT().\r
   If AsmPrepareThunk16() was not previously called with ThunkContext, then ASSERT().\r
   If ThunkContext is NULL, then ASSERT().\r
   If AsmPrepareThunk16() was not previously called with ThunkContext, then ASSERT().\r

-  If both THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL are set in \r
+  If both THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 and THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL are set in\r

   ThunkAttributes, then ASSERT().\r
 \r
   This interface is limited to be used in either physical mode or virtual modes with paging enabled where the\r
   virtual to physical mappings for ThunkContext.RealModeBuffer is mapped 1:1.\r
   ThunkAttributes, then ASSERT().\r
 \r
   This interface is limited to be used in either physical mode or virtual modes with paging enabled where the\r
   virtual to physical mappings for ThunkContext.RealModeBuffer is mapped 1:1.\r

-  \r
+\r

   @param  ThunkContext  A pointer to the context structure that describes the\r
                         16-bit real mode code to call.\r
 \r
   @param  ThunkContext  A pointer to the context structure that describes the\r
                         16-bit real mode code to call.\r
 \r


@@ -228,7 +228,7 @@ AsmThunk16 (
   ASSERT ((UINTN)ThunkContext->RealModeBuffer + m16Size <= 0x100000);\r
   ASSERT (((ThunkContext->ThunkAttributes & (THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 | THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL)) != \\r
            (THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 | THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL)));\r
   ASSERT ((UINTN)ThunkContext->RealModeBuffer + m16Size <= 0x100000);\r
   ASSERT (((ThunkContext->ThunkAttributes & (THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 | THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL)) != \\r
            (THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 | THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL)));\r

-           \r
+\r

   UpdatedRegs = InternalAsmThunk16 (\r
                   ThunkContext->RealModeState,\r
                   ThunkContext->RealModeBuffer\r
   UpdatedRegs = InternalAsmThunk16 (\r
                   ThunkContext->RealModeState,\r
                   ThunkContext->RealModeBuffer\r


@@ -250,7 +250,7 @@ AsmThunk16 (
 \r
   This interface is limited to be used in either physical mode or virtual modes with paging enabled where the\r
   virtual to physical mappings for ThunkContext.RealModeBuffer is mapped 1:1.\r
 \r
   This interface is limited to be used in either physical mode or virtual modes with paging enabled where the\r
   virtual to physical mappings for ThunkContext.RealModeBuffer is mapped 1:1.\r

-  \r
+\r

   See AsmPrepareThunk16() and AsmThunk16() for the detailed description and ASSERT() conditions.\r
 \r
   @param  ThunkContext  A pointer to the context structure that describes the\r
   See AsmPrepareThunk16() and AsmThunk16() for the detailed description and ASSERT() conditions.\r
 \r
   @param  ThunkContext  A pointer to the context structure that describes the\r

diff --git a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf b/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
index 358eeed4f44959f90db5600ebc1d553d525337de..e6c578f8a655c28caad80e3e50db6f4fa618d25b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+++ b/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
@@ -3,7 +3,7 @@
 #\r
 #  Base Memory Library implementation - no ASM.\r
 #\r
 #\r
 #  Base Memory Library implementation - no ASM.\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


@@ -22,7 +22,7 @@
   FILE_GUID                      = fd44e603-002a-4b29-9f5f-529e815b6165\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = fd44e603-002a-4b29-9f5f-529e815b6165\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = BaseMemoryLib \r
+  LIBRARY_CLASS                  = BaseMemoryLib\r

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

diff --git a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
index bbee8f2cce73c83c28900f31b2153fca99f93b61..d30d8698c4ca893d3a173fec8ca3aa40be14c669 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   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 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r


@@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @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

diff --git a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
index 9f64e85fd53df839b2724419dcc6b1e6c4e1ad51..9ad04660f7ed4ce48b1afd33fb4dfbccef82cf3d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
@@ -2,7 +2,7 @@
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
index b2590f83caef276c220b5c92e2728179f39c6e05..8ef5302e157044ee092f0fb217d7968028a78dad 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
@@ -2,7 +2,7 @@
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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 @@
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r

-  \r
+\r

   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r
   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r


@@ -63,7 +63,7 @@ CopyGuid (
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r

-  \r
+\r

   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r
   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r


@@ -103,7 +103,7 @@ CompareGuid (
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
index 4fd75fa2129651ef92b6f9781d443d8060a71715..3eb0cbb2133e247a4431ec9105ce98a306fdb83c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
index fb30fa5f4d3e6f189adee96cf3e883e45dce824a..54bc4339e1656366a1a6da0dd82d79618115f9bd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -32,7 +32,7 @@
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
index fceb6d12bf7f1723bae4b161a4c20c7d982f8336..19f98fa1f95bfeadb99e1f8d81e60a5cc8737a27 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
index 65c8b11f353c11e450f49c237e8b2a48ec460595..9fd25d88eefd00541d07f6912e3ff70632c10e65 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r


@@ -57,19 +57,19 @@ ScanMem8 (
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r

- \r
+\r

   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r
   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r

-  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching \r
+  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching\r

   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
index 8a3392718f46845728c28cd228b6e138cd1825c5..6e86472ace43dfec4450237b200bafafc29f5bf5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r

diff --git a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
index 9dd0b45e188e5cbb668f75132dc5e8bbd35417e6..9ab315b8cfe3758050375bc7980cc6cb8632c206 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
@@ -11,8 +11,8 @@
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\r
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
index da6589a6a4494450b0d26c7860b0b16615dbd4ec..d17fcf24b6c746c83deb231098d9efa68ecedf53 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
+++ b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
@@ -23,7 +23,7 @@
   FILE_GUID                      = d458a654-f64c-49db-b8d1-3821306bf1f6\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = d458a654-f64c-49db-b8d1-3821306bf1f6\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = BaseMemoryLib \r
+  LIBRARY_CLASS                  = BaseMemoryLib\r

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

diff --git a/MdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c
index c59000dc04f69bd35ae348800e3b051882423dd1..3a37a70e53bd889a6d23c0282f1915f4ef263716 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   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 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r


@@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @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

diff --git a/MdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c
index 9b76f0f1e1e742b7cdb44cf8463ea7259a079b3f..437253339f08c988052fcfcd885bbd25765b453e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c
@@ -2,7 +2,7 @@
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c
index cbb385fddfba8b4b7de2df526202264e8ce101f1..4cc95d3aab563392e6901f2ee5bf24d8cb5aadfd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c
@@ -2,7 +2,7 @@
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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 @@
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r

-  \r
+\r

   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r
   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r


@@ -63,7 +63,7 @@ CopyGuid (
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r

-  \r
+\r

   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r
   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r


@@ -103,7 +103,7 @@ CompareGuid (
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
index 4fd75fa2129651ef92b6f9781d443d8060a71715..3eb0cbb2133e247a4431ec9105ce98a306fdb83c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c
index defd510c55e7fbe22db2cc4d2c0c1b9b7c1e5a29..cf70a91878d8d9bec557077a75d84706523f5a6d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -32,7 +32,7 @@
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c
index fceb6d12bf7f1723bae4b161a4c20c7d982f8336..19f98fa1f95bfeadb99e1f8d81e60a5cc8737a27 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
index efbbe20a7089b102963adf9b08932a76787d40a3..ef63a54b7114b7bfa616d0410e3880ceae857d38 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r


@@ -57,19 +57,19 @@ ScanMem8 (
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r

- \r
+\r

   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r
   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r

-  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching \r
+  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching\r

   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
index 8a3392718f46845728c28cd228b6e138cd1825c5..6e86472ace43dfec4450237b200bafafc29f5bf5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S b/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S
index 590240591bae90e06ac833ede26f433048766b25..ee6bbe2715a37c543ab3ae6d207584356468ee02 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -46,13 +46,13 @@ ASM_GLOBAL ASM_PFX(InternalMemCompareMem)
 ASM_PFX(InternalMemCompareMem):\r
     pushq   %rsi\r
     pushq   %rdi\r
 ASM_PFX(InternalMemCompareMem):\r
     pushq   %rsi\r
     pushq   %rdi\r

-    movq    %rcx, %rsi \r
-    movq    %rdx, %rdi \r
-    movq    %r8, %rcx \r
+    movq    %rcx, %rsi\r
+    movq    %rdx, %rdi\r
+    movq    %r8, %rcx\r

     repe    cmpsb\r
     movzbq  -1(%rsi), %rax\r
     movzbq  -1(%rdi), %rdx\r
     repe    cmpsb\r
     movzbq  -1(%rsi), %rax\r
     movzbq  -1(%rdi), %rdx\r

-    subq    %rdx, %rax \r
+    subq    %rdx, %rax\r

     popq    %rdi\r
     popq    %rsi\r
     ret\r
     popq    %rdi\r
     popq    %rsi\r
     ret\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.S b/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.S
index 1d87e2d63af301997e566e79f6cf0f4814ee7af0..42a1e28df90f2a07aea7c0ef6a3776ed6140c75e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -40,14 +40,14 @@ ASM_PFX(InternalMemCopyMem):
     pushq   %rdi\r
     movq    %rdx, %rsi                  # rsi <- Source\r
     movq    %rcx, %rdi                  # rdi <- Destination\r
     pushq   %rdi\r
     movq    %rdx, %rsi                  # rsi <- Source\r
     movq    %rcx, %rdi                  # rdi <- Destination\r

-    leaq    -1(%rsi, %r8,), %r9         # r9 <- End of Source          \r
-    cmpq    %rdi, %rsi \r
+    leaq    -1(%rsi, %r8,), %r9         # r9 <- End of Source\r
+    cmpq    %rdi, %rsi\r

     movq    %rdi, %rax                  # rax <- Destination as return value\r
     jae     L0\r
     cmpq    %rdi, %r9\r
     jae     L_CopyBackward              # Copy backward if overlapped\r
 L0:\r
     movq    %rdi, %rax                  # rax <- Destination as return value\r
     jae     L0\r
     cmpq    %rdi, %r9\r
     jae     L_CopyBackward              # Copy backward if overlapped\r
 L0:\r

-    movq    %r8, %rcx \r
+    movq    %r8, %rcx\r

     andq    $7, %r8\r
     shrq    $3, %rcx                    # rcx <- # of Qwords to copy\r
     jz      L_CopyBytes\r
     andq    $7, %r8\r
     shrq    $3, %rcx                    # rcx <- # of Qwords to copy\r
     jz      L_CopyBytes\r


@@ -55,7 +55,7 @@ L0:
 L1:\r
     movq    (%rsi), %mm0\r
     movntq  %mm0, (%rdi)\r
 L1:\r
     movq    (%rsi), %mm0\r
     movntq  %mm0, (%rdi)\r

-    addq    $8, %rsi \r
+    addq    $8, %rsi\r

     addq    $8, %rdi\r
     loop    L1\r
     mfence\r
     addq    $8, %rdi\r
     loop    L1\r
     mfence\r


@@ -66,7 +66,7 @@ L_CopyBackward:
     leaq    -1(%rdi, %r8,), %rdi        # rdi <- End of Destination\r
     std                                 # set direction flag\r
 L_CopyBytes:\r
     leaq    -1(%rdi, %r8,), %rdi        # rdi <- End of Destination\r
     std                                 # set direction flag\r
 L_CopyBytes:\r

-    movq    %r8, %rcx \r
+    movq    %r8, %rcx\r

     rep     movsb                       # Copy bytes backward\r
     cld\r
     popq    %rdi\r
     rep     movsb                       # Copy bytes backward\r
     cld\r
     popq    %rdi\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.S b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.S
index 8f1899606af3047f96f284d8da6b1c650b885685..358651419a265855344bfebd2cefa084b9fad47f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -45,12 +45,12 @@
 ASM_GLOBAL ASM_PFX(InternalMemScanMem16)\r
 ASM_PFX(InternalMemScanMem16):\r
     pushq   %rdi\r
 ASM_GLOBAL ASM_PFX(InternalMemScanMem16)\r
 ASM_PFX(InternalMemScanMem16):\r
     pushq   %rdi\r

-    movq    %rcx, %rdi \r
-    movq    %r8, %rax \r
-    movq    %rdx, %rcx \r
+    movq    %rcx, %rdi\r
+    movq    %r8, %rax\r
+    movq    %rdx, %rcx\r

     repne   scasw\r
     leaq    -2(%rdi), %rax\r
     repne   scasw\r
     leaq    -2(%rdi), %rax\r

-    cmovnz  %rcx, %rax \r
+    cmovnz  %rcx, %rax\r

     popq    %rdi\r
     ret\r
 \r
     popq    %rdi\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.S b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.S
index 05b6f6489ab31981435f9ddada882777b40b2e79..93e6cc2f13f151652bdc09aadef889de72829f64 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -45,12 +45,12 @@
 ASM_GLOBAL ASM_PFX(InternalMemScanMem32)\r
 ASM_PFX(InternalMemScanMem32):\r
     pushq    %rdi\r
 ASM_GLOBAL ASM_PFX(InternalMemScanMem32)\r
 ASM_PFX(InternalMemScanMem32):\r
     pushq    %rdi\r

-    movq     %rcx, %rdi \r
-    movq     %r8, %rax \r
-    movq     %rdx, %rcx \r
+    movq     %rcx, %rdi\r
+    movq     %r8, %rax\r
+    movq     %rdx, %rcx\r

     repne    scasl\r
     leaq     -4(%rdi), %rax\r
     repne    scasl\r
     leaq     -4(%rdi), %rax\r

-    cmovnz   %rcx, %rax \r
+    cmovnz   %rcx, %rax\r

     popq     %rdi\r
     ret\r
 \r
     popq     %rdi\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.S b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.S
index dd7c1b8634e546630fc59aad7ae6c85737bd5ad0..2e59c8dd527088c466f31ff2d1ed929fc5332c22 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -45,11 +45,11 @@
 ASM_GLOBAL ASM_PFX(InternalMemScanMem64)\r
 ASM_PFX(InternalMemScanMem64):\r
     pushq    %rdi\r
 ASM_GLOBAL ASM_PFX(InternalMemScanMem64)\r
 ASM_PFX(InternalMemScanMem64):\r
     pushq    %rdi\r

-    movq     %rcx, %rdi \r
-    movq     %r8, %rax \r
-    movq     %rdx, %rcx \r
+    movq     %rcx, %rdi\r
+    movq     %r8, %rax\r
+    movq     %rdx, %rcx\r

     repne    scasq\r
     leaq     -8(%rdi), %rax\r
     repne    scasq\r
     leaq     -8(%rdi), %rax\r

-    cmovnz   %rcx, %rax \r
+    cmovnz   %rcx, %rax\r

     popq     %rdi\r
     ret\r
     popq     %rdi\r
     ret\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.S b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.S
index 4f3b950a34ab27d891a9c153ddf0d13e6dd7bf54..4bdacf7e01343dfeebed09b86fd632596120e8e3 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -45,9 +45,9 @@
 ASM_GLOBAL ASM_PFX(InternalMemScanMem8)\r
 ASM_PFX(InternalMemScanMem8):\r
     pushq    %rdi\r
 ASM_GLOBAL ASM_PFX(InternalMemScanMem8)\r
 ASM_PFX(InternalMemScanMem8):\r
     pushq    %rdi\r

-    movq     %rcx, %rdi \r
-    movq     %rdx, %rcx  \r
-    movq     %r8,   %rax \r
+    movq     %rcx, %rdi\r
+    movq     %rdx, %rcx\r
+    movq     %r8,   %rax\r

     repne    scasb\r
     leaq     -1(%rdi), %rax\r
     cmovnz   %rcx, %rax                     # set rax to 0 if not found\r
     repne    scasb\r
     leaq     -1(%rdi), %rax\r
     cmovnz   %rcx, %rax                     # set rax to 0 if not found\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.S b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.S
index ad7131f3009fc2a07440c2cfbcba8cd21f8fc0c4..16ccb3fc1d4a38a5eeda408d553cde9bdec42055 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -43,12 +43,12 @@ ASM_PFX(InternalMemSetMem):
     movq    %rcx, %r8\r
     movq    %r8, %rdi                     # rdi <- Buffer\r
     movq    %rdx, %rcx\r
     movq    %rcx, %r8\r
     movq    %r8, %rdi                     # rdi <- Buffer\r
     movq    %rdx, %rcx\r

-    andq    $7, %rdx \r
+    andq    $7, %rdx\r

     shrq    $3, %rcx\r
     jz      L_SetBytes\r
     .byte   0x0f, 0x70, 0x0C0, 0x00\r
 L0:\r
     shrq    $3, %rcx\r
     jz      L_SetBytes\r
     .byte   0x0f, 0x70, 0x0C0, 0x00\r
 L0:\r

-    movntq  %mm0, (%rdi) \r
+    movntq  %mm0, (%rdi)\r

     addq    $8, %rdi\r
     loop    L0\r
     mfence\r
     addq    $8, %rdi\r
     loop    L0\r
     mfence\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.S b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.S
index c947afd370dda5f957fbaa9bb400345f0a3574ed..4f77bacf14f7483d58edb0d9c59a5e95f59eb579 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -37,22 +37,22 @@
 ASM_GLOBAL ASM_PFX(InternalMemSetMem16)\r
 ASM_PFX(InternalMemSetMem16):\r
     pushq    %rdi\r
 ASM_GLOBAL ASM_PFX(InternalMemSetMem16)\r
 ASM_PFX(InternalMemSetMem16):\r
     pushq    %rdi\r

-    movq     %r8, %rax \r
-    movd     %rax, %mm0 \r
-    movq     %rcx, %r8 \r
-    movq     %r8, %rdi \r
-    movq     %rdx, %rcx \r
-    andl     $3, %edx \r
+    movq     %r8, %rax\r
+    movd     %rax, %mm0\r
+    movq     %rcx, %r8\r
+    movq     %r8, %rdi\r
+    movq     %rdx, %rcx\r
+    andl     $3, %edx\r

     shrq     $2, %rcx\r
     jz       L_SetWords\r
     .byte    0x0f, 0x70, 0x0C0, 0x00\r
 L0:\r
     shrq     $2, %rcx\r
     jz       L_SetWords\r
     .byte    0x0f, 0x70, 0x0C0, 0x00\r
 L0:\r

-    movntq   %mm0, (%rdi) \r
-    addq     $8, %rdi \r
+    movntq   %mm0, (%rdi)\r
+    addq     $8, %rdi\r

     loop     L0\r
     mfence\r
 L_SetWords:\r
     loop     L0\r
     mfence\r
 L_SetWords:\r

-    movl    %edx, %ecx \r
+    movl    %edx, %ecx\r

     rep     stosw\r
     movq    %r8, %rax\r
     popq    %rdi\r
     rep     stosw\r
     movq    %r8, %rax\r
     popq    %rdi\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.S b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.S
index 4ab8e3a21d1293c06d0554c9e29cc9feb5e31387..82c7cbf4d6de86ca8fdcc41166d2fe79ba122a56 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -43,13 +43,13 @@ ASM_PFX(InternalMemSetMem32):
     jz      L_SetDwords\r
    .byte    0x0f, 0x70, 0x0C0, 0x44\r
 L0:\r
     jz      L_SetDwords\r
    .byte    0x0f, 0x70, 0x0C0, 0x44\r
 L0:\r

-    movntq  %mm0, (%rdx) \r
+    movntq  %mm0, (%rdx)\r

     leaq    8(%rdx), %rdx               # use "lea" to avoid flag changes\r
     loop    L0\r
     mfence\r
 L_SetDwords:\r
     jnc     L1\r
     leaq    8(%rdx), %rdx               # use "lea" to avoid flag changes\r
     loop    L0\r
     mfence\r
 L_SetDwords:\r
     jnc     L1\r

-    movd    %mm0, (%rdx) \r
+    movd    %mm0, (%rdx)\r

 L1:\r
     ret\r
 \r
 L1:\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S
index a4c7d8cb62f2b5c26a8ac8d43f70a3a7932ed1f3..110c6f2d9c5ef2e9e8f438e90c4e99f414ace56a 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -39,7 +39,7 @@ ASM_PFX(InternalMemSetMem64):
     movq      %rcx, %rax                #rax <- Buffer\r
     xchg      %rdx, %rcx                #rcx <- Count\r
 L0:\r
     movq      %rcx, %rax                #rax <- Buffer\r
     xchg      %rdx, %rcx                #rcx <- Count\r
 L0:\r

-    movntq  %mm0, (%rdx) \r
+    movntq  %mm0, (%rdx)\r

     addq    $8, %rdx\r
     loop    L0\r
     mfence\r
     addq    $8, %rdx\r
     loop    L0\r
     mfence\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c
index 9dd0b45e188e5cbb668f75132dc5e8bbd35417e6..9ab315b8cfe3758050375bc7980cc6cb8632c206 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c
@@ -11,8 +11,8 @@
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\r
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/AArch64/CopyMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/AArch64/CopyMem.S
index 10b55b065c47b6f2cfc72b4429b034a719c34580..56fe3b0956982916ff392e47d790d92049724a0c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/AArch64/CopyMem.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/AArch64/CopyMem.S
@@ -169,7 +169,7 @@ L(copy96):
 \r
     // Align DST to 16 byte alignment so that we don't cross cache line\r
     // boundaries on both loads and stores. There are at least 96 bytes\r
 \r
     // Align DST to 16 byte alignment so that we don't cross cache line\r
     // boundaries on both loads and stores. There are at least 96 bytes\r

-    // to copy, so copy 16 bytes unaligned and then align.     The loop\r
+    // to copy, so copy 16 bytes unaligned and then align.  The loop\r

     // copies 64 bytes per iteration and prefetches one iteration ahead.\r
 \r
     .p2align 4\r
     // copies 64 bytes per iteration and prefetches one iteration ahead.\r
 \r
     .p2align 4\r


@@ -198,7 +198,7 @@ L(copy_long):
     subs    count, count, 64\r
     b.hi    1b\r
 \r
     subs    count, count, 64\r
     b.hi    1b\r
 \r

-    // Write the last full set of 64 bytes.     The remainder is at most 64\r
+    // Write the last full set of 64 bytes.   The remainder is at most 64\r

     // bytes, so it is safe to always copy 64 bytes from the end even if\r
     // there is just 1 byte left.\r
 2:\r
     // bytes, so it is safe to always copy 64 bytes from the end even if\r
     // there is just 1 byte left.\r
 2:\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/AArch64/ScanMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/AArch64/ScanMem.S
index 08e1fbb170826c071294b637cec6e6152dd4ae6b..99db2aebcb6d3d915e62b1eb763cef273bb8d844 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/AArch64/ScanMem.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/AArch64/ScanMem.S
@@ -40,7 +40,7 @@
 #define result    x0\r
 \r
 #define src       x3\r
 #define result    x0\r
 \r
 #define src       x3\r

-#define        tmp       x4\r
+#define  tmp       x4\r

 #define wtmp2     w5\r
 #define synd      x6\r
 #define soff      x9\r
 #define wtmp2     w5\r
 #define synd      x6\r
 #define soff      x9\r


@@ -68,7 +68,7 @@
 ASM_GLOBAL ASM_PFX(InternalMemScanMem8)\r
 ASM_PFX(InternalMemScanMem8):\r
     // Do not dereference srcin if no bytes to compare.\r
 ASM_GLOBAL ASM_PFX(InternalMemScanMem8)\r
 ASM_PFX(InternalMemScanMem8):\r
     // Do not dereference srcin if no bytes to compare.\r

-    cbz        cntin, .Lzero_length\r
+    cbz  cntin, .Lzero_length\r

     //\r
     // Magic constant 0x40100401 allows us to identify which lane matches\r
     // the requested byte.\r
     //\r
     // Magic constant 0x40100401 allows us to identify which lane matches\r
     // the requested byte.\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
index fa9e6d21b689df63af3dd3a76a82bf46c37a2cea..3f756647e10e2efba4fc365717f2120bbce46dfa 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Instance of Base Memory Library optimized for use in DXE phase.\r
 #\r
 ## @file\r
 #  Instance of Base Memory Library optimized for use in DXE phase.\r
 #\r

-#  Base Memory Library that is optimized for use in DXE phase.  \r
+#  Base Memory Library that is optimized for use in DXE phase.\r

 #  Uses REP, MMX, XMM registers as required for best performance.\r
 #\r
 #  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  Uses REP, MMX, XMM registers as required for best performance.\r
 #\r
 #  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r


@@ -23,7 +23,7 @@
   FILE_GUID                      = 02BD55C2-AB1D-4b75-B0FD-9A63AE09B31D\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 02BD55C2-AB1D-4b75-B0FD-9A63AE09B31D\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = BaseMemoryLib \r
+  LIBRARY_CLASS                  = BaseMemoryLib\r

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

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
index c59000dc04f69bd35ae348800e3b051882423dd1..3a37a70e53bd889a6d23c0282f1915f4ef263716 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   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 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r


@@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @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

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
index 9b76f0f1e1e742b7cdb44cf8463ea7259a079b3f..437253339f08c988052fcfcd885bbd25765b453e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
@@ -2,7 +2,7 @@
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
index cbb385fddfba8b4b7de2df526202264e8ce101f1..4cc95d3aab563392e6901f2ee5bf24d8cb5aadfd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
@@ -2,7 +2,7 @@
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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 @@
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r

-  \r
+\r

   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r
   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r


@@ -63,7 +63,7 @@ CopyGuid (
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r

-  \r
+\r

   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r
   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r


@@ -103,7 +103,7 @@ CompareGuid (
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
index 4fd75fa2129651ef92b6f9781d443d8060a71715..3eb0cbb2133e247a4431ec9105ce98a306fdb83c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
index fb30fa5f4d3e6f189adee96cf3e883e45dce824a..54bc4339e1656366a1a6da0dd82d79618115f9bd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -32,7 +32,7 @@
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
index fceb6d12bf7f1723bae4b161a4c20c7d982f8336..19f98fa1f95bfeadb99e1f8d81e60a5cc8737a27 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
index ae60ff4e97a453f9f47747901dcc46ac94c1f2e8..e72c71e1db2118cced32b2920f517887231c8e34 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r


@@ -57,19 +57,19 @@ ScanMem8 (
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r

- \r
+\r

   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r
   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r

-  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching \r
+  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching\r

   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r


@@ -77,7 +77,7 @@ ScanMem8 (
 \r
   @param  Buffer      The pointer to the target buffer to scan.\r
   @param  Length      The number of bytes in Buffer to scan.\r
 \r
   @param  Buffer      The pointer to the target buffer to scan.\r
   @param  Length      The number of bytes in Buffer to scan.\r

-  @param  Value       \r
+  @param  Value\r

 The value to search for in the target buffer.\r
 \r
   @return A pointer to the matching byte in the target buffer or NULL otherwise.\r
 The value to search for in the target buffer.\r
 \r
   @return A pointer to the matching byte in the target buffer or NULL otherwise.\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c
index c4c3fd2fc26b9101896fa86a57c01d8c443d11f1..6e86472ace43dfec4450237b200bafafc29f5bf5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/CompareMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/CompareMem.S
index 1f6212a876d6d6b3731781fd3a22d59dc127ed92..ae273183730f06b9b58c444d675433758d405be5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/CompareMem.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -41,7 +41,7 @@
 #   IN      CONST VOID                *SourceBuffer,\r
 #   IN      UINTN                     Length\r
 #   );\r
 #   IN      CONST VOID                *SourceBuffer,\r
 #   IN      UINTN                     Length\r
 #   );\r

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

 ASM_GLOBAL ASM_PFX(InternalMemCompareMem)\r
 ASM_PFX(InternalMemCompareMem):\r
     pushq   %rsi\r
 ASM_GLOBAL ASM_PFX(InternalMemCompareMem)\r
 ASM_PFX(InternalMemCompareMem):\r
     pushq   %rsi\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/CopyMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/CopyMem.S
index 13a47dc1ebe9523d7e2f8125a97d3a56d9a1e563..d6fc9cb860ce91bdfcf4d47c8ec1f92f401a5a83 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/CopyMem.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/CopyMem.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -39,7 +39,7 @@ ASM_PFX(InternalMemCopyMem):
     pushq   %rdi\r
     movq    %rdx, %rsi                  # rsi <- Source\r
     movq    %rcx, %rdi                  # rdi <- Destination\r
     pushq   %rdi\r
     movq    %rdx, %rsi                  # rsi <- Source\r
     movq    %rcx, %rdi                  # rdi <- Destination\r

-    leaq    -1(%rsi,%r8,), %r9          # r9 <- Last byte of Source      \r
+    leaq    -1(%rsi,%r8,), %r9          # r9 <- Last byte of Source\r

     cmpq    %rdi, %rsi\r
     movq    %rdi, %rax                  # rax <- Destination as return value\r
     jae     L0                          # Copy forward if Source > Destination\r
     cmpq    %rdi, %rsi\r
     movq    %rdi, %rax                  # rax <- Destination as return value\r
     jae     L0                          # Copy forward if Source > Destination\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem.S
index 2391348b2c19b8720a64f126632bdd6b3a1b428d..c3a4d76b4f469a2f99808bde8651bed0f6fcfc9f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\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


@@ -47,10 +47,10 @@ ASM_PFX(InternalMemSetMem):
     movq    %rdx, %rcx  # rcx = Count\r
     shrq    $3, %rcx    # rcx = rcx / 8\r
     cld\r
     movq    %rdx, %rcx  # rcx = Count\r
     shrq    $3, %rcx    # rcx = rcx / 8\r
     cld\r

-    rep     stosq \r
+    rep     stosq\r

     movq    %rdx, %rcx  # rcx = rdx\r
     andq    $7, %rcx    # rcx = rcx & 7\r
     movq    %rdx, %rcx  # rcx = rdx\r
     andq    $7, %rcx    # rcx = rcx & 7\r

-    rep     stosb \r
+    rep     stosb\r

     popq    %rax        # rax = Buffer\r
     popq    %rbx\r
     popq    %rdi\r
     popq    %rax        # rax = Buffer\r
     popq    %rbx\r
     popq    %rdi\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c
index 9dd0b45e188e5cbb668f75132dc5e8bbd35417e6..9ab315b8cfe3758050375bc7980cc6cb8632c206 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c
@@ -11,8 +11,8 @@
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\r
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf b/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
index bcbf2cd0eaaf571dab91cb0163bb3b81e37cd875..8f274d83b006ac6ba6e33c0b9f98d69517edb1ea 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
+++ b/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Instance of Base Memory Library optimized for use in PEI phase.\r
 #\r
 ## @file\r
 #  Instance of Base Memory Library optimized for use in PEI phase.\r
 #\r

-#  Base Memory Library that is optimized for use in PEI phase.  \r
+#  Base Memory Library that is optimized for use in PEI phase.\r

 #  Uses REP, MMX, XMM registers as required for best performance.\r
 #\r
 #  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  Uses REP, MMX, XMM registers as required for best performance.\r
 #\r
 #  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r


@@ -23,7 +23,7 @@
   FILE_GUID                      = D6F43B1B-0F21-462b-B8B7-A033C3EB4261\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = D6F43B1B-0F21-462b-B8B7-A033C3EB4261\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = BaseMemoryLib \r
+  LIBRARY_CLASS                  = BaseMemoryLib\r

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

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/CompareMemWrapper.c
index c59000dc04f69bd35ae348800e3b051882423dd1..3a37a70e53bd889a6d23c0282f1915f4ef263716 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/CompareMemWrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   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 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r


@@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @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

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/CopyMemWrapper.c
index 9b76f0f1e1e742b7cdb44cf8463ea7259a079b3f..437253339f08c988052fcfcd885bbd25765b453e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/CopyMemWrapper.c
@@ -2,7 +2,7 @@
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c
index cbb385fddfba8b4b7de2df526202264e8ce101f1..4cc95d3aab563392e6901f2ee5bf24d8cb5aadfd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c
@@ -2,7 +2,7 @@
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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 @@
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r

-  \r
+\r

   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r
   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r


@@ -63,7 +63,7 @@ CopyGuid (
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r

-  \r
+\r

   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r
   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r


@@ -103,7 +103,7 @@ CompareGuid (
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem16Wrapper.c
index 4fd75fa2129651ef92b6f9781d443d8060a71715..3eb0cbb2133e247a4431ec9105ce98a306fdb83c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem16Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem32Wrapper.c
index fb30fa5f4d3e6f189adee96cf3e883e45dce824a..54bc4339e1656366a1a6da0dd82d79618115f9bd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem32Wrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -32,7 +32,7 @@
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem64Wrapper.c
index fceb6d12bf7f1723bae4b161a4c20c7d982f8336..19f98fa1f95bfeadb99e1f8d81e60a5cc8737a27 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem64Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem8Wrapper.c
index efbbe20a7089b102963adf9b08932a76787d40a3..ef63a54b7114b7bfa616d0410e3880ceae857d38 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem8Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r


@@ -57,19 +57,19 @@ ScanMem8 (
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r

- \r
+\r

   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r
   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r

-  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching \r
+  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching\r

   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/SetMemWrapper.c
index 8a3392718f46845728c28cd228b6e138cd1825c5..6e86472ace43dfec4450237b200bafafc29f5bf5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/SetMemWrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/ZeroMemWrapper.c
index 9dd0b45e188e5cbb668f75132dc5e8bbd35417e6..9ab315b8cfe3758050375bc7980cc6cb8632c206 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/ZeroMemWrapper.c
@@ -11,8 +11,8 @@
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\r
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
index aa78fe37b5267cc104caa94a2133f0f41e42c79d..049936deabd771cb198f57f03d1841c7ea54df77 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
+++ b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
@@ -23,7 +23,7 @@
   FILE_GUID                      = e7884bf4-51a1-485b-982a-ff89129983bc\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.1\r
   FILE_GUID                      = e7884bf4-51a1-485b-982a-ff89129983bc\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.1\r

-  LIBRARY_CLASS                  = BaseMemoryLib \r
+  LIBRARY_CLASS                  = BaseMemoryLib\r

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

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
index c59000dc04f69bd35ae348800e3b051882423dd1..3a37a70e53bd889a6d23c0282f1915f4ef263716 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   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 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r


@@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @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

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
index 9b76f0f1e1e742b7cdb44cf8463ea7259a079b3f..437253339f08c988052fcfcd885bbd25765b453e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
@@ -2,7 +2,7 @@
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
index 585cda6f8c8a1100328576814f3a6cdf224c0e1b..1977be7938adc4f26e8a48342123a1965382e941 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
 #------------------------------------------------------------------------------\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


@@ -49,6 +49,6 @@ ASM_PFX(InternalMemScanMem16):
     leal    -2(%edi), %eax\r
     jz      L0\r
     movl    %ecx, %eax\r
     leal    -2(%edi), %eax\r
     jz      L0\r
     movl    %ecx, %eax\r

-L0:    \r
+L0:\r

     pop     %edi\r
     ret\r
     pop     %edi\r
     ret\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
index 91f04fa8004bd3c409510b3f74c90cf9a93c57ec..9751b4a82b2e0a93b3b5cd23c57a10131d85d25e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
 #------------------------------------------------------------------------------\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


@@ -49,6 +49,6 @@ ASM_PFX(InternalMemScanMem32):
     leal    -4(%edi), %eax\r
     jz      L0\r
     movl    %ecx, %eax\r
     leal    -4(%edi), %eax\r
     jz      L0\r
     movl    %ecx, %eax\r

-L0:    \r
+L0:\r

     pop     %edi\r
     ret\r
     pop     %edi\r
     ret\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
index 5224cf7153a399b2d462f1a2d466b1eb4f38c848..3efc9b82d3b9792591e9a6bb52837a4d56e39bdb 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
 #------------------------------------------------------------------------------\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


@@ -58,6 +58,6 @@ L1:
     leal    -8(%edi), %eax\r
     jz      L2\r
     movl    %ecx, %eax\r
     leal    -8(%edi), %eax\r
     jz      L2\r
     movl    %ecx, %eax\r

-L2:    \r
+L2:\r

     pop     %edi\r
     ret\r
     pop     %edi\r
     ret\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
index d490ee7fd0451532119858e966fb1af0eb536f17..f8d8b7a736b3dea44ed7dba20ba43141c24ccc67 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
 #------------------------------------------------------------------------------\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


@@ -49,6 +49,6 @@ ASM_PFX(InternalMemScanMem8):
     leal    -1(%edi), %eax\r
     jz      L0\r
     movl    %ecx, %eax\r
     leal    -1(%edi), %eax\r
     jz      L0\r
     movl    %ecx, %eax\r

-L0:    \r
+L0:\r

     pop     %edi\r
     ret\r
     pop     %edi\r
     ret\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
index cbb385fddfba8b4b7de2df526202264e8ce101f1..4cc95d3aab563392e6901f2ee5bf24d8cb5aadfd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
@@ -2,7 +2,7 @@
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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 @@
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r

-  \r
+\r

   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r
   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r


@@ -63,7 +63,7 @@ CopyGuid (
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r

-  \r
+\r

   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r
   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r


@@ -103,7 +103,7 @@ CompareGuid (
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
index 4fd75fa2129651ef92b6f9781d443d8060a71715..3eb0cbb2133e247a4431ec9105ce98a306fdb83c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
index fb30fa5f4d3e6f189adee96cf3e883e45dce824a..54bc4339e1656366a1a6da0dd82d79618115f9bd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -32,7 +32,7 @@
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
index fceb6d12bf7f1723bae4b161a4c20c7d982f8336..19f98fa1f95bfeadb99e1f8d81e60a5cc8737a27 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
index efbbe20a7089b102963adf9b08932a76787d40a3..ef63a54b7114b7bfa616d0410e3880ceae857d38 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r


@@ -57,19 +57,19 @@ ScanMem8 (
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r

- \r
+\r

   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r
   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r

-  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching \r
+  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching\r

   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
index 8a3392718f46845728c28cd228b6e138cd1825c5..6e86472ace43dfec4450237b200bafafc29f5bf5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
index 9dd0b45e188e5cbb668f75132dc5e8bbd35417e6..9ab315b8cfe3758050375bc7980cc6cb8632c206 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
@@ -11,8 +11,8 @@
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\r
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
index 5b2417a9b008f1edaa4049f58e60bc1201f7a847..771fddaa451f421429c18dc703e8c8e22a5af0b8 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
+++ b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
@@ -22,7 +22,7 @@
   FILE_GUID                      = 65a18235-5096-4032-8c63-214f0249ce8d\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 65a18235-5096-4032-8c63-214f0249ce8d\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = BaseMemoryLib \r
+  LIBRARY_CLASS                  = BaseMemoryLib\r

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

diff --git a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
index c59000dc04f69bd35ae348800e3b051882423dd1..3a37a70e53bd889a6d23c0282f1915f4ef263716 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   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 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r


@@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @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

diff --git a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
index 9b76f0f1e1e742b7cdb44cf8463ea7259a079b3f..437253339f08c988052fcfcd885bbd25765b453e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
@@ -2,7 +2,7 @@
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
index cbb385fddfba8b4b7de2df526202264e8ce101f1..4cc95d3aab563392e6901f2ee5bf24d8cb5aadfd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
@@ -2,7 +2,7 @@
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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 @@
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r

-  \r
+\r

   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r
   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r


@@ -63,7 +63,7 @@ CopyGuid (
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r

-  \r
+\r

   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r
   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r


@@ -103,7 +103,7 @@ CompareGuid (
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
index 4fd75fa2129651ef92b6f9781d443d8060a71715..3eb0cbb2133e247a4431ec9105ce98a306fdb83c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
index fb30fa5f4d3e6f189adee96cf3e883e45dce824a..54bc4339e1656366a1a6da0dd82d79618115f9bd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -32,7 +32,7 @@
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
index fceb6d12bf7f1723bae4b161a4c20c7d982f8336..19f98fa1f95bfeadb99e1f8d81e60a5cc8737a27 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
index efbbe20a7089b102963adf9b08932a76787d40a3..ef63a54b7114b7bfa616d0410e3880ceae857d38 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r


@@ -57,19 +57,19 @@ ScanMem8 (
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r

- \r
+\r

   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r
   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r

-  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching \r
+  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching\r

   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
index 8a3392718f46845728c28cd228b6e138cd1825c5..6e86472ace43dfec4450237b200bafafc29f5bf5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/X64/CopyMem.S b/MdePkg/Library/BaseMemoryLibSse2/X64/CopyMem.S
index d8a58a70706ec3343ea479538b4aa537d3633cdf..bbe433d360a87c92172cf95e9501325f6e550b35 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/X64/CopyMem.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/X64/CopyMem.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
 #\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


@@ -46,8 +46,8 @@ ASM_PFX(InternalMemCopyMem):
     jae     L0                          # Copy forward if Source > Destination\r
     cmpq    %rdi, %r9                   # Overlapped?\r
     jae     L_CopyBackward              # Copy backward if overlapped\r
     jae     L0                          # Copy forward if Source > Destination\r
     cmpq    %rdi, %r9                   # Overlapped?\r
     jae     L_CopyBackward              # Copy backward if overlapped\r

-L0:            \r
-    xorq    %rcx, %rcx                    \r
+L0:\r
+    xorq    %rcx, %rcx\r

     subq    %rdi, %rcx                  # rcx <- -rdi\r
     andq    $15, %rcx                   # rcx + rsi should be 16 bytes aligned\r
     jz      L1                          # skip if rcx == 0\r
     subq    %rdi, %rcx                  # rcx <- -rdi\r
     andq    $15, %rcx                   # rcx + rsi should be 16 bytes aligned\r
     jz      L1                          # skip if rcx == 0\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
index 9dd0b45e188e5cbb668f75132dc5e8bbd35417e6..9ab315b8cfe3758050375bc7980cc6cb8632c206 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
@@ -11,8 +11,8 @@
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\r
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.uni b/MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.uni
index f3e9a40aa486b11e5ae25ba7f239213aeb457039..8660ace7acc82c19abe070279b17796655c1dbf1 100644 (file)
--- a/MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.uni
+++ b/MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.uni
@@ -3,12 +3,12 @@
 //\r
 // implementation, and allocates and releases tree nodes with\r
 // MemoryAllocationLib.\r
 //\r
 // implementation, and allocates and releases tree nodes with\r
 // MemoryAllocationLib.\r

-// \r
+//\r

 // This library instance is useful when a fast associative container is needed.\r
 // Worst case time complexity is O(log n) for Find(), Next(), Prev(), Min(),\r
 // Max(), Insert(), and Delete(), where "n" is the number of elements in the\r
 // tree. Complete ordered traversal takes O(n) time.\r
 // This library instance is useful when a fast associative container is needed.\r
 // Worst case time complexity is O(log n) for Find(), Next(), Prev(), Min(),\r
 // Max(), Insert(), and Delete(), where "n" is the number of elements in the\r
 // tree. Complete ordered traversal takes O(n) time.\r

-// \r
+//\r

 // The implementation is also useful as a fast priority queue.\r
 //\r
 // Copyright (C) 2014, Red Hat, Inc.\r
 // The implementation is also useful as a fast priority queue.\r
 //\r
 // Copyright (C) 2014, Red Hat, Inc.\r


@@ -17,7 +17,7 @@
 // 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
 // http://opensource.org/licenses/bsd-license.php.\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
 // 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\r
 // 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\r
 // IMPLIED.\r

diff --git a/MdePkg/Library/BasePalLibNull/BasePalLibNull.inf b/MdePkg/Library/BasePalLibNull/BasePalLibNull.inf
index 927c6d34c4f2fedcf589581a993e6ab7bb217ed0..0c9ab53bf7124bbbb2da52437115601eea6b6d10 100644 (file)
--- a/MdePkg/Library/BasePalLibNull/BasePalLibNull.inf
+++ b/MdePkg/Library/BasePalLibNull/BasePalLibNull.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Null instance of PAL Library with empty functions.\r
 #\r
 ## @file\r
 #  Null instance of PAL Library with empty functions.\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


@@ -20,7 +20,7 @@
   FILE_GUID                      = 632D5625-B73D-43b8-AF30-8D225D96168E\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 632D5625-B73D-43b8-AF30-8D225D96168E\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PalLib \r
+  LIBRARY_CLASS                  = PalLib\r

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

diff --git a/MdePkg/Library/BasePalLibNull/PalCall.c b/MdePkg/Library/BasePalLibNull/PalCall.c
index 174c28ee67c0b7bab1982b4fa8e01a54ebe0ac32..d28bb838a3691e4e44e4cac386f5fc06fb69a62d 100644 (file)
--- a/MdePkg/Library/BasePalLibNull/PalCall.c
+++ b/MdePkg/Library/BasePalLibNull/PalCall.c
@@ -1,16 +1,16 @@
 /** @file\r
 /** @file\r

-  \r
+\r

   Template and Sample instance of PalCallLib.\r
   Template and Sample instance of PalCallLib.\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
+\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
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-     \r
+\r

 **/\r
 \r
 #include <Base.h>\r
 **/\r
 \r
 #include <Base.h>\r

diff --git a/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf b/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
index 4b511b336cd7b60147f131466cd291be1ab897e3..8a566a1a8e5779a2a6fc6e21436251e3ae70807b 100644 (file)
--- a/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
+++ b/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
@@ -4,7 +4,7 @@
 #  PCD Library that only provides access to Feature Flag, Fixed At Build,\r
 #  and Binary Patch typed PCD entries. Access to Dynamic PCD entries is ignored.\r
 #\r
 #  PCD Library that only provides access to Feature Flag, Fixed At Build,\r
 #  and Binary Patch typed PCD entries. Access to Dynamic PCD entries is ignored.\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


@@ -23,7 +23,7 @@
   FILE_GUID                      = 40096a3a-5c2a-4fbc-aef7-5475dd7ab334\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 40096a3a-5c2a-4fbc-aef7-5475dd7ab334\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PcdLib \r
+  LIBRARY_CLASS                  = PcdLib\r

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

diff --git a/MdePkg/Library/BasePcdLibNull/PcdLib.c b/MdePkg/Library/BasePcdLibNull/PcdLib.c
index 4fc3672b7a364c0d3d7ca9b5cab9da891d1df91c..fbaff2b9c0f0f1d5ac329c54d146063fbd09856e 100644 (file)
--- a/MdePkg/Library/BasePcdLibNull/PcdLib.c
+++ b/MdePkg/Library/BasePcdLibNull/PcdLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   A emptry template implementation of PCD Library.\r
 \r
 /** @file\r
   A emptry template implementation of PCD Library.\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


@@ -24,7 +24,7 @@
 \r
   Sets the current SKU in the PCD database to the value specified by SkuId.  SkuId is returned.\r
 \r
 \r
   Sets the current SKU in the PCD database to the value specified by SkuId.  SkuId is returned.\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
   @return Return the SKU ID that just be set.\r
                     set values associated with a PCD token.\r
 \r
   @return Return the SKU ID that just be set.\r


@@ -43,12 +43,12 @@ LibPcdSetSku (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 8-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 8-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the 8-bit value for the token specified by TokenNumber. \r
+  @return Returns the 8-bit value for the token specified by TokenNumber.\r

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


@@ -66,12 +66,12 @@ LibPcdGet8 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 16-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 16-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the 16-bit value for the token specified by TokenNumber. \r
+  @return Returns the 16-bit value for the token specified by TokenNumber.\r

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


@@ -89,8 +89,8 @@ LibPcdGet16 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 32-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 32-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r


@@ -112,7 +112,7 @@ LibPcdGet32 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 64-bit value for the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
   Returns the 64-bit value for the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r


@@ -135,7 +135,7 @@ LibPcdGet64 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the pointer to the buffer of the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
   Returns the pointer to the buffer of the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r


@@ -158,15 +158,15 @@ LibPcdGetPtr (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the Boolean value of the token specified by TokenNumber. \r
+\r
+  Returns the Boolean value of the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the Boolean value of the token specified by TokenNumber. \r
+  @return Returns the Boolean value of the token specified by TokenNumber.\r

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

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 LibPcdGetBool (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 LibPcdGetBool (\r
   IN UINTN             TokenNumber\r


@@ -184,7 +184,7 @@ LibPcdGetBool (
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the size of the token specified by TokenNumber. \r
+  @return Returns the size of the token specified by TokenNumber.\r

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


@@ -202,12 +202,12 @@ LibPcdGetSize (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 8-bit value for the token specified by TokenNumber and Guid.\r
   Returns the 8-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid The pointer to a 128-bit unique value that designates\r

               which namespace to retrieve a value from.\r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
               which namespace to retrieve a value from.\r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r


@@ -232,10 +232,10 @@ LibPcdGetEx8 (
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
   Returns the 16-bit value for the token specified by TokenNumber and Guid.\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
   Returns the 16-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid The pointer to a 128-bit unique value that designates\r

               which namespace to retrieve a value from.\r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
               which namespace to retrieve a value from.\r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r


@@ -258,9 +258,9 @@ LibPcdGetEx16 (
 \r
 /**\r
   Returns the 32-bit value for the token specified by TokenNumber and Guid.\r
 \r
 /**\r
   Returns the 32-bit value for the token specified by TokenNumber and Guid.\r

-  If Guid is NULL, then ASSERT(). \r
+  If Guid is NULL, then ASSERT().\r

 \r
 \r

-  @param[in]  Guid The pointer to a 128-bit unique value that designates \r
+  @param[in]  Guid The pointer to a 128-bit unique value that designates\r

               which namespace to retrieve a value from.\r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
               which namespace to retrieve a value from.\r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r


@@ -283,12 +283,12 @@ LibPcdGetEx32 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 64-bit value for the token specified by TokenNumber and Guid.\r
   Returns the 64-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -311,12 +311,12 @@ LibPcdGetEx64 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the pointer to the buffer of token specified by TokenNumber and Guid.\r
   Returns the pointer to the buffer of token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -339,12 +339,12 @@ LibPcdGetExPtr (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the Boolean value of the token specified by TokenNumber and Guid. \r
-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  Returns the Boolean value of the token specified by TokenNumber and Guid.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -367,12 +367,12 @@ LibPcdGetExBool (
 \r
 /**\r
   This function provides a means by which to retrieve the size of a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve the size of a given PCD token.\r

-  \r
-  Returns the size of the token specified by TokenNumber and Guid. \r
-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  Returns the size of the token specified by TokenNumber and Guid.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -396,8 +396,8 @@ LibPcdGetExSize (
 #ifndef DISABLE_NEW_DEPRECATED_INTERFACES\r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 #ifndef DISABLE_NEW_DEPRECATED_INTERFACES\r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 8-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -422,8 +422,8 @@ LibPcdSet8 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 16-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -448,8 +448,8 @@ LibPcdSet16 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 32-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -474,8 +474,8 @@ LibPcdSet32 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 64-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -500,19 +500,19 @@ LibPcdSet64 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets a buffer for the token specified by TokenNumber to the value \r
-  specified by Buffer and SizeOfBuffer.  Buffer is returned.  \r
-  If SizeOfBuffer is greater than the maximum size support by TokenNumber, \r
-  then set SizeOfBuffer to the maximum size supported by TokenNumber and \r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value\r
+  specified by Buffer and SizeOfBuffer.  Buffer is returned.\r
+  If SizeOfBuffer is greater than the maximum size support by TokenNumber,\r
+  then set SizeOfBuffer to the maximum size supported by TokenNumber and\r

   return NULL to indicate that the set operation was not actually performed.\r
 \r
   return NULL to indicate that the set operation was not actually performed.\r
 \r

-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the \r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the\r

   maximum size supported by TokenName and NULL must be returned.\r
   maximum size supported by TokenName and NULL must be returned.\r

-  \r
+\r

   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
+\r

   @param[in]      TokenNumber   The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
   @param[in]      Buffer        A pointer to the buffer to set.\r
   @param[in]      TokenNumber   The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
   @param[in]      Buffer        A pointer to the buffer to set.\r


@@ -537,8 +537,8 @@ LibPcdSetPtr (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the Boolean value for the token specified by TokenNumber \r
+\r
+  Sets the Boolean value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -563,13 +563,13 @@ LibPcdSetBool (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 8-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r


@@ -594,13 +594,13 @@ LibPcdSetEx8 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 16-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r


@@ -625,13 +625,13 @@ LibPcdSetEx16 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 32-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r


@@ -656,13 +656,13 @@ LibPcdSetEx32 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 64-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r


@@ -687,18 +687,18 @@ LibPcdSetEx64 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets a buffer for the token specified by TokenNumber to the value specified by \r
-  Buffer and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  the maximum size support by TokenNumber, then set SizeOfBuffer to the maximum size \r
-  supported by TokenNumber and return NULL to indicate that the set operation \r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value specified by\r
+  Buffer and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  the maximum size support by TokenNumber, then set SizeOfBuffer to the maximum size\r
+  supported by TokenNumber and return NULL to indicate that the set operation\r

   was not actually performed.\r
   was not actually performed.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
-  @param[in]  Guid              The pointer to a 128-bit unique value that \r
+\r
+  @param[in]  Guid              The pointer to a 128-bit unique value that\r

                                 designates which namespace to set a value from.\r
   @param[in]  TokenNumber       The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
                                 designates which namespace to set a value from.\r
   @param[in]  TokenNumber       The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r


@@ -725,13 +725,13 @@ LibPcdSetExPtr (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the Boolean value for the token specified by TokenNumber and \r
+\r
+  Sets the Boolean value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The Boolean value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The Boolean value to set.\r


@@ -1091,18 +1091,18 @@ LibPcdSetExBoolS (
 \r
 /**\r
   Set up a notification function that is called when a specified token is set.\r
 \r
 /**\r
   Set up a notification function that is called when a specified token is set.\r

-  \r
-  When the token specified by TokenNumber and Guid is set, \r
-  then notification function specified by NotificationFunction is called.  \r
-  If Guid is NULL, then the default token space is used. \r
-  \r
+\r
+  When the token specified by TokenNumber and Guid is set,\r
+  then notification function specified by NotificationFunction is called.\r
+  If Guid is NULL, then the default token space is used.\r
+\r

   If NotificationFunction is NULL, then ASSERT().\r
 \r
   If NotificationFunction is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid      The pointer to a 128-bit unique value that designates which \r
-                        namespace to set a value from.  If NULL, then the default \r
+  @param[in]  Guid      The pointer to a 128-bit unique value that designates which\r
+                        namespace to set a value from.  If NULL, then the default\r

                         token space is used.\r
   @param[in]  TokenNumber   The PCD token number to monitor.\r
                         token space is used.\r
   @param[in]  TokenNumber   The PCD token number to monitor.\r

-  @param[in]  NotificationFunction  The function to call when the token \r
+  @param[in]  NotificationFunction  The function to call when the token\r

                                     specified by Guid and TokenNumber is set.\r
 \r
 **/\r
                                     specified by Guid and TokenNumber is set.\r
 \r
 **/\r


@@ -1121,13 +1121,13 @@ LibPcdCallbackOnSet (
 \r
 /**\r
   Disable a notification function that was established with LibPcdCallbackonSet().\r
 \r
 /**\r
   Disable a notification function that was established with LibPcdCallbackonSet().\r

-  \r
-  Disable a notification function that was previously established with LibPcdCallbackOnSet(). \r
-  \r
+\r
+  Disable a notification function that was previously established with LibPcdCallbackOnSet().\r
+\r

   If NotificationFunction is NULL, then ASSERT().\r
   If NotificationFunction is NULL, then ASSERT().\r

-  If LibPcdCallbackOnSet() was not previously called with Guid, TokenNumber, \r
+  If LibPcdCallbackOnSet() was not previously called with Guid, TokenNumber,\r

   and NotificationFunction, then ASSERT().\r
   and NotificationFunction, then ASSERT().\r

-  \r
+\r

   @param[in]  Guid          Specify the GUID token space.\r
   @param[in]  TokenNumber   Specify the token number.\r
   @param[in]  NotificationFunction The callback function to be unregistered.\r
   @param[in]  Guid          Specify the GUID token space.\r
   @param[in]  TokenNumber   Specify the token number.\r
   @param[in]  NotificationFunction The callback function to be unregistered.\r


@@ -1148,24 +1148,24 @@ LibPcdCancelCallback (
 \r
 /**\r
   Retrieves the next token in a token space.\r
 \r
 /**\r
   Retrieves the next token in a token space.\r

-  \r
-  Retrieves the next PCD token number from the token space specified by Guid.  \r
-  If Guid is NULL, then the default token space is used.  If TokenNumber is 0, \r
-  then the first token number is returned.  Otherwise, the token number that \r
-  follows TokenNumber in the token space is returned.  If TokenNumber is the last \r
-  token number in the token space, then 0 is returned.  \r
-  \r
+\r
+  Retrieves the next PCD token number from the token space specified by Guid.\r
+  If Guid is NULL, then the default token space is used.  If TokenNumber is 0,\r
+  then the first token number is returned.  Otherwise, the token number that\r
+  follows TokenNumber in the token space is returned.  If TokenNumber is the last\r
+  token number in the token space, then 0 is returned.\r
+\r

   If TokenNumber is not 0 and is not in the token space specified by Guid, then ASSERT().\r
 \r
   If TokenNumber is not 0 and is not in the token space specified by Guid, then ASSERT().\r
 \r

-  @param[in]  Guid        The pointer to a 128-bit unique value that designates which namespace \r
+  @param[in]  Guid        The pointer to a 128-bit unique value that designates which namespace\r

                           to set a value from.  If NULL, then the default token space is used.\r
                           to set a value from.  If NULL, then the default token space is used.\r

-  @param[in]  TokenNumber The previous PCD token number.  If 0, then retrieves the first PCD \r
+  @param[in]  TokenNumber The previous PCD token number.  If 0, then retrieves the first PCD\r

                           token number.\r
 \r
   @return The next valid token number.\r
 \r
 **/\r
                           token number.\r
 \r
   @return The next valid token number.\r
 \r
 **/\r

-UINTN           \r
+UINTN\r

 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r


@@ -1181,18 +1181,18 @@ LibPcdGetNextToken (
 \r
 /**\r
   Used to retrieve the list of available PCD token space GUIDs.\r
 \r
 /**\r
   Used to retrieve the list of available PCD token space GUIDs.\r

-  \r
+\r

   Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces\r
   in the platform.\r
   If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.\r
   If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.\r
   Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces\r
   in the platform.\r
   If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.\r
   If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.\r

-  \r
+\r

   @param  TokenSpaceGuid  The pointer to a PCD token space GUID.\r
 \r
   @return The next valid token namespace.\r
 \r
 **/\r
   @param  TokenSpaceGuid  The pointer to a PCD token space GUID.\r
 \r
   @return The next valid token namespace.\r
 \r
 **/\r

-GUID *           \r
+GUID *\r

 EFIAPI\r
 LibPcdGetNextTokenSpace (\r
   IN CONST GUID  *TokenSpaceGuid\r
 EFIAPI\r
 LibPcdGetNextTokenSpace (\r
   IN CONST GUID  *TokenSpaceGuid\r


@@ -1206,24 +1206,24 @@ LibPcdGetNextTokenSpace (
 \r
 /**\r
   Sets a value of a patchable PCD entry that is type pointer.\r
 \r
 /**\r
   Sets a value of a patchable PCD entry that is type pointer.\r

-  \r
-  Sets the PCD entry specified by PatchVariable to the value specified by Buffer \r
-  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return \r
-  NULL to indicate that the set operation was not actually performed.  \r
-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to \r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified by Buffer\r
+  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return\r
+  NULL to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r

   MaximumDatumSize and NULL must be returned.\r
   MaximumDatumSize and NULL must be returned.\r

-  \r
+\r

   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r
   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r

-  @param[out] PatchVariable     A pointer to the global variable in a module that is \r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r

                                 the target of the set operation.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
                                 the target of the set operation.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return Return the pointer to the buffer that was set.\r
 \r
 **/\r
   @return Return the pointer to the buffer that was set.\r
 \r
 **/\r


@@ -1238,7 +1238,7 @@ LibPatchPcdSetPtr (
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r


@@ -1248,9 +1248,9 @@ LibPatchPcdSetPtr (
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r

-    \r
+\r

   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r

-  \r
+\r

   return (VOID *) Buffer;\r
 }\r
 \r
   return (VOID *) Buffer;\r
 }\r
 \r


@@ -1273,7 +1273,7 @@ LibPatchPcdSetPtr (
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return The status of the set operation.\r
 \r
 **/\r
   @return The status of the set operation.\r
 \r
 **/\r


@@ -1288,7 +1288,7 @@ LibPatchPcdSetPtrS (
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r


@@ -1306,26 +1306,26 @@ LibPatchPcdSetPtrS (
 \r
 /**\r
   Sets a value and size of a patchable PCD entry that is type pointer.\r
 \r
 /**\r
   Sets a value and size of a patchable PCD entry that is type pointer.\r

-  \r
-  Sets the PCD entry specified by PatchVariable to the value specified by Buffer \r
-  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return \r
-  NULL to indicate that the set operation was not actually performed.  \r
-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to \r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified by Buffer\r
+  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return\r
+  NULL to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r

   MaximumDatumSize and NULL must be returned.\r
   MaximumDatumSize and NULL must be returned.\r

-  \r
+\r

   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfPatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r
   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfPatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r

-  @param[out] PatchVariable     A pointer to the global variable in a module that is \r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r

                                 the target of the set operation.\r
   @param[out] SizeOfPatchVariable A pointer to the size, in bytes, of PatchVariable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
                                 the target of the set operation.\r
   @param[out] SizeOfPatchVariable A pointer to the size, in bytes, of PatchVariable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return Return the pointer to the buffer been set.\r
 \r
 **/\r
   @return Return the pointer to the buffer been set.\r
 \r
 **/\r


@@ -1342,7 +1342,7 @@ LibPatchPcdSetPtrAndSize (
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r


@@ -1352,10 +1352,10 @@ LibPatchPcdSetPtrAndSize (
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r

-    \r
+\r

   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
   *SizeOfPatchVariable = *SizeOfBuffer;\r
   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
   *SizeOfPatchVariable = *SizeOfBuffer;\r

-  \r
+\r

   return (VOID *) Buffer;\r
 }\r
 \r
   return (VOID *) Buffer;\r
 }\r
 \r


@@ -1380,7 +1380,7 @@ LibPatchPcdSetPtrAndSize (
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return The status of the set operation.\r
 \r
 **/\r
   @return The status of the set operation.\r
 \r
 **/\r


@@ -1397,7 +1397,7 @@ LibPatchPcdSetPtrAndSizeS (
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r

diff --git a/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf b/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
index 17b81e076a697d232961857c3762f604dc036ea6..049159c16a550c503bf2acf56c7e1382e88c6a99 100644 (file)
--- a/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
+++ b/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
@@ -4,7 +4,7 @@
 #  PCI CF8 Library that uses I/O ports 0xCF8 and 0xCFC to perform PCI Configuration cycles.\r
 #  Layers on top of an I/O Library instance.\r
 #\r
 #  PCI CF8 Library that uses I/O ports 0xCF8 and 0xCFC to perform PCI Configuration cycles.\r
 #  Layers on top of an I/O Library instance.\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


@@ -23,7 +23,7 @@
   FILE_GUID                      = 472ab06d-9810-4c00-bb7f-dad1828fc1ab\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 472ab06d-9810-4c00-bb7f-dad1828fc1ab\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PciCf8Lib \r
+  LIBRARY_CLASS                  = PciCf8Lib\r

 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r

diff --git a/MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c b/MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c
index 828508b2ebca13cce70cd1b63e6f0db836c08f11..9d8affc7497ad54b040ec05b71727f50cb18119c 100644 (file)
--- a/MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c
+++ b/MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c
@@ -2,7 +2,7 @@
   PCI CF8 Library functions that use I/O ports 0xCF8 and 0xCFC to perform PCI Configuration cycles.\r
   Layers on top of an I/O Library instance.\r
 \r
   PCI CF8 Library functions that use I/O ports 0xCF8 and 0xCFC to perform PCI Configuration cycles.\r
   Layers on top of an I/O Library instance.\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


@@ -61,20 +61,20 @@
   ASSERT (((A) & (~0xffff0ff | (M))) == 0)\r
 \r
 /**\r
   ASSERT (((A) & (~0xffff0ff | (M))) == 0)\r
 \r
 /**\r

-  Registers a PCI device so PCI configuration registers may be accessed after \r
+  Registers a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
-  Registers the PCI device specified by Address so all the PCI configuration registers \r
+\r
+  Registers the PCI device specified by Address so all the PCI configuration registers\r

   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r
   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r

-  \r
+\r

   If Address > 0x0FFFFFFF, then ASSERT().\r
   If the register specified by Address >= 0x100, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If Address > 0x0FFFFFFF, then ASSERT().\r
   If the register specified by Address >= 0x100, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r


@@ -117,7 +117,7 @@ PciCf8Read8 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -155,7 +155,7 @@ PciCf8Write8 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -200,7 +200,7 @@ PciCf8Or8 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -245,7 +245,7 @@ PciCf8And8 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -293,7 +293,7 @@ PciCf8AndThenOr8 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -341,7 +341,7 @@ PciCf8BitFieldRead8 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -393,7 +393,7 @@ PciCf8BitFieldWrite8 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -449,7 +449,7 @@ PciCf8BitFieldOr8 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -505,7 +505,7 @@ PciCf8BitFieldAnd8 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -566,7 +566,7 @@ PciCf8BitFieldAndThenOr8(
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT8    Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 0);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -609,7 +609,7 @@ PciCf8Read16 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -648,7 +648,7 @@ PciCf8Write16 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -694,7 +694,7 @@ PciCf8Or16 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -740,7 +740,7 @@ PciCf8And16 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -789,7 +789,7 @@ PciCf8AndThenOr16 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -838,7 +838,7 @@ PciCf8BitFieldRead16 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -891,7 +891,7 @@ PciCf8BitFieldWrite16 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -948,7 +948,7 @@ PciCf8BitFieldOr16 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1005,7 +1005,7 @@ PciCf8BitFieldAnd16 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1067,7 +1067,7 @@ PciCf8BitFieldAndThenOr16(
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT16   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 1);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1110,7 +1110,7 @@ PciCf8Read32 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1149,7 +1149,7 @@ PciCf8Write32 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1195,7 +1195,7 @@ PciCf8Or32 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1241,7 +1241,7 @@ PciCf8And32 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1290,7 +1290,7 @@ PciCf8AndThenOr32 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1339,7 +1339,7 @@ PciCf8BitFieldRead32 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1392,7 +1392,7 @@ PciCf8BitFieldWrite32 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1449,7 +1449,7 @@ PciCf8BitFieldOr32 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1506,7 +1506,7 @@ PciCf8BitFieldAnd32 (
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r


@@ -1568,7 +1568,7 @@ PciCf8BitFieldAndThenOr32(
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r
   BOOLEAN  InterruptState;\r
   UINT32   AddressPort;\r
   UINT32   Result;\r

-  \r
+\r

   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r
   ASSERT_INVALID_PCI_ADDRESS (Address, 3);\r
   InterruptState = SaveAndDisableInterrupts ();\r
   AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT);\r

diff --git a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
index 4b14b5d89e8de3fb495e91379ed2d9406385a586..8c96d9a414be9393e617fed9e8a46c4dcb88ea14 100644 (file)
--- a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
+++ b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
@@ -4,7 +4,7 @@
 #  PCI Express Library that uses the 256 MB PCI Express MMIO window to perform\r
 #  PCI Configuration cycles. Layers on top of an I/O Library instance.\r
 #\r
 #  PCI Express Library that uses the 256 MB PCI Express MMIO window to perform\r
 #  PCI Configuration cycles. Layers on top of an I/O Library instance.\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


@@ -23,7 +23,7 @@
   FILE_GUID                      = 287e50f4-a188-4699-b907-3e4080ca5688\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 287e50f4-a188-4699-b907-3e4080ca5688\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PciExpressLib \r
+  LIBRARY_CLASS                  = PciExpressLib\r

 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r

diff --git a/MdePkg/Library/BasePciExpressLib/PciExpressLib.c b/MdePkg/Library/BasePciExpressLib/PciExpressLib.c
index 61be0098a68ba4706001c1172998cb15100a0bf1..988e91c681177903b93d7ba20fbc9a3e99057e1c 100644 (file)
--- a/MdePkg/Library/BasePciExpressLib/PciExpressLib.c
+++ b/MdePkg/Library/BasePciExpressLib/PciExpressLib.c
@@ -5,7 +5,7 @@
   All assertions for I/O operations are handled in MMIO functions in the IoLib\r
   Library.\r
 \r
   All assertions for I/O operations are handled in MMIO functions in the IoLib\r
   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


@@ -37,20 +37,20 @@
   ASSERT (((A) & ~0xfffffff) == 0)\r
 \r
 /**\r
   ASSERT (((A) & ~0xfffffff) == 0)\r
 \r
 /**\r

-  Registers a PCI device so PCI configuration registers may be accessed after \r
+  Registers a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
-  Registers the PCI device specified by Address so all the PCI configuration \r
-  registers associated with that PCI device may be accessed after SetVirtualAddressMap() \r
+\r
+  Registers the PCI device specified by Address so all the PCI configuration\r
+  registers associated with that PCI device may be accessed after SetVirtualAddressMap()\r

   is called.\r
   is called.\r

-  \r
+\r

   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r


@@ -70,10 +70,10 @@ PciExpressRegisterForRuntimeAccess (
 \r
 /**\r
   Gets the base address of PCI Express.\r
 \r
 /**\r
   Gets the base address of PCI Express.\r

-  \r
+\r

   This internal functions retrieves PCI Express Base Address via a PCD entry\r
   PcdPciExpressBaseAddress.\r
   This internal functions retrieves PCI Express Base Address via a PCD entry\r
   PcdPciExpressBaseAddress.\r

-  \r
+\r

   @return The base address of PCI Express.\r
 \r
 **/\r
   @return The base address of PCI Express.\r
 \r
 **/\r

diff --git a/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf b/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
index 9409332cb5326d3816ea250a9f03ffa07cf7f176..4714944e68d5743b0d9a58f952a779d5611b3872 100644 (file)
--- a/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
+++ b/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
@@ -4,7 +4,7 @@
 #  PCI Library that uses I/O ports 0xCF8 and 0xCFC to perform\r
 #  PCI Configuration cycles. Layers on top of one PCI CF8 Library instance.\r
 #\r
 #  PCI Library that uses I/O ports 0xCF8 and 0xCFC to perform\r
 #  PCI Configuration cycles. Layers on top of one PCI CF8 Library instance.\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


@@ -23,7 +23,7 @@
   FILE_GUID                      = 28bde99c-e8a7-4e3e-9a8a-e66cd64f31c6\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 28bde99c-e8a7-4e3e-9a8a-e66cd64f31c6\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PciLib \r
+  LIBRARY_CLASS                  = PciLib\r

 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r

diff --git a/MdePkg/Library/BasePciLibCf8/PciLib.c b/MdePkg/Library/BasePciLibCf8/PciLib.c
index f5f21475d8bd40333dc14642a4250dcb5a0d3197..6dd888fee15078d3c9a26224c227a0151c63ff69 100644 (file)
--- a/MdePkg/Library/BasePciLibCf8/PciLib.c
+++ b/MdePkg/Library/BasePciLibCf8/PciLib.c
@@ -2,7 +2,7 @@
   PCI Library functions that use I/O ports 0xCF8 and 0xCFC to perform\r
   PCI Configuration cycles. Layers on top of one PCI CF8 Library instance.\r
 \r
   PCI Library functions that use I/O ports 0xCF8 and 0xCFC to perform\r
   PCI Configuration cycles. Layers on top of one PCI CF8 Library instance.\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


@@ -20,19 +20,19 @@
 #include <Library/PciCf8Lib.h>\r
 \r
 /**\r
 #include <Library/PciCf8Lib.h>\r
 \r
 /**\r

-  Registers a PCI device so PCI configuration registers may be accessed after \r
+  Registers a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
-  Registers the PCI device specified by Address so all the PCI configuration registers \r
+\r
+  Registers the PCI device specified by Address so all the PCI configuration registers\r

   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r
   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r

-  \r
+\r

   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r

diff --git a/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf b/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
index 6ccd54ff9d6ed3338833fd860e01132085483c76..a60b5a11486e938fe9b158d73489c2ee5a3a55e9 100644 (file)
--- a/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
+++ b/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
@@ -4,7 +4,7 @@
 #  PCI Library that uses the 256 MB PCI Express MMIO window to perform PCI\r
 #  Configuration cycles. Layers on one PCI Express Library instance.\r
 #\r
 #  PCI Library that uses the 256 MB PCI Express MMIO window to perform PCI\r
 #  Configuration cycles. Layers on one PCI Express Library instance.\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


@@ -23,7 +23,7 @@
   FILE_GUID                      = 8987081e-daeb-44a9-8bef-a195b22d9417\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 8987081e-daeb-44a9-8bef-a195b22d9417\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PciLib \r
+  LIBRARY_CLASS                  = PciLib\r

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

diff --git a/MdePkg/Library/BasePciLibPciExpress/PciLib.c b/MdePkg/Library/BasePciLibPciExpress/PciLib.c
index 487a0389b9aff081672ae2157fc424b0b02de381..d52c973a0cfe0db8ee64bace15cc446f30ae87c6 100644 (file)
--- a/MdePkg/Library/BasePciLibPciExpress/PciLib.c
+++ b/MdePkg/Library/BasePciLibPciExpress/PciLib.c
@@ -2,7 +2,7 @@
   PCI Library functions that use the 256 MB PCI Express MMIO window to perform PCI\r
   Configuration cycles. Layers on PCI Express Library.\r
 \r
   PCI Library functions that use the 256 MB PCI Express MMIO window to perform PCI\r
   Configuration cycles. Layers on PCI Express 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


@@ -20,19 +20,19 @@
 #include <Library/PciExpressLib.h>\r
 \r
 /**\r
 #include <Library/PciExpressLib.h>\r
 \r
 /**\r

-  Registers a PCI device so PCI configuration registers may be accessed after \r
+  Registers a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
-  Registers the PCI device specified by Address so all the PCI configuration registers \r
+\r
+  Registers the PCI device specified by Address so all the PCI configuration registers\r

   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r
   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r

-  \r
+\r

   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r

diff --git a/MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf b/MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
index ecc770aca7fe5b59fba6bb941e157cda1eaa6c03..b385cbb22198aba2ef77d96d736eb86c108d4889 100644 (file)
--- a/MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
+++ b/MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Null PE/Coff Extra Action library instances with empty functions.\r
 #\r
 ## @file\r
 #  Null PE/Coff Extra Action library instances with empty functions.\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                      = 0EB84DA1-267A-40b4-8347-1F48694C8B47\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 0EB84DA1-267A-40b4-8347-1F48694C8B47\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PeCoffExtraActionLib \r
+  LIBRARY_CLASS                  = PeCoffExtraActionLib\r

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

diff --git a/MdePkg/Library/BasePeCoffExtraActionLibNull/PeCoffExtraActionLib.c b/MdePkg/Library/BasePeCoffExtraActionLibNull/PeCoffExtraActionLib.c
index 3fb2827d0f756b547123d61d809e0fba62baabda..fcd33c132e0f2d6e07847496e35d465d4570b798 100644 (file)
--- a/MdePkg/Library/BasePeCoffExtraActionLibNull/PeCoffExtraActionLib.c
+++ b/MdePkg/Library/BasePeCoffExtraActionLibNull/PeCoffExtraActionLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Null PE/Coff Extra Action library instances with empty functions.\r
 \r
 /** @file\r
   Null PE/Coff Extra Action library instances with empty functions.\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


@@ -32,14 +32,14 @@ PeCoffLoaderRelocateImageExtraAction (
   )\r
 {\r
   ASSERT (ImageContext != NULL);\r
   )\r
 {\r
   ASSERT (ImageContext != NULL);\r

-}  \r
+}\r

 \r
 /**\r
   Performs additional actions just before a PE/COFF image is unloaded.  Any resources\r
   that were allocated by PeCoffLoaderRelocateImageExtraAction() must be freed.\r
 \r
 /**\r
   Performs additional actions just before a PE/COFF image is unloaded.  Any resources\r
   that were allocated by PeCoffLoaderRelocateImageExtraAction() must be freed.\r

-  \r
+\r

   If ImageContext is NULL, then ASSERT().\r
   If ImageContext is NULL, then ASSERT().\r

-  \r
+\r

   @param  ImageContext  The pointer to the image context structure that describes the\r
                         PE/COFF image that is being unloaded.\r
 \r
   @param  ImageContext  The pointer to the image context structure that describes the\r
                         PE/COFF image that is being unloaded.\r
 \r

diff --git a/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf b/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
index b6eed82d5f80f0aa76ac389d29a468168dfbacd3..784dac4a50dc440ce1877c694a68284354d1b3be 100644 (file)
--- a/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
+++ b/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  PE/COFF Entry Point Library implementation.\r
 #\r
 ## @file\r
 #  PE/COFF Entry Point Library implementation.\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


@@ -20,7 +20,7 @@
   FILE_GUID                      = be490364-73d2-420d-950e-f6450ca75dfb\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = be490364-73d2-420d-950e-f6450ca75dfb\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PeCoffGetEntryPointLib \r
+  LIBRARY_CLASS                  = PeCoffGetEntryPointLib\r

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

diff --git a/MdePkg/Library/BasePeCoffGetEntryPointLib/PeCoffGetEntryPoint.c b/MdePkg/Library/BasePeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
index e1ddc8bafa4124822c123efc282ecf674f96a0b9..1238edb5ab2ad14b63e457e9c3e9080a4655cc12 100644 (file)
--- a/MdePkg/Library/BasePeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
+++ b/MdePkg/Library/BasePeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  Provides the services to get the entry point to a PE/COFF image that has either been \r
+  Provides the services to get the entry point to a PE/COFF image that has either been\r

   loaded into memory or is executing at it's linked address.\r
 \r
   loaded into memory or is executing at it's linked address.\r
 \r

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

   Portions copyright (c) 2008 - 2009, Apple 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
   Portions copyright (c) 2008 - 2009, Apple 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


@@ -130,7 +130,7 @@ PeCoffLoaderGetMachineType (
 \r
 /**\r
   Returns a pointer to the PDB file name for a PE/COFF image that has been\r
 \r
 /**\r
   Returns a pointer to the PDB file name for a PE/COFF image that has been\r

-  loaded into system memory with the PE/COFF Loader Library functions. \r
+  loaded into system memory with the PE/COFF Loader Library functions.\r

 \r
   Returns the PDB file name for the PE/COFF image specified by Pe32Data.  If\r
   the PE/COFF image specified by Pe32Data is not a valid, then NULL is\r
 \r
   Returns the PDB file name for the PE/COFF image specified by Pe32Data.  If\r
   the PE/COFF image specified by Pe32Data is not a valid, then NULL is\r


@@ -248,7 +248,7 @@ PeCoffLoaderGetPdbPointer (
 \r
   //\r
   // Scan the directory to find the debug entry.\r
 \r
   //\r
   // Scan the directory to find the debug entry.\r

-  // \r
+  //\r

   for (DirCount = 0; DirCount < DirectoryEntry->Size; DirCount += sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY), DebugEntry++) {\r
     if (DebugEntry->Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {\r
       if (DebugEntry->SizeOfData > 0) {\r
   for (DirCount = 0; DirCount < DirectoryEntry->Size; DirCount += sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY), DebugEntry++) {\r
     if (DebugEntry->Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {\r
       if (DebugEntry->SizeOfData > 0) {\r


@@ -293,7 +293,7 @@ PeCoffGetSizeOfHeaders (
   UINTN                                 SizeOfHeaders;\r
 \r
   ASSERT (Pe32Data   != NULL);\r
   UINTN                                 SizeOfHeaders;\r
 \r
   ASSERT (Pe32Data   != NULL);\r

- \r
+\r

   DosHdr = (EFI_IMAGE_DOS_HEADER *)Pe32Data;\r
   if (DosHdr->e_magic == EFI_IMAGE_DOS_SIGNATURE) {\r
     //\r
   DosHdr = (EFI_IMAGE_DOS_HEADER *)Pe32Data;\r
   if (DosHdr->e_magic == EFI_IMAGE_DOS_SIGNATURE) {\r
     //\r

diff --git a/MdePkg/Library/BasePeCoffLib/Arm/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/Arm/PeCoffLoaderEx.c
index 38f891e2fdaafbed22ee22d6b417a9c05048e0d2..8fb5f828ab3392c7e660a00cf979039aad98af7a 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/Arm/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/Arm/PeCoffLoaderEx.c
@@ -1,7 +1,7 @@
 /** @file\r
   Specific relocation fixups for ARM architecture.\r
 \r
 /** @file\r
   Specific relocation fixups for ARM architecture.\r
 \r

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

   Portions copyright (c) 2008 - 2010, Apple 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
   Portions copyright (c) 2008 - 2010, Apple 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


@@ -18,7 +18,7 @@
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Pass in a pointer to an ARM MOVT or MOVW immediate instruciton and \r
+  Pass in a pointer to an ARM MOVT or MOVW immediate instruciton and\r

   return the immediate data encoded in the instruction.\r
 \r
   @param  Instruction   Pointer to ARM MOVT or MOVW immediate instruction\r
   return the immediate data encoded in the instruction.\r
 \r
   @param  Instruction   Pointer to ARM MOVT or MOVW immediate instruction\r


@@ -33,10 +33,10 @@ ThumbMovtImmediateAddress (
 {\r
   UINT32  Movt;\r
   UINT16  Address;\r
 {\r
   UINT32  Movt;\r
   UINT16  Address;\r

-  \r
+\r

   // Thumb2 is two 16-bit instructions working together. Not a single 32-bit instruction\r
   // Example MOVT R0, #0 is 0x0000f2c0 or 0xf2c0 0x0000\r
   // Thumb2 is two 16-bit instructions working together. Not a single 32-bit instruction\r
   // Example MOVT R0, #0 is 0x0000f2c0 or 0xf2c0 0x0000\r

-  Movt = (*Instruction << 16) | (*(Instruction + 1)); \r
+  Movt = (*Instruction << 16) | (*(Instruction + 1));\r

 \r
   // imm16 = imm4:i:imm3:imm8\r
   //         imm4 -> Bit19:Bit16\r
 \r
   // imm16 = imm4:i:imm3:imm8\r
   //         imm4 -> Bit19:Bit16\r


@@ -65,7 +65,7 @@ ThumbMovtImmediatePatch (
   UINT16  Patch;\r
 \r
   // First 16-bit chunk of instruciton\r
   UINT16  Patch;\r
 \r
   // First 16-bit chunk of instruciton\r

-  Patch  = ((Address >> 12) & 0x000f);            // imm4 \r
+  Patch  = ((Address >> 12) & 0x000f);            // imm4\r

   Patch |= (((Address & BIT11) != 0) ? BIT10 : 0); // i\r
   // Mask out instruction bits and or in address\r
   *(Instruction) = (*Instruction & ~0x040f) | Patch;\r
   Patch |= (((Address & BIT11) != 0) ? BIT10 : 0); // i\r
   // Mask out instruction bits and or in address\r
   *(Instruction) = (*Instruction & ~0x040f) | Patch;\r


@@ -81,7 +81,7 @@ ThumbMovtImmediatePatch (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Pass in a pointer to an ARM MOVW/MOVT instruciton pair and \r
+  Pass in a pointer to an ARM MOVW/MOVT instruciton pair and\r

   return the immediate data encoded in the two` instruction.\r
 \r
   @param  Instructions  Pointer to ARM MOVW/MOVT insturction pair\r
   return the immediate data encoded in the two` instruction.\r
 \r
   @param  Instructions  Pointer to ARM MOVW/MOVT insturction pair\r


@@ -96,10 +96,10 @@ ThumbMovwMovtImmediateAddress (
 {\r
   UINT16  *Word;\r
   UINT16  *Top;\r
 {\r
   UINT16  *Word;\r
   UINT16  *Top;\r

-  \r
+\r

   Word = Instructions;  // MOVW\r
   Top  = Word + 2;      // MOVT\r
   Word = Instructions;  // MOVW\r
   Top  = Word + 2;      // MOVT\r

-  \r
+\r

   return (ThumbMovtImmediateAddress (Top) << 16) + ThumbMovtImmediateAddress (Word);\r
 }\r
 \r
   return (ThumbMovtImmediateAddress (Top) << 16) + ThumbMovtImmediateAddress (Word);\r
 }\r
 \r


@@ -118,15 +118,15 @@ ThumbMovwMovtImmediatePatch (
 {\r
   UINT16  *Word;\r
   UINT16  *Top;\r
 {\r
   UINT16  *Word;\r
   UINT16  *Top;\r

-  \r
+\r

   Word = Instructions;  // MOVW\r
   Top  = Word + 2;      // MOVT\r
 \r
   ThumbMovtImmediatePatch (Word, (UINT16)(Address & 0xffff));\r
   ThumbMovtImmediatePatch (Top, (UINT16)(Address >> 16));\r
 }\r
   Word = Instructions;  // MOVW\r
   Top  = Word + 2;      // MOVT\r
 \r
   ThumbMovtImmediatePatch (Word, (UINT16)(Address & 0xffff));\r
   ThumbMovtImmediatePatch (Top, (UINT16)(Address >> 16));\r
 }\r

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

 \r
 /**\r
   Performs an ARM-based specific relocation fixup and is a no-op on other\r
 \r
 /**\r
   Performs an ARM-based specific relocation fixup and is a no-op on other\r


@@ -154,19 +154,19 @@ PeCoffLoaderRelocateImageEx (
   Fixup16   = (UINT16 *) Fixup;\r
 \r
   switch ((*Reloc) >> 12) {\r
   Fixup16   = (UINT16 *) Fixup;\r
 \r
   switch ((*Reloc) >> 12) {\r

-  \r
+\r

   case EFI_IMAGE_REL_BASED_ARM_MOV32T:\r
     FixupVal = ThumbMovwMovtImmediateAddress (Fixup16) + (UINT32)Adjust;\r
     ThumbMovwMovtImmediatePatch (Fixup16, FixupVal);\r
 \r
     if (*FixupData != NULL) {\r
       *FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64));\r
   case EFI_IMAGE_REL_BASED_ARM_MOV32T:\r
     FixupVal = ThumbMovwMovtImmediateAddress (Fixup16) + (UINT32)Adjust;\r
     ThumbMovwMovtImmediatePatch (Fixup16, FixupVal);\r
 \r
     if (*FixupData != NULL) {\r
       *FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64));\r

-      // Fixup16 is not aligned so we must copy it. Thumb instructions are streams of 16 bytes. \r
+      // Fixup16 is not aligned so we must copy it. Thumb instructions are streams of 16 bytes.\r

       CopyMem (*FixupData, Fixup16, sizeof (UINT64));\r
       *FixupData = *FixupData + sizeof(UINT64);\r
     }\r
     break;\r
       CopyMem (*FixupData, Fixup16, sizeof (UINT64));\r
       *FixupData = *FixupData + sizeof(UINT64);\r
     }\r
     break;\r

-  \r
+\r

   case EFI_IMAGE_REL_BASED_ARM_MOV32A:\r
      ASSERT (FALSE);\r
      // break omitted - ARM instruction encoding not implemented\r
   case EFI_IMAGE_REL_BASED_ARM_MOV32A:\r
      ASSERT (FALSE);\r
      // break omitted - ARM instruction encoding not implemented\r


@@ -182,7 +182,7 @@ PeCoffLoaderRelocateImageEx (
   does not mean the image can be executed it means the PE/COFF loader supports\r
   loading and relocating of the image type. It's up to the caller to support\r
   the entry point.\r
   does not mean the image can be executed it means the PE/COFF loader supports\r
   loading and relocating of the image type. It's up to the caller to support\r
   the entry point.\r

-  \r
+\r

   @param  Machine   Machine type from the PE Header.\r
 \r
   @return TRUE if this PE/COFF loader can load the image\r
   @param  Machine   Machine type from the PE Header.\r
 \r
   @return TRUE if this PE/COFF loader can load the image\r


@@ -194,7 +194,7 @@ PeCoffLoaderImageFormatSupported (
   )\r
 {\r
   if ((Machine == IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) || (Machine ==  IMAGE_FILE_MACHINE_EBC)) {\r
   )\r
 {\r
   if ((Machine == IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) || (Machine ==  IMAGE_FILE_MACHINE_EBC)) {\r

-    return TRUE; \r
+    return TRUE;\r

   }\r
 \r
   return FALSE;\r
   }\r
 \r
   return FALSE;\r


@@ -236,7 +236,7 @@ PeHotRelocateImageEx (
     }\r
     *FixupData = *FixupData + sizeof(UINT64);\r
     break;\r
     }\r
     *FixupData = *FixupData + sizeof(UINT64);\r
     break;\r

-  \r
+\r

   case EFI_IMAGE_REL_BASED_ARM_MOV32A:\r
     ASSERT (FALSE);\r
     // break omitted - ARM instruction encoding not implemented\r
   case EFI_IMAGE_REL_BASED_ARM_MOV32A:\r
     ASSERT (FALSE);\r
     // break omitted - ARM instruction encoding not implemented\r


@@ -244,7 +244,7 @@ PeHotRelocateImageEx (
     DEBUG ((EFI_D_ERROR, "PeHotRelocateEx:unknown fixed type\n"));\r
     return RETURN_UNSUPPORTED;\r
   }\r
     DEBUG ((EFI_D_ERROR, "PeHotRelocateEx:unknown fixed type\n"));\r
     return RETURN_UNSUPPORTED;\r
   }\r

-  \r
+\r

   return RETURN_SUCCESS;\r
 }\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index 8d1daba4bbe5cc5a2361ff2d3b08b1f7ad8cd160..32eca0ad2ef4062bd02c5f5c0edff04076fdf170 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -15,7 +15,7 @@
   PeCoffLoaderGetPeHeader() routine will do basic check for PE/COFF header.\r
   PeCoffLoaderGetImageInfo() routine will do basic check for whole PE/COFF image.\r
 \r
   PeCoffLoaderGetPeHeader() routine will do basic check for PE/COFF header.\r
   PeCoffLoaderGetImageInfo() routine will do basic check for whole PE/COFF image.\r
 \r

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

   Portions copyright (c) 2008 - 2009, Apple 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
   Portions copyright (c) 2008 - 2009, Apple 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


@@ -61,8 +61,8 @@ PeCoffLoaderGetPeHeaderMagicValue (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value \r
-  //       in the PE/COFF Header.  If the MachineType is Itanium(IA64) and the \r
+  // NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value\r
+  //       in the PE/COFF Header.  If the MachineType is Itanium(IA64) and the\r

   //       Magic value in the OptionalHeader is  EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC\r
   //       then override the returned value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC\r
   //\r
   //       Magic value in the OptionalHeader is  EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC\r
   //       then override the returned value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC\r
   //\r


@@ -77,12 +77,12 @@ PeCoffLoaderGetPeHeaderMagicValue (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Retrieves the PE or TE Header from a PE/COFF or TE image. \r
+  Retrieves the PE or TE Header from a PE/COFF or TE image.\r

 \r
   Caution: This function may receive untrusted input.\r
 \r
   Caution: This function may receive untrusted input.\r

-  PE/COFF image is external input, so this routine will \r
-  also done many checks in PE image to make sure PE image DosHeader, PeOptionHeader, \r
-  SizeOfHeader, Section Data Region and Security Data Region be in PE image range. \r
+  PE/COFF image is external input, so this routine will\r
+  also done many checks in PE image to make sure PE image DosHeader, PeOptionHeader,\r
+  SizeOfHeader, Section Data Region and Security Data Region be in PE image range.\r

 \r
   @param  ImageContext    The context of the image being loaded.\r
   @param  Hdr             The buffer in which to return the PE32, PE32+, or TE header.\r
 \r
   @param  ImageContext    The context of the image being loaded.\r
   @param  Hdr             The buffer in which to return the PE32, PE32+, or TE header.\r


@@ -211,7 +211,7 @@ PeCoffLoaderGetPeHeader (
 \r
     //\r
     // TE Image Data Directory Entry size is non-zero, but the Data Directory Virtual Address is zero.\r
 \r
     //\r
     // TE Image Data Directory Entry size is non-zero, but the Data Directory Virtual Address is zero.\r

-    // This case is not a valid TE image. \r
+    // This case is not a valid TE image.\r

     //\r
     if ((Hdr.Te->DataDirectory[0].Size != 0 && Hdr.Te->DataDirectory[0].VirtualAddress == 0) ||\r
         (Hdr.Te->DataDirectory[1].Size != 0 && Hdr.Te->DataDirectory[1].VirtualAddress == 0)) {\r
     //\r
     if ((Hdr.Te->DataDirectory[0].Size != 0 && Hdr.Te->DataDirectory[0].VirtualAddress == 0) ||\r
         (Hdr.Te->DataDirectory[1].Size != 0 && Hdr.Te->DataDirectory[1].VirtualAddress == 0)) {\r


@@ -235,7 +235,7 @@ PeCoffLoaderGetPeHeader (
 \r
       //\r
       // 2. Check the FileHeader.SizeOfOptionalHeader field.\r
 \r
       //\r
       // 2. Check the FileHeader.SizeOfOptionalHeader field.\r

-      // OptionalHeader.NumberOfRvaAndSizes is not bigger than 16, so \r
+      // OptionalHeader.NumberOfRvaAndSizes is not bigger than 16, so\r

       // OptionalHeader.NumberOfRvaAndSizes * sizeof (EFI_IMAGE_DATA_DIRECTORY) will not overflow.\r
       //\r
       HeaderWithoutDataDir = sizeof (EFI_IMAGE_OPTIONAL_HEADER32) - sizeof (EFI_IMAGE_DATA_DIRECTORY) * EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES;\r
       // OptionalHeader.NumberOfRvaAndSizes * sizeof (EFI_IMAGE_DATA_DIRECTORY) will not overflow.\r
       //\r
       HeaderWithoutDataDir = sizeof (EFI_IMAGE_OPTIONAL_HEADER32) - sizeof (EFI_IMAGE_DATA_DIRECTORY) * EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES;\r


@@ -349,7 +349,7 @@ PeCoffLoaderGetPeHeader (
       }\r
       //\r
       // 2. Check the FileHeader.SizeOfOptionalHeader field.\r
       }\r
       //\r
       // 2. Check the FileHeader.SizeOfOptionalHeader field.\r

-      // OptionalHeader.NumberOfRvaAndSizes is not bigger than 16, so \r
+      // OptionalHeader.NumberOfRvaAndSizes is not bigger than 16, so\r

       // OptionalHeader.NumberOfRvaAndSizes * sizeof (EFI_IMAGE_DATA_DIRECTORY) will not overflow.\r
       //\r
       HeaderWithoutDataDir = sizeof (EFI_IMAGE_OPTIONAL_HEADER64) - sizeof (EFI_IMAGE_DATA_DIRECTORY) * EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES;\r
       // OptionalHeader.NumberOfRvaAndSizes * sizeof (EFI_IMAGE_DATA_DIRECTORY) will not overflow.\r
       //\r
       HeaderWithoutDataDir = sizeof (EFI_IMAGE_OPTIONAL_HEADER64) - sizeof (EFI_IMAGE_DATA_DIRECTORY) * EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES;\r


@@ -513,7 +513,7 @@ PeCoffLoaderGetPeHeader (
       //\r
       // Section data should bigger than the Pe header.\r
       //\r
       //\r
       // Section data should bigger than the Pe header.\r
       //\r

-      if (SectionHeader.VirtualAddress < ImageContext->SizeOfHeaders || \r
+      if (SectionHeader.VirtualAddress < ImageContext->SizeOfHeaders ||\r

           SectionHeader.PointerToRawData < ImageContext->SizeOfHeaders) {\r
         ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;\r
         return RETURN_UNSUPPORTED;\r
           SectionHeader.PointerToRawData < ImageContext->SizeOfHeaders) {\r
         ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;\r
         return RETURN_UNSUPPORTED;\r


@@ -561,22 +561,22 @@ PeCoffLoaderGetPeHeader (
 /**\r
   Retrieves information about a PE/COFF image.\r
 \r
 /**\r
   Retrieves information about a PE/COFF image.\r
 \r

-  Computes the PeCoffHeaderOffset, IsTeImage, ImageType, ImageAddress, ImageSize, \r
-  DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders, and \r
-  DebugDirectoryEntryRva fields of the ImageContext structure.  \r
-  If ImageContext is NULL, then return RETURN_INVALID_PARAMETER.  \r
-  If the PE/COFF image accessed through the ImageRead service in the ImageContext \r
-  structure is not a supported PE/COFF image type, then return RETURN_UNSUPPORTED.  \r
-  If any errors occur while computing the fields of ImageContext, \r
-  then the error status is returned in the ImageError field of ImageContext.  \r
+  Computes the PeCoffHeaderOffset, IsTeImage, ImageType, ImageAddress, ImageSize,\r
+  DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders, and\r
+  DebugDirectoryEntryRva fields of the ImageContext structure.\r
+  If ImageContext is NULL, then return RETURN_INVALID_PARAMETER.\r
+  If the PE/COFF image accessed through the ImageRead service in the ImageContext\r
+  structure is not a supported PE/COFF image type, then return RETURN_UNSUPPORTED.\r
+  If any errors occur while computing the fields of ImageContext,\r
+  then the error status is returned in the ImageError field of ImageContext.\r

   If the image is a TE image, then SectionAlignment is set to 0.\r
   If the image is a TE image, then SectionAlignment is set to 0.\r

-  The ImageRead and Handle fields of ImageContext structure must be valid prior \r
+  The ImageRead and Handle fields of ImageContext structure must be valid prior\r

   to invoking this service.\r
 \r
   Caution: This function may receive untrusted input.\r
   to invoking this service.\r
 \r
   Caution: This function may receive untrusted input.\r

-  PE/COFF image is external input, so this routine will \r
-  also done many checks in PE image to make sure PE image DosHeader, PeOptionHeader, \r
-  SizeOfHeader, Section Data Region and Security Data Region be in PE image range. \r
+  PE/COFF image is external input, so this routine will\r
+  also done many checks in PE image to make sure PE image DosHeader, PeOptionHeader,\r
+  SizeOfHeader, Section Data Region and Security Data Region be in PE image range.\r

 \r
   @param  ImageContext              The pointer to the image context structure that describes the PE/COFF\r
                                     image that needs to be examined by this function.\r
 \r
   @param  ImageContext              The pointer to the image context structure that describes the PE/COFF\r
                                     image that needs to be examined by this function.\r


@@ -829,7 +829,7 @@ PeCoffLoaderGetImageInfo (
       // section headers in the Section Table must appear in order of the RVA\r
       // values for the corresponding sections. So the ImageSize can be determined\r
       // by the RVA and the VirtualSize of the last section header in the\r
       // section headers in the Section Table must appear in order of the RVA\r
       // values for the corresponding sections. So the ImageSize can be determined\r
       // by the RVA and the VirtualSize of the last section header in the\r

-      // Section Table.  \r
+      // Section Table.\r

       //\r
       if ((++Index) == (UINTN)Hdr.Te->NumberOfSections) {\r
         ImageContext->ImageSize = (SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize) - TeStrippedOffset;\r
       //\r
       if ((++Index) == (UINTN)Hdr.Te->NumberOfSections) {\r
         ImageContext->ImageSize = (SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize) - TeStrippedOffset;\r


@@ -884,7 +884,7 @@ PeCoffLoaderGetImageInfo (
 VOID *\r
 PeCoffLoaderImageAddress (\r
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT          *ImageContext,\r
 VOID *\r
 PeCoffLoaderImageAddress (\r
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT          *ImageContext,\r

-  IN     UINTN                                 Address, \r
+  IN     UINTN                                 Address,\r

   IN     UINTN                                 TeStrippedOffset\r
   )\r
 {\r
   IN     UINTN                                 TeStrippedOffset\r
   )\r
 {\r


@@ -906,12 +906,12 @@ PeCoffLoaderImageAddress (
   ImageContext as the relocation base address.  Otherwise, use the DestinationAddress field\r
   of ImageContext as the relocation base address.  The caller must allocate the relocation\r
   fixup log buffer and fill in the FixupData field of ImageContext prior to calling this function.\r
   ImageContext as the relocation base address.  Otherwise, use the DestinationAddress field\r
   of ImageContext as the relocation base address.  The caller must allocate the relocation\r
   fixup log buffer and fill in the FixupData field of ImageContext prior to calling this function.\r

-  \r
-  The ImageRead, Handle, PeCoffHeaderOffset,  IsTeImage, Machine, ImageType, ImageAddress, \r
-  ImageSize, DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders, \r
-  DebugDirectoryEntryRva, EntryPoint, FixupDataSize, CodeView, PdbPointer, and FixupData of \r
+\r
+  The ImageRead, Handle, PeCoffHeaderOffset,  IsTeImage, Machine, ImageType, ImageAddress,\r
+  ImageSize, DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders,\r
+  DebugDirectoryEntryRva, EntryPoint, FixupDataSize, CodeView, PdbPointer, and FixupData of\r

   the ImageContext structure must be valid prior to invoking this service.\r
   the ImageContext structure must be valid prior to invoking this service.\r

-    \r
+\r

   If ImageContext is NULL, then ASSERT().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r
   If ImageContext is NULL, then ASSERT().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r


@@ -966,9 +966,9 @@ PeCoffLoaderRelocateImage (
   // If there are no relocation entries, then we are done\r
   //\r
   if (ImageContext->RelocationsStripped) {\r
   // If there are no relocation entries, then we are done\r
   //\r
   if (ImageContext->RelocationsStripped) {\r

-    // Applies additional environment specific actions to relocate fixups \r
+    // Applies additional environment specific actions to relocate fixups\r

     // to a PE/COFF image if needed\r
     // to a PE/COFF image if needed\r

-    PeCoffLoaderRelocateImageExtraAction (ImageContext);  \r
+    PeCoffLoaderRelocateImageExtraAction (ImageContext);\r

     return RETURN_SUCCESS;\r
   }\r
 \r
     return RETURN_SUCCESS;\r
   }\r
 \r


@@ -1048,7 +1048,7 @@ PeCoffLoaderRelocateImage (
     //\r
     // Set base and end to bypass processing below.\r
     //\r
     //\r
     // Set base and end to bypass processing below.\r
     //\r

-    RelocBase = RelocBaseEnd = NULL;    \r
+    RelocBase = RelocBaseEnd = NULL;\r

   }\r
   RelocBaseOrg = RelocBase;\r
 \r
   }\r
   RelocBaseOrg = RelocBase;\r
 \r


@@ -1084,7 +1084,7 @@ PeCoffLoaderRelocateImage (
       if (FixupBase == NULL) {\r
         ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;\r
         return RETURN_LOAD_ERROR;\r
       if (FixupBase == NULL) {\r
         ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;\r
         return RETURN_LOAD_ERROR;\r

-      }  \r
+      }\r

 \r
       //\r
       // Run this relocation record\r
 \r
       //\r
       // Run this relocation record\r


@@ -1171,11 +1171,11 @@ PeCoffLoaderRelocateImage (
        ImageContext->EntryPoint += (UINT64) ImageContext->DestinationAddress;\r
     }\r
   }\r
        ImageContext->EntryPoint += (UINT64) ImageContext->DestinationAddress;\r
     }\r
   }\r

-  \r
-  // Applies additional environment specific actions to relocate fixups \r
+\r
+  // Applies additional environment specific actions to relocate fixups\r

   // to a PE/COFF image if needed\r
   PeCoffLoaderRelocateImageExtraAction (ImageContext);\r
   // to a PE/COFF image if needed\r
   PeCoffLoaderRelocateImageExtraAction (ImageContext);\r

-  \r
+\r

   return RETURN_SUCCESS;\r
 }\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r


@@ -1186,10 +1186,10 @@ PeCoffLoaderRelocateImage (
   specified by the ImageAddress and ImageSize fields of ImageContext.  The caller must allocate\r
   the load buffer and fill in the ImageAddress and ImageSize fields prior to calling this function.\r
   The EntryPoint, FixupDataSize, CodeView, PdbPointer and HiiResourceData fields of ImageContext are computed.\r
   specified by the ImageAddress and ImageSize fields of ImageContext.  The caller must allocate\r
   the load buffer and fill in the ImageAddress and ImageSize fields prior to calling this function.\r
   The EntryPoint, FixupDataSize, CodeView, PdbPointer and HiiResourceData fields of ImageContext are computed.\r

-  The ImageRead, Handle, PeCoffHeaderOffset,  IsTeImage,  Machine, ImageType, ImageAddress, ImageSize, \r
-  DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders, and DebugDirectoryEntryRva \r
+  The ImageRead, Handle, PeCoffHeaderOffset,  IsTeImage,  Machine, ImageType, ImageAddress, ImageSize,\r
+  DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders, and DebugDirectoryEntryRva\r

   fields of the ImageContext structure must be valid prior to invoking this service.\r
   fields of the ImageContext structure must be valid prior to invoking this service.\r

-  \r
+\r

   If ImageContext is NULL, then ASSERT().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r
   If ImageContext is NULL, then ASSERT().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r


@@ -1501,7 +1501,7 @@ PeCoffLoaderLoadImage (
     }\r
 \r
     if (TempDebugEntryRva != 0) {\r
     }\r
 \r
     if (TempDebugEntryRva != 0) {\r

-      ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva, TeStrippedOffset); \r
+      ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva, TeStrippedOffset);\r

       if (ImageContext->CodeView == NULL) {\r
         ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;\r
         return RETURN_LOAD_ERROR;\r
       if (ImageContext->CodeView == NULL) {\r
         ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;\r
         return RETURN_LOAD_ERROR;\r


@@ -1583,7 +1583,7 @@ PeCoffLoaderLoadImage (
       Base = PeCoffLoaderImageAddress (ImageContext, DirectoryEntry->VirtualAddress, 0);\r
       if (Base != NULL) {\r
         ResourceDirectory = (EFI_IMAGE_RESOURCE_DIRECTORY *) Base;\r
       Base = PeCoffLoaderImageAddress (ImageContext, DirectoryEntry->VirtualAddress, 0);\r
       if (Base != NULL) {\r
         ResourceDirectory = (EFI_IMAGE_RESOURCE_DIRECTORY *) Base;\r

-        Offset = sizeof (EFI_IMAGE_RESOURCE_DIRECTORY) + sizeof (EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY) * \r
+        Offset = sizeof (EFI_IMAGE_RESOURCE_DIRECTORY) + sizeof (EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY) *\r

                (ResourceDirectory->NumberOfNamedEntries + ResourceDirectory->NumberOfIdEntries);\r
         if (Offset > DirectoryEntry->Size) {\r
           ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;\r
                (ResourceDirectory->NumberOfNamedEntries + ResourceDirectory->NumberOfIdEntries);\r
         if (Offset > DirectoryEntry->Size) {\r
           ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;\r


@@ -1619,7 +1619,7 @@ PeCoffLoaderLoadImage (
                   return RETURN_UNSUPPORTED;\r
                 }\r
                 ResourceDirectory = (EFI_IMAGE_RESOURCE_DIRECTORY *) (Base + ResourceDirectoryEntry->u2.s.OffsetToDirectory);\r
                   return RETURN_UNSUPPORTED;\r
                 }\r
                 ResourceDirectory = (EFI_IMAGE_RESOURCE_DIRECTORY *) (Base + ResourceDirectoryEntry->u2.s.OffsetToDirectory);\r

-                Offset = ResourceDirectoryEntry->u2.s.OffsetToDirectory + sizeof (EFI_IMAGE_RESOURCE_DIRECTORY) + \r
+                Offset = ResourceDirectoryEntry->u2.s.OffsetToDirectory + sizeof (EFI_IMAGE_RESOURCE_DIRECTORY) +\r

                          sizeof (EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY) * (ResourceDirectory->NumberOfNamedEntries + ResourceDirectory->NumberOfIdEntries);\r
                 if (Offset > DirectoryEntry->Size) {\r
                   ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;\r
                          sizeof (EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY) * (ResourceDirectory->NumberOfNamedEntries + ResourceDirectory->NumberOfIdEntries);\r
                 if (Offset > DirectoryEntry->Size) {\r
                   ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;\r


@@ -1636,7 +1636,7 @@ PeCoffLoaderLoadImage (
                     return RETURN_UNSUPPORTED;\r
                   }\r
                   ResourceDirectory = (EFI_IMAGE_RESOURCE_DIRECTORY *) (Base + ResourceDirectoryEntry->u2.s.OffsetToDirectory);\r
                     return RETURN_UNSUPPORTED;\r
                   }\r
                   ResourceDirectory = (EFI_IMAGE_RESOURCE_DIRECTORY *) (Base + ResourceDirectoryEntry->u2.s.OffsetToDirectory);\r

-                  Offset = ResourceDirectoryEntry->u2.s.OffsetToDirectory + sizeof (EFI_IMAGE_RESOURCE_DIRECTORY) + \r
+                  Offset = ResourceDirectoryEntry->u2.s.OffsetToDirectory + sizeof (EFI_IMAGE_RESOURCE_DIRECTORY) +\r

                            sizeof (EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY) * (ResourceDirectory->NumberOfNamedEntries + ResourceDirectory->NumberOfIdEntries);\r
                   if (Offset > DirectoryEntry->Size) {\r
                     ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;\r
                            sizeof (EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY) * (ResourceDirectory->NumberOfNamedEntries + ResourceDirectory->NumberOfIdEntries);\r
                   if (Offset > DirectoryEntry->Size) {\r
                     ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;\r


@@ -1665,33 +1665,33 @@ PeCoffLoaderLoadImage (
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

- \r
+\r

   return Status;\r
 }\r
 \r
 \r
 /**\r
   Reapply fixups on a fixed up PE32/PE32+ image to allow virutal calling at EFI\r
   return Status;\r
 }\r
 \r
 \r
 /**\r
   Reapply fixups on a fixed up PE32/PE32+ image to allow virutal calling at EFI\r

-  runtime. \r
-  \r
-  This function reapplies relocation fixups to the PE/COFF image specified by ImageBase \r
-  and ImageSize so the image will execute correctly when the PE/COFF image is mapped \r
-  to the address specified by VirtualImageBase.  RelocationData must be identical \r
-  to the FiuxupData buffer from the PE_COFF_LOADER_IMAGE_CONTEXT structure \r
+  runtime.\r
+\r
+  This function reapplies relocation fixups to the PE/COFF image specified by ImageBase\r
+  and ImageSize so the image will execute correctly when the PE/COFF image is mapped\r
+  to the address specified by VirtualImageBase.  RelocationData must be identical\r
+  to the FiuxupData buffer from the PE_COFF_LOADER_IMAGE_CONTEXT structure\r

   after this PE/COFF image was relocated with PeCoffLoaderRelocateImage().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r
   cache(s) in hardware, then the caller is responsible for performing cache maintenance operations\r
   prior to transferring control to a PE/COFF image that is loaded using this library.\r
 \r
   after this PE/COFF image was relocated with PeCoffLoaderRelocateImage().\r
 \r
   Note that if the platform does not maintain coherency between the instruction cache(s) and the data\r
   cache(s) in hardware, then the caller is responsible for performing cache maintenance operations\r
   prior to transferring control to a PE/COFF image that is loaded using this library.\r
 \r

-  @param  ImageBase          The base address of a PE/COFF image that has been loaded \r
+  @param  ImageBase          The base address of a PE/COFF image that has been loaded\r

                              and relocated into system memory.\r
   @param  VirtImageBase      The request virtual address that the PE/COFF image is to\r
                              be fixed up for.\r
   @param  ImageSize          The size, in bytes, of the PE/COFF image.\r
                              and relocated into system memory.\r
   @param  VirtImageBase      The request virtual address that the PE/COFF image is to\r
                              be fixed up for.\r
   @param  ImageSize          The size, in bytes, of the PE/COFF image.\r

-  @param  RelocationData     A pointer to the relocation data that was collected when the PE/COFF \r
+  @param  RelocationData     A pointer to the relocation data that was collected when the PE/COFF\r

                              image was relocated using PeCoffLoaderRelocateImage().\r
                              image was relocated using PeCoffLoaderRelocateImage().\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -1784,7 +1784,7 @@ PeCoffLoaderRelocateImageForRuntime (
     ASSERT (FALSE);\r
     return ;\r
   }\r
     ASSERT (FALSE);\r
     return ;\r
   }\r

-  \r
+\r

   //\r
   // ASSERT for the invalid image when RelocBase and RelocBaseEnd are both NULL.\r
   //\r
   //\r
   // ASSERT for the invalid image when RelocBase and RelocBaseEnd are both NULL.\r
   //\r


@@ -1886,14 +1886,14 @@ PeCoffLoaderRelocateImageForRuntime (
 \r
 /**\r
   Reads contents of a PE/COFF image from a buffer in system memory.\r
 \r
 /**\r
   Reads contents of a PE/COFF image from a buffer in system memory.\r

-   \r
-  This is the default implementation of a PE_COFF_LOADER_READ_FILE function \r
-  that assumes FileHandle pointer to the beginning of a PE/COFF image.   \r
-  This function reads contents of the PE/COFF image that starts at the system memory \r
-  address specified by FileHandle.  The read operation copies ReadSize bytes from the \r
-  PE/COFF image starting at byte offset FileOffset into the buffer specified by Buffer.  \r
+\r
+  This is the default implementation of a PE_COFF_LOADER_READ_FILE function\r
+  that assumes FileHandle pointer to the beginning of a PE/COFF image.\r
+  This function reads contents of the PE/COFF image that starts at the system memory\r
+  address specified by FileHandle.  The read operation copies ReadSize bytes from the\r
+  PE/COFF image starting at byte offset FileOffset into the buffer specified by Buffer.\r

   The size of the buffer actually read is returned in ReadSize.\r
   The size of the buffer actually read is returned in ReadSize.\r

-  \r
+\r

   The caller must make sure the FileOffset and ReadSize within the file scope.\r
 \r
   If FileHandle is NULL, then ASSERT().\r
   The caller must make sure the FileOffset and ReadSize within the file scope.\r
 \r
   If FileHandle is NULL, then ASSERT().\r


@@ -1902,11 +1902,11 @@ PeCoffLoaderRelocateImageForRuntime (
 \r
   @param  FileHandle        The pointer to base of the input stream\r
   @param  FileOffset        Offset into the PE/COFF image to begin the read operation.\r
 \r
   @param  FileHandle        The pointer to base of the input stream\r
   @param  FileOffset        Offset into the PE/COFF image to begin the read operation.\r

-  @param  ReadSize          On input, the size in bytes of the requested read operation.  \r
+  @param  ReadSize          On input, the size in bytes of the requested read operation.\r

                             On output, the number of bytes actually read.\r
   @param  Buffer            Output buffer that contains the data read from the PE/COFF image.\r
 \r
                             On output, the number of bytes actually read.\r
   @param  Buffer            Output buffer that contains the data read from the PE/COFF image.\r
 \r

-  @retval RETURN_SUCCESS    Data is read from FileOffset from the Handle into \r
+  @retval RETURN_SUCCESS    Data is read from FileOffset from the Handle into\r

                             the buffer.\r
 **/\r
 RETURN_STATUS\r
                             the buffer.\r
 **/\r
 RETURN_STATUS\r


@@ -1928,15 +1928,15 @@ PeCoffLoaderImageReadFromMemory (
 \r
 /**\r
   Unloads a loaded PE/COFF image from memory and releases its taken resource.\r
 \r
 /**\r
   Unloads a loaded PE/COFF image from memory and releases its taken resource.\r

-  Releases any environment specific resources that were allocated when the image \r
-  specified by ImageContext was loaded using PeCoffLoaderLoadImage(). \r
- \r
+  Releases any environment specific resources that were allocated when the image\r
+  specified by ImageContext was loaded using PeCoffLoaderLoadImage().\r
+\r

   For NT32 emulator, the PE/COFF image loaded by system needs to release.\r
   For NT32 emulator, the PE/COFF image loaded by system needs to release.\r

-  For real platform, the PE/COFF image loaded by Core doesn't needs to be unloaded, \r
+  For real platform, the PE/COFF image loaded by Core doesn't needs to be unloaded,\r

   this function can simply return RETURN_SUCCESS.\r
   this function can simply return RETURN_SUCCESS.\r

-  \r
+\r

   If ImageContext is NULL, then ASSERT().\r
   If ImageContext is NULL, then ASSERT().\r

-  \r
+\r

   @param  ImageContext              The pointer to the image context structure that describes the PE/COFF\r
                                     image to be unloaded.\r
 \r
   @param  ImageContext              The pointer to the image context structure that describes the PE/COFF\r
                                     image to be unloaded.\r
 \r


@@ -1949,7 +1949,7 @@ PeCoffLoaderUnloadImage (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // Applies additional environment specific actions to unload a \r
+  // Applies additional environment specific actions to unload a\r

   // PE/COFF image if needed\r
   //\r
   PeCoffLoaderUnloadImageExtraAction (ImageContext);\r
   // PE/COFF image if needed\r
   //\r
   PeCoffLoaderUnloadImageExtraAction (ImageContext);\r

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
index ff0580fbdf568e765fd61945fe230025440c26ff..16f330a788efd04a240f35caecbbe6e07449ef63 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
@@ -9,7 +9,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 - 2014, Intel Corporation. All rights reserved.<BR>\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


@@ -29,7 +29,7 @@
   FILE_GUID                      = 556f5d10-7309-4af4-b80a-8196bd60946f\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 556f5d10-7309-4af4-b80a-8196bd60946f\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PeCoffLib \r
+  LIBRARY_CLASS                  = PeCoffLib\r

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

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.uni b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.uni
index 56b6f1b742284bd1be6b77d10c548aa06ca68313..99ffb7c1dbe51a6c41f444fbe32d29365e141854 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.uni
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.uni
@@ -4,13 +4,13 @@
 // The IPF version library supports loading IPF and EBC PE/COFF image.\r
 // The IA32 version library support loading IA32, X64 and EBC PE/COFF images.\r
 // The X64 version library support loading IA32, X64 and EBC PE/COFF images.\r
 // The IPF version library supports loading IPF and EBC PE/COFF image.\r
 // The IA32 version library support loading IA32, X64 and EBC PE/COFF images.\r
 // The X64 version library support loading IA32, X64 and EBC PE/COFF images.\r

-// \r
+//\r

 // Caution: This module requires additional review when modified.\r
 // This library will have external input - PE/COFF 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 library will have external input - PE/COFF image.\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

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

diff --git a/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
index 96e122b69814947d432096e0779ade7e6fba7af6..41580e56a7ea3430e5ea9e721f3d32ccaa1c14e2 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
@@ -1,7 +1,7 @@
 /** @file\r
   Fixes Intel Itanium(TM) specific relocation types.\r
 \r
 /** @file\r
   Fixes Intel Itanium(TM) specific relocation types.\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


@@ -218,8 +218,8 @@ PeCoffLoaderRelocateImageEx (
   Returns TRUE if the machine type of PE/COFF image is supported. Supported\r
   does not mean the image can be executed it means the PE/COFF loader supports\r
   loading and relocating of the image type. It's up to the caller to support\r
   Returns TRUE if the machine type of PE/COFF image is supported. Supported\r
   does not mean the image can be executed it means the PE/COFF loader supports\r
   loading and relocating of the image type. It's up to the caller to support\r

-  the entry point. \r
-  \r
+  the entry point.\r
+\r

   The itanium version PE/COFF loader/relocater supports itanium and EBC image.\r
 \r
   @param  Machine   Machine type from the PE Header.\r
   The itanium version PE/COFF loader/relocater supports itanium and EBC image.\r
 \r
   @param  Machine   Machine type from the PE Header.\r

diff --git a/MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c
index 9eda4cf39deb58edf194d1cf8c3de8b4dfd05c79..480accfb823285513098a0b86b735a408b274f82 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c
@@ -1,7 +1,7 @@
 /** @file\r
   Specific relocation fixups for none Itanium architecture.\r
 \r
 /** @file\r
   Specific relocation fixups for none Itanium architecture.\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


@@ -43,7 +43,7 @@ PeCoffLoaderRelocateImageEx (
   does not mean the image can be executed it means the PE/COFF loader supports\r
   loading and relocating of the image type. It's up to the caller to support\r
   the entry point.\r
   does not mean the image can be executed it means the PE/COFF loader supports\r
   loading and relocating of the image type. It's up to the caller to support\r
   the entry point.\r

-  \r
+\r

   The IA32/X64 version PE/COFF loader/relocater both support IA32, X64 and EBC images.\r
 \r
   @param  Machine   The machine type from the PE Header.\r
   The IA32/X64 version PE/COFF loader/relocater both support IA32, X64 and EBC images.\r
 \r
   @param  Machine   The machine type from the PE Header.\r


@@ -56,9 +56,9 @@ PeCoffLoaderImageFormatSupported (
   IN  UINT16  Machine\r
   )\r
 {\r
   IN  UINT16  Machine\r
   )\r
 {\r

-  if ((Machine == IMAGE_FILE_MACHINE_I386) || (Machine == IMAGE_FILE_MACHINE_X64) || \r
+  if ((Machine == IMAGE_FILE_MACHINE_I386) || (Machine == IMAGE_FILE_MACHINE_X64) ||\r

       (Machine == IMAGE_FILE_MACHINE_EBC) || (Machine == IMAGE_FILE_MACHINE_ARM64)) {\r
       (Machine == IMAGE_FILE_MACHINE_EBC) || (Machine == IMAGE_FILE_MACHINE_ARM64)) {\r

-    return TRUE; \r
+    return TRUE;\r

   }\r
 \r
   return FALSE;\r
   }\r
 \r
   return FALSE;\r

diff --git a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf b/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
index d29b532c0877c474c57caa141ef5c67eca6ea250..bea8e09264865dbc79f09008c7e1e54012bd06e7 100644 (file)
--- a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
+++ b/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Instance of Performance Library with empty functions.\r
 #\r
 ## @file\r
 #  Instance of Performance Library with empty functions.\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


@@ -20,7 +20,7 @@
   FILE_GUID                      = FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PerformanceLib \r
+  LIBRARY_CLASS                  = PerformanceLib\r

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

diff --git a/MdePkg/Library/BasePerformanceLibNull/PerformanceLib.c b/MdePkg/Library/BasePerformanceLibNull/PerformanceLib.c
index a68ea90d4f06f17fb76648a38830882f4792f0ed..76a0c73c475efda16dafa93abe97d774bc02b441 100644 (file)
--- a/MdePkg/Library/BasePerformanceLibNull/PerformanceLib.c
+++ b/MdePkg/Library/BasePerformanceLibNull/PerformanceLib.c
@@ -21,8 +21,8 @@
 #include <Library/PcdLib.h>\r
 \r
 /**\r
 #include <Library/PcdLib.h>\r
 \r
 /**\r

-  Creates a record for the beginning of a performance measurement. \r
-  \r
+  Creates a record for the beginning of a performance measurement.\r
+\r

   Creates a record that contains the Handle, Token, and Module.\r
   If TimeStamp is not zero, then TimeStamp is added to the record as the start time.\r
   If TimeStamp is zero, then this function reads the current time stamp\r
   Creates a record that contains the Handle, Token, and Module.\r
   If TimeStamp is not zero, then TimeStamp is added to the record as the start time.\r
   If TimeStamp is zero, then this function reads the current time stamp\r


@@ -54,8 +54,8 @@ StartPerformanceMeasurement (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Fills in the end time of a performance measurement. \r
-  \r
+  Fills in the end time of a performance measurement.\r
+\r

   Looks up the record that matches Handle, Token, and Module.\r
   If the record can not be found then return RETURN_NOT_FOUND.\r
   If the record is found and TimeStamp is not zero,\r
   Looks up the record that matches Handle, Token, and Module.\r
   If the record can not be found then return RETURN_NOT_FOUND.\r
   If the record is found and TimeStamp is not zero,\r


@@ -89,7 +89,7 @@ EndPerformanceMeasurement (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Attempts to retrieve a performance measurement log entry from the performance measurement log. \r
+  Attempts to retrieve a performance measurement log entry from the performance measurement log.\r

   It can also retrieve the log created by StartPerformanceMeasurementEx and EndPerformanceMeasurementEx,\r
   and then eliminate the Identifier.\r
 \r
   It can also retrieve the log created by StartPerformanceMeasurementEx and EndPerformanceMeasurementEx,\r
   and then eliminate the Identifier.\r
 \r


@@ -114,9 +114,9 @@ EndPerformanceMeasurement (
                                   0, then the first performance measurement log entry is retrieved.\r
                                   On exit, the key of the next performance lof entry entry.\r
   @param  Handle                  The pointer to environment specific context used to identify the component\r
                                   0, then the first performance measurement log entry is retrieved.\r
                                   On exit, the key of the next performance lof entry entry.\r
   @param  Handle                  The pointer to environment specific context used to identify the component\r

-                                  being measured.  \r
+                                  being measured.\r

   @param  Token                   The pointer to a Null-terminated ASCII string that identifies the component\r
   @param  Token                   The pointer to a Null-terminated ASCII string that identifies the component\r

-                                  being measured. \r
+                                  being measured.\r

   @param  Module                  The pointer to a Null-terminated ASCII string that identifies the module\r
                                   being measured.\r
   @param  StartTimeStamp          The pointer to the 64-bit time stamp that was recorded when the measurement\r
   @param  Module                  The pointer to a Null-terminated ASCII string that identifies the module\r
                                   being measured.\r
   @param  StartTimeStamp          The pointer to the 64-bit time stamp that was recorded when the measurement\r


@@ -130,7 +130,7 @@ EndPerformanceMeasurement (
 UINTN\r
 EFIAPI\r
 GetPerformanceMeasurement (\r
 UINTN\r
 EFIAPI\r
 GetPerformanceMeasurement (\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


@@ -265,7 +265,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


@@ -285,8 +285,8 @@ GetPerformanceMeasurementEx (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Returns TRUE if the performance measurement macros are enabled. \r
-  \r
+  Returns TRUE if the performance measurement macros are enabled.\r
+\r

   This function returns TRUE if the PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED bit of\r
   PcdPerformanceLibraryPropertyMask is set.  Otherwise FALSE is returned.\r
 \r
   This function returns TRUE if the PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED bit of\r
   PcdPerformanceLibraryPropertyMask is set.  Otherwise FALSE is returned.\r
 \r

diff --git a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
index 1b9c8ad2c8c7fc0a7751a9d9e2b3e420d8ba4864..343af2ef855179f9fb572bfbfb5704181a1b0157 100644 (file)
--- a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
+++ b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
@@ -4,7 +4,7 @@
 #  Post Code Library that uses DebugLib service to send PostCode.\r
 #  It layers on top of a Debug Library instance.\r
 #\r
 #  Post Code Library that uses DebugLib service to send PostCode.\r
 #  It layers on top of a Debug Library instance.\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


@@ -23,7 +23,7 @@
   FILE_GUID                      = 19e3bbba-beb1-43e8-b32d-9acbb22c7639\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 19e3bbba-beb1-43e8-b32d-9acbb22c7639\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PostCodeLib \r
+  LIBRARY_CLASS                  = PostCodeLib\r

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

diff --git a/MdePkg/Library/BasePostCodeLibDebug/PostCode.c b/MdePkg/Library/BasePostCodeLibDebug/PostCode.c
index e6541ab5742be847c12fe929ab221c4e336634aa..18bf2b83a720d96464e0ff632e49ceaaa31a9628 100644 (file)
--- a/MdePkg/Library/BasePostCodeLibDebug/PostCode.c
+++ b/MdePkg/Library/BasePostCodeLibDebug/PostCode.c
@@ -1,14 +1,14 @@
 /** @file\r
   The instance of Post Code Library that layers on top of a Debug Library instance.\r
 \r
 /** @file\r
   The instance of Post Code Library that layers on top of a Debug Library instance.\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
+  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


@@ -21,14 +21,14 @@
 /**\r
   Sends an 32-bit value to a POST card.\r
 \r
 /**\r
   Sends an 32-bit value to a POST card.\r
 \r

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.  \r
-  Some implementations of this library function may perform I/O operations \r
-  directly to a POST card device.  Other implementations may send Value to \r
-  ReportStatusCode(), and the status code reporting mechanism will eventually \r
+  Sends the 32-bit value specified by Value to a POST card, and returns Value.\r
+  Some implementations of this library function may perform I/O operations\r
+  directly to a POST card device.  Other implementations may send Value to\r
+  ReportStatusCode(), and the status code reporting mechanism will eventually\r

   display the 32-bit value on the status reporting device.\r
   display the 32-bit value on the status reporting device.\r

-  \r
-  PostCode() must actively prevent recursion.  If PostCode() is called while \r
-  processing another any other Post Code Library function, then \r
+\r
+  PostCode() must actively prevent recursion.  If PostCode() is called while\r
+  processing another any other Post Code Library function, then\r

   PostCode() must return Value immediately.\r
 \r
   @param  Value  The 32-bit value to write to the POST card.\r
   PostCode() must return Value immediately.\r
 \r
   @param  Value  The 32-bit value to write to the POST card.\r


@@ -51,21 +51,21 @@ PostCode (
   Sends an 32-bit value to a POST and associated ASCII string.\r
 \r
   Sends the 32-bit value specified by Value to a POST card, and returns Value.\r
   Sends an 32-bit value to a POST and associated ASCII string.\r
 \r
   Sends the 32-bit value specified by Value to a POST card, and returns Value.\r

-  If Description is not NULL, then the ASCII string specified by Description is \r
-  also passed to the handler that displays the POST card value.  Some \r
-  implementations of this library function may perform I/O operations directly \r
-  to a POST card device.  Other implementations may send Value to ReportStatusCode(), \r
-  and the status code reporting mechanism will eventually display the 32-bit \r
-  value on the status reporting device.  \r
-\r
-  PostCodeWithDescription()must actively prevent recursion.  If \r
-  PostCodeWithDescription() is called while processing another any other Post \r
-  Code Library function, then PostCodeWithDescription() must return Value \r
+  If Description is not NULL, then the ASCII string specified by Description is\r
+  also passed to the handler that displays the POST card value.  Some\r
+  implementations of this library function may perform I/O operations directly\r
+  to a POST card device.  Other implementations may send Value to ReportStatusCode(),\r
+  and the status code reporting mechanism will eventually display the 32-bit\r
+  value on the status reporting device.\r
+\r
+  PostCodeWithDescription()must actively prevent recursion.  If\r
+  PostCodeWithDescription() is called while processing another any other Post\r
+  Code Library function, then PostCodeWithDescription() must return Value\r

   immediately.\r
 \r
   @param  Value        The 32-bit value to write to the POST card.\r
   immediately.\r
 \r
   @param  Value        The 32-bit value to write to the POST card.\r

-  @param  Description  The pointer to an ASCII string that is a description of the \r
-                       POST code value.  This is an optional parameter that may \r
+  @param  Description  The pointer to an ASCII string that is a description of the\r
+                       POST code value.  This is an optional parameter that may\r

                        be NULL.\r
 \r
   @return The 32-bit value to write to the POST card.\r
                        be NULL.\r
 \r
   @return The 32-bit value to write to the POST card.\r


@@ -86,12 +86,12 @@ PostCodeWithDescription (
 /**\r
   Returns TRUE if POST Codes are enabled.\r
 \r
 /**\r
   Returns TRUE if POST Codes are enabled.\r
 \r

-  This function returns TRUE if the POST_CODE_PROPERTY_POST_CODE_ENABLED \r
+  This function returns TRUE if the POST_CODE_PROPERTY_POST_CODE_ENABLED\r

   bit of PcdPostCodePropertyMask is set.  Otherwise FALSE is returned.\r
 \r
   bit of PcdPostCodePropertyMask is set.  Otherwise FALSE is returned.\r
 \r

-  @retval  TRUE   The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of \r
+  @retval  TRUE   The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of\r

                   PcdPostCodeProperyMask is set.\r
                   PcdPostCodeProperyMask is set.\r

-  @retval  FALSE  The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of \r
+  @retval  FALSE  The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of\r

                   PcdPostCodeProperyMask is clear.\r
 \r
 **/\r
                   PcdPostCodeProperyMask is clear.\r
 \r
 **/\r

diff --git a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf b/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
index ebe115872883b4243b42d275b86b48506bd68a10..6a5a482b1df7b6d07ea5e690bf96865c7d7ca818 100644 (file)
--- a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
+++ b/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
@@ -3,7 +3,7 @@
 #\r
 #  Post Code Library that writes post code values to I/O port 0x80.\r
 #\r
 #\r
 #  Post Code Library that writes post code values to I/O port 0x80.\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
 #\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                      = b6e9a733-eb75-41b6-b30c-009bcf3801c8\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = b6e9a733-eb75-41b6-b30c-009bcf3801c8\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PostCodeLib \r
+  LIBRARY_CLASS                  = PostCodeLib\r

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

diff --git a/MdePkg/Library/BasePostCodeLibPort80/PostCode.c b/MdePkg/Library/BasePostCodeLibPort80/PostCode.c
index f1fdbabce4b458fb80c3fa265fdd7654c1648aa3..df58efc9c4bb0756669ec15858a251a97dca4f5f 100644 (file)
--- a/MdePkg/Library/BasePostCodeLibPort80/PostCode.c
+++ b/MdePkg/Library/BasePostCodeLibPort80/PostCode.c
@@ -1,14 +1,14 @@
 /** @file\r
   Post Code Library instance that writes post code values to I/O port 0x80.\r
 \r
 /** @file\r
   Post Code Library instance that writes post code values to I/O port 0x80.\r
 \r

-  Copyright (c) 2006 - 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) 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


@@ -22,14 +22,14 @@
 /**\r
   Sends an 32-bit value to a POST card.\r
 \r
 /**\r
   Sends an 32-bit value to a POST card.\r
 \r

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.  \r
-  Some implementations of this library function may perform I/O operations \r
-  directly to a POST card device.  Other implementations may send Value to \r
-  ReportStatusCode(), and the status code reporting mechanism will eventually \r
+  Sends the 32-bit value specified by Value to a POST card, and returns Value.\r
+  Some implementations of this library function may perform I/O operations\r
+  directly to a POST card device.  Other implementations may send Value to\r
+  ReportStatusCode(), and the status code reporting mechanism will eventually\r

   display the 32-bit value on the status reporting device.\r
   display the 32-bit value on the status reporting device.\r

-  \r
-  PostCode() must actively prevent recursion.  If PostCode() is called while \r
-  processing another any other Post Code Library function, then \r
+\r
+  PostCode() must actively prevent recursion.  If PostCode() is called while\r
+  processing another any other Post Code Library function, then\r

   PostCode() must return Value immediately.\r
 \r
   @param  Value  The 32-bit value to write to the POST card.\r
   PostCode() must return Value immediately.\r
 \r
   @param  Value  The 32-bit value to write to the POST card.\r


@@ -60,7 +60,7 @@ PostCode (
     ASSERT (FALSE);\r
     break;\r
   }\r
     ASSERT (FALSE);\r
     break;\r
   }\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -69,21 +69,21 @@ PostCode (
   Sends an 32-bit value to a POST and associated ASCII string.\r
 \r
   Sends the 32-bit value specified by Value to a POST card, and returns Value.\r
   Sends an 32-bit value to a POST and associated ASCII string.\r
 \r
   Sends the 32-bit value specified by Value to a POST card, and returns Value.\r

-  If Description is not NULL, then the ASCII string specified by Description is \r
-  also passed to the handler that displays the POST card value.  Some \r
-  implementations of this library function may perform I/O operations directly \r
-  to a POST card device.  Other implementations may send Value to ReportStatusCode(), \r
-  and the status code reporting mechanism will eventually display the 32-bit \r
-  value on the status reporting device.  \r
-\r
-  PostCodeWithDescription()must actively prevent recursion.  If \r
-  PostCodeWithDescription() is called while processing another any other Post \r
-  Code Library function, then PostCodeWithDescription() must return Value \r
+  If Description is not NULL, then the ASCII string specified by Description is\r
+  also passed to the handler that displays the POST card value.  Some\r
+  implementations of this library function may perform I/O operations directly\r
+  to a POST card device.  Other implementations may send Value to ReportStatusCode(),\r
+  and the status code reporting mechanism will eventually display the 32-bit\r
+  value on the status reporting device.\r
+\r
+  PostCodeWithDescription()must actively prevent recursion.  If\r
+  PostCodeWithDescription() is called while processing another any other Post\r
+  Code Library function, then PostCodeWithDescription() must return Value\r

   immediately.\r
 \r
   @param  Value        The 32-bit value to write to the POST card.\r
   immediately.\r
 \r
   @param  Value        The 32-bit value to write to the POST card.\r

-  @param  Description  The pointer to an ASCII string that is a description of the \r
-                       POST code value.  This is an optional parameter that may \r
+  @param  Description  The pointer to an ASCII string that is a description of the\r
+                       POST code value.  This is an optional parameter that may\r

                        be NULL.\r
 \r
   @return The 32-bit value to write to the POST card.\r
                        be NULL.\r
 \r
   @return The 32-bit value to write to the POST card.\r


@@ -104,12 +104,12 @@ PostCodeWithDescription (
 /**\r
   Returns TRUE if POST Codes are enabled.\r
 \r
 /**\r
   Returns TRUE if POST Codes are enabled.\r
 \r

-  This function returns TRUE if the POST_CODE_PROPERTY_POST_CODE_ENABLED \r
+  This function returns TRUE if the POST_CODE_PROPERTY_POST_CODE_ENABLED\r

   bit of PcdPostCodePropertyMask is set.  Otherwise FALSE is returned.\r
 \r
   bit of PcdPostCodePropertyMask is set.  Otherwise FALSE is returned.\r
 \r

-  @retval  TRUE   The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of \r
+  @retval  TRUE   The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of\r

                   PcdPostCodeProperyMask is set.\r
                   PcdPostCodeProperyMask is set.\r

-  @retval  FALSE  The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of \r
+  @retval  FALSE  The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of\r

                   PcdPostCodeProperyMask is clear.\r
 \r
 **/\r
                   PcdPostCodeProperyMask is clear.\r
 \r
 **/\r

diff --git a/MdePkg/Library/BasePrintLib/BasePrintLib.inf b/MdePkg/Library/BasePrintLib/BasePrintLib.inf
index 069b80d5e45058cfd540f688268e4071fda3bd76..83ecc83b5575418ae709d26dd1d8f02d47c334b9 100644 (file)
--- a/MdePkg/Library/BasePrintLib/BasePrintLib.inf
+++ b/MdePkg/Library/BasePrintLib/BasePrintLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Print Library implementation.\r
 #\r
 ## @file\r
 #  Print Library implementation.\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


@@ -20,7 +20,7 @@
   FILE_GUID                      = a86fbfca-0183-4eeb-aa8a-762e3b7da1f3\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = a86fbfca-0183-4eeb-aa8a-762e3b7da1f3\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PrintLib \r
+  LIBRARY_CLASS                  = PrintLib\r

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

diff --git a/MdePkg/Library/BasePrintLib/PrintLib.c b/MdePkg/Library/BasePrintLib/PrintLib.c
index 34793919f67a06520c00aedfce0ff67df3737c08..749c02ac57f8b098708f61f639f353eb0ffef59d 100644 (file)
--- a/MdePkg/Library/BasePrintLib/PrintLib.c
+++ b/MdePkg/Library/BasePrintLib/PrintLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Base Print Library instance implementation.\r
 \r
 /** @file\r
   Base Print Library instance 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

   Portions copyright (c) 2008 - 2009, Apple 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
   Portions copyright (c) 2008 - 2009, Apple 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


@@ -17,8 +17,8 @@
 \r
 //\r
 // Declare a VA_LIST global variable that is used in calls to BasePrintLibSPrintMarker()\r
 \r
 //\r
 // Declare a VA_LIST global variable that is used in calls to BasePrintLibSPrintMarker()\r

-// when the BASE_LIST parameter is valid and the VA_LIST parameter is ignored.  \r
-// A NULL VA_LIST can not be passed into  BasePrintLibSPrintMarker() because some \r
+// when the BASE_LIST parameter is valid and the VA_LIST parameter is ignored.\r
+// A NULL VA_LIST can not be passed into  BasePrintLibSPrintMarker() because some\r

 // compilers define VA_LIST to be a structure.\r
 //\r
 VA_LIST gNullVaList;\r
 // compilers define VA_LIST to be a structure.\r
 //\r
 VA_LIST gNullVaList;\r


@@ -355,26 +355,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


@@ -390,7 +390,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


@@ -793,29 +793,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


@@ -827,7 +827,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


@@ -908,7 +908,7 @@ AsciiValueToStringS (
 }\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


@@ -921,7 +921,7 @@ AsciiValueToStringS (
   @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


@@ -936,7 +936,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


@@ -947,7 +947,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/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
index 6f19b314496b4b190df386697d5e53fc5fda6080..0b4b496ed77d0528ef4c2e9184a501308e43a4c7 100644 (file)
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
@@ -1,7 +1,7 @@
 /** @file\r
   Print Library internal worker functions.\r
 \r
 /** @file\r
   Print Library internal worker 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


@@ -83,7 +83,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


@@ -102,7 +102,7 @@ BasePrintLibFillBuffer (
   )\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


@@ -128,8 +128,8 @@ BasePrintLibFillBuffer (
 **/\r
 CHAR8 *\r
 BasePrintLibValueToString (\r
 **/\r
 CHAR8 *\r
 BasePrintLibValueToString (\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


@@ -152,23 +152,23 @@ BasePrintLibValueToString (
 \r
 /**\r
   Internal function that converts a decimal value to a Null-terminated string.\r
 \r
 /**\r
   Internal function that converts a decimal value to a Null-terminated string.\r

-  \r
-  Converts the decimal number specified by Value to a Null-terminated  \r
+\r
+  Converts the decimal number specified by Value to a Null-terminated\r

   string specified by Buffer containing at most Width characters.\r
   If Width is 0 then a width of  MAXIMUM_VALUE_CHARACTERS is assumed.\r
   The total number of characters placed in Buffer is returned.\r
   If the conversion contains more than Width characters, then only the first\r
   string specified by Buffer containing at most Width characters.\r
   If Width is 0 then a width of  MAXIMUM_VALUE_CHARACTERS is assumed.\r
   The total number of characters placed in Buffer is returned.\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
+  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
   If Value is < 0, then the fist character in Buffer is a '-'.\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 Value is < 0, 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
 \r
   sign character, '0' characters, digit characters for Value, and the Null-terminator\r
   add up to Width characters.\r
 \r


@@ -184,7 +184,7 @@ BasePrintLibValueToString (
   @param  Width     The maximum number of characters to place in Buffer, not including\r
                     the Null-terminator.\r
   @param  Increment The character increment in Buffer.\r
   @param  Width     The maximum number of characters to place in Buffer, not including\r
                     the Null-terminator.\r
   @param  Increment The character increment in Buffer.\r

-  \r
+\r

   @return Total number of characters required to perform the conversion.\r
 \r
 **/\r
   @return Total number of characters required to perform the conversion.\r
 \r
 **/\r


@@ -222,7 +222,7 @@ BasePrintLibConvertValueToString (
   ASSERT (((Flags & COMMA_TYPE) == 0) || ((Flags & RADIX_HEX) == 0));\r
 \r
   OriginalBuffer = Buffer;\r
   ASSERT (((Flags & COMMA_TYPE) == 0) || ((Flags & RADIX_HEX) == 0));\r
 \r
   OriginalBuffer = Buffer;\r

-  \r
+\r

   //\r
   // Width is 0 or COMMA_TYPE is set, PREFIX_ZERO is ignored.\r
   //\r
   //\r
   // Width is 0 or COMMA_TYPE is set, PREFIX_ZERO is ignored.\r
   //\r


@@ -239,7 +239,7 @@ BasePrintLibConvertValueToString (
   // Set the tag for the end of the input Buffer.\r
   //\r
   EndBuffer = Buffer + Width * Increment;\r
   // Set the tag for the end of the input Buffer.\r
   //\r
   EndBuffer = Buffer + Width * Increment;\r

-  \r
+\r

   //\r
   // Convert decimal negative\r
   //\r
   //\r
   // Convert decimal negative\r
   //\r


@@ -248,21 +248,21 @@ BasePrintLibConvertValueToString (
     Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, '-', Increment);\r
     Width--;\r
   }\r
     Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, '-', Increment);\r
     Width--;\r
   }\r

-  \r
+\r

   //\r
   // Count the length of the value string.\r
   //\r
   Radix = ((Flags & RADIX_HEX) == 0)? 10 : 16;\r
   ValueBufferPtr = BasePrintLibValueToString (ValueBuffer, Value, Radix);\r
   Count = ValueBufferPtr - ValueBuffer;\r
   //\r
   // Count the length of the value string.\r
   //\r
   Radix = ((Flags & RADIX_HEX) == 0)? 10 : 16;\r
   ValueBufferPtr = BasePrintLibValueToString (ValueBuffer, Value, Radix);\r
   Count = ValueBufferPtr - ValueBuffer;\r

-  \r
+\r

   //\r
   // Append Zero\r
   //\r
   if ((Flags & PREFIX_ZERO) != 0) {\r
     Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Width - Count, '0', Increment);\r
   }\r
   //\r
   // Append Zero\r
   //\r
   if ((Flags & PREFIX_ZERO) != 0) {\r
     Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Width - Count, '0', Increment);\r
   }\r

-  \r
+\r

   //\r
   // Print Comma type for every 3 characters\r
   //\r
   //\r
   // Print Comma type for every 3 characters\r
   //\r


@@ -282,7 +282,7 @@ BasePrintLibConvertValueToString (
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Print Null-terminator\r
   //\r
   //\r
   // Print Null-terminator\r
   //\r


@@ -496,21 +496,21 @@ BasePrintLibConvertValueToStringS (
 }\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


@@ -566,7 +566,7 @@ BasePrintLibSPrintMarker (
 \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


@@ -687,24 +687,24 @@ BasePrintLibSPrintMarker (
         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


@@ -748,11 +748,11 @@ BasePrintLibSPrintMarker (
             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


@@ -763,7 +763,7 @@ BasePrintLibSPrintMarker (
           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


@@ -803,9 +803,9 @@ BasePrintLibSPrintMarker (
           //\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


@@ -843,9 +843,9 @@ BasePrintLibSPrintMarker (
             //\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


@@ -857,9 +857,9 @@ BasePrintLibSPrintMarker (
             //\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


@@ -873,7 +873,7 @@ BasePrintLibSPrintMarker (
           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


@@ -946,7 +946,7 @@ BasePrintLibSPrintMarker (
           GuidData3 = ReadUnaligned16 (&(TmpGuid->Data3));\r
           BasePrintLibSPrint (\r
             ValueBuffer,\r
           GuidData3 = ReadUnaligned16 (&(TmpGuid->Data3));\r
           BasePrintLibSPrint (\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


@@ -967,9 +967,9 @@ BasePrintLibSPrintMarker (
 \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


@@ -1054,7 +1054,7 @@ BasePrintLibSPrintMarker (
         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


@@ -1230,11 +1230,11 @@ BasePrintLibSPrintMarker (
 }\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

diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.h b/MdePkg/Library/BasePrintLib/PrintLibInternal.h
index 052e699574c646c6d3b1d97406de90f4a0fb22e4..9e3ce67709d2a581ab6d8dc71a68aeb67f559e79 100644 (file)
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.h
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.h
@@ -1,7 +1,7 @@
 /** @file\r
   Base Print Library instance Internal Functions definition.\r
 \r
 /** @file\r
   Base Print Library instance Internal Functions definition.\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


@@ -55,21 +55,21 @@ typedef struct {
 } TIME;\r
 \r
 /**\r
 } TIME;\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


@@ -93,11 +93,11 @@ BasePrintLibSPrintMarker (
   );\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


@@ -129,7 +129,7 @@ BasePrintLibSPrint (
 \r
   @param  Buffer      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      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


@@ -161,30 +161,30 @@ BasePrintLibFillBuffer (
 **/\r
 CHAR8 *\r
 BasePrintLibValueToString (\r
 **/\r
 CHAR8 *\r
 BasePrintLibValueToString (\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
 /**\r
   Internal function that converts a decimal value to a Null-terminated string.\r
   IN UINTN      Radix\r
   );\r
 \r
 /**\r
   Internal function that converts a decimal value to a Null-terminated string.\r

-  \r
-  Converts the decimal number specified by Value to a Null-terminated  \r
+\r
+  Converts the decimal number specified by Value to a Null-terminated\r

   string specified by Buffer containing at most Width characters.\r
   If Width is 0 then a width of  MAXIMUM_VALUE_CHARACTERS is assumed.\r
   The total number of characters placed in Buffer is returned.\r
   If the conversion contains more than Width characters, then only the first\r
   string specified by Buffer containing at most Width characters.\r
   If Width is 0 then a width of  MAXIMUM_VALUE_CHARACTERS is assumed.\r
   The total number of characters placed in Buffer is returned.\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
+  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
   If Value is < 0, then the fist character in Buffer is a '-'.\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 Value is < 0, 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
 \r
   sign character, '0' characters, digit characters for Value, and the Null-terminator\r
   add up to Width characters.\r
 \r


@@ -200,7 +200,7 @@ BasePrintLibValueToString (
   @param  Width     The maximum number of characters to place in Buffer, not including\r
                     the Null-terminator.\r
   @param  Increment Character increment in Buffer.\r
   @param  Width     The maximum number of characters to place in Buffer, not including\r
                     the Null-terminator.\r
   @param  Increment Character increment in Buffer.\r

-  \r
+\r

   @return Total number of characters required to perform the conversion.\r
 \r
 **/\r
   @return Total number of characters required to perform the conversion.\r
 \r
 **/\r

diff --git a/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLib.c b/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLib.c
index 829c597fb8d1a057b44bbd59946a41a685c5129a..497c288898b7790bc034ff8dafc0acb65dd1c653 100644 (file)
--- a/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLib.c
+++ b/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Null Base Report Status Code Library instance with empty functions.\r
 \r
 /** @file\r
   Null Base Report Status Code Library instance with empty functions.\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


@@ -215,7 +215,7 @@ ReportStatusCodeWithDevicePath (
   )\r
 {\r
   ASSERT (DevicePath != NULL);\r
   )\r
 {\r
   ASSERT (DevicePath != NULL);\r

-  \r
+\r

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

diff --git a/MdePkg/Library/BaseS3BootScriptLibNull/BaseS3BootScriptLibNull.uni b/MdePkg/Library/BaseS3BootScriptLibNull/BaseS3BootScriptLibNull.uni
index aebac53d7c9f38f9b1be678038e6cd0c6ed195b6..f15fef6c900c9c1b24d297e6884be956314a5326 100644 (file)
--- a/MdePkg/Library/BaseS3BootScriptLibNull/BaseS3BootScriptLibNull.uni
+++ b/MdePkg/Library/BaseS3BootScriptLibNull/BaseS3BootScriptLibNull.uni
@@ -5,13 +5,13 @@
 // resume.  All the library interfaces simply return EFI_SUCCESS without\r
 // performing any operation.\r
 //\r
 // resume.  All the library interfaces simply return EFI_SUCCESS without\r
 // performing any operation.\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 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/MdePkg/Library/BaseS3BootScriptLibNull/BootScriptLib.c b/MdePkg/Library/BaseS3BootScriptLibNull/BootScriptLib.c
index 3dee64746ad93dd482a8bb1f10bf127c483eca57..7d678d7c7f5910702550bf46147773e06584822f 100644 (file)
--- a/MdePkg/Library/BaseS3BootScriptLibNull/BootScriptLib.c
+++ b/MdePkg/Library/BaseS3BootScriptLibNull/BootScriptLib.c
@@ -1,7 +1,7 @@
 /** @file\r
 /** @file\r

-  Null function implementation for EFI S3 boot script. \r
+  Null function implementation for EFI S3 boot script.\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

 \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 @@
 #include <Library/S3BootScriptLib.h>\r
 \r
 /**\r
 #include <Library/S3BootScriptLib.h>\r
 \r
 /**\r

-  Save I/O write to boot script \r
+  Save I/O write to boot script\r

 \r
   @param Width  the width of the I/O operations.Enumerated in S3_BOOT_SCRIPT_LIB_WIDTH.\r
   @param Address The base address of the I/O operations.\r
 \r
   @param Width  the width of the I/O operations.Enumerated in S3_BOOT_SCRIPT_LIB_WIDTH.\r
   @param Address The base address of the I/O operations.\r


@@ -38,7 +38,7 @@ S3BootScriptSaveIoWrite (
   IN  VOID                              *Buffer\r
   )\r
 {\r
   IN  VOID                              *Buffer\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

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


@@ -61,7 +61,7 @@ S3BootScriptSaveIoReadWrite (
   IN  VOID                            *DataMask\r
   )\r
 {\r
   IN  VOID                            *DataMask\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

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


@@ -84,7 +84,7 @@ S3BootScriptSaveMemWrite (
   IN  VOID                              *Buffer\r
   )\r
 {\r
   IN  VOID                              *Buffer\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 /**\r
   Adds a record for a memory modify operation into a specified boot script table.\r
 }\r
 /**\r
   Adds a record for a memory modify operation into a specified boot script table.\r


@@ -106,7 +106,7 @@ S3BootScriptSaveMemReadWrite (
   IN  VOID                              *DataMask\r
   )\r
 {\r
   IN  VOID                              *DataMask\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 /**\r
   Adds a record for a PCI configuration space write operation into a specified boot script table.\r
 }\r
 /**\r
   Adds a record for a PCI configuration space write operation into a specified boot script table.\r


@@ -128,7 +128,7 @@ S3BootScriptSavePciCfgWrite (
   IN  VOID                            *Buffer\r
   )\r
 {\r
   IN  VOID                            *Buffer\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

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


@@ -151,7 +151,7 @@ S3BootScriptSavePciCfgReadWrite (
   IN  VOID                              *DataMask\r
   )\r
 {\r
   IN  VOID                              *DataMask\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 /**\r
   Adds a record for a PCI configuration space modify operation into a specified boot script table.\r
 }\r
 /**\r
   Adds a record for a PCI configuration space modify operation into a specified boot script table.\r


@@ -175,7 +175,7 @@ S3BootScriptSavePciCfg2Write (
   IN VOID                           *Buffer\r
   )\r
 {\r
   IN VOID                           *Buffer\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 /**\r
   Adds a record for a PCI configuration space modify operation into a specified boot script table.\r
 }\r
 /**\r
   Adds a record for a PCI configuration space modify operation into a specified boot script table.\r


@@ -198,8 +198,8 @@ S3BootScriptSavePciCfg2ReadWrite (
   IN VOID                           *Data,\r
   IN VOID                           *DataMask\r
   )\r
   IN VOID                           *Data,\r
   IN VOID                           *DataMask\r
   )\r

-{ \r
-       return RETURN_SUCCESS;\r
+{\r
+  return RETURN_SUCCESS;\r

 }\r
 /**\r
   Adds a record for an SMBus command execution into a specified boot script table.\r
 }\r
 /**\r
   Adds a record for an SMBus command execution into a specified boot script table.\r


@@ -209,26 +209,26 @@ S3BootScriptSavePciCfg2ReadWrite (
                         transactions.\r
   @param Length         A pointer to signify the number of bytes that this operation will do.\r
   @param Buffer         Contains the value of data to execute to the SMBUS slave device.\r
                         transactions.\r
   @param Length         A pointer to signify the number of bytes that this operation will do.\r
   @param Buffer         Contains the value of data to execute to the SMBUS slave device.\r

-  \r
+\r

   @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table do operation.\r
   @retval RETURN_SUCCESS           Opcode is added.\r
 **/\r
 RETURN_STATUS\r
 EFIAPI\r
 S3BootScriptSaveSmbusExecute (\r
   @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table do operation.\r
   @retval RETURN_SUCCESS           Opcode is added.\r
 **/\r
 RETURN_STATUS\r
 EFIAPI\r
 S3BootScriptSaveSmbusExecute (\r

-  IN  UINTN                             SmBusAddress, \r
+  IN  UINTN                             SmBusAddress,\r

   IN  EFI_SMBUS_OPERATION               Operation,\r
   IN  UINTN                             *Length,\r
   IN  VOID                              *Buffer\r
   )\r
 {\r
   IN  EFI_SMBUS_OPERATION               Operation,\r
   IN  UINTN                             *Length,\r
   IN  VOID                              *Buffer\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 /**\r
   Adds a record for an execution stall on the processor into a specified boot script table.\r
 \r
   @param Duration   Duration in microseconds of the stall\r
 }\r
 /**\r
   Adds a record for an execution stall on the processor into a specified boot script table.\r
 \r
   @param Duration   Duration in microseconds of the stall\r

-  \r
+\r

   @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table do operation.\r
   @retval RETURN_SUCCESS           Opcode is added.\r
 **/\r
   @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table do operation.\r
   @retval RETURN_SUCCESS           Opcode is added.\r
 **/\r


@@ -238,13 +238,13 @@ S3BootScriptSaveStall (
   IN  UINTN                             Duration\r
   )\r
 {\r
   IN  UINTN                             Duration\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 /**\r
   Adds a record for dispatching specified arbitrary code into a specified boot script table.\r
 \r
   @param EntryPoint   Entry point of the code to be dispatched.\r
 }\r
 /**\r
   Adds a record for dispatching specified arbitrary code into a specified boot script table.\r
 \r
   @param EntryPoint   Entry point of the code to be dispatched.\r

-  \r
+\r

   @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table do operation.\r
   @retval RETURN_SUCCESS            Opcode is added.\r
 **/\r
   @retval RETURN_OUT_OF_RESOURCES   Not enough memory for the table do operation.\r
   @retval RETURN_SUCCESS            Opcode is added.\r
 **/\r


@@ -261,7 +261,7 @@ S3BootScriptSaveDispatch (
 \r
   @param EntryPoint   Entry point of the code to be dispatched.\r
   @param Context      Argument to be passed into the EntryPoint of the code to be dispatched.\r
 \r
   @param EntryPoint   Entry point of the code to be dispatched.\r
   @param Context      Argument to be passed into the EntryPoint of the code to be dispatched.\r

-  \r
+\r

   @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table do operation.\r
   @retval RETURN_SUCCESS           Opcode is added.\r
 **/\r
   @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table do operation.\r
   @retval RETURN_SUCCESS           Opcode is added.\r
 **/\r


@@ -272,13 +272,13 @@ S3BootScriptSaveDispatch2 (
   IN  VOID                              *Context\r
   )\r
 {\r
   IN  VOID                              *Context\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 \r
 /**\r
   Adds a record for memory reads of the memory location and continues when the exit criteria is\r
   satisfied or after a defined duration.\r
 }\r
 \r
 /**\r
   Adds a record for memory reads of the memory location and continues when the exit criteria is\r
   satisfied or after a defined duration.\r

- \r
+\r

   Please aware, below interface is different with PI specification, Vol 5:\r
   EFI_S3_SAVE_STATE_PROTOCOL.Write() for EFI_BOOT_SCRIPT_MEM_POLL_OPCODE.\r
   "Duration" below is microseconds, while "Delay" in PI specification means\r
   Please aware, below interface is different with PI specification, Vol 5:\r
   EFI_S3_SAVE_STATE_PROTOCOL.Write() for EFI_BOOT_SCRIPT_MEM_POLL_OPCODE.\r
   "Duration" below is microseconds, while "Delay" in PI specification means\r


@@ -306,16 +306,16 @@ S3BootScriptSaveMemPoll (
   IN  UINT64                            LoopTimes\r
   )\r
 {\r
   IN  UINT64                            LoopTimes\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 \r
 /**\r
   Store arbitrary information in the boot script table. This opcode is a no-op on dispatch and is only\r
   used for debugging script issues.\r
 }\r
 \r
 /**\r
   Store arbitrary information in the boot script table. This opcode is a no-op on dispatch and is only\r
   used for debugging script issues.\r

-  \r
+\r

   @param InformationLength   Length of the data in bytes\r
   @param Information       Information to be logged in the boot scrpit\r
   @param InformationLength   Length of the data in bytes\r
   @param Information       Information to be logged in the boot scrpit\r

- \r
+\r

   @retval RETURN_UNSUPPORTED   If  entering runtime, this method will not support.\r
   @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table do operation.\r
   @retval RETURN_SUCCESS           Opcode is added.\r
   @retval RETURN_UNSUPPORTED   If  entering runtime, this method will not support.\r
   @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table do operation.\r
   @retval RETURN_SUCCESS           Opcode is added.\r


@@ -324,17 +324,17 @@ S3BootScriptSaveMemPoll (
 RETURN_STATUS\r
 EFIAPI\r
 S3BootScriptSaveInformation (\r
 RETURN_STATUS\r
 EFIAPI\r
 S3BootScriptSaveInformation (\r

-  IN  UINT32                   InformationLength, \r
+  IN  UINT32                   InformationLength,\r

   IN  VOID                    *Information\r
   )\r
 {\r
   IN  VOID                    *Information\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 /**\r
   Adds a record for I/O reads the I/O location and continues when the exit criteria is satisfied or after a\r
   defined duration.\r
 }\r
 /**\r
   Adds a record for I/O reads the I/O location and continues when the exit criteria is satisfied or after a\r
   defined duration.\r

-  \r
-  @param  Width                 The width of the I/O operations. \r
+\r
+  @param  Width                 The width of the I/O operations.\r

   @param  Address               The base address of the I/O operations.\r
   @param  Data                  The comparison value used for the polling exit criteria.\r
   @param  DataMask              Mask used for the polling criteria. The bits in the bytes below Width which are zero\r
   @param  Address               The base address of the I/O operations.\r
   @param  Data                  The comparison value used for the polling exit criteria.\r
   @param  DataMask              Mask used for the polling criteria. The bits in the bytes below Width which are zero\r


@@ -352,18 +352,18 @@ S3BootScriptSaveIoPoll (
   IN S3_BOOT_SCRIPT_LIB_WIDTH       Width,\r
   IN UINT64                     Address,\r
   IN VOID                      *Data,\r
   IN S3_BOOT_SCRIPT_LIB_WIDTH       Width,\r
   IN UINT64                     Address,\r
   IN VOID                      *Data,\r

-  IN VOID                      *DataMask, \r
-  IN UINT64                     Delay   \r
+  IN VOID                      *DataMask,\r
+  IN UINT64                     Delay\r

   )\r
 {\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 \r
 /**\r
   Adds a record for PCI configuration space reads and continues when the exit criteria is satisfied or\r
   after a defined duration.\r
 \r
 }\r
 \r
 /**\r
   Adds a record for PCI configuration space reads and continues when the exit criteria is satisfied or\r
   after a defined duration.\r
 \r

-  @param  Width                 The width of the I/O operations. \r
+  @param  Width                 The width of the I/O operations.\r

   @param  Address               The address within the PCI configuration space.\r
   @param  Data                  The comparison value used for the polling exit criteria.\r
   @param  DataMask              Mask used for the polling criteria. The bits in the bytes below Width which are zero\r
   @param  Address               The address within the PCI configuration space.\r
   @param  Data                  The comparison value used for the polling exit criteria.\r
   @param  DataMask              Mask used for the polling criteria. The bits in the bytes below Width which are zero\r


@@ -385,13 +385,13 @@ S3BootScriptSavePciPoll (
    IN UINT64                     Delay\r
  )\r
 {\r
    IN UINT64                     Delay\r
  )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 /**\r
   Adds a record for PCI configuration space reads and continues when the exit criteria is satisfied or\r
   after a defined duration.\r
 \r
 }\r
 /**\r
   Adds a record for PCI configuration space reads and continues when the exit criteria is satisfied or\r
   after a defined duration.\r
 \r

-  @param  Width                 The width of the I/O operations. \r
+  @param  Width                 The width of the I/O operations.\r

   @param  Segment               The PCI segment number for Address.\r
   @param  Address               The address within the PCI configuration space.\r
   @param  Data                  The comparison value used for the polling exit criteria.\r
   @param  Segment               The PCI segment number for Address.\r
   @param  Address               The address within the PCI configuration space.\r
   @param  Data                  The comparison value used for the polling exit criteria.\r


@@ -403,7 +403,7 @@ S3BootScriptSavePciPoll (
  @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table do operation.\r
  @retval RETURN_SUCCESS           Opcode is added.\r
  @note   A known Limitations in the implementation: When interpreting the opcode  EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE\r
  @retval RETURN_OUT_OF_RESOURCES  Not enough memory for the table do operation.\r
  @retval RETURN_SUCCESS           Opcode is added.\r
  @note   A known Limitations in the implementation: When interpreting the opcode  EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE\r

-         EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE and EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE, the 'Segment' parameter is assumed as \r
+         EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE and EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE, the 'Segment' parameter is assumed as\r

          Zero, or else, assert.\r
 \r
 **/\r
          Zero, or else, assert.\r
 \r
 **/\r


@@ -418,7 +418,7 @@ S3BootScriptSavePci2Poll (
    IN UINT64                        Delay\r
   )\r
 {\r
    IN UINT64                        Delay\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 /**\r
   Save ASCII string information specified by Buffer to\r
 }\r
 /**\r
   Save ASCII string information specified by Buffer to\r


@@ -436,31 +436,31 @@ S3BootScriptSaveInformationAsciiString (
   IN  CONST CHAR8               *String\r
   )\r
 {\r
   IN  CONST CHAR8               *String\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

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

-  This is an function to close the S3 boot script table. The function could only be called in \r
-  BOOT time phase. To comply with the Framework spec definition on \r
+  This is an function to close the S3 boot script table. The function could only be called in\r
+  BOOT time phase. To comply with the Framework spec definition on\r

   EFI_BOOT_SCRIPT_SAVE_PROTOCOL.CloseTable(), this function will fulfill following things:\r
   1. Closes the specified boot script table\r
   EFI_BOOT_SCRIPT_SAVE_PROTOCOL.CloseTable(), this function will fulfill following things:\r
   1. Closes the specified boot script table\r

-  2. It allocates a new memory pool to duplicate all the boot scripts in the specified table. \r
-     Once this function is called, the table maintained by the library will be destroyed \r
+  2. It allocates a new memory pool to duplicate all the boot scripts in the specified table.\r
+     Once this function is called, the table maintained by the library will be destroyed\r

      after it is copied into the allocated pool.\r
      after it is copied into the allocated pool.\r

-  3. Any attempts to add a script record after calling this function will cause a new table \r
+  3. Any attempts to add a script record after calling this function will cause a new table\r

      to be created by the library.\r
      to be created by the library.\r

-  4. The base address of the allocated pool will be returned in Address. Note that after \r
+  4. The base address of the allocated pool will be returned in Address. Note that after\r

      using the boot script table, the CALLER is responsible for freeing the pool that is allocated\r
      using the boot script table, the CALLER is responsible for freeing the pool that is allocated\r

-     by this function. \r
+     by this function.\r

 \r
   In Spec PI1.1, this EFI_BOOT_SCRIPT_SAVE_PROTOCOL.CloseTable() is retired. By then it is not\r
   necessary to provide this API in BootScriptLib. To provides this API for now is only to meet\r
   the requirement from Framework Spec.\r
 \r
   In Spec PI1.1, this EFI_BOOT_SCRIPT_SAVE_PROTOCOL.CloseTable() is retired. By then it is not\r
   necessary to provide this API in BootScriptLib. To provides this API for now is only to meet\r
   the requirement from Framework Spec.\r

-  \r
-  If anyone does call CloseTable() on a real platform, then the caller is responsible for figuring out \r
-  how to get the script to run on an S3 resume because the boot script maintained by the lib will be \r
+\r
+  If anyone does call CloseTable() on a real platform, then the caller is responsible for figuring out\r
+  how to get the script to run on an S3 resume because the boot script maintained by the lib will be\r

   destroyed.\r
   destroyed.\r

- \r
-  @return the base address of the new copy of the boot script table.   \r
+\r
+  @return the base address of the new copy of the boot script table.\r

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


@@ -469,13 +469,13 @@ S3BootScriptCloseTable (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-       return 0;\r
+  return 0;\r

 }\r
 /**\r
   Executes the S3 boot script table.\r
 \r
   @param RETURN_SUCCESS           The boot script table was executed successfully.\r
 }\r
 /**\r
   Executes the S3 boot script table.\r
 \r
   @param RETURN_SUCCESS           The boot script table was executed successfully.\r

-  @param RETURN_UNSUPPORTED       Invalid script table or opcode.  \r
+  @param RETURN_UNSUPPORTED       Invalid script table or opcode.\r

 **/\r
 RETURN_STATUS\r
 EFIAPI\r
 **/\r
 RETURN_STATUS\r
 EFIAPI\r


@@ -483,10 +483,10 @@ S3BootScriptExecute (
    VOID\r
   )\r
 {\r
    VOID\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

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

-  Move the last boot script entry to the position \r
+  Move the last boot script entry to the position\r

 \r
   @param  BeforeOrAfter         Specifies whether the opcode is stored before (TRUE) or after (FALSE) the position\r
                                 in the boot script table specified by Position. If Position is NULL or points to\r
 \r
   @param  BeforeOrAfter         Specifies whether the opcode is stored before (TRUE) or after (FALSE) the position\r
                                 in the boot script table specified by Position. If Position is NULL or points to\r


@@ -507,15 +507,15 @@ S3BootScriptMoveLastOpcode (
   IN OUT VOID                         **Position OPTIONAL\r
 )\r
 {\r
   IN OUT VOID                         **Position OPTIONAL\r
 )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 /**\r
   Find a label within the boot script table and, if not present, optionally create it.\r
 \r
   @param  BeforeOrAfter         Specifies whether the opcode is stored before (TRUE)\r
 }\r
 /**\r
   Find a label within the boot script table and, if not present, optionally create it.\r
 \r
   @param  BeforeOrAfter         Specifies whether the opcode is stored before (TRUE)\r

-                                or after (FALSE) the position in the boot script table \r
+                                or after (FALSE) the position in the boot script table\r

                                 specified by Position.\r
                                 specified by Position.\r

-  @param  CreateIfNotFound      Specifies whether the label will be created if the label \r
+  @param  CreateIfNotFound      Specifies whether the label will be created if the label\r

                                 does not exists (TRUE) or not (FALSE).\r
   @param  Position              On entry, specifies the position in the boot script table\r
                                 where the opcode will be inserted, either before or after,\r
                                 does not exists (TRUE) or not (FALSE).\r
   @param  Position              On entry, specifies the position in the boot script table\r
                                 where the opcode will be inserted, either before or after,\r


@@ -526,13 +526,13 @@ S3BootScriptMoveLastOpcode (
   @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
 **/\r
 RETURN_STATUS\r
                                 Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
 \r
 **/\r
 RETURN_STATUS\r

-EFIAPI \r
+EFIAPI\r

 S3BootScriptLabel (\r
   IN       BOOLEAN                      BeforeOrAfter,\r
   IN       BOOLEAN                      CreateIfNotFound,\r
 S3BootScriptLabel (\r
   IN       BOOLEAN                      BeforeOrAfter,\r
   IN       BOOLEAN                      CreateIfNotFound,\r


@@ -540,7 +540,7 @@ S3BootScriptLabel (
   IN CONST CHAR8                       *Label\r
   )\r
 {\r
   IN CONST CHAR8                       *Label\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\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


@@ -551,18 +551,18 @@ S3BootScriptLabel (
   @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
 **/\r
 RETURN_STATUS\r
                                 Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
 \r
 **/\r
 RETURN_STATUS\r

-EFIAPI \r
+EFIAPI\r

 S3BootScriptCompare (\r
   IN  UINT8                       *Position1,\r
   IN  UINT8                       *Position2,\r
   OUT UINTN                       *RelativePosition\r
   )\r
 {\r
 S3BootScriptCompare (\r
   IN  UINT8                       *Position1,\r
   IN  UINT8                       *Position2,\r
   OUT UINTN                       *RelativePosition\r
   )\r
 {\r

-       return RETURN_SUCCESS;\r
+  return RETURN_SUCCESS;\r

 }\r
 }\r

diff --git a/MdePkg/Library/BaseS3IoLib/BaseS3IoLib.inf b/MdePkg/Library/BaseS3IoLib/BaseS3IoLib.inf
index b6c10941ff3fdc5a000a89611fde3fa1d7854441..c00211fdadbe33f0fc5785c24c99120ebb209001 100644 (file)
--- a/MdePkg/Library/BaseS3IoLib/BaseS3IoLib.inf
+++ b/MdePkg/Library/BaseS3IoLib/BaseS3IoLib.inf
@@ -1,10 +1,10 @@
 ## @file\r
 # Instance of S3 I/O Library based on I/O and S3 BootScript Library.\r
 #\r
 ## @file\r
 # Instance of S3 I/O Library based on I/O and S3 BootScript Library.\r
 #\r

-# S3 I/O and MMIO Library Services that do I/O and also \r
+# S3 I/O and MMIO Library Services that do I/O and also\r

 # enable the I/O operatation to be replayed during an S3 resume.\r
 #\r
 # enable the I/O operatation to be replayed during an S3 resume.\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
 #\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 @@
   FILE_GUID                      = B13F938E-47DF-4516-A397-8927A4E42B61\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = B13F938E-47DF-4516-A397-8927A4E42B61\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = S3IoLib \r
+  LIBRARY_CLASS                  = S3IoLib\r

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

diff --git a/MdePkg/Library/BaseS3IoLib/BaseS3IoLib.uni b/MdePkg/Library/BaseS3IoLib/BaseS3IoLib.uni
index 863b334835557ea17793aebb61fa72c8eade91c7..870e371dbe89aa0b0bec6065207c1fbf3cf48080 100644 (file)
--- a/MdePkg/Library/BaseS3IoLib/BaseS3IoLib.uni
+++ b/MdePkg/Library/BaseS3IoLib/BaseS3IoLib.uni
@@ -4,13 +4,13 @@
 // S3 I/O and MMIO Library Services that do I/O and also\r
 // enable the I/O operatation to be replayed during an S3 resume.\r
 //\r
 // S3 I/O and MMIO Library Services that do I/O and also\r
 // enable the I/O operatation to be replayed during an S3 resume.\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/MdePkg/Library/BaseS3IoLib/S3IoLib.c b/MdePkg/Library/BaseS3IoLib/S3IoLib.c
index 017bcbb9cd37c6a287d465f54c917a486e401cd5..adadc2373197f794f7a690fdc0f7f45c35bfbf40 100644 (file)
--- a/MdePkg/Library/BaseS3IoLib/S3IoLib.c
+++ b/MdePkg/Library/BaseS3IoLib/S3IoLib.c
@@ -1,8 +1,8 @@
 /** @file\r
   I/O and MMIO Library Services that do I/O and also enable the I/O operatation\r
   to be replayed during an S3 resume.\r
 /** @file\r
   I/O and MMIO Library Services that do I/O and also enable the I/O operatation\r
   to be replayed during an S3 resume.\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

 \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 @@
   Saves an I/O port value to the boot script.\r
 \r
   This internal worker function saves an I/O port value in the S3 script\r
   Saves an I/O port value to the boot script.\r
 \r
   This internal worker function saves an I/O port value in the S3 script\r

-  to be replayed on S3 resume. \r
+  to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -44,7 +44,7 @@ InternalSaveIoWriteValueToBootScript (
   )\r
 {\r
   RETURN_STATUS                Status;\r
   )\r
 {\r
   RETURN_STATUS                Status;\r

-  \r
+\r

   Status = S3BootScriptSaveIoWrite (\r
              Width,\r
              Port,\r
   Status = S3BootScriptSaveIoWrite (\r
              Width,\r
              Port,\r


@@ -53,12 +53,12 @@ InternalSaveIoWriteValueToBootScript (
              );\r
   ASSERT (Status == RETURN_SUCCESS);\r
 }\r
              );\r
   ASSERT (Status == RETURN_SUCCESS);\r
 }\r

-  \r
+\r

 /**\r
   Saves an 8-bit I/O port value to the boot script.\r
 \r
   This internal worker function saves an 8-bit I/O port value in the S3 script\r
 /**\r
   Saves an 8-bit I/O port value to the boot script.\r
 \r
   This internal worker function saves an 8-bit I/O port value in the S3 script\r

-  to be replayed on S3 resume. \r
+  to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -189,7 +189,7 @@ S3IoAnd8 (
 \r
 /**\r
   Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, and writes the result back to the 8-bit I/O port and saves \r
+  inclusive OR, and writes the result back to the 8-bit I/O port and saves\r

   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r
   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -290,7 +290,7 @@ S3IoBitFieldWrite8 (
 \r
 /**\r
   Reads a bit field in an 8-bit port, performs a bitwise OR, and writes the\r
 \r
 /**\r
   Reads a bit field in an 8-bit port, performs a bitwise OR, and writes the\r

-  result back to the bit field in the 8-bit port and saves the value in the \r
+  result back to the bit field in the 8-bit port and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise OR\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise OR\r


@@ -329,7 +329,7 @@ S3IoBitFieldOr8 (
 \r
 /**\r
   Reads a bit field in an 8-bit port, performs a bitwise AND, and writes the\r
 \r
 /**\r
   Reads a bit field in an 8-bit port, performs a bitwise AND, and writes the\r

-  result back to the bit field in the 8-bit port  and saves the value in the \r
+  result back to the bit field in the 8-bit port  and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -413,7 +413,7 @@ S3IoBitFieldAndThenOr8 (
   Saves a 16-bit I/O port value to the boot script.\r
 \r
   This internal worker function saves a 16-bit I/O port value in the S3 script\r
   Saves a 16-bit I/O port value to the boot script.\r
 \r
   This internal worker function saves a 16-bit I/O port value in the S3 script\r

-  to be replayed on S3 resume. \r
+  to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -430,7 +430,7 @@ InternalSaveIoWrite16ValueToBootScript (
   )\r
 {\r
   InternalSaveIoWriteValueToBootScript (S3BootScriptWidthUint16, Port, &Value);\r
   )\r
 {\r
   InternalSaveIoWriteValueToBootScript (S3BootScriptWidthUint16, Port, &Value);\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -486,7 +486,7 @@ S3IoWrite16 (
 \r
 /**\r
   Reads a 16-bit I/O port, performs a bitwise OR, and writes the\r
 \r
 /**\r
   Reads a 16-bit I/O port, performs a bitwise OR, and writes the\r

-  result back to the 16-bit I/O port and saves the value in the S3 script to \r
+  result back to the 16-bit I/O port and saves the value in the S3 script to\r

   be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise OR\r
   be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise OR\r


@@ -607,7 +607,7 @@ S3IoBitFieldRead16 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Writes a bit field to an I/O register and saves the value in the S3 script \r
+  Writes a bit field to an I/O register and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r
   to be replayed on S3 resume.\r
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r


@@ -645,7 +645,7 @@ S3IoBitFieldWrite16 (
 \r
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise OR, and writes the\r
 \r
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise OR, and writes the\r

-  result back to the bit field in the 16-bit port and saves the value in the \r
+  result back to the bit field in the 16-bit port and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise OR\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise OR\r


@@ -684,7 +684,7 @@ S3IoBitFieldOr16 (
 \r
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise AND, and writes the\r
 \r
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise AND, and writes the\r

-  result back to the bit field in the 16-bit port and saves the value in the \r
+  result back to the bit field in the 16-bit port and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND between\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -724,7 +724,7 @@ S3IoBitFieldAnd16 (
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise AND followed by a\r
   bitwise OR, and writes the result back to the bit field in the\r
 /**\r
   Reads a bit field in a 16-bit port, performs a bitwise AND followed by a\r
   bitwise OR, and writes the result back to the bit field in the\r

-  16-bit port  and saves the value in the S3 script to be replayed on S3 \r
+  16-bit port  and saves the value in the S3 script to be replayed on S3\r

   resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND followed\r
   resume.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND followed\r


@@ -769,7 +769,7 @@ S3IoBitFieldAndThenOr16 (
   Saves a 32-bit I/O port value to the boot script.\r
 \r
   This internal worker function saves a 32-bit I/O port value in the S3 script\r
   Saves a 32-bit I/O port value to the boot script.\r
 \r
   This internal worker function saves a 32-bit I/O port value in the S3 script\r

-  to be replayed on S3 resume. \r
+  to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -786,7 +786,7 @@ InternalSaveIoWrite32ValueToBootScript (
   )\r
 {\r
   InternalSaveIoWriteValueToBootScript (S3BootScriptWidthUint32, Port, &Value);\r
   )\r
 {\r
   InternalSaveIoWriteValueToBootScript (S3BootScriptWidthUint32, Port, &Value);\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -842,7 +842,7 @@ S3IoWrite32 (
 \r
 /**\r
   Reads a 32-bit I/O port, performs a bitwise OR, and writes the\r
 \r
 /**\r
   Reads a 32-bit I/O port, performs a bitwise OR, and writes the\r

-  result back to the 32-bit I/O port and saves the value in the S3 script to \r
+  result back to the 32-bit I/O port and saves the value in the S3 script to\r

   be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise OR\r
   be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise OR\r


@@ -900,7 +900,7 @@ S3IoAnd32 (
 \r
 /**\r
   Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, and writes the result back to the 32-bit I/O port and saves \r
+  inclusive OR, and writes the result back to the 32-bit I/O port and saves\r

   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r
   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -1001,7 +1001,7 @@ S3IoBitFieldWrite32 (
 \r
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise OR, and writes the\r
 \r
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise OR, and writes the\r

-  result back to the bit field in the 32-bit port and saves the value in the \r
+  result back to the bit field in the 32-bit port and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise OR\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise OR\r


@@ -1040,7 +1040,7 @@ S3IoBitFieldOr32 (
 \r
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise AND, and writes the\r
 \r
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise AND, and writes the\r

-  result back to the bit field in the 32-bit port and saves the value in the \r
+  result back to the bit field in the 32-bit port and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -1080,7 +1080,7 @@ S3IoBitFieldAnd32 (
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise AND followed by a\r
   bitwise OR, and writes the result back to the bit field in the\r
 /**\r
   Reads a bit field in a 32-bit port, performs a bitwise AND followed by a\r
   bitwise OR, and writes the result back to the bit field in the\r

-  32-bit port and saves the value in the S3 script to be replayed on S3 \r
+  32-bit port and saves the value in the S3 script to be replayed on S3\r

   resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND followed\r
   resume.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND followed\r


@@ -1125,7 +1125,7 @@ S3IoBitFieldAndThenOr32 (
   Saves a 64-bit I/O port value to the boot script.\r
 \r
   This internal worker function saves a 64-bit I/O port value in the S3 script\r
   Saves a 64-bit I/O port value to the boot script.\r
 \r
   This internal worker function saves a 64-bit I/O port value in the S3 script\r

-  to be replayed on S3 resume. \r
+  to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -1142,7 +1142,7 @@ InternalSaveIoWrite64ValueToBootScript (
   )\r
 {\r
   InternalSaveIoWriteValueToBootScript (S3BootScriptWidthUint64, Port, &Value);\r
   )\r
 {\r
   InternalSaveIoWriteValueToBootScript (S3BootScriptWidthUint64, Port, &Value);\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -1198,7 +1198,7 @@ S3IoWrite64 (
 \r
 /**\r
   Reads a 64-bit I/O port, performs a bitwise OR, and writes the\r
 \r
 /**\r
   Reads a 64-bit I/O port, performs a bitwise OR, and writes the\r

-  result back to the 64-bit I/O port and saves the value in the S3 script to \r
+  result back to the 64-bit I/O port and saves the value in the S3 script to\r

   be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise OR\r
   be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise OR\r


@@ -1357,7 +1357,7 @@ S3IoBitFieldWrite64 (
 \r
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise OR, and writes the\r
 \r
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise OR, and writes the\r

-  result back to the bit field in the 64-bit port and saves the value in the \r
+  result back to the bit field in the 64-bit port and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise OR\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise OR\r


@@ -1396,7 +1396,7 @@ S3IoBitFieldOr64 (
 \r
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise AND, and writes the\r
 \r
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise AND, and writes the\r

-  result back to the bit field in the 64-bit port and saves the value in the \r
+  result back to the bit field in the 64-bit port and saves the value in the\r

   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND between\r
   S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -1436,7 +1436,7 @@ S3IoBitFieldAnd64 (
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise AND followed by a\r
   bitwise OR, and writes the result back to the bit field in the\r
 /**\r
   Reads a bit field in a 64-bit port, performs a bitwise AND followed by a\r
   bitwise OR, and writes the result back to the bit field in the\r

-  64-bit port and saves the value in the S3 script to be replayed on S3 \r
+  64-bit port and saves the value in the S3 script to be replayed on S3\r

   resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND followed\r
   resume.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND followed\r


@@ -1481,7 +1481,7 @@ S3IoBitFieldAndThenOr64 (
   Saves an MMIO register value to the boot script.\r
 \r
   This internal worker function saves an MMIO register value in the S3 script\r
   Saves an MMIO register value to the boot script.\r
 \r
   This internal worker function saves an MMIO register value in the S3 script\r

-  to be replayed on S3 resume. \r
+  to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -1512,7 +1512,7 @@ InternalSaveMmioWriteValueToBootScript (
   Saves an 8-bit MMIO register value to the boot script.\r
 \r
   This internal worker function saves an 8-bit MMIO register value in the S3 script\r
   Saves an 8-bit MMIO register value to the boot script.\r
 \r
   This internal worker function saves an 8-bit MMIO register value in the S3 script\r

-  to be replayed on S3 resume. \r
+  to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -1534,7 +1534,7 @@ InternalSaveMmioWrite8ValueToBootScript (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads an 8-bit MMIO register and saves the value in the S3 script to be \r
+  Reads an 8-bit MMIO register and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address. The 8-bit read value is\r
   replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address. The 8-bit read value is\r


@@ -1558,7 +1558,7 @@ S3MmioRead8 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Writes an 8-bit MMIO register and saves the value in the S3 script to be \r
+  Writes an 8-bit MMIO register and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Writes the 8-bit MMIO register specified by Address with the value specified\r
   replayed on S3 resume.\r
 \r
   Writes the 8-bit MMIO register specified by Address with the value specified\r


@@ -1585,7 +1585,7 @@ S3MmioWrite8 (
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise OR, and writes the\r
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise OR, and writes the\r

-  result back to the 8-bit MMIO register and saves the value in the S3 script \r
+  result back to the 8-bit MMIO register and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise\r
   to be replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise\r


@@ -1614,7 +1614,7 @@ S3MmioOr8 (
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise AND, and writes the result\r
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise AND, and writes the result\r

-  back to the 8-bit MMIO register and saves the value in the S3 script to be \r
+  back to the 8-bit MMIO register and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r
   replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1643,7 +1643,7 @@ S3MmioAnd8 (
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, and writes the result back to the 8-bit MMIO register and saves \r
+  inclusive OR, and writes the result back to the 8-bit MMIO register and saves\r

   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r
   the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1869,7 +1869,7 @@ S3MmioBitFieldAndThenOr8 (
   Saves a 16-bit MMIO register value to the boot script.\r
 \r
   This internal worker function saves a 16-bit MMIO register value in the S3 script\r
   Saves a 16-bit MMIO register value to the boot script.\r
 \r
   This internal worker function saves a 16-bit MMIO register value in the S3 script\r

-  to be replayed on S3 resume. \r
+  to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -1886,7 +1886,7 @@ InternalSaveMmioWrite16ValueToBootScript (
   )\r
 {\r
   InternalSaveMmioWriteValueToBootScript (S3BootScriptWidthUint16, Address, &Value);\r
   )\r
 {\r
   InternalSaveMmioWriteValueToBootScript (S3BootScriptWidthUint16, Address, &Value);\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -1943,7 +1943,7 @@ S3MmioWrite16 (
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise OR, and writes the\r
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise OR, and writes the\r

-  result back to the 16-bit MMIO register and saves the value in the S3 script \r
+  result back to the 16-bit MMIO register and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise\r
   to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise\r


@@ -1972,7 +1972,7 @@ S3MmioOr16 (
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise AND, and writes the result\r
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise AND, and writes the result\r

-  back to the 16-bit MMIO register and saves the value in the S3 script to be \r
+  back to the 16-bit MMIO register and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r
   replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2001,7 +2001,7 @@ S3MmioAnd16 (
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, and writes the result back to the 16-bit MMIO register and \r
+  inclusive OR, and writes the result back to the 16-bit MMIO register and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2101,7 +2101,7 @@ S3MmioBitFieldWrite16 (
 \r
 /**\r
   Reads a bit field in a 16-bit MMIO register, performs a bitwise OR, and\r
 \r
 /**\r
   Reads a bit field in a 16-bit MMIO register, performs a bitwise OR, and\r

-  writes the result back to the bit field in the 16-bit MMIO register and \r
+  writes the result back to the bit field in the 16-bit MMIO register and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise\r


@@ -2141,7 +2141,7 @@ S3MmioBitFieldOr16 (
 \r
 /**\r
   Reads a bit field in a 16-bit MMIO register, performs a bitwise AND, and\r
 \r
 /**\r
   Reads a bit field in a 16-bit MMIO register, performs a bitwise AND, and\r

-  writes the result back to the bit field in the 16-bit MMIO register and \r
+  writes the result back to the bit field in the 16-bit MMIO register and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2227,7 +2227,7 @@ S3MmioBitFieldAndThenOr16 (
   Saves a 32-bit MMIO register value to the boot script.\r
 \r
   This internal worker function saves a 32-bit MMIO register value in the S3 script\r
   Saves a 32-bit MMIO register value to the boot script.\r
 \r
   This internal worker function saves a 32-bit MMIO register value in the S3 script\r

-  to be replayed on S3 resume. \r
+  to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -2249,7 +2249,7 @@ InternalSaveMmioWrite32ValueToBootScript (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 32-bit MMIO register saves the value in the S3 script to be \r
+  Reads a 32-bit MMIO register saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address. The 32-bit read value is\r
   replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address. The 32-bit read value is\r


@@ -2273,7 +2273,7 @@ S3MmioRead32 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Writes a 32-bit MMIO register and saves the value in the S3 script to be \r
+  Writes a 32-bit MMIO register and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Writes the 32-bit MMIO register specified by Address with the value specified\r
   replayed on S3 resume.\r
 \r
   Writes the 32-bit MMIO register specified by Address with the value specified\r


@@ -2300,7 +2300,7 @@ S3MmioWrite32 (
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise OR, and writes the\r
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise OR, and writes the\r

-  result back to the 32-bit MMIO register and saves the value in the S3 script \r
+  result back to the 32-bit MMIO register and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise\r
   to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise\r


@@ -2329,7 +2329,7 @@ S3MmioOr32 (
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise AND, and writes the result\r
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise AND, and writes the result\r

-  back to the 32-bit MMIO register and saves the value in the S3 script to be \r
+  back to the 32-bit MMIO register and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r
   replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2358,7 +2358,7 @@ S3MmioAnd32 (
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, and writes the result back to the 32-bit MMIO register and \r
+  inclusive OR, and writes the result back to the 32-bit MMIO register and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2389,7 +2389,7 @@ S3MmioAndThenOr32 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a bit field of a MMIO register and saves the value in the S3 script \r
+  Reads a bit field of a MMIO register and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Reads the bit field in a 32-bit MMIO register. The bit field is specified by\r
   to be replayed on S3 resume.\r
 \r
   Reads the bit field in a 32-bit MMIO register. The bit field is specified by\r


@@ -2421,7 +2421,7 @@ S3MmioBitFieldRead32 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Writes a bit field to a MMIO register and saves the value in the S3 script \r
+  Writes a bit field to a MMIO register and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Writes Value to the bit field of the MMIO register. The bit field is\r
   to be replayed on S3 resume.\r
 \r
   Writes Value to the bit field of the MMIO register. The bit field is\r


@@ -2458,7 +2458,7 @@ S3MmioBitFieldWrite32 (
 \r
 /**\r
   Reads a bit field in a 32-bit MMIO register, performs a bitwise OR, and\r
 \r
 /**\r
   Reads a bit field in a 32-bit MMIO register, performs a bitwise OR, and\r

-  writes the result back to the bit field in the 32-bit MMIO register and \r
+  writes the result back to the bit field in the 32-bit MMIO register and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise\r


@@ -2498,7 +2498,7 @@ S3MmioBitFieldOr32 (
 \r
 /**\r
   Reads a bit field in a 32-bit MMIO register, performs a bitwise AND, and\r
 \r
 /**\r
   Reads a bit field in a 32-bit MMIO register, performs a bitwise AND, and\r

-  writes the result back to the bit field in the 32-bit MMIO register and \r
+  writes the result back to the bit field in the 32-bit MMIO register and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2584,7 +2584,7 @@ S3MmioBitFieldAndThenOr32 (
   Saves a 64-bit MMIO register value to the boot script.\r
 \r
   This internal worker function saves a 64-bit MMIO register value in the S3 script\r
   Saves a 64-bit MMIO register value to the boot script.\r
 \r
   This internal worker function saves a 64-bit MMIO register value in the S3 script\r

-  to be replayed on S3 resume. \r
+  to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -2606,7 +2606,7 @@ InternalSaveMmioWrite64ValueToBootScript (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 64-bit MMIO register and saves the value in the S3 script to be \r
+  Reads a 64-bit MMIO register and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address. The 64-bit read value is\r
   replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address. The 64-bit read value is\r


@@ -2630,7 +2630,7 @@ S3MmioRead64 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Writes a 64-bit MMIO register and saves the value in the S3 script to be \r
+  Writes a 64-bit MMIO register and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Writes the 64-bit MMIO register specified by Address with the value specified\r
   replayed on S3 resume.\r
 \r
   Writes the 64-bit MMIO register specified by Address with the value specified\r


@@ -2657,7 +2657,7 @@ S3MmioWrite64 (
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise OR, and writes the\r
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise OR, and writes the\r

-  result back to the 64-bit MMIO register and saves the value in the S3 script \r
+  result back to the 64-bit MMIO register and saves the value in the S3 script\r

   to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise\r
   to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise\r


@@ -2686,7 +2686,7 @@ S3MmioOr64 (
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise AND, and writes the result\r
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise AND, and writes the result\r

-  back to the 64-bit MMIO register and saves the value in the S3 script to be \r
+  back to the 64-bit MMIO register and saves the value in the S3 script to be\r

   replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r
   replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2715,7 +2715,7 @@ S3MmioAnd64 (
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise\r
 \r
 /**\r
   Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise\r

-  inclusive OR, and writes the result back to the 64-bit MMIO register and \r
+  inclusive OR, and writes the result back to the 64-bit MMIO register and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2815,7 +2815,7 @@ S3MmioBitFieldWrite64 (
 \r
 /**\r
   Reads a bit field in a 64-bit MMIO register, performs a bitwise OR, and\r
 \r
 /**\r
   Reads a bit field in a 64-bit MMIO register, performs a bitwise OR, and\r

-  writes the result back to the bit field in the 64-bit MMIO register and \r
+  writes the result back to the bit field in the 64-bit MMIO register and\r

   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise\r
   saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise\r


@@ -2941,11 +2941,11 @@ S3MmioBitFieldAndThenOr64 (
   Copy data from MMIO region to system memory by using 8-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copy data from MMIO region to system memory by using 8-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 8-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 8-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -2984,13 +2984,13 @@ S3MmioReadBuffer8 (
   Copy data from MMIO region to system memory by using 16-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copy data from MMIO region to system memory by using 16-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 16-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 16-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -3031,13 +3031,13 @@ S3MmioReadBuffer16 (
   Copy data from MMIO region to system memory by using 32-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copy data from MMIO region to system memory by using 32-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 32-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 32-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -3078,13 +3078,13 @@ S3MmioReadBuffer32 (
   Copy data from MMIO region to system memory by using 64-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copy data from MMIO region to system memory by using 64-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 64-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 64-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r


@@ -3126,11 +3126,11 @@ S3MmioReadBuffer64 (
   Copy data from system memory to MMIO region by using 8-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copy data from system memory to MMIO region by using 8-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 8-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 8-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -3169,13 +3169,13 @@ S3MmioWriteBuffer8 (
   Copy data from system memory to MMIO region by using 16-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copy data from system memory to MMIO region by using 16-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 16-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 16-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -3218,13 +3218,13 @@ S3MmioWriteBuffer16 (
   Copy data from system memory to MMIO region by using 32-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copy data from system memory to MMIO region by using 32-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 32-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 32-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -3266,13 +3266,13 @@ S3MmioWriteBuffer32 (
   Copy data from system memory to MMIO region by using 64-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r
   Copy data from system memory to MMIO region by using 64-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 64-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 64-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf b/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
index 561c504d7a47408f661d675502bf402a561b822c..f55e78ddfb7cbc8994c561828210b069e40322d3 100644 (file)
--- a/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
+++ b/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
@@ -1,10 +1,10 @@
 ## @file\r
 # Instance of S3 PCI Library based on PCI and S3 BootScript Library.\r
 #\r
 ## @file\r
 # Instance of S3 PCI Library based on PCI and S3 BootScript Library.\r
 #\r

-# S3 PCI Services that perform PCI Configuration cycles and \r
+# S3 PCI Services that perform PCI Configuration cycles and\r

 # also enable the PCI operation to be replayed during an S3 resume.\r
 #\r
 # also enable the PCI operation to be replayed during an S3 resume.\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
 #\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 @@
   FILE_GUID                      = F66B6BD2-513F-441d-B367-2D5BD4998A50\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = F66B6BD2-513F-441d-B367-2D5BD4998A50\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = S3PciLib \r
+  LIBRARY_CLASS                  = S3PciLib\r

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

diff --git a/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.uni b/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.uni
index 4d9d51c42e333b41491c8269295e5348a2797ce8..0de9f05c6492cbc79633d5920c89d4ad131d9ef9 100644 (file)
--- a/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.uni
+++ b/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.uni
@@ -4,13 +4,13 @@
 // S3 PCI Services that perform PCI Configuration cycles and\r
 // also enable the PCI operation to be replayed during an S3 resume.\r
 //\r
 // S3 PCI Services that perform PCI Configuration cycles and\r
 // also enable the PCI operation to be replayed during an S3 resume.\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/MdePkg/Library/BaseS3PciLib/S3PciLib.c b/MdePkg/Library/BaseS3PciLib/S3PciLib.c
index 27342b0eca889d32c915fb9fa5250c4df63af266..d029f73dab8157f8a8ac5a6456815b33ebcb9989 100644 (file)
--- a/MdePkg/Library/BaseS3PciLib/S3PciLib.c
+++ b/MdePkg/Library/BaseS3PciLib/S3PciLib.c
@@ -1,9 +1,9 @@
 /** @file\r
   PCI configuration Library Services that do PCI configuration and also enable\r
   the PCI operations to be replayed during an S3 resume. This library class\r
 /** @file\r
   PCI configuration Library Services that do PCI configuration and also enable\r
   the PCI operations to be replayed during an S3 resume. This library class\r

-  maps directly on top of the PciLib class. \r
+  maps directly on top of the PciLib class.\r

 \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


@@ -31,7 +31,7 @@
   Saves a PCI configuration value to the boot script.\r
 \r
   This internal worker function saves a PCI configuration value in\r
   Saves a PCI configuration value to the boot script.\r
 \r
   This internal worker function saves a PCI configuration value in\r

-  the S3 script to be replayed on S3 resume. \r
+  the S3 script to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -63,7 +63,7 @@ InternalSavePciWriteValueToBootScript (
   Saves an 8-bit PCI configuration value to the boot script.\r
 \r
   This internal worker function saves an 8-bit PCI configuration value in\r
   Saves an 8-bit PCI configuration value to the boot script.\r
 \r
   This internal worker function saves an 8-bit PCI configuration value in\r

-  the S3 script to be replayed on S3 resume. \r
+  the S3 script to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -429,7 +429,7 @@ S3PciBitFieldAndThenOr8 (
   Saves a 16-bit PCI configuration value to the boot script.\r
 \r
   This internal worker function saves a 16-bit PCI configuration value in\r
   Saves a 16-bit PCI configuration value to the boot script.\r
 \r
   This internal worker function saves a 16-bit PCI configuration value in\r

-  the S3 script to be replayed on S3 resume. \r
+  the S3 script to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -805,7 +805,7 @@ S3PciBitFieldAndThenOr16 (
   Saves a 32-bit PCI configuration value to the boot script.\r
 \r
   This internal worker function saves a 32-bit PCI configuration value in the S3 script\r
   Saves a 32-bit PCI configuration value to the boot script.\r
 \r
   This internal worker function saves a 32-bit PCI configuration value in the S3 script\r

-  to be replayed on S3 resume. \r
+  to be replayed on S3 resume.\r

 \r
   If the saving process fails, then ASSERT().\r
 \r
 \r
   If the saving process fails, then ASSERT().\r
 \r


@@ -1264,6 +1264,6 @@ S3PciWriteBuffer (
              Buffer\r
              );\r
   ASSERT (Status == RETURN_SUCCESS);\r
              Buffer\r
              );\r
   ASSERT (Status == RETURN_SUCCESS);\r

-  \r
+\r

   return Size;\r
 }\r
   return Size;\r
 }\r

diff --git a/MdePkg/Library/BaseS3SmbusLib/BaseS3SmbusLib.inf b/MdePkg/Library/BaseS3SmbusLib/BaseS3SmbusLib.inf
index 553662471f2260baecfffe50a9ef41eed7d5ac17..de68c9ff72d749442ab092a404830a1741933aeb 100644 (file)
--- a/MdePkg/Library/BaseS3SmbusLib/BaseS3SmbusLib.inf
+++ b/MdePkg/Library/BaseS3SmbusLib/BaseS3SmbusLib.inf
@@ -2,9 +2,9 @@
 # Instance of S3 Smbus Library based on SmBus and S3 BootScript Library.\r
 #\r
 # S3 Smbus Library Services that do SMBus transactions and also enable the\r
 # Instance of S3 Smbus Library based on SmBus and S3 BootScript Library.\r
 #\r
 # S3 Smbus Library Services that do SMBus transactions and also enable the\r

-# operatation to be replayed during an S3 resume. \r
+# operatation to be replayed during an S3 resume.\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

 #\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 @@
   FILE_GUID                      = 01190654-FED0-40d3-BA7F-2925539E5830\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 01190654-FED0-40d3-BA7F-2925539E5830\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = S3SmbusLib \r
+  LIBRARY_CLASS                  = S3SmbusLib\r

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

diff --git a/MdePkg/Library/BaseS3SmbusLib/BaseS3SmbusLib.uni b/MdePkg/Library/BaseS3SmbusLib/BaseS3SmbusLib.uni
index fd47c5e6baa519a5366315ae8eb6ef4d85a39dad..a8bc675ab7f23641e08da8c42982221f42ffe335 100644 (file)
--- a/MdePkg/Library/BaseS3SmbusLib/BaseS3SmbusLib.uni
+++ b/MdePkg/Library/BaseS3SmbusLib/BaseS3SmbusLib.uni
@@ -4,13 +4,13 @@
 // S3 Smbus Library Services that do SMBus transactions and also enable the\r
 // operatation to be replayed during an S3 resume.\r
 //\r
 // S3 Smbus Library Services that do SMBus transactions and also enable the\r
 // operatation to be replayed during an S3 resume.\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 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/MdePkg/Library/BaseS3SmbusLib/S3SmbusLib.c b/MdePkg/Library/BaseS3SmbusLib/S3SmbusLib.c
index 1a7e0aef6461da290b64a3c28bc860b45288137c..899d5886d2b9bb81ba59c1a3384b8eb3c48f23b8 100644 (file)
--- a/MdePkg/Library/BaseS3SmbusLib/S3SmbusLib.c
+++ b/MdePkg/Library/BaseS3SmbusLib/S3SmbusLib.c
@@ -1,9 +1,9 @@
 /** @file\r
   Smbus Library Services that do SMBus transactions and also enable the operatation\r
   to be replayed during an S3 resume. This library class maps directly on top\r
 /** @file\r
   Smbus Library Services that do SMBus transactions and also enable the operatation\r
   to be replayed during an S3 resume. This library class maps directly on top\r

-  of the SmbusLib class. \r
+  of the SmbusLib class.\r

 \r
 \r

-  Copyright (c) 2007, 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\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r


@@ -25,7 +25,7 @@
 #include <Library/S3SmbusLib.h>\r
 \r
 /**\r
 #include <Library/S3SmbusLib.h>\r
 \r
 /**\r

-  Saves an SMBus operation to S3 script to be replayed on S3 resume. \r
+  Saves an SMBus operation to S3 script to be replayed on S3 resume.\r

 \r
   This function provides a standard way to save SMBus operation to S3 boot Script.\r
   The data can either be of the Length byte, word, or a block of data.\r
 \r
   This function provides a standard way to save SMBus operation to S3 boot Script.\r
   The data can either be of the Length byte, word, or a block of data.\r


@@ -86,7 +86,7 @@ S3SmBusQuickRead (
   )\r
 {\r
   SmBusQuickRead (SmBusAddress, Status);\r
   )\r
 {\r
   SmBusQuickRead (SmBusAddress, Status);\r

-  \r
+\r

   InternalSaveSmBusExecToBootScript (EfiSmbusQuickRead, SmBusAddress, 0, NULL);\r
 }\r
 \r
   InternalSaveSmBusExecToBootScript (EfiSmbusQuickRead, SmBusAddress, 0, NULL);\r
 }\r
 \r


@@ -119,7 +119,7 @@ S3SmBusQuickWrite (
 \r
   InternalSaveSmBusExecToBootScript (EfiSmbusQuickWrite, SmBusAddress, 0, NULL);\r
 }\r
 \r
   InternalSaveSmBusExecToBootScript (EfiSmbusQuickWrite, SmBusAddress, 0, NULL);\r
 }\r

-  \r
+\r

 /**\r
   Executes an SMBUS receive byte command and saves the value in the S3 script to be replayed\r
   on S3 resume.\r
 /**\r
   Executes an SMBUS receive byte command and saves the value in the S3 script to be replayed\r
   on S3 resume.\r


@@ -277,7 +277,7 @@ S3SmBusWriteDataByte (
   If Status is not NULL, then the status of the executed command is returned in Status.\r
   If Length in SmBusAddress is not zero, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r
   If Status is not NULL, then the status of the executed command is returned in Status.\r
   If Length in SmBusAddress is not zero, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r

-  \r
+\r

   @param  SmBusAddress    Address that encodes the SMBUS Slave Address,\r
                           SMBUS Command, SMBUS Data Length, and PEC.\r
   @param  Status          Return status for the executed command.\r
   @param  SmBusAddress    Address that encodes the SMBUS Slave Address,\r
                           SMBUS Command, SMBUS Data Length, and PEC.\r
   @param  Status          Return status for the executed command.\r


@@ -294,7 +294,7 @@ S3SmBusReadDataWord (
   )\r
 {\r
   UINT16  Word;\r
   )\r
 {\r
   UINT16  Word;\r

-  \r
+\r

   Word = SmBusReadDataWord (SmBusAddress, Status);\r
 \r
   InternalSaveSmBusExecToBootScript (EfiSmbusReadWord, SmBusAddress, 2, &Word);\r
   Word = SmBusReadDataWord (SmBusAddress, Status);\r
 \r
   InternalSaveSmBusExecToBootScript (EfiSmbusReadWord, SmBusAddress, 2, &Word);\r


@@ -375,7 +375,7 @@ S3SmBusProcessCall (
 \r
   InternalSaveSmBusExecToBootScript (EfiSmbusProcessCall, SmBusAddress, 2, &Value);\r
 \r
 \r
   InternalSaveSmBusExecToBootScript (EfiSmbusProcessCall, SmBusAddress, 2, &Value);\r
 \r

-  return Word; \r
+  return Word;\r

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


@@ -427,7 +427,7 @@ S3SmBusReadBlock (
   The SMBUS slave address, SMBUS command, and SMBUS length fields of SmBusAddress are required.\r
   Bytes are written to the SMBUS from Buffer.\r
   The number of bytes written is returned, and will never return a value larger than 32-bytes.\r
   The SMBUS slave address, SMBUS command, and SMBUS length fields of SmBusAddress are required.\r
   Bytes are written to the SMBUS from Buffer.\r
   The number of bytes written is returned, and will never return a value larger than 32-bytes.\r

-  If Status is not NULL, then the status of the executed command is returned in Status.  \r
+  If Status is not NULL, then the status of the executed command is returned in Status.\r

   If Length in SmBusAddress is zero or greater than 32, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r
   If Length in SmBusAddress is zero or greater than 32, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r


@@ -454,7 +454,7 @@ S3SmBusWriteBlock (
   Length = SmBusWriteBlock (SmBusAddress, Buffer, Status);\r
 \r
   InternalSaveSmBusExecToBootScript (EfiSmbusWriteBlock, SmBusAddress, SMBUS_LIB_LENGTH (SmBusAddress), Buffer);\r
   Length = SmBusWriteBlock (SmBusAddress, Buffer, Status);\r
 \r
   InternalSaveSmBusExecToBootScript (EfiSmbusWriteBlock, SmBusAddress, SMBUS_LIB_LENGTH (SmBusAddress), Buffer);\r

-  \r
+\r

   return Length;\r
 }\r
 \r
   return Length;\r
 }\r
 \r


@@ -493,9 +493,9 @@ S3SmBusBlockProcessCall (
   )\r
 {\r
   UINTN   Length;\r
   )\r
 {\r
   UINTN   Length;\r

-  \r
+\r

   Length = SmBusBlockProcessCall (SmBusAddress, WriteBuffer, ReadBuffer, Status);\r
   Length = SmBusBlockProcessCall (SmBusAddress, WriteBuffer, ReadBuffer, Status);\r

-  \r
+\r

   InternalSaveSmBusExecToBootScript (EfiSmbusBWBRProcessCall, SmBusAddress, SMBUS_LIB_LENGTH (SmBusAddress), ReadBuffer);\r
 \r
   return Length;\r
   InternalSaveSmBusExecToBootScript (EfiSmbusBWBRProcessCall, SmBusAddress, SMBUS_LIB_LENGTH (SmBusAddress), ReadBuffer);\r
 \r
   return Length;\r

diff --git a/MdePkg/Library/BaseS3StallLib/BaseS3StallLib.inf b/MdePkg/Library/BaseS3StallLib/BaseS3StallLib.inf
index a77eec512d6129ac1bd3bac1cadfa72d82ffd0d2..bbdc69995f58e6d53d5b5ae0b49026294a74cdfd 100644 (file)
--- a/MdePkg/Library/BaseS3StallLib/BaseS3StallLib.inf
+++ b/MdePkg/Library/BaseS3StallLib/BaseS3StallLib.inf
@@ -2,9 +2,9 @@
 # Instance of S3 Stall Library based on Timer and S3 BootScript Library.\r
 #\r
 # Stall Services that do stall and also enable the Stall operatation\r
 # Instance of S3 Stall Library based on Timer and S3 BootScript Library.\r
 #\r
 # Stall Services that do stall and also enable the Stall operatation\r

-# to be replayed during an S3 resume. \r
+# to be replayed during an S3 resume.\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

 #\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 @@
   FILE_GUID                      = 498C6AC3-CC29-4821-BE6F-7C6F4ECF2C14\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 498C6AC3-CC29-4821-BE6F-7C6F4ECF2C14\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = S3StallLib \r
+  LIBRARY_CLASS                  = S3StallLib\r

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

diff --git a/MdePkg/Library/BaseS3StallLib/BaseS3StallLib.uni b/MdePkg/Library/BaseS3StallLib/BaseS3StallLib.uni
index e063d7d75b6f88c3223e225fa69bebf02297c99b..b65bf3553cd1198fd9f0a2eb72e1c76241812c3f 100644 (file)
--- a/MdePkg/Library/BaseS3StallLib/BaseS3StallLib.uni
+++ b/MdePkg/Library/BaseS3StallLib/BaseS3StallLib.uni
@@ -4,13 +4,13 @@
 // Stall Services that do stall and also enable the Stall operatation\r
 // to be replayed during an S3 resume.\r
 //\r
 // Stall Services that do stall and also enable the Stall operatation\r
 // to be replayed during an S3 resume.\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 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/MdePkg/Library/BaseS3StallLib/S3StallLib.c b/MdePkg/Library/BaseS3StallLib/S3StallLib.c
index e5ebc874f5c2dd778cef7b58d7f490694ff81892..095f22a44a1559bae9ad7072522e4a89f3acd263 100644 (file)
--- a/MdePkg/Library/BaseS3StallLib/S3StallLib.c
+++ b/MdePkg/Library/BaseS3StallLib/S3StallLib.c
@@ -1,9 +1,9 @@
 /** @file\r
   Stall Services that do stall and also enable the Stall operatation\r
   to be replayed during an S3 resume. This library class maps directly on top\r
 /** @file\r
   Stall Services that do stall and also enable the Stall operatation\r
   to be replayed during an S3 resume. This library class maps directly on top\r

-  of the Timer class. \r
+  of the Timer class.\r

 \r
 \r

-  Copyright (c) 2007, 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\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r


@@ -42,10 +42,10 @@ S3Stall (
   )\r
 {\r
   RETURN_STATUS    Status;\r
   )\r
 {\r
   RETURN_STATUS    Status;\r

-  \r
+\r

   Status = S3BootScriptSaveStall (MicroSecondDelay (MicroSeconds));\r
   ASSERT (Status == RETURN_SUCCESS);\r
   Status = S3BootScriptSaveStall (MicroSecondDelay (MicroSeconds));\r
   ASSERT (Status == RETURN_SUCCESS);\r

-  \r
+\r

   return MicroSeconds;\r
 }\r
 \r
   return MicroSeconds;\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.c b/MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.c
index e29fdf55bbfb148184c867fce4c277c72f55b040..b1c3b7ac9c329685452be4735133d0202356d679 100644 (file)
--- a/MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.c
+++ b/MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.c
@@ -1,7 +1,7 @@
 /** @file\r
   Null Serial Port library instance with empty functions.\r
 \r
 /** @file\r
   Null Serial Port library instance with empty functions.\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


@@ -18,11 +18,11 @@
 \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


@@ -37,19 +37,19 @@ SerialPortInitialize (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Write data from buffer to serial device. \r
- \r
-  Writes NumberOfBytes data bytes from Buffer to the serial device.  \r
+  Write data from buffer to serial device.\r
+\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
   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

-  If Buffer is NULL, then ASSERT(). \r
+  If Buffer is NULL, then ASSERT().\r

   If NumberOfBytes is zero, then return 0.\r
 \r
   @param  Buffer           The pointer to the data buffer to be written.\r
   @param  NumberOfBytes    The number of bytes to written to the serial device.\r
 \r
   @retval 0                NumberOfBytes is 0.\r
   If NumberOfBytes is zero, then return 0.\r
 \r
   @param  Buffer           The pointer to the data buffer to be written.\r
   @param  NumberOfBytes    The 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


@@ -66,11 +66,11 @@ SerialPortWrite (
 \r
 /**\r
   Read data from serial device and save the datas in buffer.\r
 \r
 /**\r
   Read data from serial device and save the datas in buffer.\r

- \r
+\r

   Reads NumberOfBytes data bytes from a serial device into the buffer\r
   Reads NumberOfBytes data bytes from a serial device into the buffer\r

-  specified by Buffer. The number of bytes actually read is returned. \r
+  specified by Buffer. The number of bytes actually read is returned.\r

   If the return value is less than NumberOfBytes, then the rest operation failed.\r
   If the return value is less than NumberOfBytes, then the rest operation failed.\r

-  If Buffer is NULL, then ASSERT(). \r
+  If Buffer is NULL, then ASSERT().\r

   If NumberOfBytes is zero, then return 0.\r
 \r
   @param  Buffer           The pointer to the data buffer to store the data read from the serial device.\r
   If NumberOfBytes is zero, then return 0.\r
 \r
   @param  Buffer           The pointer to the data buffer to store the data read from the serial device.\r

diff --git a/MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.c b/MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.c
index 32bead9b04d465e349d06507eaf01fd1a21ce7f4..e8422cb7f27bd6d327599c0eed05672235e64b09 100644 (file)
--- a/MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.c
+++ b/MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.c
@@ -1,7 +1,7 @@
 /** @file\r
 Null implementation of SmBusLib class library.\r
 \r
 /** @file\r
 Null implementation of SmBusLib class library.\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


@@ -278,7 +278,7 @@ SmBusWriteDataByte (
   If Status is not NULL, then the status of the executed command is returned in Status.\r
   If Length in SmBusAddress is not zero, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r
   If Status is not NULL, then the status of the executed command is returned in Status.\r
   If Length in SmBusAddress is not zero, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r

-  \r
+\r

   @param  SmBusAddress  Address that encodes the SMBUS Slave Address,\r
                         SMBUS Command, SMBUS Data Length, and PEC.\r
   @param  Status        Return status for the executed command.\r
   @param  SmBusAddress  Address that encodes the SMBUS Slave Address,\r
                         SMBUS Command, SMBUS Data Length, and PEC.\r
   @param  Status        Return status for the executed command.\r


@@ -453,7 +453,7 @@ SmBusReadBlock (
   The SMBUS slave address, SMBUS command, and SMBUS length fields of SmBusAddress are required.\r
   Bytes are written to the SMBUS from Buffer.\r
   The number of bytes written is returned, and will never return a value larger than 32-bytes.\r
   The SMBUS slave address, SMBUS command, and SMBUS length fields of SmBusAddress are required.\r
   Bytes are written to the SMBUS from Buffer.\r
   The number of bytes written is returned, and will never return a value larger than 32-bytes.\r

-  If Status is not NULL, then the status of the executed command is returned in Status.  \r
+  If Status is not NULL, then the status of the executed command is returned in Status.\r

   If Length in SmBusAddress is zero or greater than 32, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r
   If Length in SmBusAddress is zero or greater than 32, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
index 03562c6e5608a7b4838403dab5aa56ad9fa35822..0be1d4331f072b1d0b5e207fd3f0dfb606464598 100755 (executable)
--- a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
+++ b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
@@ -31,11 +31,11 @@
 \r
 [Sources.IA32]\r
   Ia32/InternalGetSpinLockProperties.c | MSFT\r
 \r
 [Sources.IA32]\r
   Ia32/InternalGetSpinLockProperties.c | MSFT\r

-  Ia32/InterlockedCompareExchange64.c | MSFT \r
-  Ia32/InterlockedCompareExchange32.c | MSFT \r
+  Ia32/InterlockedCompareExchange64.c | MSFT\r
+  Ia32/InterlockedCompareExchange32.c | MSFT\r

   Ia32/InterlockedCompareExchange16.c | MSFT\r
   Ia32/InterlockedCompareExchange16.c | MSFT\r

-  Ia32/InterlockedDecrement.c | MSFT \r
-  Ia32/InterlockedIncrement.c | MSFT \r
+  Ia32/InterlockedDecrement.c | MSFT\r
+  Ia32/InterlockedIncrement.c | MSFT\r

   SynchronizationMsc.c  | MSFT\r
 \r
   Ia32/InterlockedCompareExchange64.nasm| INTEL\r
   SynchronizationMsc.c  | MSFT\r
 \r
   Ia32/InterlockedCompareExchange64.nasm| INTEL\r


@@ -54,22 +54,22 @@
   X64/InterlockedCompareExchange64.c | MSFT\r
   X64/InterlockedCompareExchange32.c | MSFT\r
   X64/InterlockedCompareExchange16.c | MSFT\r
   X64/InterlockedCompareExchange64.c | MSFT\r
   X64/InterlockedCompareExchange32.c | MSFT\r
   X64/InterlockedCompareExchange16.c | MSFT\r

-  \r
+\r

   X64/InterlockedCompareExchange64.nasm| INTEL\r
   X64/InterlockedCompareExchange32.nasm| INTEL\r
   X64/InterlockedCompareExchange16.nasm| INTEL\r
   X64/InterlockedCompareExchange64.nasm| INTEL\r
   X64/InterlockedCompareExchange32.nasm| INTEL\r
   X64/InterlockedCompareExchange16.nasm| INTEL\r

-  \r
-  X64/InterlockedDecrement.c | MSFT \r
-  X64/InterlockedIncrement.c | MSFT \r
-  SynchronizationMsc.c | MSFT \r
+\r
+  X64/InterlockedDecrement.c | MSFT\r
+  X64/InterlockedIncrement.c | MSFT\r
+  SynchronizationMsc.c | MSFT\r

 \r
   X64/InterlockedDecrement.nasm| INTEL\r
   X64/InterlockedIncrement.nasm| INTEL\r
 \r
   X64/InterlockedDecrement.nasm| INTEL\r
   X64/InterlockedIncrement.nasm| INTEL\r

-  Synchronization.c | INTEL \r
+  Synchronization.c | INTEL\r

 \r
   Ia32/InternalGetSpinLockProperties.c | GCC\r
   X64/GccInline.c | GCC\r
 \r
   Ia32/InternalGetSpinLockProperties.c | GCC\r
   X64/GccInline.c | GCC\r

-  SynchronizationGcc.c  | GCC \r
+  SynchronizationGcc.c  | GCC\r

 \r
 [Sources.IPF]\r
   Ipf/Synchronization.c\r
 \r
 [Sources.IPF]\r
   Ipf/Synchronization.c\r


@@ -80,9 +80,9 @@
   Ipf/InternalGetSpinLockProperties.c | MSFT\r
   Ipf/InternalGetSpinLockProperties.c | GCC\r
 \r
   Ipf/InternalGetSpinLockProperties.c | MSFT\r
   Ipf/InternalGetSpinLockProperties.c | GCC\r
 \r

-  Synchronization.c     | INTEL \r
-  SynchronizationMsc.c  | MSFT \r
-  SynchronizationGcc.c  | GCC \r
+  Synchronization.c     | INTEL\r
+  SynchronizationMsc.c  | MSFT\r
+  SynchronizationGcc.c  | GCC\r

 \r
 [Sources.EBC]\r
   Synchronization.c\r
 \r
 [Sources.EBC]\r
   Synchronization.c\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLibInternals.h b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLibInternals.h
index 9716b9276b4430f52049bc281b5f537c73b3cd09..37edd7c1885221ae79f27f16fa125d63c6c9d864 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLibInternals.h
+++ b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLibInternals.h
@@ -1,7 +1,7 @@
 /** @file\r
   Declaration of internal functions in BaseSynchronizationLib.\r
 \r
 /** @file\r
   Declaration of internal functions in BaseSynchronizationLib.\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


@@ -143,7 +143,7 @@ InternalSyncCompareExchange64 (
   requirements for optimal spin lock performance.\r
 \r
   @return The architecture specific spin lock alignment.\r
   requirements for optimal spin lock performance.\r
 \r
   @return The architecture specific spin lock alignment.\r

-  \r
+\r

 **/\r
 UINTN\r
 InternalGetSpinLockProperties (\r
 **/\r
 UINTN\r
 InternalGetSpinLockProperties (\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/Ebc/Synchronization.c b/MdePkg/Library/BaseSynchronizationLib/Ebc/Synchronization.c
index a57860203b120268898c085770a60e489d699fe4..c13f4e06bcdbbd307b7eb40aed2ffac6a5164c34 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/Ebc/Synchronization.c
+++ b/MdePkg/Library/BaseSynchronizationLib/Ebc/Synchronization.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of synchronization functions on EBC.\r
 \r
 /** @file\r
   Implementation of synchronization functions on EBC.\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


@@ -77,9 +77,9 @@ InternalSyncCompareExchange32 (
 /**\r
   Performs an atomic compare exchange operation on a 64-bit unsigned integer.\r
 \r
 /**\r
   Performs an atomic compare exchange operation on a 64-bit unsigned integer.\r
 \r

-  Performs an atomic compare exchange operation on the 64-bit unsigned integer specified \r
-  by Value.  If Value is equal to CompareValue, then Value is set to ExchangeValue and \r
-  CompareValue is returned.  If Value is not equal to CompareValue, then Value is returned. \r
+  Performs an atomic compare exchange operation on the 64-bit unsigned integer specified\r
+  by Value.  If Value is equal to CompareValue, then Value is set to ExchangeValue and\r
+  CompareValue is returned.  If Value is not equal to CompareValue, then Value is returned.\r

   The compare exchange operation must be performed using MP safe mechanisms.\r
 \r
   @param  Value         A pointer to the 64-bit value for the compare exchange\r
   The compare exchange operation must be performed using MP safe mechanisms.\r
 \r
   @param  Value         A pointer to the 64-bit value for the compare exchange\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c b/MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c
index bd81aad6c243622d3e88782d3d66ba45068a8624..4ab293f243b8233fd2ce080b6e52f54129b69714 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c
+++ b/MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c
@@ -1,7 +1,7 @@
 /** @file\r
   GCC inline implementation of BaseSynchronizationLib processor specific functions.\r
 /** @file\r
   GCC inline implementation of BaseSynchronizationLib processor specific functions.\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

   Portions copyright (c) 2008 - 2009, Apple 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
   Portions copyright (c) 2008 - 2009, Apple 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


@@ -42,12 +42,12 @@ InternalSyncIncrement (
     "movl    %2, %%eax      "\r
     : "=a" (Result),          // %0\r
       "=m" (*Value)           // %1\r
     "movl    %2, %%eax      "\r
     : "=a" (Result),          // %0\r
       "=m" (*Value)           // %1\r

-    : "m"  (*Value)           // %2 \r
+    : "m"  (*Value)           // %2\r

     : "memory",\r
       "cc"\r
     );\r
     : "memory",\r
       "cc"\r
     );\r

-    \r
-  return Result;    \r
+\r
+  return Result;\r

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


@@ -72,18 +72,18 @@ InternalSyncDecrement (
   )\r
 {\r
    UINT32  Result;\r
   )\r
 {\r
    UINT32  Result;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "lock               \n\t"\r
     "decl    %2         \n\t"\r
     "movl    %2, %%eax      "\r
     : "=a" (Result),          // %0\r
       "=m" (*Value)           // %1\r
   __asm__ __volatile__ (\r
     "lock               \n\t"\r
     "decl    %2         \n\t"\r
     "movl    %2, %%eax      "\r
     : "=a" (Result),          // %0\r
       "=m" (*Value)           // %1\r

-    : "m"  (*Value)           // %2 \r
+    : "m"  (*Value)           // %2\r

     : "memory",\r
       "cc"\r
     );\r
     : "memory",\r
       "cc"\r
     );\r

-    \r
+\r

   return Result;\r
 }\r
 \r
   return Result;\r
 }\r
 \r


@@ -163,7 +163,7 @@ InternalSyncCompareExchange32 (
     : "=a" (CompareValue)     // %0\r
     : "q"  (ExchangeValue),   // %1\r
       "m"  (*Value),          // %2\r
     : "=a" (CompareValue)     // %0\r
     : "q"  (ExchangeValue),   // %1\r
       "m"  (*Value),          // %2\r

-      "0"  (CompareValue)     // %4 \r
+      "0"  (CompareValue)     // %4\r

     : "memory",\r
       "cc"\r
     );\r
     : "memory",\r
       "cc"\r
     );\r


@@ -198,8 +198,8 @@ InternalSyncCompareExchange64 (
 {\r
   __asm__ __volatile__ (\r
     "                       \n\t"\r
 {\r
   __asm__ __volatile__ (\r
     "                       \n\t"\r

-    "push        %%ebx      \n\t" \r
-    "movl        %2,%%ebx   \n\t"   \r
+    "push        %%ebx      \n\t"\r
+    "movl        %2,%%ebx   \n\t"\r

     "lock                   \n\t"\r
     "cmpxchg8b   (%1)       \n\t"\r
     "pop         %%ebx      \n\t"\r
     "lock                   \n\t"\r
     "cmpxchg8b   (%1)       \n\t"\r
     "pop         %%ebx      \n\t"\r


@@ -210,6 +210,6 @@ InternalSyncCompareExchange64 (
     : "memory",\r
       "cc"\r
     );\r
     : "memory",\r
       "cc"\r
     );\r

-  \r
+\r

   return CompareValue;\r
 }\r
   return CompareValue;\r
 }\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/Ia32/InternalGetSpinLockProperties.c b/MdePkg/Library/BaseSynchronizationLib/Ia32/InternalGetSpinLockProperties.c
index 60f5c7f36bc22628b8ce834a377a4d69949544cb..50ffe8e3aad7f2d5d70ae16d02f02f1e9c7f95e5 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/Ia32/InternalGetSpinLockProperties.c
+++ b/MdePkg/Library/BaseSynchronizationLib/Ia32/InternalGetSpinLockProperties.c
@@ -1,7 +1,7 @@
 /** @file\r
   Internal function to get spin lock alignment.\r
 \r
 /** @file\r
   Internal function to get spin lock alignment.\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


@@ -19,7 +19,7 @@
   requirements for optimal spin lock performance.\r
 \r
   @return The architecture specific spin lock alignment.\r
   requirements for optimal spin lock performance.\r
 \r
   @return The architecture specific spin lock alignment.\r

-  \r
+\r

 **/\r
 UINTN\r
 InternalGetSpinLockProperties (\r
 **/\r
 UINTN\r
 InternalGetSpinLockProperties (\r


@@ -48,7 +48,7 @@ InternalGetSpinLockProperties (
   if (FamilyId == 0x0f) {\r
     //\r
     // In processors based on Intel NetBurst microarchitecture, use two cache lines\r
   if (FamilyId == 0x0f) {\r
     //\r
     // In processors based on Intel NetBurst microarchitecture, use two cache lines\r

-    // \r
+    //\r

     ModelId = ModelId | ((RegEax >> 12) & 0xf0);\r
     if (ModelId <= 0x04 || ModelId == 0x06) {\r
       CacheLineSize *= 2;\r
     ModelId = ModelId | ((RegEax >> 12) & 0xf0);\r
     if (ModelId <= 0x04 || ModelId == 0x06) {\r
       CacheLineSize *= 2;\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/Ipf/InternalGetSpinLockProperties.c b/MdePkg/Library/BaseSynchronizationLib/Ipf/InternalGetSpinLockProperties.c
index f6464c2db7094d32504a7f78124ba50919082150..3993f6bb63d5df948e2bf6c35f978f75d45e84b2 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/Ipf/InternalGetSpinLockProperties.c
+++ b/MdePkg/Library/BaseSynchronizationLib/Ipf/InternalGetSpinLockProperties.c
@@ -1,7 +1,7 @@
 /** @file\r
   Internal function to get spin lock alignment.\r
 \r
 /** @file\r
   Internal function to get spin lock alignment.\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


@@ -17,7 +17,7 @@
   requirements for optimal spin lock performance.\r
 \r
   @return The architecture specific spin lock alignment.\r
   requirements for optimal spin lock performance.\r
 \r
   @return The architecture specific spin lock alignment.\r

-  \r
+\r

 **/\r
 UINTN\r
 InternalGetSpinLockProperties (\r
 **/\r
 UINTN\r
 InternalGetSpinLockProperties (\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/Synchronization.c b/MdePkg/Library/BaseSynchronizationLib/Synchronization.c
index 4f2e21bcb32110789ad57bf549a7cd2d3b274feb..76c5a1275c222a150460847f39cb94276788fd26 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/Synchronization.c
+++ b/MdePkg/Library/BaseSynchronizationLib/Synchronization.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of synchronization functions.\r
 \r
 /** @file\r
   Implementation of synchronization functions.\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


@@ -22,7 +22,7 @@
   optimal spin lock performance.\r
 \r
   This function retrieves the spin lock alignment requirements for optimal\r
   optimal spin lock performance.\r
 \r
   This function retrieves the spin lock alignment requirements for optimal\r

-  performance on a given CPU architecture. The spin lock alignment is byte alignment. \r
+  performance on a given CPU architecture. The spin lock alignment is byte alignment.\r

   It must be a power of two and is returned by this function. If there are no alignment\r
   requirements, then 1 must be returned. The spin lock synchronization\r
   functions must function correctly if the spin lock size and alignment values\r
   It must be a power of two and is returned by this function. If there are no alignment\r
   requirements, then 1 must be returned. The spin lock synchronization\r
   functions must function correctly if the spin lock size and alignment values\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/SynchronizationGcc.c b/MdePkg/Library/BaseSynchronizationLib/SynchronizationGcc.c
index 98c9648632db44b3609cc740a9829fb4943b6259..5ac548b19feb5ce4edbd49a783da18af80efd88f 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/SynchronizationGcc.c
+++ b/MdePkg/Library/BaseSynchronizationLib/SynchronizationGcc.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of synchronization functions.\r
 \r
 /** @file\r
   Implementation of synchronization functions.\r
 \r

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

   Portions copyright (c) 2008 - 2009, Apple 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
   Portions copyright (c) 2008 - 2009, Apple 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


@@ -16,7 +16,7 @@
 #include "BaseSynchronizationLibInternals.h"\r
 \r
 //\r
 #include "BaseSynchronizationLibInternals.h"\r
 \r
 //\r

-// GCC inline assembly for Read Write Barrier  \r
+// GCC inline assembly for Read Write Barrier\r

 //\r
 #define _ReadWriteBarrier() do { __asm__ __volatile__ ("": : : "memory"); } while(0)\r
 \r
 //\r
 #define _ReadWriteBarrier() do { __asm__ __volatile__ ("": : : "memory"); } while(0)\r
 \r


@@ -28,7 +28,7 @@
   optimal spin lock performance.\r
 \r
   This function retrieves the spin lock alignment requirements for optimal\r
   optimal spin lock performance.\r
 \r
   This function retrieves the spin lock alignment requirements for optimal\r

-  performance on a given CPU architecture. The spin lock alignment is byte alignment. \r
+  performance on a given CPU architecture. The spin lock alignment is byte alignment.\r

   It must be a power of two and is returned by this function. If there are no alignment\r
   requirements, then 1 must be returned. The spin lock synchronization\r
   functions must function correctly if the spin lock size and alignment values\r
   It must be a power of two and is returned by this function. If there are no alignment\r
   requirements, then 1 must be returned. The spin lock synchronization\r
   functions must function correctly if the spin lock size and alignment values\r


@@ -191,7 +191,7 @@ AcquireSpinLockOrFail (
 {\r
   SPIN_LOCK   LockValue;\r
   VOID        *Result;\r
 {\r
   SPIN_LOCK   LockValue;\r
   VOID        *Result;\r

-  \r
+\r

   ASSERT (SpinLock != NULL);\r
 \r
   LockValue = *SpinLock;\r
   ASSERT (SpinLock != NULL);\r
 \r
   LockValue = *SpinLock;\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/SynchronizationMsc.c b/MdePkg/Library/BaseSynchronizationLib/SynchronizationMsc.c
index 8bc6d2669ebd59d17a70ff63b8b43f430f982703..e3298c8ab4ae0e8e1a5ef2b788b88cd06cd89246 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/SynchronizationMsc.c
+++ b/MdePkg/Library/BaseSynchronizationLib/SynchronizationMsc.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of synchronization functions.\r
 \r
 /** @file\r
   Implementation of synchronization functions.\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 @@ void    _ReadWriteBarrier (void);
   optimal spin lock performance.\r
 \r
   This function retrieves the spin lock alignment requirements for optimal\r
   optimal spin lock performance.\r
 \r
   This function retrieves the spin lock alignment requirements for optimal\r

-  performance on a given CPU architecture. The spin lock alignment is byte alignment. \r
+  performance on a given CPU architecture. The spin lock alignment is byte alignment.\r

   It must be a power of two and is returned by this function. If there are no alignment\r
   requirements, then 1 must be returned. The spin lock synchronization\r
   functions must function correctly if the spin lock size and alignment values\r
   It must be a power of two and is returned by this function. If there are no alignment\r
   requirements, then 1 must be returned. The spin lock synchronization\r
   functions must function correctly if the spin lock size and alignment values\r


@@ -193,7 +193,7 @@ AcquireSpinLockOrFail (
 {\r
   SPIN_LOCK   LockValue;\r
   VOID        *Result;\r
 {\r
   SPIN_LOCK   LockValue;\r
   VOID        *Result;\r

-  \r
+\r

   ASSERT (SpinLock != NULL);\r
 \r
   LockValue = *SpinLock;\r
   ASSERT (SpinLock != NULL);\r
 \r
   LockValue = *SpinLock;\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/X64/GccInline.c b/MdePkg/Library/BaseSynchronizationLib/X64/GccInline.c
index 6347073fee510c2fb9f14ee9440ac34dad9bfcc0..5224dd063ffda213b00d9a4cdfdd9dfaaef6b544 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/X64/GccInline.c
+++ b/MdePkg/Library/BaseSynchronizationLib/X64/GccInline.c
@@ -1,8 +1,8 @@
 /** @file\r
   GCC inline implementation of BaseSynchronizationLib processor specific functions.\r
 /** @file\r
   GCC inline implementation of BaseSynchronizationLib processor specific functions.\r

-  \r
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
-  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> \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

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under 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,12 +43,12 @@ InternalSyncIncrement (
     "mov     %2, %%eax      "\r
     : "=a" (Result),          // %0\r
       "=m" (*Value)           // %1\r
     "mov     %2, %%eax      "\r
     : "=a" (Result),          // %0\r
       "=m" (*Value)           // %1\r

-    : "m"  (*Value)           // %2 \r
+    : "m"  (*Value)           // %2\r

     : "memory",\r
       "cc"\r
     );\r
     : "memory",\r
       "cc"\r
     );\r

-    \r
-  return Result;    \r
+\r
+  return Result;\r

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


@@ -72,18 +72,18 @@ InternalSyncDecrement (
   )\r
 {\r
    UINT32  Result;\r
   )\r
 {\r
    UINT32  Result;\r

-  \r
+\r

   __asm__ __volatile__ (\r
     "lock               \n\t"\r
     "decl    %2         \n\t"\r
     "mov     %2, %%eax      "\r
     : "=a" (Result),          // %0\r
       "=m" (*Value)           // %1\r
   __asm__ __volatile__ (\r
     "lock               \n\t"\r
     "decl    %2         \n\t"\r
     "mov     %2, %%eax      "\r
     : "=a" (Result),          // %0\r
       "=m" (*Value)           // %1\r

-    : "m"  (*Value)           // %2 \r
+    : "m"  (*Value)           // %2\r

     : "memory",\r
       "cc"\r
     );\r
     : "memory",\r
       "cc"\r
     );\r

-    \r
+\r

   return Result;\r
 }\r
 \r
   return Result;\r
 }\r
 \r


@@ -166,12 +166,12 @@ InternalSyncCompareExchange32 (
     : "=a" (CompareValue),    // %0\r
       "=m" (*Value)           // %1\r
     : "a"  (CompareValue),    // %2\r
     : "=a" (CompareValue),    // %0\r
       "=m" (*Value)           // %1\r
     : "a"  (CompareValue),    // %2\r

-      "r"  (ExchangeValue),   // %3 \r
+      "r"  (ExchangeValue),   // %3\r

       "m"  (*Value)\r
     : "memory",\r
       "cc"\r
     );\r
       "m"  (*Value)\r
     : "memory",\r
       "cc"\r
     );\r

-    \r
+\r

   return CompareValue;\r
 }\r
 \r
   return CompareValue;\r
 }\r
 \r


@@ -208,12 +208,12 @@ InternalSyncCompareExchange64 (
     : "=a" (CompareValue),    // %0\r
       "=m" (*Value)           // %1\r
     : "a"  (CompareValue),    // %2\r
     : "=a" (CompareValue),    // %0\r
       "=m" (*Value)           // %1\r
     : "a"  (CompareValue),    // %2\r

-      "r"  (ExchangeValue),   // %3 \r
+      "r"  (ExchangeValue),   // %3\r

       "m"  (*Value)\r
     : "memory",\r
       "cc"\r
     );\r
       "m"  (*Value)\r
     : "memory",\r
       "cc"\r
     );\r

-  \r
+\r

   return CompareValue;\r
 }\r
 \r
   return CompareValue;\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf b/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
index e72abdd81868fa758d4219cfe7f4ad7627ff7c9e..0737468bf418c40a9a693c17dd4a27c707d39c97 100644 (file)
--- a/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
+++ b/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
@@ -6,7 +6,7 @@
 #  also be used to test build DXE, Runtime, DXE SAL, and DXE SMM modules that require timer\r
 #  services as well as EBC modules that require timer services.\r
 #\r
 #  also be used to test build DXE, Runtime, DXE SAL, and DXE SMM modules that require timer\r
 #  services as well as EBC modules that require timer 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
 #\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 @@
   FILE_GUID                      = f4731d79-537e-4505-bd52-c03f9b1f6b89\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = f4731d79-537e-4505-bd52-c03f9b1f6b89\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = TimerLib \r
+  LIBRARY_CLASS                  = TimerLib\r

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

diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
index e818543d925530ee9a9f66245c423c15b22bc2a6..dc89157c4efd47c2a1fac61757faf86f754c39a2 100644 (file)
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
+++ b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Decompress Library implementation refer to UEFI specification.\r
 \r
 /** @file\r
   UEFI Decompress Library implementation refer to UEFI specification.\r
 \r

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

   Portions copyright (c) 2008 - 2009, Apple 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
   Portions copyright (c) 2008 - 2009, Apple 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


@@ -71,7 +71,7 @@ FillBuf (
   // Calculate additional bit count read to update mBitCount\r
   //\r
   Sd->mBitCount = (UINT16) (Sd->mBitCount - NumOfBits);\r
   // Calculate additional bit count read to update mBitCount\r
   //\r
   Sd->mBitCount = (UINT16) (Sd->mBitCount - NumOfBits);\r

-  \r
+\r

   //\r
   // Copy NumOfBits of bits from mSubBitBuf into mBitBuf\r
   //\r
   //\r
   // Copy NumOfBits of bits from mSubBitBuf into mBitBuf\r
   //\r


@@ -101,7 +101,7 @@ GetBits (
 \r
   //\r
   // Pop NumOfBits of Bits from Left\r
 \r
   //\r
   // Pop NumOfBits of Bits from Left\r

-  //  \r
+  //\r

   OutBits = (UINT32) (Sd->mBitBuf >> (BITBUFSIZ - NumOfBits));\r
 \r
   //\r
   OutBits = (UINT32) (Sd->mBitBuf >> (BITBUFSIZ - NumOfBits));\r
 \r
   //\r


@@ -166,7 +166,7 @@ MakeTable (
   for (Index = 0; Index < NumOfChar; Index++) {\r
     Count[BitLen[Index]]++;\r
   }\r
   for (Index = 0; Index < NumOfChar; Index++) {\r
     Count[BitLen[Index]]++;\r
   }\r

-  \r
+\r

   Start[0] = 0;\r
   Start[1] = 0;\r
 \r
   Start[0] = 0;\r
   Start[1] = 0;\r
 \r


@@ -182,7 +182,7 @@ MakeTable (
   }\r
 \r
   JuBits = (UINT16) (16 - TableBits);\r
   }\r
 \r
   JuBits = (UINT16) (16 - TableBits);\r

-  \r
+\r

   Weight[0] = 0;\r
   for (Index = 1; Index <= TableBits; Index++) {\r
     Start[Index] >>= JuBits;\r
   Weight[0] = 0;\r
   for (Index = 1; Index <= TableBits; Index++) {\r
     Start[Index] >>= JuBits;\r


@@ -191,7 +191,7 @@ MakeTable (
 \r
   while (Index <= 16) {\r
     Weight[Index] = (UINT16) (1U << (16 - Index));\r
 \r
   while (Index <= 16) {\r
     Weight[Index] = (UINT16) (1U << (16 - Index));\r

-    Index++;    \r
+    Index++;\r

   }\r
 \r
   Index = (UINT16) (Start[TableBits + 1] >> JuBits);\r
   }\r
 \r
   Index = (UINT16) (Start[TableBits + 1] >> JuBits);\r


@@ -232,7 +232,7 @@ MakeTable (
           Sd->mRight[Avail] = Sd->mLeft[Avail] = 0;\r
           *Pointer = Avail++;\r
         }\r
           Sd->mRight[Avail] = Sd->mLeft[Avail] = 0;\r
           *Pointer = Avail++;\r
         }\r

-        \r
+\r

         if (*Pointer < (2 * NC - 1)) {\r
           if ((Index3 & Mask) != 0) {\r
             Pointer = &Sd->mRight[*Pointer];\r
         if (*Pointer < (2 * NC - 1)) {\r
           if ((Index3 & Mask) != 0) {\r
             Pointer = &Sd->mRight[*Pointer];\r


@@ -335,7 +335,7 @@ ReadPTLen (
 \r
   ASSERT (nn <= NPT);\r
   //\r
 \r
   ASSERT (nn <= NPT);\r
   //\r

-  // Read Extra Set Code Length Array size \r
+  // Read Extra Set Code Length Array size\r

   //\r
   Number = (UINT16) GetBits (Sd, nbit);\r
 \r
   //\r
   Number = (UINT16) GetBits (Sd, nbit);\r
 \r


@@ -360,7 +360,7 @@ ReadPTLen (
 \r
     //\r
     // If a code length is less than 7, then it is encoded as a 3-bit\r
 \r
     //\r
     // If a code length is less than 7, then it is encoded as a 3-bit\r

-    // value. Or it is encoded as a series of "1"s followed by a \r
+    // value. Or it is encoded as a series of "1"s followed by a\r

     // terminating "0". The number of "1"s = Code length - 4.\r
     //\r
     if (CharC == 7) {\r
     // terminating "0". The number of "1"s = Code length - 4.\r
     //\r
     if (CharC == 7) {\r


@@ -370,15 +370,15 @@ ReadPTLen (
         CharC += 1;\r
       }\r
     }\r
         CharC += 1;\r
       }\r
     }\r

-    \r
+\r

     FillBuf (Sd, (UINT16) ((CharC < 7) ? 3 : CharC - 3));\r
 \r
     Sd->mPTLen[Index++] = (UINT8) CharC;\r
     FillBuf (Sd, (UINT16) ((CharC < 7) ? 3 : CharC - 3));\r
 \r
     Sd->mPTLen[Index++] = (UINT8) CharC;\r

- \r
+\r

     //\r
     //\r

-    // For Code&Len Set, \r
+    // For Code&Len Set,\r

     // After the third length of the code length concatenation,\r
     // After the third length of the code length concatenation,\r

-    // a 2-bit value is used to indicated the number of consecutive \r
+    // a 2-bit value is used to indicated the number of consecutive\r

     // zero lengths after the third length.\r
     //\r
     if (Index == Special) {\r
     // zero lengths after the third length.\r
     //\r
     if (Index == Special) {\r


@@ -392,7 +392,7 @@ ReadPTLen (
   while (Index < nn && Index < NPT) {\r
     Sd->mPTLen[Index++] = 0;\r
   }\r
   while (Index < nn && Index < NPT) {\r
     Sd->mPTLen[Index++] = 0;\r
   }\r

-  \r
+\r

   return MakeTable (Sd, nn, Sd->mPTLen, 8, Sd->mPTTable);\r
 }\r
 \r
   return MakeTable (Sd, nn, Sd->mPTLen, 8, Sd->mPTTable);\r
 }\r
 \r


@@ -504,7 +504,7 @@ DecodeC (
     //\r
     // Starting a new block\r
     // Read BlockSize from block header\r
     //\r
     // Starting a new block\r
     // Read BlockSize from block header\r

-    // \r
+    //\r

     Sd->mBlockSize    = (UINT16) GetBits (Sd, 16);\r
 \r
     //\r
     Sd->mBlockSize    = (UINT16) GetBits (Sd, 16);\r
 \r
     //\r


@@ -581,7 +581,7 @@ Decode (
   for (;;) {\r
     //\r
     // Get one code from mBitBuf\r
   for (;;) {\r
     //\r
     // Get one code from mBitBuf\r

-    // \r
+    //\r

     CharC = DecodeC (Sd);\r
     if (Sd->mBadTableFlag != 0) {\r
       goto Done;\r
     CharC = DecodeC (Sd);\r
     if (Sd->mBadTableFlag != 0) {\r
       goto Done;\r


@@ -605,7 +605,7 @@ Decode (
       // Process a Pointer\r
       //\r
       CharC       = (UINT16) (CharC - (BIT8 - THRESHOLD));\r
       // Process a Pointer\r
       //\r
       CharC       = (UINT16) (CharC - (BIT8 - THRESHOLD));\r

- \r
+\r

       //\r
       // Get string length\r
       //\r
       //\r
       // Get string length\r
       //\r


@@ -636,18 +636,18 @@ Done:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Given a compressed source buffer, this function retrieves the size of \r
-  the uncompressed buffer and the size of the scratch buffer required \r
+  Given a 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
   If the size of the uncompressed buffer or the size of the scratch buffer cannot\r
   required to decompress the buffer specified by Source and SourceSize.\r
   If the size of the uncompressed buffer or the size of the scratch buffer cannot\r

-  be determined from the compressed data specified by Source and SourceData, \r
+  be determined from the compressed data specified by Source and SourceData,\r

   then RETURN_INVALID_PARAMETER is returned.  Otherwise, the size of the uncompressed\r
   buffer is returned in DestinationSize, the size of the scratch buffer is returned\r
   in ScratchSize, and RETURN_SUCCESS is returned.\r
   then RETURN_INVALID_PARAMETER is returned.  Otherwise, the size of the uncompressed\r
   buffer is returned in DestinationSize, the size of the scratch buffer is returned\r
   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 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 beginning bytes of the source data and output it as DestinationSize.\r
   And ScratchSize is specific to the decompression implementation.\r


@@ -662,16 +662,16 @@ Done:
                           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
                           buffer was returned in ScratchSize.\r

-  @retval  RETURN_INVALID_PARAMETER \r
-                          The size of the uncompressed data or the size of \r
-                          the scratch buffer cannot be determined from \r
-                          the compressed data specified by Source \r
+  @retval  RETURN_INVALID_PARAMETER\r
+                          The size of the uncompressed data or the size of\r
+                          the scratch buffer cannot be determined from\r
+                          the compressed data specified by Source\r

                           and SourceSize.\r
 **/\r
 RETURN_STATUS\r
                           and SourceSize.\r
 **/\r
 RETURN_STATUS\r


@@ -710,10 +710,10 @@ UefiDecompressGetInfo (
   Extracts decompressed data to its original form.\r
   This function is designed so that the decompression algorithm can be implemented\r
   without using any memory services.  As a result, this function is not allowed to\r
   Extracts decompressed data to its original form.\r
   This function is designed so that the decompression algorithm can be implemented\r
   without using any memory services.  As a result, this function is not allowed to\r

-  call any memory allocation services in its implementation.  It is the caller's \r
+  call any memory allocation services in its implementation.  It is the caller's\r

   responsibility to allocate and free the Destination and Scratch buffers.\r
   responsibility to allocate and free the Destination and Scratch buffers.\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


@@ -724,13 +724,13 @@ UefiDecompressGetInfo (
   @param  Source      The source buffer containing the compressed data.\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  Source      The source buffer containing the compressed data.\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/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
index 36d7a240c19de7bbc7ad8678548759fbf0977dac..e6496ee570640883280156ba05fc48839aa9ee48 100644 (file)
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
+++ b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  UEFI Decompress Library implementation.\r
 #\r
 ## @file\r
 #  UEFI Decompress Library implementation.\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


@@ -20,7 +20,7 @@
   FILE_GUID                      = 9ae5147d-b240-467f-a484-b024fdc42ee0\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 9ae5147d-b240-467f-a484-b024fdc42ee0\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = UefiDecompressLib \r
+  LIBRARY_CLASS                  = UefiDecompressLib\r

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

diff --git a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.c b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.c
index d3d8c4c47c51a3e6b172d85caf68f9b3c81d8a1b..f065a1d0ceeb4c409f57f00c5bd3d22bca4be53a 100644 (file)
--- a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.c
+++ b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.c
@@ -1,7 +1,7 @@
 /** @file\r
   Entry point to the DXE Core.\r
 \r
 /** @file\r
   Entry point to the DXE Core.\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


@@ -21,12 +21,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseLib.h>\r
 \r
 //\r
 #include <Library/BaseLib.h>\r
 \r
 //\r

-// Cache copy of HobList pointer. \r
-// \r
+// Cache copy of HobList pointer.\r
+//\r

 VOID *gHobList = NULL;\r
 \r
 /**\r
 VOID *gHobList = NULL;\r
 \r
 /**\r

-  The entry point of PE/COFF Image for the DXE Core. \r
+  The entry point of PE/COFF Image for the DXE Core.\r

 \r
   This function is the entry point for the DXE Core. This function is required to call\r
   ProcessModuleEntryPointList() and ProcessModuleEntryPointList() is never expected to return.\r
 \r
   This function is the entry point for the DXE Core. This function is required to call\r
   ProcessModuleEntryPointList() and ProcessModuleEntryPointList() is never expected to return.\r


@@ -34,7 +34,7 @@ VOID *gHobList = NULL;
   System Table and the image handle for the DXE Core itself have been established.\r
   If ProcessModuleEntryPointList() returns, then ASSERT() and halt the system.\r
 \r
   System Table and the image handle for the DXE Core itself have been established.\r
   If ProcessModuleEntryPointList() returns, then ASSERT() and halt the system.\r
 \r

-  @param  HobStart  The pointer to the beginning of the HOB List passed in from the PEI Phase. \r
+  @param  HobStart  The pointer to the beginning of the HOB List passed in from the PEI Phase.\r

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


@@ -66,7 +66,7 @@ _ModuleEntryPoint (
 \r
   This function is required to call _ModuleEntryPoint() passing in HobStart.\r
 \r
 \r
   This function is required to call _ModuleEntryPoint() passing in HobStart.\r
 \r

-  @param  HobStart  The pointer to the beginning of the HOB List passed in from the PEI Phase. \r
+  @param  HobStart  The pointer to the beginning of the HOB List passed in from the PEI Phase.\r

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

diff --git a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
index 01f64c34c7a1029b253f5a6c19df43d4ee37bb19..c6635a3e5605a0823b82d66d1068d519616202c5 100644 (file)
--- a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
+++ b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # Module entry point library for DXE core.\r
 #\r
 ## @file\r
 # Module entry point library for DXE core.\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


@@ -20,7 +20,7 @@
   FILE_GUID                      = d258d6af-2fc0-4019-9c1f-1101c3dd19b5\r
   MODULE_TYPE                    = DXE_CORE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = d258d6af-2fc0-4019-9c1f-1101c3dd19b5\r
   MODULE_TYPE                    = DXE_CORE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = DxeCoreEntryPoint|DXE_CORE \r
+  LIBRARY_CLASS                  = DxeCoreEntryPoint|DXE_CORE\r

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

diff --git a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
index ae48d9279fd9454ca83a0f786e0fde7df9e597c6..3c7d65306703304898e25df8ce443a3c1016f870 100644 (file)
--- a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
+++ b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
@@ -4,7 +4,7 @@
 # HOB Library implementation for the DXE Core. Does not have a constructor.\r
 #  Uses gHobList defined in the DXE Core Entry Point Library.\r
 #\r
 # HOB Library implementation for the DXE Core. Does not have a constructor.\r
 #  Uses gHobList defined in the DXE Core Entry Point Library.\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


@@ -23,7 +23,7 @@
   FILE_GUID                      = 882ee1a3-35b2-412c-b8a2-7a8d34a7c390\r
   MODULE_TYPE                    = DXE_CORE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 882ee1a3-35b2-412c-b8a2-7a8d34a7c390\r
   MODULE_TYPE                    = DXE_CORE\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = HobLib|DXE_CORE \r
+  LIBRARY_CLASS                  = HobLib|DXE_CORE\r

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

diff --git a/MdePkg/Library/DxeCoreHobLib/HobLib.c b/MdePkg/Library/DxeCoreHobLib/HobLib.c
index 8ca3489c10a75c5a12acfe934f4192d5851fbefc..6aac20dd4d8df0f878e21edb4b4d93505f979a0e 100644 (file)
--- a/MdePkg/Library/DxeCoreHobLib/HobLib.c
+++ b/MdePkg/Library/DxeCoreHobLib/HobLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   HOB Library implementation for DxeCore driver.\r
 \r
 /** @file\r
   HOB Library implementation for DxeCore 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


@@ -23,15 +23,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Returns the pointer to the HOB list.\r
 \r
   This function returns the pointer to first HOB in the list.\r
   Returns the pointer to the HOB list.\r
 \r
   This function returns the pointer to first HOB in the list.\r

-  For PEI phase, the PEI service GetHobList() can be used to retrieve the pointer \r
+  For PEI phase, the PEI service GetHobList() can be used to retrieve the pointer\r

   to the HOB list.  For the DXE phase, the HOB list pointer can be retrieved through\r
   the EFI System Table by looking up theHOB list GUID in the System Configuration Table.\r
   to the HOB list.  For the DXE phase, the HOB list pointer can be retrieved through\r
   the EFI System Table by looking up theHOB list GUID in the System Configuration Table.\r

-  Since the System Configuration Table does not exist that the time the DXE Core is \r
-  launched, the DXE Core uses a global variable from the DXE Core Entry Point Library \r
+  Since the System Configuration Table does not exist that the time the DXE Core is\r
+  launched, the DXE Core uses a global variable from the DXE Core Entry Point Library\r

   to manage the pointer to the HOB list.\r
   to manage the pointer to the HOB list.\r

-  \r
+\r

   If the pointer to the HOB list is NULL, then ASSERT().\r
   If the pointer to the HOB list is NULL, then ASSERT().\r

-  \r
+\r

   @return The pointer to the HOB list.\r
 \r
 **/\r
   @return The pointer to the HOB list.\r
 \r
 **/\r


@@ -48,12 +48,12 @@ GetHobList (
 /**\r
   Returns the next instance of a HOB type from the starting HOB.\r
 \r
 /**\r
   Returns the next instance of a HOB type from the starting HOB.\r
 \r

-  This function searches the first instance of a HOB type from the starting HOB pointer. \r
+  This function searches the first instance of a HOB type from the starting HOB pointer.\r

   If there does not exist such HOB type from the starting HOB pointer, it will return NULL.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r
   If there does not exist such HOB type from the starting HOB pointer, it will return NULL.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r

-  \r
+\r

   If HobStart is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r
   If HobStart is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r


@@ -89,9 +89,9 @@ GetNextHob (
 /**\r
   Returns the first instance of a HOB type among the whole HOB list.\r
 \r
 /**\r
   Returns the first instance of a HOB type among the whole HOB list.\r
 \r

-  This function searches the first instance of a HOB type among the whole HOB list. \r
-  If there does not exist such HOB type in the HOB list, it will return NULL. \r
-  \r
+  This function searches the first instance of a HOB type among the whole HOB list.\r
+  If there does not exist such HOB type in the HOB list, it will return NULL.\r
+\r

   If the pointer to the HOB list is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r
   If the pointer to the HOB list is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r


@@ -113,17 +113,17 @@ GetFirstHob (
 \r
 /**\r
   Returns the next instance of the matched GUID HOB from the starting HOB.\r
 \r
 /**\r
   Returns the next instance of the matched GUID HOB from the starting HOB.\r

-  \r
-  This function searches the first instance of a HOB from the starting HOB pointer. \r
-  Such HOB should satisfy two conditions: \r
-  its HOB type is EFI_HOB_TYPE_GUID_EXTENSION, and its GUID Name equals to the input Guid. \r
-  If such a HOB from the starting HOB pointer does not exist, it will return NULL. \r
+\r
+  This function searches the first instance of a HOB from the starting HOB pointer.\r
+  Such HOB should satisfy two conditions:\r
+  its HOB type is EFI_HOB_TYPE_GUID_EXTENSION, and its GUID Name equals to the input Guid.\r
+  If such a HOB from the starting HOB pointer does not exist, it will return NULL.\r

   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r
   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If HobStart is NULL, then ASSERT().\r
 \r
   If Guid is NULL, then ASSERT().\r
   If HobStart is NULL, then ASSERT().\r
 \r


@@ -154,14 +154,14 @@ GetNextGuidHob (
 \r
 /**\r
   Returns the first instance of the matched GUID HOB among the whole HOB list.\r
 \r
 /**\r
   Returns the first instance of the matched GUID HOB among the whole HOB list.\r

-  \r
-  This function searches the first instance of a HOB among the whole HOB list. \r
+\r
+  This function searches the first instance of a HOB among the whole HOB list.\r

   Such HOB should satisfy two conditions:\r
   its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid.\r
   If such a HOB from the starting HOB pointer does not exist, it will return NULL.\r
   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r
   Such HOB should satisfy two conditions:\r
   its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid.\r
   If such a HOB from the starting HOB pointer does not exist, it will return NULL.\r
   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r

-  \r
+\r

   If the pointer to the HOB list is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
 \r
   If the pointer to the HOB list is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
 \r


@@ -185,11 +185,11 @@ GetFirstGuidHob (
 /**\r
   Get the system boot mode from the HOB list.\r
 \r
 /**\r
   Get the system boot mode from the HOB list.\r
 \r

-  This function returns the system boot mode information from the \r
+  This function returns the system boot mode information from the\r

   PHIT HOB in HOB list.\r
 \r
   If the pointer to the HOB list is NULL, then ASSERT().\r
   PHIT HOB in HOB list.\r
 \r
   If the pointer to the HOB list is NULL, then ASSERT().\r

-  \r
+\r

   @param  VOID\r
 \r
   @return The Boot Mode.\r
   @param  VOID\r
 \r
   @return The Boot Mode.\r


@@ -214,7 +214,7 @@ GetBootModeHob (
   This function builds a HOB for a loaded PE32 module.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for a loaded PE32 module.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If ModuleName is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   If ModuleName is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r


@@ -245,7 +245,7 @@ BuildModuleHob (
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r


@@ -277,7 +277,7 @@ BuildResourceDescriptorWithOwnerHob (
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r


@@ -302,15 +302,15 @@ BuildResourceDescriptorHob (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Builds a customized HOB tagged with a GUID for identification and returns \r
+  Builds a customized HOB tagged with a GUID for identification and returns\r

   the start address of GUID HOB data.\r
 \r
   the start address of GUID HOB data.\r
 \r

-  This function builds a customized HOB tagged with a GUID for identification \r
-  and returns the start address of GUID HOB data so that caller can fill the customized data. \r
+  This function builds a customized HOB tagged with a GUID for identification\r
+  and returns the start address of GUID HOB data so that caller can fill the customized data.\r

   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase.\r
   For DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r
   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase.\r
   For DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
   If DataLength > (0xFFF8 - sizeof (EFI_HOB_GUID_TYPE)), then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
   If DataLength > (0xFFF8 - sizeof (EFI_HOB_GUID_TYPE)), then ASSERT().\r


@@ -338,16 +338,16 @@ BuildGuidHob (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Builds a customized HOB tagged with a GUID for identification, copies the input data to the HOB \r
+  Builds a customized HOB tagged with a GUID for identification, copies the input data to the HOB\r

   data field, and returns the start address of the GUID HOB data.\r
 \r
   This function builds a customized HOB tagged with a GUID for identification and copies the input\r
   data field, and returns the start address of the GUID HOB data.\r
 \r
   This function builds a customized HOB tagged with a GUID for identification and copies the input\r

-  data to the HOB data field and returns the start address of the GUID HOB data.  It can only be \r
-  invoked during PEI phase; for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.  \r
+  data to the HOB data field and returns the start address of the GUID HOB data.  It can only be\r
+  invoked during PEI phase; for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase.\r
   For DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r
   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase.\r
   For DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If Data is NULL and DataLength > 0, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If Data is NULL and DataLength > 0, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r


@@ -383,7 +383,7 @@ BuildGuidDataHob (
   This function builds a Firmware Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r
   This function builds a Firmware Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r
   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r


@@ -410,7 +410,7 @@ BuildFvHob (
   This function builds a EFI_HOB_TYPE_FV2 HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r
   This function builds a EFI_HOB_TYPE_FV2 HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r
   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r


@@ -418,7 +418,7 @@ BuildFvHob (
   @param  Length        The size of the Firmware Volume in bytes.\r
   @param  FvName        The name of the Firmware Volume.\r
   @param  FileName      The name of the file.\r
   @param  Length        The size of the Firmware Volume in bytes.\r
   @param  FvName        The name of the Firmware Volume.\r
   @param  FileName      The name of the file.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -473,7 +473,7 @@ BuildFv3Hob (
   This function builds a Capsule Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r
   This function builds a Capsule Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If the platform does not support Capsule Volume HOBs, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   If the platform does not support Capsule Volume HOBs, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r


@@ -500,7 +500,7 @@ BuildCvHob (
   This function builds a HOB for the CPU.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for the CPU.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  SizeOfMemorySpace   The maximum physical memory addressability of the processor.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  SizeOfMemorySpace   The maximum physical memory addressability of the processor.\r


@@ -526,7 +526,7 @@ BuildCpuHob (
   This function builds a HOB for the stack.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for the stack.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the Stack.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the Stack.\r


@@ -552,7 +552,7 @@ BuildStackHob (
   This function builds a HOB for BSP store.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for BSP store.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the BSP.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the BSP.\r


@@ -580,7 +580,7 @@ BuildBspStoreHob (
   This function builds a HOB for the memory allocation.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for the memory allocation.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() because PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the memory.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the memory.\r

diff --git a/MdePkg/Library/DxeExtendedSalLib/DxeExtendedSalLib.inf b/MdePkg/Library/DxeExtendedSalLib/DxeExtendedSalLib.inf
index 2c4e28b039d651f3d6ae3d1a78157056f30b270f..4adc505f3a897aeafec41fa4a83138172a60bc8f 100644 (file)
--- a/MdePkg/Library/DxeExtendedSalLib/DxeExtendedSalLib.inf
+++ b/MdePkg/Library/DxeExtendedSalLib/DxeExtendedSalLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  The library implements the Extended SAL Library Class for boot service only modules.\r
 #\r
 ## @file\r
 #  The library implements the Extended SAL Library Class for boot service only modules.\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


@@ -19,7 +19,7 @@
   FILE_GUID                      = 8FDED21D-7AB5-4c26-8CF7-20EC4DB9861D\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 8FDED21D-7AB5-4c26-8CF7-20EC4DB9861D\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = ExtendedSalLib|DXE_DRIVER UEFI_DRIVER UEFI_APPLICATION \r
+  LIBRARY_CLASS                  = ExtendedSalLib|DXE_DRIVER UEFI_DRIVER UEFI_APPLICATION\r

   CONSTRUCTOR                    = DxeExtendedSalLibConstruct\r
 \r
 #\r
   CONSTRUCTOR                    = DxeExtendedSalLibConstruct\r
 \r
 #\r

diff --git a/MdePkg/Library/DxeExtendedSalLib/ExtendedSalLib.c b/MdePkg/Library/DxeExtendedSalLib/ExtendedSalLib.c
index 0f48c63f7b85f0011b6354469380fc2bb6e0bb78..6c86066550c3dc6a647ef92de34ca5043778d6f6 100644 (file)
--- a/MdePkg/Library/DxeExtendedSalLib/ExtendedSalLib.c
+++ b/MdePkg/Library/DxeExtendedSalLib/ExtendedSalLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   The library implements the Extended SAL Library Class for boot service only modules.\r
 \r
 /** @file\r
   The library implements the Extended SAL Library Class for boot service only modules.\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


@@ -64,7 +64,7 @@ EFI_PLABEL                          mPlabel;
 /**\r
   Constructor function to get Extended SAL Boot Service Protocol, and initializes\r
   physical plabel of ESAL entrypoint.\r
 /**\r
   Constructor function to get Extended SAL Boot Service Protocol, and initializes\r
   physical plabel of ESAL entrypoint.\r

-  \r
+\r

   This function first locates Extended SAL Boot Service Protocol and caches it in global variable.\r
   Then it initializes the physical plable of ESAL entrypoint, and stores\r
   it where GetEsalEntryPoint() can easily retrieve.\r
   This function first locates Extended SAL Boot Service Protocol and caches it in global variable.\r
   Then it initializes the physical plable of ESAL entrypoint, and stores\r
   it where GetEsalEntryPoint() can easily retrieve.\r


@@ -109,7 +109,7 @@ DxeExtendedSalLibConstruct (
 \r
 /**\r
   Registers function of ESAL class and it's associated global.\r
 \r
 /**\r
   Registers function of ESAL class and it's associated global.\r

-  \r
+\r

   This function registers function of ESAL class, together with its associated global.\r
   It is worker function for RegisterEsalClass().\r
   It is only for boot time.\r
   This function registers function of ESAL class, together with its associated global.\r
   It is worker function for RegisterEsalClass().\r
   It is only for boot time.\r


@@ -144,7 +144,7 @@ RegisterEsalFunction (
 \r
 /**\r
   Registers ESAL Class and it's associated global.\r
 \r
 /**\r
   Registers ESAL Class and it's associated global.\r

-  \r
+\r

   This function registers one or more Extended SAL services in a given\r
   class along with the associated global context.\r
   This function is only available prior to ExitBootServices().\r
   This function registers one or more Extended SAL services in a given\r
   class along with the associated global context.\r
   This function is only available prior to ExitBootServices().\r


@@ -153,11 +153,11 @@ RegisterEsalFunction (
   @param  ClassGuidHi          GUID of function class, upper 64-bits\r
   @param  ModuleGlobal         Module global for the class.\r
   @param  ...                  List of Function/FunctionId pairs, ended by NULL\r
   @param  ClassGuidHi          GUID of function class, upper 64-bits\r
   @param  ModuleGlobal         Module global for the class.\r
   @param  ...                  List of Function/FunctionId pairs, ended by NULL\r

-  \r
+\r

   @retval EFI_SUCCESS          The Extended SAL services were registered.\r
   @retval EFI_UNSUPPORTED      This function was called after ExitBootServices().\r
   @retval EFI_OUT_OF_RESOURCES There are not enough resources available to register one or more of the specified services.\r
   @retval EFI_SUCCESS          The Extended SAL services were registered.\r
   @retval EFI_UNSUPPORTED      This function was called after ExitBootServices().\r
   @retval EFI_OUT_OF_RESOURCES There are not enough resources available to register one or more of the specified services.\r

-  @retval Other                ClassGuid could not be installed onto a new handle.  \r
+  @retval Other                ClassGuid could not be installed onto a new handle.\r

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


@@ -215,7 +215,7 @@ RegisterEsalClass (
 \r
 /**\r
   Calls an Extended SAL Class service that was previously registered with RegisterEsalClass().\r
 \r
 /**\r
   Calls an Extended SAL Class service that was previously registered with RegisterEsalClass().\r

-  \r
+\r

   This function gets the entrypoint of Extended SAL, and calls an Extended SAL Class service\r
   that was previously registered with RegisterEsalClass() through this entrypoint.\r
 \r
   This function gets the entrypoint of Extended SAL, and calls an Extended SAL Class service\r
   that was previously registered with RegisterEsalClass() through this entrypoint.\r
 \r


@@ -229,12 +229,12 @@ RegisterEsalClass (
   @param  Arg6            Argument 6 ClassGuid/FunctionId defined\r
   @param  Arg7            Argument 7 ClassGuid/FunctionId defined\r
   @param  Arg8            Argument 8 ClassGuid/FunctionId defined\r
   @param  Arg6            Argument 6 ClassGuid/FunctionId defined\r
   @param  Arg7            Argument 7 ClassGuid/FunctionId defined\r
   @param  Arg8            Argument 8 ClassGuid/FunctionId defined\r

-  \r
+\r

   @retval EFI_SAL_SUCCESS ESAL procedure successfully called.\r
   @retval EFI_SAL_ERROR   The address of ExtendedSalProc() can not be correctly\r
                           initialized.\r
   @retval Other           Status returned from ExtendedSalProc() service of\r
   @retval EFI_SAL_SUCCESS ESAL procedure successfully called.\r
   @retval EFI_SAL_ERROR   The address of ExtendedSalProc() can not be correctly\r
                           initialized.\r
   @retval Other           Status returned from ExtendedSalProc() service of\r

-                          EXTENDED_SAL_BOOT_SERVICE_PROTOCOL.  \r
+                          EXTENDED_SAL_BOOT_SERVICE_PROTOCOL.\r

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


@@ -298,7 +298,7 @@ EsalCall (
 \r
 /**\r
   Wrapper for the EsalStallFunctionId service of Extended SAL Stall Services Class.\r
 \r
 /**\r
   Wrapper for the EsalStallFunctionId service of Extended SAL Stall Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalStallFunctionId service of Extended SAL\r
   Stall Services Class. See EsalStallFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalStallFunctionId service of Extended SAL\r
   Stall Services Class. See EsalStallFunctionId of Extended SAL Specification.\r
 \r


@@ -316,22 +316,22 @@ EsalStall (
   )\r
 {\r
   return EsalCall (\r
   )\r
 {\r
   return EsalCall (\r

-           EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_LO, \r
-           EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_HI, \r
-           StallFunctionId, \r
-           Microseconds, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_LO,\r
+           EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_HI,\r
+           StallFunctionId,\r
+           Microseconds,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalSetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalSetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r


@@ -353,22 +353,22 @@ EsalSetNewPalEntry (
   )\r
 {\r
   return EsalCall (\r
   )\r
 {\r
   return EsalCall (\r

-           EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO, \r
+           EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO,\r

            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r
            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r

-           SetNewPalEntryFunctionId, \r
-           PhysicalAddress, \r
-           PalEntryPoint, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           SetNewPalEntryFunctionId,\r
+           PhysicalAddress,\r
+           PalEntryPoint,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalGetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalGetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r


@@ -392,20 +392,20 @@ EsalGetNewPalEntry (
   return EsalCall (\r
            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r

-           GetNewPalEntryFunctionId, \r
-           PhysicalAddress, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           GetNewPalEntryFunctionId,\r
+           PhysicalAddress,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalGetStateBufferFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalGetStateBufferFunctionId of Extended SAL Specification.\r
 \r


@@ -434,13 +434,13 @@ EsalGetStateBuffer (
   Regs = EsalCall (\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r
   Regs = EsalCall (\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalGetStateBufferFunctionId, \r
-           McaType, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalGetStateBufferFunctionId,\r
+           McaType,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 \r
            0\r
            );\r
 \r


@@ -452,7 +452,7 @@ EsalGetStateBuffer (
 \r
 /**\r
   Wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r
 \r
 /**\r
   Wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalSaveStateBufferFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalSaveStateBufferFunctionId of Extended SAL Specification.\r
 \r


@@ -470,20 +470,20 @@ EsalSaveStateBuffer (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalSaveStateBufferFunctionId, \r
-           McaType, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalSaveStateBufferFunctionId,\r
+           McaType,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetVectorsFunctionId service of Extended SAL Base Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetVectorsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetVectorsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetVectorsFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetVectorsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetVectorsFunctionId of Extended SAL Specification.\r
 \r


@@ -505,20 +505,20 @@ EsalGetVectors (
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalGetVectorsFunctionId, \r
-           VectorType, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalGetVectorsFunctionId,\r
+           VectorType,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r
 \r


@@ -542,20 +542,20 @@ EsalMcGetParams (
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalMcGetParamsFunctionId, \r
-           ParamInfoType, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalMcGetParamsFunctionId,\r
+           ParamInfoType,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r
 \r


@@ -573,20 +573,20 @@ EsalMcGetMcParams (
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalMcGetMcParamsFunctionId, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalMcGetMcParamsFunctionId,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL Base Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetMcCheckinFlagsFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetMcCheckinFlagsFunctionId of Extended SAL Specification.\r
 \r


@@ -604,20 +604,20 @@ EsalGetMcCheckinFlags (
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalGetMcCheckinFlagsFunctionId, \r
-           CpuIndex, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalGetMcCheckinFlagsFunctionId,\r
+           CpuIndex,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalAddCpuDataFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalAddCpuDataFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalAddCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalAddCpuDataFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalAddCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalAddCpuDataFunctionId of Extended SAL Specification.\r
 \r


@@ -642,20 +642,20 @@ EsalAddCpuData (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           AddCpuDataFunctionId, \r
-           CpuGlobalId, \r
-           Enabled, \r
-           PalCompatibility, \r
-           0, \r
-           0, \r
-           0, \r
+           AddCpuDataFunctionId,\r
+           CpuGlobalId,\r
+           Enabled,\r
+           PalCompatibility,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalRemoveCpuDataFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalRemoveCpuDataFunctionId of Extended SAL Specification.\r
 \r


@@ -674,20 +674,20 @@ EsalRemoveCpuData (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           RemoveCpuDataFunctionId, \r
-           CpuGlobalId, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           RemoveCpuDataFunctionId,\r
+           CpuGlobalId,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalModifyCpuDataFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalModifyCpuDataFunctionId of Extended SAL Specification.\r
 \r


@@ -712,20 +712,20 @@ EsalModifyCpuData (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           ModifyCpuDataFunctionId, \r
-           CpuGlobalId, \r
-           Enabled, \r
-           PalCompatibility, \r
-           0, \r
-           0, \r
-           0, \r
+           ModifyCpuDataFunctionId,\r
+           CpuGlobalId,\r
+           Enabled,\r
+           PalCompatibility,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIdFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIdFunctionId of Extended SAL Specification.\r
 \r


@@ -747,20 +747,20 @@ EsalGetCpuDataById (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           GetCpuDataByIDFunctionId, \r
-           CpuGlobalId, \r
-           IndexByEnabledCpu, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           GetCpuDataByIDFunctionId,\r
+           CpuGlobalId,\r
+           IndexByEnabledCpu,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIndexFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIndexFunctionId of Extended SAL Specification.\r
 \r


@@ -782,20 +782,20 @@ EsalGetCpuDataByIndex (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           GetCpuDataByIndexFunctionId, \r
-           Index, \r
-           IndexByEnabledCpu, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           GetCpuDataByIndexFunctionId,\r
+           Index,\r
+           IndexByEnabledCpu,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalWhoAmIFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalWhoAmIFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalWhoAmIFunctionId service of Extended SAL\r
   MP Services Class. See EsalWhoAmIFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalWhoAmIFunctionId service of Extended SAL\r
   MP Services Class. See EsalWhoAmIFunctionId of Extended SAL Specification.\r
 \r


@@ -815,20 +815,20 @@ EsalWhoAmI (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           CurrentProcInfoFunctionId, \r
-           IndexByEnabledCpu, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           CurrentProcInfoFunctionId,\r
+           IndexByEnabledCpu,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalNumProcessors service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalNumProcessors service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalNumProcessors service of Extended SAL\r
   MP Services Class. See EsalNumProcessors of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalNumProcessors service of Extended SAL\r
   MP Services Class. See EsalNumProcessors of Extended SAL Specification.\r
 \r


@@ -845,20 +845,20 @@ EsalNumProcessors (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           NumProcessorsFunctionId, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           NumProcessorsFunctionId,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalSetMinStateFnctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalSetMinStateFnctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalSetMinStateFnctionId service of Extended SAL\r
   MP Services Class. See EsalSetMinStateFnctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalSetMinStateFnctionId service of Extended SAL\r
   MP Services Class. See EsalSetMinStateFnctionId of Extended SAL Specification.\r
 \r


@@ -880,20 +880,20 @@ EsalSetMinState (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           SetMinStateFunctionId, \r
-           CpuGlobalId, \r
-           MinStatePointer, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           SetMinStateFunctionId,\r
+           CpuGlobalId,\r
+           MinStatePointer,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetMinStateFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetMinStateFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetMinStateFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetMinStateFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetMinStateFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetMinStateFunctionId of Extended SAL Specification.\r
 \r


@@ -912,20 +912,20 @@ EsalGetMinState (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           GetMinStateFunctionId, \r
-           CpuGlobalId, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           GetMinStateFunctionId,\r
+           CpuGlobalId,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL MCA Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL MCA Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcsGetStateInfoFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcsGetStateInfoFunctionId of Extended SAL Specification.\r
 \r


@@ -950,13 +950,13 @@ EsalMcaGetStateInfo (
   Regs = EsalCall (\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_HI,\r
   Regs = EsalCall (\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_HI,\r

-           McaGetStateInfoFunctionId, \r
-           CpuGlobalId, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           McaGetStateInfoFunctionId,\r
+           CpuGlobalId,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 \r
            0\r
            );\r
 \r


@@ -968,7 +968,7 @@ EsalMcaGetStateInfo (
 \r
 /**\r
   Wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL MCA Services Class.\r
 \r
 /**\r
   Wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL MCA Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcaRegisterCpuFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcaRegisterCpuFunctionId of Extended SAL Specification.\r
 \r


@@ -989,13 +989,13 @@ EsalMcaRegisterCpu (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_HI,\r

-           McaRegisterCpuFunctionId, \r
-           CpuGlobalId, \r
-           StateBufferPointer, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           McaRegisterCpuFunctionId,\r
+           CpuGlobalId,\r
+           StateBufferPointer,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
            0\r
            );\r
 }\r

diff --git a/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.c b/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.c
index 744201bb49482c69e2d3079d787986122e2ee987..acad85e2476f3155f472e5cfe7c042cdba417ab1 100644 (file)
--- a/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.c
+++ b/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Provide generic extract guided section functions for Dxe phase.\r
 \r
 /** @file\r
   Provide generic extract guided section functions for Dxe phase.\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


@@ -40,13 +40,13 @@ EFIAPI
 ReallocateExtractHandlerTable (\r
   VOID\r
   )\r
 ReallocateExtractHandlerTable (\r
   VOID\r
   )\r

-{ \r
+{\r

   //\r
   // Reallocate memory for GuidTable\r
   //\r
   mExtractHandlerGuidTable = ReallocatePool (\r
   //\r
   // Reallocate memory for GuidTable\r
   //\r
   mExtractHandlerGuidTable = ReallocatePool (\r

-                               mMaxNumberOfExtractHandler * sizeof (GUID), \r
-                               (mMaxNumberOfExtractHandler + EXTRACT_HANDLER_TABLE_SIZE) * sizeof (GUID), \r
+                               mMaxNumberOfExtractHandler * sizeof (GUID),\r
+                               (mMaxNumberOfExtractHandler + EXTRACT_HANDLER_TABLE_SIZE) * sizeof (GUID),\r

                                mExtractHandlerGuidTable\r
                              );\r
 \r
                                mExtractHandlerGuidTable\r
                              );\r
 \r


@@ -58,8 +58,8 @@ ReallocateExtractHandlerTable (
   // Reallocate memory for Decode handler Table\r
   //\r
   mExtractDecodeHandlerTable = ReallocatePool (\r
   // Reallocate memory for Decode handler Table\r
   //\r
   mExtractDecodeHandlerTable = ReallocatePool (\r

-                               mMaxNumberOfExtractHandler * sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER), \r
-                               (mMaxNumberOfExtractHandler + EXTRACT_HANDLER_TABLE_SIZE) * sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER), \r
+                               mMaxNumberOfExtractHandler * sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER),\r
+                               (mMaxNumberOfExtractHandler + EXTRACT_HANDLER_TABLE_SIZE) * sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER),\r

                                mExtractDecodeHandlerTable\r
                              );\r
 \r
                                mExtractDecodeHandlerTable\r
                              );\r
 \r


@@ -71,15 +71,15 @@ ReallocateExtractHandlerTable (
   // Reallocate memory for GetInfo handler Table\r
   //\r
   mExtractGetInfoHandlerTable = ReallocatePool (\r
   // Reallocate memory for GetInfo handler Table\r
   //\r
   mExtractGetInfoHandlerTable = ReallocatePool (\r

-                               mMaxNumberOfExtractHandler * sizeof (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER), \r
-                               (mMaxNumberOfExtractHandler + EXTRACT_HANDLER_TABLE_SIZE) * sizeof (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER), \r
+                               mMaxNumberOfExtractHandler * sizeof (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER),\r
+                               (mMaxNumberOfExtractHandler + EXTRACT_HANDLER_TABLE_SIZE) * sizeof (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER),\r

                                mExtractGetInfoHandlerTable\r
                              );\r
 \r
   if (mExtractGetInfoHandlerTable == NULL) {\r
     goto Done;\r
   }\r
                                mExtractGetInfoHandlerTable\r
                              );\r
 \r
   if (mExtractGetInfoHandlerTable == NULL) {\r
     goto Done;\r
   }\r

-  \r
+\r

   //\r
   // Increase max handler number\r
   //\r
   //\r
   // Increase max handler number\r
   //\r


@@ -96,7 +96,7 @@ Done:
   if (mExtractGetInfoHandlerTable != NULL) {\r
     FreePool (mExtractGetInfoHandlerTable);\r
   }\r
   if (mExtractGetInfoHandlerTable != NULL) {\r
     FreePool (mExtractGetInfoHandlerTable);\r
   }\r

-  \r
+\r

   return RETURN_OUT_OF_RESOURCES;\r
 }\r
 /**\r
   return RETURN_OUT_OF_RESOURCES;\r
 }\r
 /**\r


@@ -123,7 +123,7 @@ DxeExtractGuidedSectionLibConstructor (
 \r
   Sets ExtractHandlerGuidTable so it points at a callee allocated array of registered GUIDs.\r
   The total number of GUIDs in the array are returned. Since the array of GUIDs is callee allocated\r
 \r
   Sets ExtractHandlerGuidTable so it points at a callee allocated array of registered GUIDs.\r
   The total number of GUIDs in the array are returned. Since the array of GUIDs is callee allocated\r

-  and caller must treat this array of GUIDs as read-only data. \r
+  and caller must treat this array of GUIDs as read-only data.\r

   If ExtractHandlerGuidTable is NULL, then ASSERT().\r
 \r
   @param[out]  ExtractHandlerGuidTable  A pointer to the array of GUIDs that have been registered through\r
   If ExtractHandlerGuidTable is NULL, then ASSERT().\r
 \r
   @param[out]  ExtractHandlerGuidTable  A pointer to the array of GUIDs that have been registered through\r


@@ -151,7 +151,7 @@ ExtractGuidedSectionGetGuidList (
   Registers the handlers specified by GetInfoHandler and DecodeHandler with the GUID specified by SectionGuid.\r
   If the GUID value specified by SectionGuid has already been registered, then return RETURN_ALREADY_STARTED.\r
   If there are not enough resources available to register the handlers  then RETURN_OUT_OF_RESOURCES is returned.\r
   Registers the handlers specified by GetInfoHandler and DecodeHandler with the GUID specified by SectionGuid.\r
   If the GUID value specified by SectionGuid has already been registered, then return RETURN_ALREADY_STARTED.\r
   If there are not enough resources available to register the handlers  then RETURN_OUT_OF_RESOURCES is returned.\r

-  \r
+\r

   If SectionGuid is NULL, then ASSERT().\r
   If GetInfoHandler is NULL, then ASSERT().\r
   If DecodeHandler is NULL, then ASSERT().\r
   If SectionGuid is NULL, then ASSERT().\r
   If GetInfoHandler is NULL, then ASSERT().\r
   If DecodeHandler is NULL, then ASSERT().\r


@@ -162,7 +162,7 @@ ExtractGuidedSectionGetGuidList (
                              size of the decoded buffer and the size of an optional scratch buffer\r
                              required to actually decode the data in a GUIDed section.\r
   @param[in]  DecodeHandler  The pointer to a function that decodes a GUIDed section into a caller\r
                              size of the decoded buffer and the size of an optional scratch buffer\r
                              required to actually decode the data in a GUIDed section.\r
   @param[in]  DecodeHandler  The pointer to a function that decodes a GUIDed section into a caller\r

-                             allocated output buffer. \r
+                             allocated output buffer.\r

 \r
   @retval  RETURN_SUCCESS           The handlers were registered.\r
   @retval  RETURN_OUT_OF_RESOURCES  There are not enough resources available to register the handlers.\r
 \r
   @retval  RETURN_SUCCESS           The handlers were registered.\r
   @retval  RETURN_OUT_OF_RESOURCES  There are not enough resources available to register the handlers.\r


@@ -199,7 +199,7 @@ ExtractGuidedSectionRegisterHandlers (
       return RETURN_SUCCESS;\r
     }\r
   }\r
       return RETURN_SUCCESS;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Check the global table is enough to contain new Handler.\r
   //\r
   //\r
   // Check the global table is enough to contain new Handler.\r
   //\r


@@ -208,7 +208,7 @@ ExtractGuidedSectionRegisterHandlers (
       return RETURN_OUT_OF_RESOURCES;\r
     }\r
   }\r
       return RETURN_OUT_OF_RESOURCES;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Register new Handler and guid value.\r
   //\r
   //\r
   // Register new Handler and guid value.\r
   //\r


@@ -234,14 +234,14 @@ ExtractGuidedSectionRegisterHandlers (
   The selected handler is used to retrieve and return the size of the decoded buffer and the size of an\r
   optional scratch buffer required to actually decode the data in a GUIDed section.\r
 \r
   The selected handler is used to retrieve and return the size of the decoded buffer and the size of an\r
   optional 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 any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r
   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r

-  then RETURN_UNSUPPORTED is returned.  \r
-  If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler \r
+  then RETURN_UNSUPPORTED is returned.\r
+  If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r

   of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to retrieve the OututBufferSize, ScratchSize, and Attributes values. The return status from the handler of\r
   type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER is returned.\r
   of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to retrieve the OututBufferSize, ScratchSize, and Attributes values. The return status from the handler of\r
   type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER is returned.\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


@@ -268,13 +268,13 @@ ExtractGuidedSectionGetInfo (
   IN  CONST VOID    *InputSection,\r
   OUT       UINT32  *OutputBufferSize,\r
   OUT       UINT32  *ScratchBufferSize,\r
   IN  CONST VOID    *InputSection,\r
   OUT       UINT32  *OutputBufferSize,\r
   OUT       UINT32  *ScratchBufferSize,\r

-  OUT       UINT16  *SectionAttribute   \r
+  OUT       UINT16  *SectionAttribute\r

   )\r
 {\r
   UINT32 Index;\r
   EFI_GUID *SectionDefinitionGuid;\r
 \r
   )\r
 {\r
   UINT32 Index;\r
   EFI_GUID *SectionDefinitionGuid;\r
 \r

-  ASSERT (InputSection != NULL);  \r
+  ASSERT (InputSection != NULL);\r

   ASSERT (OutputBufferSize != NULL);\r
   ASSERT (ScratchBufferSize != NULL);\r
   ASSERT (SectionAttribute != NULL);\r
   ASSERT (OutputBufferSize != NULL);\r
   ASSERT (ScratchBufferSize != NULL);\r
   ASSERT (SectionAttribute != NULL);\r


@@ -284,7 +284,7 @@ ExtractGuidedSectionGetInfo (
   } else {\r
     SectionDefinitionGuid = &(((EFI_GUID_DEFINED_SECTION *) InputSection)->SectionDefinitionGuid);\r
   }\r
   } else {\r
     SectionDefinitionGuid = &(((EFI_GUID_DEFINED_SECTION *) InputSection)->SectionDefinitionGuid);\r
   }\r

- \r
+\r

   //\r
   // Search the match registered GetInfo handler for the input guided section.\r
   //\r
   //\r
   // Search the match registered GetInfo handler for the input guided section.\r
   //\r


@@ -303,7 +303,7 @@ ExtractGuidedSectionGetInfo (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Not found, the input guided section is not supported. \r
+  // Not found, the input guided section is not supported.\r

   //\r
   return RETURN_UNSUPPORTED;\r
 }\r
   //\r
   return RETURN_UNSUPPORTED;\r
 }\r


@@ -314,26 +314,26 @@ ExtractGuidedSectionGetInfo (
   The selected handler is used to decode the data in a GUIDed section and return the result in a caller\r
   allocated output buffer.\r
 \r
   The selected handler is used to decode the data in a GUIDed section and return the result in a caller\r
   allocated output buffer.\r
 \r

-  Decodes the GUIDed section specified by InputSection.  \r
+  Decodes the GUIDed section specified by InputSection.\r

   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r
   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r

-  then RETURN_UNSUPPORTED is returned.  \r
+  then RETURN_UNSUPPORTED is returned.\r

   If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r
   of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to decode InputSection 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 data in InputSection,\r
   then OutputBuffer is set to point at the data in InputSection.  Otherwise, the decoded data will be placed in caller\r
   allocated buffer specified by OutputBuffer.    This function is responsible for computing the  EFI_AUTH_STATUS_PLATFORM_OVERRIDE\r
   If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r
   of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to decode InputSection 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 data in InputSection,\r
   then OutputBuffer is set to point at the data in InputSection.  Otherwise, the decoded data will be placed in caller\r
   allocated buffer specified by OutputBuffer.    This function is responsible for computing the  EFI_AUTH_STATUS_PLATFORM_OVERRIDE\r

-  bit of in AuthenticationStatus.  The return status from the handler of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER is returned. \r
-   \r
+  bit of in AuthenticationStatus.  The return status from the handler of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER is returned.\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

-  If AuthenticationStatus is NULL, then ASSERT().  \r
+  If AuthenticationStatus is NULL, then ASSERT().\r

 \r
   @param[in]  InputSection   A pointer to a GUIDed section of an FFS formatted file.\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[in]  ScratchBuffer  A caller allocated buffer that may be required by this function as a scratch buffer to perform the decode operation. \r
-  @param[out] AuthenticationStatus \r
+  @param[out] OutputBuffer   A pointer to a buffer that contains the result of a decode operation.\r
+  @param[in]  ScratchBuffer  A caller allocated buffer that may be required by this function 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. See the definition\r
                              of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI\r
                              Specification.\r
                              A pointer to the authentication status of the decoded output buffer. See the definition\r
                              of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI\r
                              Specification.\r


@@ -349,12 +349,12 @@ ExtractGuidedSectionDecode (
   IN  CONST VOID    *InputSection,\r
   OUT       VOID    **OutputBuffer,\r
   IN        VOID    *ScratchBuffer,        OPTIONAL\r
   IN  CONST VOID    *InputSection,\r
   OUT       VOID    **OutputBuffer,\r
   IN        VOID    *ScratchBuffer,        OPTIONAL\r

-  OUT       UINT32  *AuthenticationStatus  \r
+  OUT       UINT32  *AuthenticationStatus\r

   )\r
 {\r
   UINT32 Index;\r
   EFI_GUID *SectionDefinitionGuid;\r
   )\r
 {\r
   UINT32 Index;\r
   EFI_GUID *SectionDefinitionGuid;\r

-  \r
+\r

   //\r
   // Check the input parameters\r
   //\r
   //\r
   // Check the input parameters\r
   //\r


@@ -386,29 +386,29 @@ ExtractGuidedSectionDecode (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Not found, the input guided section is not supported. \r
+  // Not found, the input guided section is not supported.\r

   //\r
   return RETURN_UNSUPPORTED;\r
 }\r
 \r
 /**\r
   //\r
   return RETURN_UNSUPPORTED;\r
 }\r
 \r
 /**\r

-  Retrieves handlers of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER and \r
+  Retrieves handlers of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER and\r

   EXTRACT_GUIDED_SECTION_DECODE_HANDLER for a specific GUID section type.\r
   EXTRACT_GUIDED_SECTION_DECODE_HANDLER for a specific GUID section type.\r

-  \r
-  Retrieves the handlers associated with SectionGuid and returns them in \r
+\r
+  Retrieves the handlers associated with SectionGuid and returns them in\r

   GetInfoHandler and DecodeHandler.\r
 \r
   GetInfoHandler and DecodeHandler.\r
 \r

-  If the GUID value specified by SectionGuid has not been registered, then \r
+  If the GUID value specified by SectionGuid has not been registered, then\r

   return RETURN_NOT_FOUND.\r
   return RETURN_NOT_FOUND.\r

-  \r
+\r

   If SectionGuid is NULL, then ASSERT().\r
 \r
   If SectionGuid is NULL, then ASSERT().\r
 \r

-  @param[in]  SectionGuid    A pointer to the GUID associated with the handlersof the GUIDed \r
+  @param[in]  SectionGuid    A pointer to the GUID associated with the handlersof the GUIDed\r

                              section type being retrieved.\r
                              section type being retrieved.\r

-  @param[out] GetInfoHandler Pointer to a function that examines a GUIDed section and returns \r
-                             the size of the decoded buffer and the size of an optional scratch \r
-                             buffer required to actually decode the data in a GUIDed section.  \r
-                             This is an optional parameter that may be NULL. If it is NULL, then \r
+  @param[out] GetInfoHandler Pointer to a function that examines a GUIDed section and returns\r
+                             the size of the decoded buffer and the size of an optional scratch\r
+                             buffer required to actually decode the data in a GUIDed section.\r
+                             This is an optional parameter that may be NULL. If it is NULL, then\r

                              the previously registered handler is not returned.\r
   @param[out] DecodeHandler  Pointer to a function that decodes a GUIDed section into a caller\r
                              allocated output buffer. This is an optional parameter that may be NULL.\r
                              the previously registered handler is not returned.\r
   @param[out] DecodeHandler  Pointer to a function that decodes a GUIDed section into a caller\r
                              allocated output buffer. This is an optional parameter that may be NULL.\r


@@ -426,7 +426,7 @@ ExtractGuidedSectionGetHandlers (
   OUT        EXTRACT_GUIDED_SECTION_DECODE_HANDLER    *DecodeHandler    OPTIONAL\r
   )\r
 {\r
   OUT        EXTRACT_GUIDED_SECTION_DECODE_HANDLER    *DecodeHandler    OPTIONAL\r
   )\r
 {\r

-  UINT32 Index; \r
+  UINT32 Index;\r

 \r
   //\r
   // Check input parameter.\r
 \r
   //\r
   // Check input parameter.\r


@@ -438,7 +438,7 @@ ExtractGuidedSectionGetHandlers (
   //\r
   for (Index = 0; Index < mNumberOfExtractHandler; Index ++) {\r
     if (CompareGuid (&mExtractHandlerGuidTable[Index], SectionGuid)) {\r
   //\r
   for (Index = 0; Index < mNumberOfExtractHandler; Index ++) {\r
     if (CompareGuid (&mExtractHandlerGuidTable[Index], SectionGuid)) {\r

-      \r
+\r

       //\r
       // If the guided handler has been registered before, then return the registered handlers.\r
       //\r
       //\r
       // If the guided handler has been registered before, then return the registered handlers.\r
       //\r

diff --git a/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf b/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
index c66a26b16839cc3fda9306b619ea2434c17f8d86..d263f787b270d7dd07c8c2b7696a5c85ef07c4e0 100644 (file)
--- a/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+++ b/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
@@ -3,7 +3,7 @@
 #\r
 # This library provides generic extract guided section functions for DXE module.\r
 #\r
 #\r
 # This library provides generic extract guided section functions for DXE module.\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


@@ -22,7 +22,7 @@
   FILE_GUID                      = f773469b-e265-4b0c-b0a6-2f971fbfe72b\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = f773469b-e265-4b0c-b0a6-2f971fbfe72b\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = ExtractGuidedSectionLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = ExtractGuidedSectionLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

 \r
   CONSTRUCTOR                    = DxeExtractGuidedSectionLibConstructor\r
 \r
 \r
   CONSTRUCTOR                    = DxeExtractGuidedSectionLibConstructor\r
 \r

diff --git a/MdePkg/Library/DxeHobLib/DxeHobLib.inf b/MdePkg/Library/DxeHobLib/DxeHobLib.inf
index 32cd5546ab3701294c6b44dcc1b5a252bce5e9fb..e30efcc6d72a33dc42b1924d3679eacda613d714 100644 (file)
--- a/MdePkg/Library/DxeHobLib/DxeHobLib.inf
+++ b/MdePkg/Library/DxeHobLib/DxeHobLib.inf
@@ -4,7 +4,7 @@
 # HOB Library implementation that retrieves the HOB List\r
 #  from the System Configuration Table in the EFI System Table.\r
 #\r
 # HOB Library implementation that retrieves the HOB List\r
 #  from the System Configuration Table in the EFI System Table.\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


@@ -23,7 +23,7 @@
   FILE_GUID                      = f12b59c9-76d0-4661-ad7c-f04d1bef0558\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = f12b59c9-76d0-4661-ad7c-f04d1bef0558\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = HobLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER SMM_CORE DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = HobLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER SMM_CORE DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

   CONSTRUCTOR                    = HobLibConstructor\r
 \r
 #\r
   CONSTRUCTOR                    = HobLibConstructor\r
 \r
 #\r


@@ -42,7 +42,7 @@
   BaseMemoryLib\r
   DebugLib\r
   UefiLib\r
   BaseMemoryLib\r
   DebugLib\r
   UefiLib\r

-    \r
+\r

 [Guids]\r
   gEfiHobListGuid                               ## CONSUMES  ## SystemTable\r
 \r
 [Guids]\r
   gEfiHobListGuid                               ## CONSUMES  ## SystemTable\r
 \r

diff --git a/MdePkg/Library/DxeHobLib/HobLib.c b/MdePkg/Library/DxeHobLib/HobLib.c
index ed6262c4b2626e6f58a1d6622c03acc40217f6ca..51357305ce352a63395fd23c6d6ae69e33da3f32 100644 (file)
--- a/MdePkg/Library/DxeHobLib/HobLib.c
+++ b/MdePkg/Library/DxeHobLib/HobLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   HOB Library implemenation for Dxe Phase.\r
 \r
 /** @file\r
   HOB Library implemenation for 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

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under 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,11 +27,11 @@ VOID  *mHobList = NULL;
   Returns the pointer to the HOB list.\r
 \r
   This function returns the pointer to first HOB in the list.\r
   Returns the pointer to the HOB list.\r
 \r
   This function returns the pointer to first HOB in the list.\r

-  For PEI phase, the PEI service GetHobList() can be used to retrieve the pointer \r
+  For PEI phase, the PEI service GetHobList() can be used to retrieve the pointer\r

   to the HOB list.  For the DXE phase, the HOB list pointer can be retrieved through\r
   the EFI System Table by looking up theHOB list GUID in the System Configuration Table.\r
   to the HOB list.  For the DXE phase, the HOB list pointer can be retrieved through\r
   the EFI System Table by looking up theHOB list GUID in the System Configuration Table.\r

-  Since the System Configuration Table does not exist that the time the DXE Core is \r
-  launched, the DXE Core uses a global variable from the DXE Core Entry Point Library \r
+  Since the System Configuration Table does not exist that the time the DXE Core is\r
+  launched, the DXE Core uses a global variable from the DXE Core Entry Point Library\r

   to manage the pointer to the HOB list.\r
 \r
   If the pointer to the HOB list is NULL, then ASSERT().\r
   to manage the pointer to the HOB list.\r
 \r
   If the pointer to the HOB list is NULL, then ASSERT().\r


@@ -59,7 +59,7 @@ GetHobList (
 \r
 /**\r
   The constructor function caches the pointer to HOB list by calling GetHobList()\r
 \r
 /**\r
   The constructor function caches the pointer to HOB list by calling GetHobList()\r

-  and will always return EFI_SUCCESS. \r
+  and 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


@@ -82,12 +82,12 @@ HobLibConstructor (
 /**\r
   Returns the next instance of a HOB type from the starting HOB.\r
 \r
 /**\r
   Returns the next instance of a HOB type from the starting HOB.\r
 \r

-  This function searches the first instance of a HOB type from the starting HOB pointer. \r
+  This function searches the first instance of a HOB type from the starting HOB pointer.\r

   If there does not exist such HOB type from the starting HOB pointer, it will return NULL.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r
   If there does not exist such HOB type from the starting HOB pointer, it will return NULL.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r

-  \r
+\r

   If HobStart is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r
   If HobStart is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r


@@ -106,7 +106,7 @@ GetNextHob (
   EFI_PEI_HOB_POINTERS  Hob;\r
 \r
   ASSERT (HobStart != NULL);\r
   EFI_PEI_HOB_POINTERS  Hob;\r
 \r
   ASSERT (HobStart != NULL);\r

-   \r
+\r

   Hob.Raw = (UINT8 *) HobStart;\r
   //\r
   // Parse the HOB list until end of list or matching type is found.\r
   Hob.Raw = (UINT8 *) HobStart;\r
   //\r
   // Parse the HOB list until end of list or matching type is found.\r


@@ -123,9 +123,9 @@ GetNextHob (
 /**\r
   Returns the first instance of a HOB type among the whole HOB list.\r
 \r
 /**\r
   Returns the first instance of a HOB type among the whole HOB list.\r
 \r

-  This function searches the first instance of a HOB type among the whole HOB list. \r
-  If there does not exist such HOB type in the HOB list, it will return NULL. \r
-  \r
+  This function searches the first instance of a HOB type among the whole HOB list.\r
+  If there does not exist such HOB type in the HOB list, it will return NULL.\r
+\r

   If the pointer to the HOB list is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r
   If the pointer to the HOB list is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r


@@ -147,17 +147,17 @@ GetFirstHob (
 \r
 /**\r
   Returns the next instance of the matched GUID HOB from the starting HOB.\r
 \r
 /**\r
   Returns the next instance of the matched GUID HOB from the starting HOB.\r

-  \r
-  This function searches the first instance of a HOB from the starting HOB pointer. \r
-  Such HOB should satisfy two conditions: \r
-  its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid. \r
-  If there does not exist such HOB from the starting HOB pointer, it will return NULL. \r
+\r
+  This function searches the first instance of a HOB from the starting HOB pointer.\r
+  Such HOB should satisfy two conditions:\r
+  its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid.\r
+  If there does not exist such HOB from the starting HOB pointer, it will return NULL.\r

   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r
   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If HobStart is NULL, then ASSERT().\r
 \r
   If Guid is NULL, then ASSERT().\r
   If HobStart is NULL, then ASSERT().\r
 \r


@@ -188,14 +188,14 @@ GetNextGuidHob (
 \r
 /**\r
   Returns the first instance of the matched GUID HOB among the whole HOB list.\r
 \r
 /**\r
   Returns the first instance of the matched GUID HOB among the whole HOB list.\r

-  \r
-  This function searches the first instance of a HOB among the whole HOB list. \r
+\r
+  This function searches the first instance of a HOB among the whole HOB list.\r

   Such HOB should satisfy two conditions:\r
   its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid.\r
   If there does not exist such HOB from the starting HOB pointer, it will return NULL.\r
   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r
   Such HOB should satisfy two conditions:\r
   its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid.\r
   If there does not exist such HOB from the starting HOB pointer, it will return NULL.\r
   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r

-  \r
+\r

   If the pointer to the HOB list is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
 \r
   If the pointer to the HOB list is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
 \r


@@ -219,11 +219,11 @@ GetFirstGuidHob (
 /**\r
   Get the system boot mode from the HOB list.\r
 \r
 /**\r
   Get the system boot mode from the HOB list.\r
 \r

-  This function returns the system boot mode information from the \r
+  This function returns the system boot mode information from the\r

   PHIT HOB in HOB list.\r
 \r
   If the pointer to the HOB list is NULL, then ASSERT().\r
   PHIT HOB in HOB list.\r
 \r
   If the pointer to the HOB list is NULL, then ASSERT().\r

-  \r
+\r

   @param  VOID\r
 \r
   @return The Boot Mode.\r
   @param  VOID\r
 \r
   @return The Boot Mode.\r


@@ -248,7 +248,7 @@ GetBootModeHob (
   This function builds a HOB for a loaded PE32 module.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for a loaded PE32 module.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If ModuleName is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   If ModuleName is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r


@@ -279,7 +279,7 @@ BuildModuleHob (
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r


@@ -311,7 +311,7 @@ BuildResourceDescriptorWithOwnerHob (
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r


@@ -336,15 +336,15 @@ BuildResourceDescriptorHob (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Builds a customized HOB tagged with a GUID for identification and returns \r
+  Builds a customized HOB tagged with a GUID for identification and returns\r

   the start address of GUID HOB data.\r
 \r
   the start address of GUID HOB data.\r
 \r

-  This function builds a customized HOB tagged with a GUID for identification \r
-  and returns the start address of GUID HOB data so that caller can fill the customized data. \r
+  This function builds a customized HOB tagged with a GUID for identification\r
+  and returns the start address of GUID HOB data so that caller can fill the customized data.\r

   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
   If DataLength > (0xFFF8 - sizeof (EFI_HOB_GUID_TYPE)), then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
   If DataLength > (0xFFF8 - sizeof (EFI_HOB_GUID_TYPE)), then ASSERT().\r


@@ -372,16 +372,16 @@ BuildGuidHob (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Builds a customized HOB tagged with a GUID for identification, copies the input data to the HOB \r
+  Builds a customized HOB tagged with a GUID for identification, copies the input data to the HOB\r

   data field, and returns the start address of the GUID HOB data.\r
 \r
   This function builds a customized HOB tagged with a GUID for identification and copies the input\r
   data field, and returns the start address of the GUID HOB data.\r
 \r
   This function builds a customized HOB tagged with a GUID for identification and copies the input\r

-  data to the HOB data field and returns the start address of the GUID HOB data.  It can only be \r
-  invoked during PEI phase; for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.  \r
+  data to the HOB data field and returns the start address of the GUID HOB data.  It can only be\r
+  invoked during PEI phase; for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If Data is NULL and DataLength > 0, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If Data is NULL and DataLength > 0, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r


@@ -417,7 +417,7 @@ BuildGuidDataHob (
   This function builds a Firmware Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a Firmware Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r
   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r


@@ -444,7 +444,7 @@ BuildFvHob (
   This function builds a EFI_HOB_TYPE_FV2 HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a EFI_HOB_TYPE_FV2 HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r
   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r


@@ -452,7 +452,7 @@ BuildFvHob (
   @param  Length        The size of the Firmware Volume in bytes.\r
   @param  FvName        The name of the Firmware Volume.\r
   @param  FileName      The name of the file.\r
   @param  Length        The size of the Firmware Volume in bytes.\r
   @param  FvName        The name of the Firmware Volume.\r
   @param  FileName      The name of the file.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -507,7 +507,7 @@ BuildFv3Hob (
   This function builds a Capsule Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a Capsule Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If the platform does not support Capsule Volume HOBs, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   If the platform does not support Capsule Volume HOBs, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r


@@ -534,7 +534,7 @@ BuildCvHob (
   This function builds a HOB for the CPU.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for the CPU.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  SizeOfMemorySpace   The maximum physical memory addressability of the processor.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  SizeOfMemorySpace   The maximum physical memory addressability of the processor.\r


@@ -560,7 +560,7 @@ BuildCpuHob (
   This function builds a HOB for the stack.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for the stack.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the Stack.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the Stack.\r


@@ -586,7 +586,7 @@ BuildStackHob (
   This function builds a HOB for BSP store.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for BSP store.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the BSP.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the BSP.\r


@@ -614,7 +614,7 @@ BuildBspStoreHob (
   This function builds a HOB for the memory allocation.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for the memory allocation.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the memory.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the memory.\r

diff --git a/MdePkg/Library/DxeHstiLib/HstiAip.c b/MdePkg/Library/DxeHstiLib/HstiAip.c
index 5677cd31e2a231443267a5bac6e14c95775c3ae0..cf775b03aa93cee6da62fede10441ac8c7f692af 100644 (file)
--- a/MdePkg/Library/DxeHstiLib/HstiAip.c
+++ b/MdePkg/Library/DxeHstiLib/HstiAip.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @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


@@ -18,7 +18,7 @@
 \r
   This function returns information of type InformationType from the adapter.\r
   If an adapter does not support the requested informational type, then\r
 \r
   This function returns information of type InformationType from the adapter.\r
   If an adapter does not support the requested informational type, then\r

-  EFI_UNSUPPORTED is returned. \r
+  EFI_UNSUPPORTED is returned.\r

 \r
   @param[in]  This                   A pointer to the EFI_ADAPTER_INFORMATION_PROTOCOL instance.\r
   @param[in]  InformationType        A pointer to an EFI_GUID that defines the contents of InformationBlock.\r
 \r
   @param[in]  This                   A pointer to the EFI_ADAPTER_INFORMATION_PROTOCOL instance.\r
   @param[in]  InformationType        A pointer to an EFI_GUID that defines the contents of InformationBlock.\r


@@ -30,8 +30,8 @@
   @retval EFI_UNSUPPORTED            The InformationType is not known.\r
   @retval EFI_DEVICE_ERROR           The device reported an error.\r
   @retval EFI_OUT_OF_RESOURCES       The request could not be completed due to a lack of resources.\r
   @retval EFI_UNSUPPORTED            The InformationType is not known.\r
   @retval EFI_DEVICE_ERROR           The device reported an error.\r
   @retval EFI_OUT_OF_RESOURCES       The request could not be completed due to a lack of resources.\r

-  @retval EFI_INVALID_PARAMETER      This is NULL. \r
-  @retval EFI_INVALID_PARAMETER      InformationBlock is NULL. \r
+  @retval EFI_INVALID_PARAMETER      This is NULL.\r
+  @retval EFI_INVALID_PARAMETER      InformationBlock is NULL.\r

   @retval EFI_INVALID_PARAMETER      InformationBlockSize is NULL.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER      InformationBlockSize is NULL.\r
 \r
 **/\r

diff --git a/MdePkg/Library/DxeHstiLib/HstiDxe.c b/MdePkg/Library/DxeHstiLib/HstiDxe.c
index d08d8def0cb5fdf3b91a84720cd189faf6fd556a..397fea01f5e7475412c7499fa627ac4ee3123d8a 100644 (file)
--- a/MdePkg/Library/DxeHstiLib/HstiDxe.c
+++ b/MdePkg/Library/DxeHstiLib/HstiDxe.c
@@ -115,7 +115,7 @@ InternalHstiFindAip (
     }\r
 \r
     Hsti = InformationBlock;\r
     }\r
 \r
     Hsti = InformationBlock;\r

-    if ((Hsti->Role == Role) && \r
+    if ((Hsti->Role == Role) &&\r

         ((ImplementationID == NULL) || (StrCmp (ImplementationID, Hsti->ImplementationID) == 0))) {\r
       break;\r
     } else {\r
         ((ImplementationID == NULL) || (StrCmp (ImplementationID, Hsti->ImplementationID) == 0))) {\r
       break;\r
     } else {\r


@@ -311,7 +311,7 @@ HstiLibSetTable (
   CopyMem (&HstiAip->Aip, &mAdapterInformationProtocol, sizeof(EFI_ADAPTER_INFORMATION_PROTOCOL));\r
   HstiAip->HstiSize = HstiSize;\r
   HstiAip->HstiMaxSize = HstiSize;\r
   CopyMem (&HstiAip->Aip, &mAdapterInformationProtocol, sizeof(EFI_ADAPTER_INFORMATION_PROTOCOL));\r
   HstiAip->HstiSize = HstiSize;\r
   HstiAip->HstiMaxSize = HstiSize;\r

-  \r
+\r

   Handle = NULL;\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Handle,\r
   Handle = NULL;\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Handle,\r

diff --git a/MdePkg/Library/DxeHstiLib/HstiDxe.h b/MdePkg/Library/DxeHstiLib/HstiDxe.h
index aaa4a0c4a1b26e3ec560edd0ae7760c36eb19eb9..c5e23d45b3b3340a6d27e7ccdd50e7865714428c 100644 (file)
--- a/MdePkg/Library/DxeHstiLib/HstiDxe.h
+++ b/MdePkg/Library/DxeHstiLib/HstiDxe.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @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


@@ -62,4 +62,4 @@ InternalHstiIsValidTable (
   IN UINTN                    HstiSize\r
   );\r
 \r
   IN UINTN                    HstiSize\r
   );\r
 \r

-#endif
\ No newline at end of file
+#endif\r

diff --git a/MdePkg/Library/DxeIoLibCpuIo2/DxeCpuIo2LibInternal.h b/MdePkg/Library/DxeIoLibCpuIo2/DxeCpuIo2LibInternal.h
index 8c289cb20df70a0a0ec7258219a42776508ad5ed..2904044da0596844973e0d32eb12df1383cf7acb 100644 (file)
--- a/MdePkg/Library/DxeIoLibCpuIo2/DxeCpuIo2LibInternal.h
+++ b/MdePkg/Library/DxeIoLibCpuIo2/DxeCpuIo2LibInternal.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal include file of DXE CPU IO2 Library.\r
 /** @file\r
   Internal include file of DXE CPU IO2 Library.\r

-  \r
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+\r
+  Copyright (c) 2010 - 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 are licensed and made available\r
   Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials are licensed and made available\r


@@ -157,7 +157,7 @@ MmioReadWorker (
                         The caller is responsible for aligning the Address if required.\r
   @param  Width         The width of the I/O operation.\r
   @param  Data          The value to write to the I/O port.\r
                         The caller is responsible for aligning the Address if required.\r
   @param  Width         The width of the I/O operation.\r
   @param  Data          The value to write to the I/O port.\r

-  \r
+\r

   @return Data read from registers in the EFI system memory space.\r
 \r
 **/\r
   @return Data read from registers in the EFI system memory space.\r
 \r
 **/\r

diff --git a/MdePkg/Library/DxeIoLibCpuIo2/DxeIoLibCpuIo2.inf b/MdePkg/Library/DxeIoLibCpuIo2/DxeIoLibCpuIo2.inf
index 65031d0bd334610f401d4933b61d73978814c5a1..899b7a88a0c1b9ea388e7af4b9a212c195f855b1 100644 (file)
--- a/MdePkg/Library/DxeIoLibCpuIo2/DxeIoLibCpuIo2.inf
+++ b/MdePkg/Library/DxeIoLibCpuIo2/DxeIoLibCpuIo2.inf
@@ -3,9 +3,9 @@
 #\r
 # I/O Library implementation that uses the CPU I/O2 Protocol for I/O and MMIO operations.\r
 #\r
 #\r
 # I/O Library implementation that uses the CPU I/O2 Protocol for I/O and MMIO operations.\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 are licensed and made available\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
+# 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
 # distribution. The full text of the license may be found at\r
 # http://opensource.org/licenses/bsd-license.php.\r
 #\r

diff --git a/MdePkg/Library/DxeIoLibCpuIo2/DxeIoLibCpuIo2.uni b/MdePkg/Library/DxeIoLibCpuIo2/DxeIoLibCpuIo2.uni
index 5dabb401bfbc91397fd549bb9f5895e3c680498f..17912d89c2156f719719fe7b0593b666cf47c614 100644 (file)
--- a/MdePkg/Library/DxeIoLibCpuIo2/DxeIoLibCpuIo2.uni
+++ b/MdePkg/Library/DxeIoLibCpuIo2/DxeIoLibCpuIo2.uni
@@ -3,13 +3,13 @@
 //\r
 // I/O Library implementation that uses the CPU I/O2 Protocol for I/O and MMIO operations.\r
 //\r
 //\r
 // I/O Library implementation that uses the CPU I/O2 Protocol for I/O and MMIO operations.\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 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
 // 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
 //\r
 // THE PROGRAM IS 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/MdePkg/Library/DxeIoLibCpuIo2/IoLib.c b/MdePkg/Library/DxeIoLibCpuIo2/IoLib.c
index 4182e299dab7c8adb6ff90afce8bae17d0f0ad43..3f9576c70bdf347a3b0a83dbfbc23b443ec68701 100644 (file)
--- a/MdePkg/Library/DxeIoLibCpuIo2/IoLib.c
+++ b/MdePkg/Library/DxeIoLibCpuIo2/IoLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   I/O Library instance based on EFI_CPU_IO2_PROTOCOL.\r
 /** @file\r
   I/O Library instance based on EFI_CPU_IO2_PROTOCOL.\r

-  \r
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+\r
+  Copyright (c) 2010 - 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 are licensed and made available\r
   Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials are licensed and made available\r


@@ -216,7 +216,7 @@ MmioReadWorker (
                         The caller is responsible for aligning the Address if required.\r
   @param  Width         The width of the I/O operation.\r
   @param  Data          The value to write to the I/O port.\r
                         The caller is responsible for aligning the Address if required.\r
   @param  Width         The width of the I/O operation.\r
   @param  Data          The value to write to the I/O port.\r

-  \r
+\r

   @return Data read from registers in the EFI system memory space.\r
 \r
 **/\r
   @return Data read from registers in the EFI system memory space.\r
 \r
 **/\r


@@ -292,7 +292,7 @@ IoWrite8 (
   serialized.\r
 \r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
   serialized.\r
 \r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

- \r
+\r

   If 16-bit I/O port operations are not supported, then ASSERT().\r
 \r
   @param  Port  The I/O port to read.\r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
 \r
   @param  Port  The I/O port to read.\r


@@ -350,7 +350,7 @@ IoWrite16 (
   Reads the 32-bit I/O port specified by Port. The 32-bit read value is returned.\r
   This function must guarantee that all I/O read and write operations are\r
   serialized.\r
   Reads the 32-bit I/O port specified by Port. The 32-bit read value is returned.\r
   This function must guarantee that all I/O read and write operations are\r
   serialized.\r

- \r
+\r

   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r


@@ -441,7 +441,7 @@ IoRead64 (
   operations are serialized.\r
 \r
   If Port is not aligned on a 64-bit boundary, then ASSERT().\r
   operations are serialized.\r
 \r
   If Port is not aligned on a 64-bit boundary, then ASSERT().\r

- \r
+\r

   If 64-bit I/O port operations are not supported, then ASSERT().\r
 \r
   @param  Port  The I/O port to write.\r
   If 64-bit I/O port operations are not supported, then ASSERT().\r
 \r
   @param  Port  The I/O port to write.\r


@@ -702,7 +702,7 @@ MmioWrite8 (
   operations are serialized.\r
 \r
   If Address is not aligned on a 16-bit boundary, then ASSERT().\r
   operations are serialized.\r
 \r
   If Address is not aligned on a 16-bit boundary, then ASSERT().\r

- \r
+\r

   If 16-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r
   If 16-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r


@@ -731,7 +731,7 @@ MmioRead16 (
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 16-bit boundary, then ASSERT().\r
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 16-bit boundary, then ASSERT().\r

- \r
+\r

   If 16-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r
   If 16-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r


@@ -760,7 +760,7 @@ MmioWrite16 (
   operations are serialized.\r
 \r
   If Address is not aligned on a 32-bit boundary, then ASSERT().\r
   operations are serialized.\r
 \r
   If Address is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   If 32-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r
   If 32-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r


@@ -789,7 +789,7 @@ MmioRead32 (
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 32-bit boundary, then ASSERT().\r
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 32-bit boundary, then ASSERT().\r

- \r
+\r

   If 32-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r
   If 32-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r


@@ -818,7 +818,7 @@ MmioWrite32 (
   operations are serialized.\r
 \r
   If Address is not aligned on a 64-bit boundary, then ASSERT().\r
   operations are serialized.\r
 \r
   If Address is not aligned on a 64-bit boundary, then ASSERT().\r

- \r
+\r

   If 64-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r
   If 64-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r


@@ -847,7 +847,7 @@ MmioRead64 (
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 64-bit boundary, then ASSERT().\r
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 64-bit boundary, then ASSERT().\r

- \r
+\r

   If 64-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r
   If 64-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r

diff --git a/MdePkg/Library/DxeIoLibCpuIo2/IoLibMmioBuffer.c b/MdePkg/Library/DxeIoLibCpuIo2/IoLibMmioBuffer.c
index 9e14c258c6e33ebbb2a475174f90291c686bf804..b40f94c66fe5c8ce9241ae100a9d934244154399 100644 (file)
--- a/MdePkg/Library/DxeIoLibCpuIo2/IoLibMmioBuffer.c
+++ b/MdePkg/Library/DxeIoLibCpuIo2/IoLibMmioBuffer.c
@@ -1,7 +1,7 @@
 /** @file\r
   I/O Library MMIO Buffer Functions.\r
 \r
 /** @file\r
   I/O Library MMIO Buffer Functions.\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 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
   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


@@ -67,7 +67,7 @@ MmioReadBuffer8 (
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied from.\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied from.\r


@@ -170,7 +170,7 @@ MmioReadBuffer32 (
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

- \r
+\r

   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied from.\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied from.\r

diff --git a/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsal.inf b/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsal.inf
index fdfc12b94584c46d5d537771a0d315ef4c647851..1b08c564a455055ea7331d70b04eff2ca4cae4e6 100644 (file)
--- a/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsal.inf
+++ b/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsal.inf
@@ -4,9 +4,9 @@
 # I/O Library implementation that uses Itanium ESAL services for I/O\r
 #  and MMIO operations.\r
 #\r
 # I/O Library implementation that uses Itanium ESAL services for I/O\r
 #  and MMIO operations.\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 are licensed and made available\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
+# 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
 # distribution. The full text of the license may be found at\r
 # http://opensource.org/licenses/bsd-license.php.\r
 #\r

diff --git a/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsal.uni b/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsal.uni
index c0d1d9717fe4883dcb0ddca9e94828b49704ba7d..6aaa33473bef540a6bb2ce32805a868558f689d3 100644 (file)
--- a/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsal.uni
+++ b/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsal.uni
@@ -4,13 +4,13 @@
 // I/O Library implementation that uses Itanium ESAL services for I/O\r
 // and MMIO operations.\r
 //\r
 // I/O Library implementation that uses Itanium ESAL services for I/O\r
 // and MMIO operations.\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 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
 // 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
 //\r
 // THE PROGRAM IS 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/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsalInternal.h b/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsalInternal.h
index c6dd4af5430212c66fad8500d76dc51f8cf4754d..db37d548ed315aab41fb109505a31236ec2dcbae 100644 (file)
--- a/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsalInternal.h
+++ b/MdePkg/Library/DxeIoLibEsal/DxeIoLibEsalInternal.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal include file for the I/O Library using ESAL services.\r
 /** @file\r
   Internal include file for the I/O Library using ESAL services.\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 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
   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

diff --git a/MdePkg/Library/DxeIoLibEsal/IoLib.c b/MdePkg/Library/DxeIoLibEsal/IoLib.c
index ab186a6d322f3a437aa055db6587c52f5468dd16..ceb43480a4759afc2eb990c4998a080355802a9f 100644 (file)
--- a/MdePkg/Library/DxeIoLibEsal/IoLib.c
+++ b/MdePkg/Library/DxeIoLibEsal/IoLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   I/O Library basic function implementation and worker functions.\r
 \r
 /** @file\r
   I/O Library basic function implementation and worker functions.\r
 \r

-  Copyright (c) 2006 - 2011, 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


@@ -47,13 +47,13 @@ IoReadWorker (
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r

-                IoReadFunctionId, \r
-                (UINT64)Width, \r
-                Port, \r
-                1, \r
-                (UINT64)&Data, \r
-                0, \r
-                0, \r
+                IoReadFunctionId,\r
+                (UINT64)Width,\r
+                Port,\r
+                1,\r
+                (UINT64)&Data,\r
+                0,\r
+                0,\r

                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r
                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r


@@ -90,13 +90,13 @@ IoWriteWorker (
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r

-                IoWriteFunctionId, \r
-                (UINT64)Width, \r
-                Port, \r
-                1, \r
-                (UINT64)&Data, \r
-                0, \r
-                0, \r
+                IoWriteFunctionId,\r
+                (UINT64)Width,\r
+                Port,\r
+                1,\r
+                (UINT64)&Data,\r
+                0,\r
+                0,\r

                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r
                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r


@@ -133,13 +133,13 @@ IoReadFifoWorker (
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r

-                IoReadFunctionId, \r
-                (UINT64)Width, \r
-                Port, \r
-                Count, \r
-                (UINT64)Buffer, \r
-                0, \r
-                0, \r
+                IoReadFunctionId,\r
+                (UINT64)Width,\r
+                Port,\r
+                Count,\r
+                (UINT64)Buffer,\r
+                0,\r
+                0,\r

                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r
                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r


@@ -175,13 +175,13 @@ IoWriteFifoWorker (
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r

-                IoWriteFunctionId, \r
-                (UINT64)Width, \r
-                Port, \r
-                Count, \r
-                (UINT64)Buffer, \r
-                0, \r
-                0, \r
+                IoWriteFunctionId,\r
+                (UINT64)Width,\r
+                Port,\r
+                Count,\r
+                (UINT64)Buffer,\r
+                0,\r
+                0,\r

                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r
                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r


@@ -216,13 +216,13 @@ MmioReadWorker (
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r

-                MemReadFunctionId, \r
-                (UINT64)Width, \r
-                Address, \r
-                1, \r
-                (UINT64)&Data, \r
-                0, \r
-                0, \r
+                MemReadFunctionId,\r
+                (UINT64)Width,\r
+                Address,\r
+                1,\r
+                (UINT64)&Data,\r
+                0,\r
+                0,\r

                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r
                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r


@@ -257,13 +257,13 @@ MmioWriteWorker (
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r
   ReturnReg = EsalCall (\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID_HI,\r

-                MemWriteFunctionId, \r
-                (UINT64)Width, \r
-                Address, \r
-                1, \r
-                (UINT64)&Data, \r
-                0, \r
-                0, \r
+                MemWriteFunctionId,\r
+                (UINT64)Width,\r
+                Address,\r
+                1,\r
+                (UINT64)&Data,\r
+                0,\r
+                0,\r

                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r
                 0\r
                 );\r
   ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r

diff --git a/MdePkg/Library/DxeIoLibEsal/IoLibMmioBuffer.c b/MdePkg/Library/DxeIoLibEsal/IoLibMmioBuffer.c
index 5addef2291cfd408a6ecfad40b0ea567cbd36fdc..8a725dc29efa9170f5341e00fffb259905376d9b 100644 (file)
--- a/MdePkg/Library/DxeIoLibEsal/IoLibMmioBuffer.c
+++ b/MdePkg/Library/DxeIoLibEsal/IoLibMmioBuffer.c
@@ -1,7 +1,7 @@
 /** @file\r
   I/O Library MMIO Buffer Functions.\r
 \r
 /** @file\r
   I/O Library MMIO Buffer Functions.\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


@@ -17,11 +17,11 @@
 /**\r
   Copy data from MMIO region to system memory by using 8-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 8-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 8-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 8-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -44,9 +44,9 @@ MmioReadBuffer8 (
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length-- > 0) {\r
     *(Buffer++) = MmioRead8 (StartAddress++);\r
   }\r
   while (Length-- > 0) {\r
     *(Buffer++) = MmioRead8 (StartAddress++);\r
   }\r


@@ -57,13 +57,13 @@ MmioReadBuffer8 (
 /**\r
   Copy data from MMIO region to system memory by using 16-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 16-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 16-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 16-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -87,15 +87,15 @@ MmioReadBuffer16 (
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT16) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT16) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length > 0) {\r
     *(Buffer++) = MmioRead16 (StartAddress);\r
     StartAddress += sizeof (UINT16);\r
   while (Length > 0) {\r
     *(Buffer++) = MmioRead16 (StartAddress);\r
     StartAddress += sizeof (UINT16);\r


@@ -108,13 +108,13 @@ MmioReadBuffer16 (
 /**\r
   Copy data from MMIO region to system memory by using 32-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 32-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 32-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 32-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -138,15 +138,15 @@ MmioReadBuffer32 (
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT32) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT32) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length > 0) {\r
     *(Buffer++) = MmioRead32 (StartAddress);\r
     StartAddress += sizeof (UINT32);\r
   while (Length > 0) {\r
     *(Buffer++) = MmioRead32 (StartAddress);\r
     StartAddress += sizeof (UINT32);\r


@@ -159,13 +159,13 @@ MmioReadBuffer32 (
 /**\r
   Copy data from MMIO region to system memory by using 64-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 64-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 64-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 64-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r


@@ -189,15 +189,15 @@ MmioReadBuffer64 (
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT64) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT64) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length > 0) {\r
     *(Buffer++) = MmioRead64 (StartAddress);\r
     StartAddress += sizeof (UINT64);\r
   while (Length > 0) {\r
     *(Buffer++) = MmioRead64 (StartAddress);\r
     StartAddress += sizeof (UINT64);\r


@@ -211,11 +211,11 @@ MmioReadBuffer64 (
 /**\r
   Copy data from system memory to MMIO region by using 8-bit access.\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 8-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 8-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 8-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -238,27 +238,27 @@ MmioWriteBuffer8 (
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r

- \r
+\r

   ReturnBuffer = (UINT8 *) Buffer;\r
   ReturnBuffer = (UINT8 *) Buffer;\r

-  \r
+\r

   while (Length-- > 0) {\r
      MmioWrite8 (StartAddress++, *(Buffer++));\r
   }\r
 \r
   return ReturnBuffer;\r
   while (Length-- > 0) {\r
      MmioWrite8 (StartAddress++, *(Buffer++));\r
   }\r
 \r
   return ReturnBuffer;\r

- \r
+\r

 }\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 16-bit access.\r
 \r
 }\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 16-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 16-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 16-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -283,7 +283,7 @@ MmioWriteBuffer16 (
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r


@@ -291,10 +291,10 @@ MmioWriteBuffer16 (
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT16 *) Buffer;\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT16 *) Buffer;\r

-  \r
+\r

   while (Length > 0) {\r
     MmioWrite16 (StartAddress, *(Buffer++));\r
   while (Length > 0) {\r
     MmioWrite16 (StartAddress, *(Buffer++));\r

-    \r
+\r

     StartAddress += sizeof (UINT16);\r
     Length -= sizeof (UINT16);\r
   }\r
     StartAddress += sizeof (UINT16);\r
     Length -= sizeof (UINT16);\r
   }\r


@@ -306,13 +306,13 @@ MmioWriteBuffer16 (
 /**\r
   Copy data from system memory to MMIO region by using 32-bit access.\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 32-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 32-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 32-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -337,7 +337,7 @@ MmioWriteBuffer32 (
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r


@@ -345,10 +345,10 @@ MmioWriteBuffer32 (
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT32 *) Buffer;\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT32 *) Buffer;\r

-  \r
+\r

   while (Length > 0) {\r
     MmioWrite32 (StartAddress, *(Buffer++));\r
   while (Length > 0) {\r
     MmioWrite32 (StartAddress, *(Buffer++));\r

-    \r
+\r

     StartAddress += sizeof (UINT32);\r
     Length -= sizeof (UINT32);\r
   }\r
     StartAddress += sizeof (UINT32);\r
     Length -= sizeof (UINT32);\r
   }\r


@@ -359,13 +359,13 @@ MmioWriteBuffer32 (
 /**\r
   Copy data from system memory to MMIO region by using 64-bit access.\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 64-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 64-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 64-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r


@@ -390,7 +390,7 @@ MmioWriteBuffer64 (
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r


@@ -398,10 +398,10 @@ MmioWriteBuffer64 (
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT64 *) Buffer;\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT64 *) Buffer;\r

-  \r
+\r

   while (Length > 0) {\r
     MmioWrite64 (StartAddress, *(Buffer++));\r
   while (Length > 0) {\r
     MmioWrite64 (StartAddress, *(Buffer++));\r

-    \r
+\r

     StartAddress += sizeof (UINT64);\r
     Length -= sizeof (UINT64);\r
   }\r
     StartAddress += sizeof (UINT64);\r
     Length -= sizeof (UINT64);\r
   }\r

diff --git a/MdePkg/Library/DxePalLibEsal/DxePalLibEsal.c b/MdePkg/Library/DxePalLibEsal/DxePalLibEsal.c
index 65003204567c4f1d30b79df8ee1ee36ceac58098..7d3579f041a306ac90c18b470f210578745c397c 100644 (file)
--- a/MdePkg/Library/DxePalLibEsal/DxePalLibEsal.c
+++ b/MdePkg/Library/DxePalLibEsal/DxePalLibEsal.c
@@ -1,7 +1,7 @@
 /** @file\r
   PAL Library Class implementation built upon Extended SAL Procedures.\r
 \r
 /** @file\r
   PAL Library Class implementation built upon Extended SAL Procedures.\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


@@ -59,13 +59,13 @@ PalCall (
   SalReturn = EsalCall (\r
                 EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r
   SalReturn = EsalCall (\r
                 EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO,\r
                 EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r

-                PalProcFunctionId, \r
-                Index, \r
-                Arg2, \r
-                Arg3, \r
-                Arg4, \r
-                0, \r
-                0, \r
+                PalProcFunctionId,\r
+                Index,\r
+                Arg2,\r
+                Arg3,\r
+                Arg4,\r
+                0,\r
+                0,\r

                 0\r
                 );\r
   PalReturn = (PAL_CALL_RETURN *) (UINTN) (&SalReturn);\r
                 0\r
                 );\r
   PalReturn = (PAL_CALL_RETURN *) (UINTN) (&SalReturn);\r

diff --git a/MdePkg/Library/DxePalLibEsal/DxePalLibEsal.inf b/MdePkg/Library/DxePalLibEsal/DxePalLibEsal.inf
index 1340d2902ba258eba4d7ec629d9fbc066fd91df2..f0ed2adabf2e2c1dd723217ed2e5b352daaa0971 100644 (file)
--- a/MdePkg/Library/DxePalLibEsal/DxePalLibEsal.inf
+++ b/MdePkg/Library/DxePalLibEsal/DxePalLibEsal.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Instance of PAL Library Class using Extended SAL functions\r
 #\r
 ## @file\r
 #  Instance of PAL Library Class using Extended SAL functions\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


@@ -19,7 +19,7 @@
   FILE_GUID                      = 8BA65DE3-39E1-4afd-A8FE-7DD0BAFEFCC0\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 8BA65DE3-39E1-4afd-A8FE-7DD0BAFEFCC0\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PalLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION \r
+  LIBRARY_CLASS                  = PalLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION\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/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index 371166818a34a5fea352bf58232bbf12e8a4af41..7fcbb028726fbb540520b54d4bc70f01d9e70fc2 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c
@@ -1,14 +1,14 @@
 /** @file\r
 Implementation of PcdLib class library for DXE phase.\r
 \r
 /** @file\r
 Implementation of PcdLib class library for DXE phase.\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
-THE PROGRAM 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


@@ -46,7 +46,7 @@ GetPiPcdProtocol (
 \r
   if (mPiPcd == NULL) {\r
     //\r
 \r
   if (mPiPcd == NULL) {\r
     //\r

-    // PI Pcd protocol defined in PI 1.2 vol3 should be installed before the module \r
+    // PI Pcd protocol defined in PI 1.2 vol3 should be installed before the module\r

     // access DynamicEx type PCD.\r
     //\r
     Status = gBS->LocateProtocol (&gEfiPcdProtocolGuid, NULL, (VOID **) &mPiPcd);\r
     // access DynamicEx type PCD.\r
     //\r
     Status = gBS->LocateProtocol (&gEfiPcdProtocolGuid, NULL, (VOID **) &mPiPcd);\r


@@ -73,7 +73,7 @@ GetPcdProtocol (
     //\r
     // PCD protocol need to be installed before the module access Dynamic type PCD.\r
     // But dynamic type PCD is not required in PI 1.2 specification.\r
     //\r
     // PCD protocol need to be installed before the module access Dynamic type PCD.\r
     // But dynamic type PCD is not required in PI 1.2 specification.\r

-    // \r
+    //\r

     Status = gBS->LocateProtocol (&gPcdProtocolGuid, NULL, (VOID **)&mPcd);\r
     ASSERT_EFI_ERROR (Status);\r
     ASSERT (mPcd != NULL);\r
     Status = gBS->LocateProtocol (&gPcdProtocolGuid, NULL, (VOID **)&mPcd);\r
     ASSERT_EFI_ERROR (Status);\r
     ASSERT (mPcd != NULL);\r


@@ -109,7 +109,7 @@ GetPiPcdInfoProtocolPointer (
 GET_PCD_INFO_PROTOCOL *\r
 GetPcdInfoProtocolPointer (\r
   VOID\r
 GET_PCD_INFO_PROTOCOL *\r
 GetPcdInfoProtocolPointer (\r
   VOID\r

-  ) \r
+  )\r

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


@@ -147,12 +147,12 @@ LibPcdSetSku (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 8-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 8-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the 8-bit value for the token specified by TokenNumber. \r
+  @return Returns the 8-bit value for the token specified by TokenNumber.\r

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


@@ -168,12 +168,12 @@ LibPcdGet8 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 16-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 16-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the 16-bit value for the token specified by TokenNumber. \r
+  @return Returns the 16-bit value for the token specified by TokenNumber.\r

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


@@ -189,8 +189,8 @@ LibPcdGet16 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 32-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 32-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r


@@ -210,7 +210,7 @@ LibPcdGet32 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 64-bit value for the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
   Returns the 64-bit value for the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r


@@ -231,7 +231,7 @@ LibPcdGet64 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the pointer to the buffer of the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
   Returns the pointer to the buffer of the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r


@@ -252,15 +252,15 @@ LibPcdGetPtr (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the Boolean value of the token specified by TokenNumber. \r
+\r
+  Returns the Boolean value of the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the Boolean value of the token specified by TokenNumber. \r
+  @return Returns the Boolean value of the token specified by TokenNumber.\r

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

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 LibPcdGetBool (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 LibPcdGetBool (\r
   IN UINTN             TokenNumber\r


@@ -276,7 +276,7 @@ LibPcdGetBool (
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the size of the token specified by TokenNumber. \r
+  @return Returns the size of the token specified by TokenNumber.\r

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


@@ -292,12 +292,12 @@ LibPcdGetSize (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 8-bit value for the token specified by TokenNumber and Guid.\r
   Returns the 8-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid         The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid         The pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -312,7 +312,7 @@ LibPcdGetEx8 (
   )\r
 {\r
   ASSERT (Guid != NULL);\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r

-  \r
+\r

   return GetPiPcdProtocol()->Get8 (Guid, TokenNumber);\r
 }\r
 \r
   return GetPiPcdProtocol()->Get8 (Guid, TokenNumber);\r
 }\r
 \r


@@ -321,10 +321,10 @@ LibPcdGetEx8 (
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
   Returns the 16-bit value for the token specified by TokenNumber and Guid.\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
   Returns the 16-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid         The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid         The pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -346,9 +346,9 @@ LibPcdGetEx16 (
 \r
 /**\r
   Returns the 32-bit value for the token specified by TokenNumber and Guid.\r
 \r
 /**\r
   Returns the 32-bit value for the token specified by TokenNumber and Guid.\r

-  If Guid is NULL, then ASSERT(). \r
+  If Guid is NULL, then ASSERT().\r

 \r
 \r

-  @param[in]  Guid         The pointer to a 128-bit unique value that designates \r
+  @param[in]  Guid         The pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -371,12 +371,12 @@ LibPcdGetEx32 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 64-bit value for the token specified by TokenNumber and Guid.\r
   Returns the 64-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -391,7 +391,7 @@ LibPcdGetEx64 (
   )\r
 {\r
   ASSERT (Guid != NULL);\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r

-  \r
+\r

   return GetPiPcdProtocol()->Get64 (Guid, TokenNumber);\r
 }\r
 \r
   return GetPiPcdProtocol()->Get64 (Guid, TokenNumber);\r
 }\r
 \r


@@ -399,12 +399,12 @@ LibPcdGetEx64 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the pointer to the buffer of token specified by TokenNumber and Guid.\r
   Returns the pointer to the buffer of token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -427,12 +427,12 @@ LibPcdGetExPtr (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the Boolean value of the token specified by TokenNumber and Guid. \r
-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  Returns the Boolean value of the token specified by TokenNumber and Guid.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -455,12 +455,12 @@ LibPcdGetExBool (
 \r
 /**\r
   This function provides a means by which to retrieve the size of a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve the size of a given PCD token.\r

-  \r
-  Returns the size of the token specified by TokenNumber and Guid. \r
-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  Returns the size of the token specified by TokenNumber and Guid.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -484,8 +484,8 @@ LibPcdGetExSize (
 #ifndef DISABLE_NEW_DEPRECATED_INTERFACES\r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 #ifndef DISABLE_NEW_DEPRECATED_INTERFACES\r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 8-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -502,7 +502,7 @@ LibPcdSet8 (
   )\r
 {\r
   GetPcdProtocol()->Set8 (TokenNumber, Value);\r
   )\r
 {\r
   GetPcdProtocol()->Set8 (TokenNumber, Value);\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -510,8 +510,8 @@ LibPcdSet8 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 16-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -528,7 +528,7 @@ LibPcdSet16 (
   )\r
 {\r
   GetPcdProtocol()->Set16 (TokenNumber, Value);\r
   )\r
 {\r
   GetPcdProtocol()->Set16 (TokenNumber, Value);\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -536,8 +536,8 @@ LibPcdSet16 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 32-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -562,10 +562,10 @@ LibPcdSet32 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 64-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
   to the value specified by Value.  Value is returned.\r

-  \r
+\r

   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r
 \r


@@ -588,19 +588,19 @@ LibPcdSet64 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets a buffer for the token specified by TokenNumber to the value \r
-  specified by Buffer and SizeOfBuffer.  Buffer is returned.  \r
-  If SizeOfBuffer is greater than the maximum size support by TokenNumber, \r
-  then set SizeOfBuffer to the maximum size supported by TokenNumber and \r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value\r
+  specified by Buffer and SizeOfBuffer.  Buffer is returned.\r
+  If SizeOfBuffer is greater than the maximum size support by TokenNumber,\r
+  then set SizeOfBuffer to the maximum size supported by TokenNumber and\r

   return NULL to indicate that the set operation was not actually performed.\r
 \r
   return NULL to indicate that the set operation was not actually performed.\r
 \r

-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the \r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the\r

   maximum size supported by TokenName and NULL must be returned.\r
   maximum size supported by TokenName and NULL must be returned.\r

-  \r
+\r

   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
+\r

   @param[in]      TokenNumber   The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
   @param[in]      Buffer        A pointer to the buffer to set.\r
   @param[in]      TokenNumber   The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
   @param[in]      Buffer        A pointer to the buffer to set.\r


@@ -638,8 +638,8 @@ LibPcdSetPtr (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the Boolean value for the token specified by TokenNumber \r
+\r
+  Sets the Boolean value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -664,13 +664,13 @@ LibPcdSetBool (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 8-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r


@@ -697,13 +697,13 @@ LibPcdSetEx8 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 16-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r


@@ -730,13 +730,13 @@ LibPcdSetEx16 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 32-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r


@@ -763,13 +763,13 @@ LibPcdSetEx32 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 64-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r


@@ -796,18 +796,18 @@ LibPcdSetEx64 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets a buffer for the token specified by TokenNumber to the value specified by \r
-  Buffer and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  the maximum size support by TokenNumber, then set SizeOfBuffer to the maximum size \r
-  supported by TokenNumber and return NULL to indicate that the set operation \r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value specified by\r
+  Buffer and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  the maximum size support by TokenNumber, then set SizeOfBuffer to the maximum size\r
+  supported by TokenNumber and return NULL to indicate that the set operation\r

   was not actually performed.\r
   was not actually performed.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
-  @param[in]  Guid              The pointer to a 128-bit unique value that \r
+\r
+  @param[in]  Guid              The pointer to a 128-bit unique value that\r

                                 designates which namespace to set a value from.\r
   @param[in]  TokenNumber       The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
                                 designates which namespace to set a value from.\r
   @param[in]  TokenNumber       The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r


@@ -849,13 +849,13 @@ LibPcdSetExPtr (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the Boolean value for the token specified by TokenNumber and \r
+\r
+  Sets the Boolean value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The Boolean value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The Boolean value to set.\r


@@ -1217,17 +1217,17 @@ LibPcdSetExBoolS (
 \r
 /**\r
   Set up a notification function that is called when a specified token is set.\r
 \r
 /**\r
   Set up a notification function that is called when a specified token is set.\r

-  \r
-  When the token specified by TokenNumber and Guid is set, \r
-  then notification function specified by NotificationFunction is called.  \r
+\r
+  When the token specified by TokenNumber and Guid is set,\r
+  then notification function specified by NotificationFunction is called.\r

   If Guid is NULL, then the default token space is used.\r
   If NotificationFunction is NULL, then ASSERT().\r
 \r
   If Guid is NULL, then the default token space is used.\r
   If NotificationFunction is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid                  The pointer to a 128-bit unique value that designates which \r
-                                    namespace to set a value from.  If NULL, then the default \r
+  @param[in]  Guid                  The pointer to a 128-bit unique value that designates which\r
+                                    namespace to set a value from.  If NULL, then the default\r

                                     token space is used.\r
   @param[in]  TokenNumber           The PCD token number to monitor.\r
                                     token space is used.\r
   @param[in]  TokenNumber           The PCD token number to monitor.\r

-  @param[in]  NotificationFunction  The function to call when the token \r
+  @param[in]  NotificationFunction  The function to call when the token\r

                                     specified by Guid and TokenNumber is set.\r
 \r
 **/\r
                                     specified by Guid and TokenNumber is set.\r
 \r
 **/\r


@@ -1253,12 +1253,12 @@ LibPcdCallbackOnSet (
 \r
 /**\r
   Disable a notification function that was established with LibPcdCallbackonSet().\r
 \r
 /**\r
   Disable a notification function that was established with LibPcdCallbackonSet().\r

-  \r
+\r

   Disable a notification function that was previously established with LibPcdCallbackOnSet().\r
   If NotificationFunction is NULL, then ASSERT().\r
   Disable a notification function that was previously established with LibPcdCallbackOnSet().\r
   If NotificationFunction is NULL, then ASSERT().\r

-  If LibPcdCallbackOnSet() was not previously called with Guid, TokenNumber, \r
+  If LibPcdCallbackOnSet() was not previously called with Guid, TokenNumber,\r

   and NotificationFunction, then ASSERT().\r
   and NotificationFunction, then ASSERT().\r

-  \r
+\r

   @param[in]  Guid                 Specify the GUID token space.\r
   @param[in]  TokenNumber          Specify the token number.\r
   @param[in]  NotificationFunction The callback function to be unregistered.\r
   @param[in]  Guid                 Specify the GUID token space.\r
   @param[in]  TokenNumber          Specify the token number.\r
   @param[in]  NotificationFunction The callback function to be unregistered.\r


@@ -1275,7 +1275,7 @@ LibPcdCancelCallback (
   EFI_STATUS Status;\r
 \r
   ASSERT (NotificationFunction != NULL);\r
   EFI_STATUS Status;\r
 \r
   ASSERT (NotificationFunction != NULL);\r

-    \r
+\r

   Status = GetPiPcdProtocol()->CancelCallback (Guid, TokenNumber, (EFI_PCD_PROTOCOL_CALLBACK) NotificationFunction);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = GetPiPcdProtocol()->CancelCallback (Guid, TokenNumber, (EFI_PCD_PROTOCOL_CALLBACK) NotificationFunction);\r
   ASSERT_EFI_ERROR (Status);\r
 \r


@@ -1286,24 +1286,24 @@ LibPcdCancelCallback (
 \r
 /**\r
   Retrieves the next token in a token space.\r
 \r
 /**\r
   Retrieves the next token in a token space.\r

-  \r
-  Retrieves the next PCD token number from the token space specified by Guid.  \r
-  If Guid is NULL, then the default token space is used.  If TokenNumber is 0, \r
-  then the first token number is returned.  Otherwise, the token number that \r
-  follows TokenNumber in the token space is returned.  If TokenNumber is the last \r
-  token number in the token space, then 0 is returned.  \r
-  \r
+\r
+  Retrieves the next PCD token number from the token space specified by Guid.\r
+  If Guid is NULL, then the default token space is used.  If TokenNumber is 0,\r
+  then the first token number is returned.  Otherwise, the token number that\r
+  follows TokenNumber in the token space is returned.  If TokenNumber is the last\r
+  token number in the token space, then 0 is returned.\r
+\r

   If TokenNumber is not 0 and is not in the token space specified by Guid, then ASSERT().\r
 \r
   If TokenNumber is not 0 and is not in the token space specified by Guid, then ASSERT().\r
 \r

-  @param[in]  Guid        The pointer to a 128-bit unique value that designates which namespace \r
+  @param[in]  Guid        The pointer to a 128-bit unique value that designates which namespace\r

                           to set a value from.  If NULL, then the default token space is used.\r
                           to set a value from.  If NULL, then the default token space is used.\r

-  @param[in]  TokenNumber The previous PCD token number.  If 0, then retrieves the first PCD \r
+  @param[in]  TokenNumber The previous PCD token number.  If 0, then retrieves the first PCD\r

                           token number.\r
 \r
   @return The next valid token number.\r
 \r
 **/\r
                           token number.\r
 \r
   @return The next valid token number.\r
 \r
 **/\r

-UINTN           \r
+UINTN\r

 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r


@@ -1322,12 +1322,12 @@ LibPcdGetNextToken (
 \r
 /**\r
   Used to retrieve the list of available PCD token space GUIDs.\r
 \r
 /**\r
   Used to retrieve the list of available PCD token space GUIDs.\r

-  \r
+\r

   Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces\r
   in the platform.\r
   If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.\r
   If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.\r
   Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces\r
   in the platform.\r
   If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.\r
   If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.\r

-  \r
+\r

   @param  TokenSpaceGuid  The pointer to the a PCD token space GUID.\r
 \r
   @return The next valid token namespace.\r
   @param  TokenSpaceGuid  The pointer to the a PCD token space GUID.\r
 \r
   @return The next valid token namespace.\r


@@ -1347,24 +1347,24 @@ LibPcdGetNextTokenSpace (
 \r
 /**\r
   Sets a value of a patchable PCD entry that is type pointer.\r
 \r
 /**\r
   Sets a value of a patchable PCD entry that is type pointer.\r

-  \r
-  Sets the PCD entry specified by PatchVariable to the value specified by Buffer \r
-  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return \r
-  NULL to indicate that the set operation was not actually performed.  \r
-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to \r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified by Buffer\r
+  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return\r
+  NULL to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r

   MaximumDatumSize and NULL must be returned.\r
   MaximumDatumSize and NULL must be returned.\r

-  \r
+\r

   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r
   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r

-  @param[out] PatchVariable     A pointer to the global variable in a module that is \r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r

                                 the target of the set operation.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
                                 the target of the set operation.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return Return the pointer to the buffer been set.\r
 \r
 **/\r
   @return Return the pointer to the buffer been set.\r
 \r
 **/\r


@@ -1379,7 +1379,7 @@ LibPatchPcdSetPtr (
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r


@@ -1389,9 +1389,9 @@ LibPatchPcdSetPtr (
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r

-    \r
+\r

   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r

-  \r
+\r

   return (VOID *) Buffer;\r
 }\r
 \r
   return (VOID *) Buffer;\r
 }\r
 \r


@@ -1414,7 +1414,7 @@ LibPatchPcdSetPtr (
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return The status of the set operation.\r
 \r
 **/\r
   @return The status of the set operation.\r
 \r
 **/\r


@@ -1429,7 +1429,7 @@ LibPatchPcdSetPtrS (
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r


@@ -1448,26 +1448,26 @@ LibPatchPcdSetPtrS (
 \r
 /**\r
   Sets a value and size of a patchable PCD entry that is type pointer.\r
 \r
 /**\r
   Sets a value and size of a patchable PCD entry that is type pointer.\r

-  \r
-  Sets the PCD entry specified by PatchVariable to the value specified by Buffer \r
-  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return \r
-  NULL to indicate that the set operation was not actually performed.  \r
-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to \r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified by Buffer\r
+  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return\r
+  NULL to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r

   MaximumDatumSize and NULL must be returned.\r
   MaximumDatumSize and NULL must be returned.\r

-  \r
+\r

   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfPatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r
   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfPatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r

-  @param[out] PatchVariable     A pointer to the global variable in a module that is \r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r

                                 the target of the set operation.\r
   @param[out] SizeOfPatchVariable A pointer to the size, in bytes, of PatchVariable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
                                 the target of the set operation.\r
   @param[out] SizeOfPatchVariable A pointer to the size, in bytes, of PatchVariable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return Return the pointer to the buffer been set.\r
 \r
 **/\r
   @return Return the pointer to the buffer been set.\r
 \r
 **/\r


@@ -1484,7 +1484,7 @@ LibPatchPcdSetPtrAndSize (
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r


@@ -1494,10 +1494,10 @@ LibPatchPcdSetPtrAndSize (
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r

-    \r
+\r

   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
   *SizeOfPatchVariable = *SizeOfBuffer;\r
   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
   *SizeOfPatchVariable = *SizeOfBuffer;\r

-  \r
+\r

   return (VOID *) Buffer;\r
 }\r
 \r
   return (VOID *) Buffer;\r
 }\r
 \r


@@ -1522,7 +1522,7 @@ LibPatchPcdSetPtrAndSize (
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return The status of the set operation.\r
 \r
 **/\r
   @return The status of the set operation.\r
 \r
 **/\r


@@ -1539,7 +1539,7 @@ LibPatchPcdSetPtrAndSizeS (
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.inf b/MdePkg/Library/DxePcdLib/DxePcdLib.inf
index 23cd5d6e7046873cc41122d70dbe1804dcd48b6f..816106bfeb562013306be89d0c033a4c0917206f 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.inf
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -5,7 +5,7 @@
 #   1) PCD_PROTOCOL\r
 #      It is EDKII implementation which support Dynamic/DynamicEx Pcds.\r
 #   2) EFI_PCD_PROTOCOL\r
 #   1) PCD_PROTOCOL\r
 #      It is EDKII implementation which support Dynamic/DynamicEx 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
 # For dynamicEx type PCD, it is compatible between PCD_PROTOCOL and EFI_PCD_PROTOCOL.\r
 #      type Pcd.\r
 #\r
 # For dynamicEx type PCD, it is compatible between PCD_PROTOCOL and EFI_PCD_PROTOCOL.\r


@@ -13,12 +13,12 @@
 # This library instance uses the PCD_PROTOCOL to handle dynamic PCD request and use\r
 # EFI_PCD_PROTOCOL to handle dynamicEx type PCD.\r
 #\r
 # This library instance uses the PCD_PROTOCOL to handle dynamic PCD request and use\r
 # EFI_PCD_PROTOCOL to handle dynamicEx type PCD.\r
 #\r

-# Note: A driver of type DXE_RUNTIME_DRIVER and DXE_SMM_DRIVER can only use this DxePcdLib \r
-#  in their initialization without any issues to access Dynamic and DynamicEx PCD. They can't \r
+# Note: A driver of type DXE_RUNTIME_DRIVER and DXE_SMM_DRIVER can only use this DxePcdLib\r
+#  in their initialization without any issues to access Dynamic and DynamicEx PCD. They can't\r

 #  access Dynamic and DynamicEx PCD in the implementation of runtime services and SMI handlers.\r
 #  access Dynamic and DynamicEx PCD in the implementation of runtime services and SMI handlers.\r

-#  Because EFI_PCD_PROTOCOL is DXE protocol that is not aviable in OS runtime phase.  \r
+#  Because EFI_PCD_PROTOCOL is DXE protocol that is not aviable in OS runtime phase.\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

 #\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


@@ -37,7 +37,7 @@
   FILE_GUID                      = af97eb89-4cc6-45f8-a514-ca025b346480\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = af97eb89-4cc6-45f8-a514-ca025b346480\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PcdLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER SMM_CORE UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = PcdLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER SMM_CORE UEFI_APPLICATION UEFI_DRIVER\r

 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.uni b/MdePkg/Library/DxePcdLib/DxePcdLib.uni
index baae8eab6d0c0f13d1a59626f1acfe325941ea3b..9a7a02bb7e0a8e5d94b9aeaf0713fed5fd9bbc80 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.uni
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.uni
@@ -7,13 +7,13 @@
 // 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
 // For dynamicEx type PCD, it is compatible between PCD_PROTOCOL and EFI_PCD_PROTOCOL.\r

-// \r
+//\r

 // This library instance uses the PCD_PROTOCOL to handle dynamic PCD request and use\r
 // EFI_PCD_PROTOCOL to handle dynamicEx type PCD.\r
 //\r
 // This library instance uses the PCD_PROTOCOL to handle dynamic PCD request and use\r
 // EFI_PCD_PROTOCOL to handle dynamicEx type PCD.\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

diff --git a/MdePkg/Library/DxeRuntimeExtendedSalLib/DxeRuntimeExtendedSalLib.inf b/MdePkg/Library/DxeRuntimeExtendedSalLib/DxeRuntimeExtendedSalLib.inf
index 4bc09f9308f2342c06fa4eb1e0162f8b655eaaf3..cf22411bccd35c5dc9cf87b673baa76c8545b769 100644 (file)
--- a/MdePkg/Library/DxeRuntimeExtendedSalLib/DxeRuntimeExtendedSalLib.inf
+++ b/MdePkg/Library/DxeRuntimeExtendedSalLib/DxeRuntimeExtendedSalLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This library implements the Extended SAL Library Class for use in boot services and runtime.\r
 #\r
 ## @file\r
 #  This library implements the Extended SAL Library Class for use in boot services and runtime.\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


@@ -19,7 +19,7 @@
   FILE_GUID                      = AE66715B-75F5-4423-8FAD-A4AFB3C53ACF\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = AE66715B-75F5-4423-8FAD-A4AFB3C53ACF\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = ExtendedSalLib|DXE_RUNTIME_DRIVER DXE_SAL_DRIVER \r
+  LIBRARY_CLASS                  = ExtendedSalLib|DXE_RUNTIME_DRIVER DXE_SAL_DRIVER\r

   CONSTRUCTOR                    = DxeRuntimeExtendedSalLibConstruct\r
   DESTRUCTOR                     = DxeRuntimeExtendedSalLibDeconstruct\r
 \r
   CONSTRUCTOR                    = DxeRuntimeExtendedSalLibConstruct\r
   DESTRUCTOR                     = DxeRuntimeExtendedSalLibDeconstruct\r
 \r

diff --git a/MdePkg/Library/DxeRuntimeExtendedSalLib/ExtendedSalLib.c b/MdePkg/Library/DxeRuntimeExtendedSalLib/ExtendedSalLib.c
index f9e974b373d48ab7c994b974e30e1c4d3d3b7fc3..a3ba071550f1ca080d99f6ddb0a45b588ac57762 100644 (file)
--- a/MdePkg/Library/DxeRuntimeExtendedSalLib/ExtendedSalLib.c
+++ b/MdePkg/Library/DxeRuntimeExtendedSalLib/ExtendedSalLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   This library implements the Extended SAL Library Class for use in boot services and runtime.\r
 \r
 /** @file\r
   This library implements the Extended SAL Library Class for use in boot services and runtime.\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


@@ -158,9 +158,9 @@ DxeSalLibInitialize (
 /**\r
   Constructor function to initializes physical plabel of ESAL entrypoint and register an event\r
   for initialization of virtual plabel of ESAL entrypoint.\r
 /**\r
   Constructor function to initializes physical plabel of ESAL entrypoint and register an event\r
   for initialization of virtual plabel of ESAL entrypoint.\r

-  \r
+\r

   This is the library constructor function to call a function to initialize physical plabel of ESAL entrypoint\r
   This is the library constructor function to call a function to initialize physical plabel of ESAL entrypoint\r

-  and to register notification function for \r
+  and to register notification function for\r

   EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE, which sets virtual plabel of ESAL entrypoint.\r
 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE, which sets virtual plabel of ESAL entrypoint.\r
 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r


@@ -200,9 +200,9 @@ DxeRuntimeExtendedSalLibConstruct (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Destructor function to close the event created by the library constructor \r
-  \r
-  This is the library destructor function to close the event with type of \r
+  Destructor function to close the event created by the library constructor\r
+\r
+  This is the library destructor function to close the event with type of\r

   EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE, which is created by the library constructor.\r
 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE, which is created by the library constructor.\r
 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r


@@ -232,7 +232,7 @@ DxeRuntimeExtendedSalLibDeconstruct (
 \r
 /**\r
   Registers function of ESAL class and it's associated global.\r
 \r
 /**\r
   Registers function of ESAL class and it's associated global.\r

-  \r
+\r

   This function registers function of ESAL class, together with its associated global.\r
   It is worker function for RegisterEsalClass().\r
   It is only for boot time.\r
   This function registers function of ESAL class, together with its associated global.\r
   It is worker function for RegisterEsalClass().\r
   It is only for boot time.\r


@@ -267,7 +267,7 @@ RegisterEsalFunction (
 \r
 /**\r
   Registers ESAL Class and it's associated global.\r
 \r
 /**\r
   Registers ESAL Class and it's associated global.\r

-  \r
+\r

   This function registers one or more Extended SAL services in a given\r
   class along with the associated global context.\r
   This function is only available prior to ExitBootServices().\r
   This function registers one or more Extended SAL services in a given\r
   class along with the associated global context.\r
   This function is only available prior to ExitBootServices().\r


@@ -280,7 +280,7 @@ RegisterEsalFunction (
   @retval EFI_SUCCESS          The Extended SAL services were registered.\r
   @retval EFI_UNSUPPORTED      This function was called after ExitBootServices().\r
   @retval EFI_OUT_OF_RESOURCES There are not enough resources available to register one or more of the specified services.\r
   @retval EFI_SUCCESS          The Extended SAL services were registered.\r
   @retval EFI_UNSUPPORTED      This function was called after ExitBootServices().\r
   @retval EFI_OUT_OF_RESOURCES There are not enough resources available to register one or more of the specified services.\r

-  @retval Other                ClassGuid could not be installed onto a new handle.  \r
+  @retval Other                ClassGuid could not be installed onto a new handle.\r

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


@@ -338,7 +338,7 @@ RegisterEsalClass (
 \r
 /**\r
   Calls an Extended SAL Class service that was previously registered with RegisterEsalClass().\r
 \r
 /**\r
   Calls an Extended SAL Class service that was previously registered with RegisterEsalClass().\r

-  \r
+\r

   This function gets the entrypoint of Extended SAL, and calls an Extended SAL Class service\r
   that was previously registered with RegisterEsalClass() through this entrypoint.\r
 \r
   This function gets the entrypoint of Extended SAL, and calls an Extended SAL Class service\r
   that was previously registered with RegisterEsalClass() through this entrypoint.\r
 \r


@@ -352,12 +352,12 @@ RegisterEsalClass (
   @param  Arg6            Argument 6 ClassGuid/FunctionId defined\r
   @param  Arg7            Argument 7 ClassGuid/FunctionId defined\r
   @param  Arg8            Argument 8 ClassGuid/FunctionId defined\r
   @param  Arg6            Argument 6 ClassGuid/FunctionId defined\r
   @param  Arg7            Argument 7 ClassGuid/FunctionId defined\r
   @param  Arg8            Argument 8 ClassGuid/FunctionId defined\r

-  \r
+\r

   @retval EFI_SAL_SUCCESS ESAL procedure successfully called.\r
   @retval EFI_SAL_ERROR   The address of ExtendedSalProc() can not be correctly\r
                           initialized.\r
   @retval Other           Status returned from ExtendedSalProc() service of\r
   @retval EFI_SAL_SUCCESS ESAL procedure successfully called.\r
   @retval EFI_SAL_ERROR   The address of ExtendedSalProc() can not be correctly\r
                           initialized.\r
   @retval Other           Status returned from ExtendedSalProc() service of\r

-                          EXTENDED_SAL_BOOT_SERVICE_PROTOCOL.  \r
+                          EXTENDED_SAL_BOOT_SERVICE_PROTOCOL.\r

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


@@ -421,7 +421,7 @@ EsalCall (
 \r
 /**\r
   Wrapper for the EsalStallFunctionId service of Extended SAL Stall Services Class.\r
 \r
 /**\r
   Wrapper for the EsalStallFunctionId service of Extended SAL Stall Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalStallFunctionId service of Extended SAL\r
   Stall Services Class. See EsalStallFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalStallFunctionId service of Extended SAL\r
   Stall Services Class. See EsalStallFunctionId of Extended SAL Specification.\r
 \r


@@ -439,22 +439,22 @@ EsalStall (
   )\r
 {\r
   return EsalCall (\r
   )\r
 {\r
   return EsalCall (\r

-           EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_LO, \r
-           EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_HI, \r
-           StallFunctionId, \r
-           Microseconds, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_LO,\r
+           EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_HI,\r
+           StallFunctionId,\r
+           Microseconds,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalSetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalSetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalSetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r


@@ -476,22 +476,22 @@ EsalSetNewPalEntry (
   )\r
 {\r
   return EsalCall (\r
   )\r
 {\r
   return EsalCall (\r

-           EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO, \r
+           EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO,\r

            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r
            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r

-           SetNewPalEntryFunctionId, \r
-           PhysicalAddress, \r
-           PalEntryPoint, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           SetNewPalEntryFunctionId,\r
+           PhysicalAddress,\r
+           PalEntryPoint,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL PAL Services Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalGetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetNewPalEntryFunctionId service of Extended SAL\r
   PAL Services Services Class. See EsalGetNewPalEntryFunctionId of Extended SAL Specification.\r
 \r


@@ -515,20 +515,20 @@ EsalGetNewPalEntry (
   return EsalCall (\r
            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r

-           GetNewPalEntryFunctionId, \r
-           PhysicalAddress, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           GetNewPalEntryFunctionId,\r
+           PhysicalAddress,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalGetStateBufferFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalGetStateBufferFunctionId of Extended SAL Specification.\r
 \r


@@ -557,13 +557,13 @@ EsalGetStateBuffer (
   Regs = EsalCall (\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r
   Regs = EsalCall (\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalGetStateBufferFunctionId, \r
-           McaType, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalGetStateBufferFunctionId,\r
+           McaType,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 \r
            0\r
            );\r
 \r


@@ -575,10 +575,10 @@ EsalGetStateBuffer (
 \r
 /**\r
   Wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r
 \r
 /**\r
   Wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL MCA Log Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalSaveStateBufferFunctionId of Extended SAL Specification.\r
   This function is a wrapper for the EsalSaveStateBufferFunctionId service of Extended SAL\r
   MCA Log Services Class. See EsalSaveStateBufferFunctionId of Extended SAL Specification.\r

-  \r
+\r

   @param  McaType         See type parameter of SAL Procedure SAL_GET_STATE_INFO.\r
 \r
   @retval EFI_SUCCESS  The memory buffer containing the error record was written to nonvolatile storage.\r
   @param  McaType         See type parameter of SAL Procedure SAL_GET_STATE_INFO.\r
 \r
   @retval EFI_SUCCESS  The memory buffer containing the error record was written to nonvolatile storage.\r


@@ -593,20 +593,20 @@ EsalSaveStateBuffer (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalSaveStateBufferFunctionId, \r
-           McaType, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalSaveStateBufferFunctionId,\r
+           McaType,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetVectorsFunctionId service of Extended SAL Base Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetVectorsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetVectorsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetVectorsFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetVectorsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetVectorsFunctionId of Extended SAL Specification.\r
 \r


@@ -628,20 +628,20 @@ EsalGetVectors (
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalGetVectorsFunctionId, \r
-           VectorType, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalGetVectorsFunctionId,\r
+           VectorType,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r
 \r


@@ -665,23 +665,23 @@ EsalMcGetParams (
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalMcGetParamsFunctionId, \r
-           ParamInfoType, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalMcGetParamsFunctionId,\r
+           ParamInfoType,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcGetParamsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r
   This function is a wrapper for the EsalMcGetParamsFunctionId service of Extended SAL\r
   Base Services Class. See EsalMcGetParamsFunctionId of Extended SAL Specification.\r

-  \r
+\r

   @retval EFI_SAL_SUCCESS          Call completed without error.\r
   @retval EFI_SAL_NO_INFORMATION   The requested vector has not been registered\r
                                    with the SAL Procedure SAL_MC_SET_PARAMS.\r
   @retval EFI_SAL_SUCCESS          Call completed without error.\r
   @retval EFI_SAL_NO_INFORMATION   The requested vector has not been registered\r
                                    with the SAL Procedure SAL_MC_SET_PARAMS.\r


@@ -696,20 +696,20 @@ EsalMcGetMcParams (
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalMcGetMcParamsFunctionId, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalMcGetMcParamsFunctionId,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL Base Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL Base Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetMcCheckinFlagsFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetMcCheckinFlagsFunctionId service of Extended SAL\r
   Base Services Class. See EsalGetMcCheckinFlagsFunctionId of Extended SAL Specification.\r
 \r


@@ -727,20 +727,20 @@ EsalGetMcCheckinFlags (
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-           EsalGetMcCheckinFlagsFunctionId, \r
-           CpuIndex, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           EsalGetMcCheckinFlagsFunctionId,\r
+           CpuIndex,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalAddCpuDataFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalAddCpuDataFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalAddCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalAddCpuDataFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalAddCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalAddCpuDataFunctionId of Extended SAL Specification.\r
 \r


@@ -765,20 +765,20 @@ EsalAddCpuData (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           AddCpuDataFunctionId, \r
-           CpuGlobalId, \r
-           Enabled, \r
-           PalCompatibility, \r
-           0, \r
-           0, \r
-           0, \r
+           AddCpuDataFunctionId,\r
+           CpuGlobalId,\r
+           Enabled,\r
+           PalCompatibility,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalRemoveCpuDataFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalRemoveCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalRemoveCpuDataFunctionId of Extended SAL Specification.\r
 \r


@@ -797,20 +797,20 @@ EsalRemoveCpuData (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           RemoveCpuDataFunctionId, \r
-           CpuGlobalId, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           RemoveCpuDataFunctionId,\r
+           CpuGlobalId,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalModifyCpuDataFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalModifyCpuDataFunctionId service of Extended SAL\r
   MP Services Class. See EsalModifyCpuDataFunctionId of Extended SAL Specification.\r
 \r


@@ -835,20 +835,20 @@ EsalModifyCpuData (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           ModifyCpuDataFunctionId, \r
-           CpuGlobalId, \r
-           Enabled, \r
-           PalCompatibility, \r
-           0, \r
-           0, \r
-           0, \r
+           ModifyCpuDataFunctionId,\r
+           CpuGlobalId,\r
+           Enabled,\r
+           PalCompatibility,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIdFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetCpuDataByIdFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIdFunctionId of Extended SAL Specification.\r
 \r


@@ -870,20 +870,20 @@ EsalGetCpuDataById (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           GetCpuDataByIDFunctionId, \r
-           CpuGlobalId, \r
-           IndexByEnabledCpu, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           GetCpuDataByIDFunctionId,\r
+           CpuGlobalId,\r
+           IndexByEnabledCpu,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIndexFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetCpuDataByIndexFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetCpuDataByIndexFunctionId of Extended SAL Specification.\r
 \r


@@ -905,20 +905,20 @@ EsalGetCpuDataByIndex (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           GetCpuDataByIndexFunctionId, \r
-           Index, \r
-           IndexByEnabledCpu, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           GetCpuDataByIndexFunctionId,\r
+           Index,\r
+           IndexByEnabledCpu,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalWhoAmIFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalWhoAmIFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalWhoAmIFunctionId service of Extended SAL\r
   MP Services Class. See EsalWhoAmIFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalWhoAmIFunctionId service of Extended SAL\r
   MP Services Class. See EsalWhoAmIFunctionId of Extended SAL Specification.\r
 \r


@@ -938,20 +938,20 @@ EsalWhoAmI (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           CurrentProcInfoFunctionId, \r
-           IndexByEnabledCpu, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           CurrentProcInfoFunctionId,\r
+           IndexByEnabledCpu,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalNumProcessors service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalNumProcessors service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalNumProcessors service of Extended SAL\r
   MP Services Class. See EsalNumProcessors of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalNumProcessors service of Extended SAL\r
   MP Services Class. See EsalNumProcessors of Extended SAL Specification.\r
 \r


@@ -968,20 +968,20 @@ EsalNumProcessors (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           NumProcessorsFunctionId, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           NumProcessorsFunctionId,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalSetMinStateFnctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalSetMinStateFnctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalSetMinStateFnctionId service of Extended SAL\r
   MP Services Class. See EsalSetMinStateFnctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalSetMinStateFnctionId service of Extended SAL\r
   MP Services Class. See EsalSetMinStateFnctionId of Extended SAL Specification.\r
 \r


@@ -1003,20 +1003,20 @@ EsalSetMinState (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           SetMinStateFunctionId, \r
-           CpuGlobalId, \r
-           MinStatePointer, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           SetMinStateFunctionId,\r
+           CpuGlobalId,\r
+           MinStatePointer,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetMinStateFunctionId service of Extended SAL MP Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalGetMinStateFunctionId service of Extended SAL MP Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalGetMinStateFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetMinStateFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalGetMinStateFunctionId service of Extended SAL\r
   MP Services Class. See EsalGetMinStateFunctionId of Extended SAL Specification.\r
 \r


@@ -1035,20 +1035,20 @@ EsalGetMinState (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MP_SERVICES_PROTOCOL_GUID_HI,\r

-           GetMinStateFunctionId, \r
-           CpuGlobalId, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           GetMinStateFunctionId,\r
+           CpuGlobalId,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL MCA Services Class.\r
            0\r
            );\r
 }\r
 \r
 /**\r
   Wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL MCA Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcsGetStateInfoFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalMcsGetStateInfoFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcsGetStateInfoFunctionId of Extended SAL Specification.\r
 \r


@@ -1073,13 +1073,13 @@ EsalMcaGetStateInfo (
   Regs = EsalCall (\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_HI,\r
   Regs = EsalCall (\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_HI,\r

-           McaGetStateInfoFunctionId, \r
-           CpuGlobalId, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           McaGetStateInfoFunctionId,\r
+           CpuGlobalId,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 \r
            0\r
            );\r
 \r


@@ -1091,7 +1091,7 @@ EsalMcaGetStateInfo (
 \r
 /**\r
   Wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL MCA Services Class.\r
 \r
 /**\r
   Wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL MCA Services Class.\r

-  \r
+\r

   This function is a wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcaRegisterCpuFunctionId of Extended SAL Specification.\r
 \r
   This function is a wrapper for the EsalMcaRegisterCpuFunctionId service of Extended SAL\r
   MCA Services Class. See EsalMcaRegisterCpuFunctionId of Extended SAL Specification.\r
 \r


@@ -1112,13 +1112,13 @@ EsalMcaRegisterCpu (
   return EsalCall (\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_HI,\r
   return EsalCall (\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_LO,\r
            EFI_EXTENDED_SAL_MCA_SERVICES_PROTOCOL_GUID_HI,\r

-           McaRegisterCpuFunctionId, \r
-           CpuGlobalId, \r
-           StateBufferPointer, \r
-           0, \r
-           0, \r
-           0, \r
-           0, \r
+           McaRegisterCpuFunctionId,\r
+           CpuGlobalId,\r
+           StateBufferPointer,\r
+           0,\r
+           0,\r
+           0,\r
+           0,\r

            0\r
            );\r
 }\r
            0\r
            );\r
 }\r

diff --git a/MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.inf b/MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.inf
index 5d7357035b8b30c02291eaa93db11fc61192c397..622872188cac887370be989c8504cc7af15f3a6e 100644 (file)
--- a/MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.inf
+++ b/MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.inf
@@ -1,13 +1,13 @@
 ## @file\r
 ## @file\r

-# Instance of PCI Express Library using the 256 MB PCI Express MMIO window that \r
+# Instance of PCI Express Library using the 256 MB PCI Express MMIO window that\r

 # is safe for runtime use.\r
 #\r
 # PCI Express Library that uses the 256 MB PCI Express MMIO window to perform\r
 # is safe for runtime use.\r
 #\r
 # PCI Express Library that uses the 256 MB PCI Express MMIO window to perform\r

-#  PCI Configuration cycles. Layers on top of an I/O Library instance.  A table of \r
-#  PCI devices that are registered for for runtime access is maintained so the \r
+#  PCI Configuration cycles. Layers on top of an I/O Library instance.  A table of\r
+#  PCI devices that are registered for for runtime access is maintained so the\r

 #  proper virtual address is used to perform the PCI Express Configuration cycle.\r
 #\r
 #  proper virtual address is used to perform the PCI Express Configuration cycle.\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


@@ -26,7 +26,7 @@
   FILE_GUID                      = 54DCBCE5-92AD-41f5-AAAF-1170F16DA6A8\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 54DCBCE5-92AD-41f5-AAAF-1170F16DA6A8\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PciExpressLib|DXE_RUNTIME_DRIVER \r
+  LIBRARY_CLASS                  = PciExpressLib|DXE_RUNTIME_DRIVER\r

   CONSTRUCTOR                    = DxeRuntimePciExpressLibConstructor\r
   DESTRUCTOR                     = DxeRuntimePciExpressLibDestructor\r
 \r
   CONSTRUCTOR                    = DxeRuntimePciExpressLibConstructor\r
   DESTRUCTOR                     = DxeRuntimePciExpressLibDestructor\r
 \r

diff --git a/MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.uni b/MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.uni
index 83c086f73547e53234d032699b6200edf976375a..099b12f3bd50e053ddf7c6fe7509c1e55d127206 100644 (file)
--- a/MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.uni
+++ b/MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.uni
@@ -2,13 +2,13 @@
 // Instance of PCI Express Library using the 256 MB PCI Express MMIO window that\r
 //\r
 // is safe for runtime use.\r
 // Instance of PCI Express Library using the 256 MB PCI Express MMIO window that\r
 //\r
 // is safe for runtime use.\r

-// \r
+//\r

 // PCI Express Library that uses the 256 MB PCI Express MMIO window to perform\r
 // PCI Configuration cycles. Layers on top of an I/O Library instance.  A table of\r
 // PCI devices that are registered for for runtime access is maintained so the\r
 // proper virtual address is used to perform the PCI Express Configuration cycle.\r
 //\r
 // PCI Express Library that uses the 256 MB PCI Express MMIO window to perform\r
 // PCI Configuration cycles. Layers on top of an I/O Library instance.  A table of\r
 // PCI devices that are registered for for runtime access is maintained so the\r
 // proper virtual address is used to perform the PCI Express Configuration cycle.\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

diff --git a/MdePkg/Library/DxeRuntimePciExpressLib/PciExpressLib.c b/MdePkg/Library/DxeRuntimePciExpressLib/PciExpressLib.c
index 01bd96166eb4be4b3cef7bddc8b279784029bd26..39fa4f1749460c45514b8bc15db90e38b124453f 100644 (file)
--- a/MdePkg/Library/DxeRuntimePciExpressLib/PciExpressLib.c
+++ b/MdePkg/Library/DxeRuntimePciExpressLib/PciExpressLib.c
@@ -5,7 +5,7 @@
   All assertions for I/O operations are handled in MMIO functions in the IoLib\r
   Library.\r
 \r
   All assertions for I/O operations are handled in MMIO functions in the IoLib\r
   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


@@ -103,12 +103,12 @@ DxeRuntimePciExpressLibVirtualNotify (
 }\r
 \r
 /**\r
 }\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


@@ -144,12 +144,12 @@ DxeRuntimePciExpressLibConstructor (
 }\r
 \r
 /**\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


@@ -164,7 +164,7 @@ DxeRuntimePciExpressLibDestructor (
   EFI_STATUS  Status;\r
 \r
   //\r
   EFI_STATUS  Status;\r
 \r
   //\r

-  // If one or more PCI devices have been registered for runtime access, then \r
+  // If one or more PCI devices have been registered for runtime access, then\r

   // free the registration table.\r
   //\r
   if (mDxeRuntimePciExpressLibRegistrationTable != NULL) {\r
   // free the registration table.\r
   //\r
   if (mDxeRuntimePciExpressLibRegistrationTable != NULL) {\r


@@ -182,10 +182,10 @@ DxeRuntimePciExpressLibDestructor (
 \r
 /**\r
   Gets the base address of PCI Express.\r
 \r
 /**\r
   Gets the base address of PCI Express.\r

-  \r
+\r

   This internal functions retrieves PCI Express Base Address via a PCD entry\r
   PcdPciExpressBaseAddress.\r
   This internal functions retrieves PCI Express Base Address via a PCD entry\r
   PcdPciExpressBaseAddress.\r

-  \r
+\r

   @param  Address  The address that encodes the PCI Bus, Device, Function and Register.\r
   @return          The base address of PCI Express.\r
 \r
   @param  Address  The address that encodes the PCI Bus, Device, Function and Register.\r
   @return          The base address of PCI Express.\r
 \r


@@ -247,26 +247,26 @@ GetPciExpressAddress (
   CpuBreakpoint();\r
 \r
   //\r
   CpuBreakpoint();\r
 \r
   //\r

-  // Return the physical address \r
+  // Return the physical address\r

   //\r
   return Address;\r
 }\r
 \r
 /**\r
   //\r
   return Address;\r
 }\r
 \r
 /**\r

-  Registers a PCI device so PCI configuration registers may be accessed after \r
+  Registers a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
-  Registers the PCI device specified by Address so all the PCI configuration \r
-  registers associated with that PCI device may be accessed after SetVirtualAddressMap() \r
+\r
+  Registers the PCI device specified by Address so all the PCI configuration\r
+  registers associated with that PCI device may be accessed after SetVirtualAddressMap()\r

   is called.\r
   is called.\r

-  \r
+\r

   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r


@@ -334,8 +334,8 @@ PciExpressRegisterForRuntimeAccess (
   // Grow the size of the registration table\r
   //\r
   NewTable = ReallocateRuntimePool (\r
   // Grow the size of the registration table\r
   //\r
   NewTable = ReallocateRuntimePool (\r

-               (mDxeRuntimePciExpressLibNumberOfRuntimeRanges + 0) * sizeof (PCI_EXPRESS_RUNTIME_REGISTRATION_TABLE), \r
-               (mDxeRuntimePciExpressLibNumberOfRuntimeRanges + 1) * sizeof (PCI_EXPRESS_RUNTIME_REGISTRATION_TABLE), \r
+               (mDxeRuntimePciExpressLibNumberOfRuntimeRanges + 0) * sizeof (PCI_EXPRESS_RUNTIME_REGISTRATION_TABLE),\r
+               (mDxeRuntimePciExpressLibNumberOfRuntimeRanges + 1) * sizeof (PCI_EXPRESS_RUNTIME_REGISTRATION_TABLE),\r

                mDxeRuntimePciExpressLibRegistrationTable\r
                );\r
   if (NewTable == NULL) {\r
                mDxeRuntimePciExpressLibRegistrationTable\r
                );\r
   if (NewTable == NULL) {\r

diff --git a/MdePkg/Library/DxeSalLibEsal/DxeSalLibEsal.c b/MdePkg/Library/DxeSalLibEsal/DxeSalLibEsal.c
index 8d1dd9ae15d3d5d067d643cf41e38b49c57a1ec7..340765e6fd3cefd28f8fb9ff58ae47620cb288d3 100644 (file)
--- a/MdePkg/Library/DxeSalLibEsal/DxeSalLibEsal.c
+++ b/MdePkg/Library/DxeSalLibEsal/DxeSalLibEsal.c
@@ -1,7 +1,7 @@
 /** @file\r
   This library implements the SAL Library Class using Extended SAL functions\r
 \r
 /** @file\r
   This library implements the SAL Library Class using Extended SAL functions\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,8 +21,8 @@
 \r
 /**\r
   Makes a SAL procedure call.\r
 \r
 /**\r
   Makes a SAL procedure call.\r

-  \r
-  This is a wrapper function to make a SAL procedure call.  \r
+\r
+  This is a wrapper function to make a SAL procedure call.\r

   No parameter checking is performed on the 8 input parameters,\r
   but there are some common rules that the caller should follow\r
   when making a SAL call.  Any address passed to SAL as buffers\r
   No parameter checking is performed on the 8 input parameters,\r
   but there are some common rules that the caller should follow\r
   when making a SAL call.  Any address passed to SAL as buffers\r


@@ -59,7 +59,7 @@ SalCall (
   )\r
 {\r
   SAL_RETURN_REGS Regs;\r
   )\r
 {\r
   SAL_RETURN_REGS Regs;\r

-  \r
+\r

   //\r
   // Initial all members in this structure.\r
   //\r
   //\r
   // Initial all members in this structure.\r
   //\r


@@ -73,13 +73,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-             SalSetVectorsFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             SalSetVectorsFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -88,13 +88,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r

-             SalGetStateInfoFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             SalGetStateInfoFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -103,13 +103,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r

-             SalGetStateInfoSizeFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             SalGetStateInfoSizeFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -118,13 +118,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_MCA_LOG_SERVICES_PROTOCOL_GUID_HI,\r

-             SalClearStateInfoFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             SalClearStateInfoFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -133,13 +133,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-             SalMcRendezFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             SalMcRendezFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
    break;\r
              Arg8\r
              );\r
    break;\r


@@ -148,13 +148,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-             SalMcSetParamsFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             SalMcSetParamsFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -163,13 +163,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-             EsalRegisterPhysicalAddrFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             EsalRegisterPhysicalAddrFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -178,13 +178,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_CACHE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_CACHE_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_CACHE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_CACHE_SERVICES_PROTOCOL_GUID_HI,\r

-             SalCacheFlushFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             SalCacheFlushFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -193,13 +193,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_CACHE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_CACHE_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_CACHE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_CACHE_SERVICES_PROTOCOL_GUID_HI,\r

-             SalCacheInitFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             SalCacheInitFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -208,13 +208,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_PCI_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_PCI_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_PCI_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_PCI_SERVICES_PROTOCOL_GUID_HI,\r

-             SalPciConfigReadFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             SalPciConfigReadFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -223,13 +223,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_PCI_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_PCI_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_PCI_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_PCI_SERVICES_PROTOCOL_GUID_HI,\r

-             SalPciConfigWriteFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             SalPciConfigWriteFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -238,13 +238,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-             EsalGetPlatformBaseFreqFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             EsalGetPlatformBaseFreqFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -253,13 +253,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_BASE_SERVICES_PROTOCOL_GUID_HI,\r

-             EsalPhysicalIdInfoFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             EsalPhysicalIdInfoFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r


@@ -268,13 +268,13 @@ SalCall (
     return EsalCall (\r
              EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r
     return EsalCall (\r
              EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_LO,\r
              EFI_EXTENDED_SAL_PAL_SERVICES_PROTOCOL_GUID_HI,\r

-             EsalUpdatePalFunctionId, \r
-             Arg2, \r
-             Arg3, \r
-             Arg4, \r
-             Arg5, \r
-             Arg6, \r
-             Arg7, \r
+             EsalUpdatePalFunctionId,\r
+             Arg2,\r
+             Arg3,\r
+             Arg4,\r
+             Arg5,\r
+             Arg6,\r
+             Arg7,\r

              Arg8\r
              );\r
     break;\r
              Arg8\r
              );\r
     break;\r

diff --git a/MdePkg/Library/DxeSalLibEsal/DxeSalLibEsal.inf b/MdePkg/Library/DxeSalLibEsal/DxeSalLibEsal.inf
index 656d949574b22ecf5c57922f079f24bd27de3e5a..36ab5892a8dfa13d869606062e2843f6c3dccaeb 100644 (file)
--- a/MdePkg/Library/DxeSalLibEsal/DxeSalLibEsal.inf
+++ b/MdePkg/Library/DxeSalLibEsal/DxeSalLibEsal.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This library implements the SAL Library Class using Extended SAL functions\r
 #\r
 ## @file\r
 #  This library implements the SAL Library Class using Extended SAL functions\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


@@ -19,7 +19,7 @@
   FILE_GUID                      = 2B73B074-2E67-498b-82AC-CE38FB770FFC\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 2B73B074-2E67-498b-82AC-CE38FB770FFC\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = SalLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION \r
+  LIBRARY_CLASS                  = SalLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION\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/MdePkg/Library/DxeServicesLib/DxeServicesLib.c b/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
index 1827c9216fbc231c98b756b0bc66e7c7b13c7b58..d4f366425fed300127832c4386beded29e5ec533 100644 (file)
--- a/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
+++ b/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  MDE DXE Services Library provides functions that simplify the development of DXE Drivers.  \r
+  MDE DXE Services Library provides functions that simplify the development of DXE Drivers.\r

   These functions help access data from sections of FFS files or from file path.\r
 \r
   These functions help access data from sections of FFS files or from file path.\r
 \r

-  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2007 - 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


@@ -30,15 +30,15 @@
 \r
 /**\r
   Identify the device handle from which the Image is loaded from. As this device handle is passed to\r
 \r
 /**\r
   Identify the device handle from which the Image is loaded from. As this device handle is passed to\r

-  GetSectionFromFv as the identifier for a Firmware Volume, an EFI_FIRMWARE_VOLUME2_PROTOCOL \r
+  GetSectionFromFv as the identifier for a Firmware Volume, an EFI_FIRMWARE_VOLUME2_PROTOCOL\r

   protocol instance should be located succesfully by calling gBS->HandleProtocol ().\r
 \r
   This function locates the EFI_LOADED_IMAGE_PROTOCOL instance installed\r
   on ImageHandle. It then returns EFI_LOADED_IMAGE_PROTOCOL.DeviceHandle.\r
   protocol instance should be located succesfully by calling gBS->HandleProtocol ().\r
 \r
   This function locates the EFI_LOADED_IMAGE_PROTOCOL instance installed\r
   on ImageHandle. It then returns EFI_LOADED_IMAGE_PROTOCOL.DeviceHandle.\r

-  \r
+\r

   If ImageHandle is NULL, then ASSERT ();\r
   If failed to locate a EFI_LOADED_IMAGE_PROTOCOL on ImageHandle, then ASSERT ();\r
   If ImageHandle is NULL, then ASSERT ();\r
   If failed to locate a EFI_LOADED_IMAGE_PROTOCOL on ImageHandle, then ASSERT ();\r

-  \r
+\r

   @param  ImageHandle         The firmware allocated handle for UEFI image.\r
 \r
   @retval  EFI_HANDLE         The device handle from which the Image is loaded from.\r
   @param  ImageHandle         The firmware allocated handle for UEFI image.\r
 \r
   @retval  EFI_HANDLE         The device handle from which the Image is loaded from.\r


@@ -51,7 +51,7 @@ InternalImageHandleToFvHandle (
 {\r
   EFI_STATUS                    Status;\r
   EFI_LOADED_IMAGE_PROTOCOL     *LoadedImage;\r
 {\r
   EFI_STATUS                    Status;\r
   EFI_LOADED_IMAGE_PROTOCOL     *LoadedImage;\r

-  \r
+\r

   ASSERT (ImageHandle != NULL);\r
 \r
   Status = gBS->HandleProtocol (\r
   ASSERT (ImageHandle != NULL);\r
 \r
   Status = gBS->HandleProtocol (\r


@@ -73,47 +73,47 @@ InternalImageHandleToFvHandle (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocate and fill a buffer from a Firmware Section identified by a Firmware File GUID name, a Firmware \r
+  Allocate and fill a buffer from a Firmware Section identified by a Firmware File GUID name, a Firmware\r

   Section type and instance number from the specified Firmware Volume.\r
 \r
   Section type and instance number from the specified Firmware Volume.\r
 \r

-  This functions first locate the EFI_FIRMWARE_VOLUME2_PROTOCOL protocol instance on FvHandle in order to \r
-  carry out the Firmware Volume read operation. The function then reads the Firmware Section found sepcifed \r
-  by NameGuid, SectionType and SectionInstance. \r
-  \r
-  The details of this search order is defined in description of EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection () \r
+  This functions first locate the EFI_FIRMWARE_VOLUME2_PROTOCOL protocol instance on FvHandle in order to\r
+  carry out the Firmware Volume read operation. The function then reads the Firmware Section found sepcifed\r
+  by NameGuid, SectionType and SectionInstance.\r
+\r
+  The details of this search order is defined in description of EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection ()\r

   found in PI Specification.\r
   found in PI Specification.\r

-  \r
-  If SectionType is EFI_SECTION_TE, EFI_SECTION_TE is used as section type to start the search. If EFI_SECTION_TE section \r
-  is not found, EFI_SECTION_PE32 will be used to try the search again. If no EFI_SECTION_PE32 section is found, EFI_NOT_FOUND \r
+\r
+  If SectionType is EFI_SECTION_TE, EFI_SECTION_TE is used as section type to start the search. If EFI_SECTION_TE section\r
+  is not found, EFI_SECTION_PE32 will be used to try the search again. If no EFI_SECTION_PE32 section is found, EFI_NOT_FOUND\r

   is returned.\r
   is returned.\r

-  \r
-  The data and size is returned by Buffer and Size. The caller is responsible to free the Buffer allocated \r
+\r
+  The data and size is returned by Buffer and Size. The caller is responsible to free the Buffer allocated\r

   by this function. This function can be only called at TPL_NOTIFY and below.\r
   by this function. This function can be only called at TPL_NOTIFY and below.\r

-  \r
+\r

   If NameGuid is NULL, then ASSERT();\r
   If Buffer is NULL, then ASSERT();\r
   If Size is NULL, then ASSERT().\r
 \r
   If NameGuid is NULL, then ASSERT();\r
   If Buffer is NULL, then ASSERT();\r
   If Size is NULL, then ASSERT().\r
 \r

-  @param  FvHandle                The device handle that contains a instance of \r
+  @param  FvHandle                The device handle that contains a instance of\r

                                   EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r
   @param  NameGuid                The GUID name of a Firmware File.\r
   @param  SectionType             The Firmware Section type.\r
                                   EFI_FIRMWARE_VOLUME2_PROTOCOL instance.\r
   @param  NameGuid                The GUID name of a Firmware File.\r
   @param  SectionType             The Firmware Section type.\r

-  @param  SectionInstance         The instance number of Firmware Section to  \r
+  @param  SectionInstance         The instance number of Firmware Section to\r

                                   read from starting from 0.\r
                                   read from starting from 0.\r

-  @param  Buffer                  On output, Buffer contains the the data read \r
+  @param  Buffer                  On output, Buffer contains the the data read\r

                                   from the section in the Firmware File found.\r
   @param  Size                    On output, the size of Buffer.\r
 \r
   @retval  EFI_SUCCESS            The image is found and data and size is returned.\r
                                   from the section in the Firmware File found.\r
   @param  Size                    On output, the size of Buffer.\r
 \r
   @retval  EFI_SUCCESS            The image is found and data and size is returned.\r

-  @retval  EFI_NOT_FOUND          The image specified by NameGuid and SectionType \r
+  @retval  EFI_NOT_FOUND          The image specified by NameGuid and SectionType\r

                                   can't be found.\r
                                   can't be found.\r

-  @retval  EFI_OUT_OF_RESOURCES   There were not enough resources to allocate the \r
+  @retval  EFI_OUT_OF_RESOURCES   There were not enough resources to allocate the\r

                                   output data buffer or complete the operations.\r
                                   output data buffer or complete the operations.\r

-  @retval  EFI_DEVICE_ERROR       A hardware error occurs during reading from the \r
+  @retval  EFI_DEVICE_ERROR       A hardware error occurs during reading from the\r

                                   Firmware Volume.\r
                                   Firmware Volume.\r

-  @retval  EFI_ACCESS_DENIED      The firmware volume containing the searched \r
+  @retval  EFI_ACCESS_DENIED      The firmware volume containing the searched\r

                                   Firmware File is configured to disallow reads.\r
                                   Firmware File is configured to disallow reads.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 InternalGetSectionFromFv (\r
 **/\r
 EFI_STATUS\r
 InternalGetSectionFromFv (\r


@@ -132,7 +132,7 @@ InternalGetSectionFromFv (
   ASSERT (NameGuid != NULL);\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Size != NULL);\r
   ASSERT (NameGuid != NULL);\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Size != NULL);\r

-  \r
+\r

   if (FvHandle == NULL) {\r
     //\r
     // Return EFI_NOT_FOUND directly for NULL FvHandle.\r
   if (FvHandle == NULL) {\r
     //\r
     // Return EFI_NOT_FOUND directly for NULL FvHandle.\r


@@ -166,7 +166,7 @@ InternalGetSectionFromFv (
 \r
   if (EFI_ERROR (Status) && (SectionType == EFI_SECTION_TE)) {\r
     //\r
 \r
   if (EFI_ERROR (Status) && (SectionType == EFI_SECTION_TE)) {\r
     //\r

-    // Try reading PE32 section, if the required section is TE type \r
+    // Try reading PE32 section, if the required section is TE type\r

     //\r
     *Buffer = NULL;\r
     *Size   = 0;\r
     //\r
     *Buffer = NULL;\r
     *Size   = 0;\r


@@ -185,51 +185,51 @@ InternalGetSectionFromFv (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Searches all the available firmware volumes and returns the first matching FFS section. \r
+  Searches all the available firmware volumes and returns the first matching FFS section.\r

 \r
   This function searches all the firmware volumes for FFS files with FV file type specified by FileType\r
 \r
   This function searches all the firmware volumes for FFS files with FV file type specified by FileType\r

-  The order that the firmware volumes is searched is not deterministic. For each available FV a search \r
-  is made for FFS file of type FileType. If the FV contains more than one FFS file with the same FileType, \r
-  the FileInstance instance will be the matched FFS file. For each FFS file found a search \r
-  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance instances \r
-  of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer. \r
-  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size. \r
-  It is the caller's responsibility to use FreePool() to free the allocated buffer.  \r
-  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections \r
+  The order that the firmware volumes is searched is not deterministic. For each available FV a search\r
+  is made for FFS file of type FileType. If the FV contains more than one FFS file with the same FileType,\r
+  the FileInstance instance will be the matched FFS file. For each FFS file found a search\r
+  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance instances\r
+  of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer.\r
+  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size.\r
+  It is the caller's responsibility to use FreePool() to free the allocated buffer.\r
+  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections\r

   are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r
   are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r

-  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails, \r
+  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails,\r

   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r
 \r
   If Buffer is NULL, then ASSERT().\r
   If Size is NULL, then ASSERT().\r
 \r
   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r
 \r
   If Buffer is NULL, then ASSERT().\r
   If Size is NULL, then ASSERT().\r
 \r

-  @param  FileType             Indicates the FV file type to search for within all \r
+  @param  FileType             Indicates the FV file type to search for within all\r

                                available FVs.\r
                                available FVs.\r

-  @param  FileInstance         Indicates which file instance within all available \r
+  @param  FileInstance         Indicates which file instance within all available\r

                                FVs specified by FileType.\r
                                FileInstance starts from zero.\r
                                FVs specified by FileType.\r
                                FileInstance starts from zero.\r

-  @param  SectionType          Indicates the FFS section type to search for \r
-                               within the FFS file \r
+  @param  SectionType          Indicates the FFS section type to search for\r
+                               within the FFS file\r

                                specified by FileType with FileInstance.\r
                                specified by FileType with FileInstance.\r

-  @param  SectionInstance      Indicates which section instance within the FFS file \r
-                               specified by FileType with FileInstance to retrieve. \r
+  @param  SectionInstance      Indicates which section instance within the FFS file\r
+                               specified by FileType with FileInstance to retrieve.\r

                                SectionInstance starts from zero.\r
                                SectionInstance starts from zero.\r

-  @param  Buffer               On output, a pointer to a callee allocated buffer \r
+  @param  Buffer               On output, a pointer to a callee allocated buffer\r

                                containing the FFS file section that was found.\r
                                containing the FFS file section that was found.\r

-                               Is it the caller's responsibility to free this \r
+                               Is it the caller's responsibility to free this\r

                                buffer using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r
                                buffer using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r

-  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve \r
+  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve\r

                                 the matching FFS section.\r
                                 the matching FFS section.\r

-  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a \r
+  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a\r

                                 device error.\r
                                 device error.\r

-  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because \r
-                                the firmware volume that \r
+  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because\r
+                                the firmware volume that\r

                                 contains the matching FFS section does not allow reads.\r
 **/\r
 EFI_STATUS\r
                                 contains the matching FFS section does not allow reads.\r
 **/\r
 EFI_STATUS\r


@@ -300,7 +300,7 @@ GetSectionFromAnyFvByFileType  (
     //\r
     if (IndexFile == 0) {\r
       Status = InternalGetSectionFromFv (\r
     //\r
     if (IndexFile == 0) {\r
       Status = InternalGetSectionFromFv (\r

-                 HandleBuffer[IndexFv], \r
+                 HandleBuffer[IndexFv],\r

                  &NameGuid,\r
                  SectionType,\r
                  SectionInstance,\r
                  &NameGuid,\r
                  SectionType,\r
                  SectionInstance,\r


@@ -315,14 +315,14 @@ GetSectionFromAnyFvByFileType  (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // The required FFS section file is not found. \r
+  // The required FFS section file is not found.\r

   //\r
   if (IndexFv == HandleCount) {\r
     Status = EFI_NOT_FOUND;\r
   }\r
 \r
 Done:\r
   //\r
   if (IndexFv == HandleCount) {\r
     Status = EFI_NOT_FOUND;\r
   }\r
 \r
 Done:\r

-  if (HandleBuffer != NULL) {  \r
+  if (HandleBuffer != NULL) {\r

     FreePool(HandleBuffer);\r
   }\r
 \r
     FreePool(HandleBuffer);\r
   }\r
 \r


@@ -330,18 +330,18 @@ Done:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Searches all the availables firmware volumes and returns the first matching FFS section. \r
-\r
-  This function searches all the firmware volumes for FFS files with an FFS filename specified by NameGuid.  \r
-  The order that the firmware volumes is searched is not deterministic. For each FFS file found a search \r
-  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance instances \r
-  of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer. \r
-  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size. \r
-  It is the caller's responsibility to use FreePool() to free the allocated buffer.  \r
-  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections \r
+  Searches all the availables firmware volumes and returns the first matching FFS section.\r
+\r
+  This function searches all the firmware volumes for FFS files with an FFS filename specified by NameGuid.\r
+  The order that the firmware volumes is searched is not deterministic. For each FFS file found a search\r
+  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance instances\r
+  of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer.\r
+  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size.\r
+  It is the caller's responsibility to use FreePool() to free the allocated buffer.\r
+  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections\r

   are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r
   are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r

-  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails, \r
+  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails,\r

   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r
 \r
   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r
 \r


@@ -350,26 +350,26 @@ Done:
   If Size is NULL, then ASSERT().\r
 \r
 \r
   If Size is NULL, then ASSERT().\r
 \r
 \r

-  @param  NameGuid             A pointer to to the FFS filename GUID to search for  \r
-                               within any of the firmware volumes in the platform. \r
-  @param  SectionType          Indicates the FFS section type to search for within \r
+  @param  NameGuid             A pointer to to the FFS filename GUID to search for\r
+                               within any of the firmware volumes in the platform.\r
+  @param  SectionType          Indicates the FFS section type to search for within\r

                                the FFS file specified by NameGuid.\r
                                the FFS file specified by NameGuid.\r

-  @param  SectionInstance      Indicates which section instance within the FFS file \r
+  @param  SectionInstance      Indicates which section instance within the FFS file\r

                                specified by NameGuid to retrieve.\r
                                specified by NameGuid to retrieve.\r

-  @param  Buffer               On output, a pointer to a callee allocated buffer \r
-                               containing the FFS file section that was found.  \r
-                               Is it the caller's responsibility to free this buffer \r
+  @param  Buffer               On output, a pointer to a callee allocated buffer\r
+                               containing the FFS file section that was found.\r
+                               Is it the caller's responsibility to free this buffer\r

                                using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r
                                using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r

-  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to \r
+  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to\r

                                 retrieve the matching FFS section.\r
                                 retrieve the matching FFS section.\r

-  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a \r
+  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a\r

                                 device error.\r
                                 device error.\r

-  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the \r
-                                firmware volume that \r
+  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the\r
+                                firmware volume that\r

                                 contains the matching FFS section does not allow reads.\r
 **/\r
 EFI_STATUS\r
                                 contains the matching FFS section does not allow reads.\r
 **/\r
 EFI_STATUS\r


@@ -425,11 +425,11 @@ GetSectionFromAnyFv  (
     //\r
     if (HandleBuffer[Index] != FvHandle) {\r
       Status = InternalGetSectionFromFv (\r
     //\r
     if (HandleBuffer[Index] != FvHandle) {\r
       Status = InternalGetSectionFromFv (\r

-                 HandleBuffer[Index], \r
-                 NameGuid, \r
-                 SectionType, \r
+                 HandleBuffer[Index],\r
+                 NameGuid,\r
+                 SectionType,\r

                  SectionInstance,\r
                  SectionInstance,\r

-                 Buffer, \r
+                 Buffer,\r

                  Size\r
                  );\r
 \r
                  Size\r
                  );\r
 \r


@@ -445,58 +445,58 @@ GetSectionFromAnyFv  (
   }\r
 \r
 Done:\r
   }\r
 \r
 Done:\r

-  \r
-  if (HandleBuffer != NULL) {  \r
+\r
+  if (HandleBuffer != NULL) {\r

     FreePool(HandleBuffer);\r
   }\r
   return Status;\r
     FreePool(HandleBuffer);\r
   }\r
   return Status;\r

-  \r
+\r

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

-  Searches the firmware volume that the currently executing module was loaded from and returns the first matching FFS section. \r
+  Searches the firmware volume that the currently executing module was loaded from and returns the first matching FFS section.\r

 \r
 \r

-  This function searches the firmware volume that the currently executing module was loaded \r
-  from for an FFS file with an FFS filename specified by NameGuid. If the FFS file is found a search \r
-  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance \r
+  This function searches the firmware volume that the currently executing module was loaded\r
+  from for an FFS file with an FFS filename specified by NameGuid. If the FFS file is found a search\r
+  is made for FFS sections of type SectionType. If the FFS file contains at least SectionInstance\r

   instances of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer.\r
   instances of the FFS section specified by SectionType, then the SectionInstance instance is returned in Buffer.\r

-  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size. \r
-  It is the caller's responsibility to use FreePool() to free the allocated buffer. \r
-  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections are retrieved from \r
+  Buffer is allocated using AllocatePool(), and the size of the allocated buffer is returned in Size.\r
+  It is the caller's responsibility to use FreePool() to free the allocated buffer.\r
+  See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for details on how sections are retrieved from\r

   an FFS file based on SectionType and SectionInstance.\r
 \r
   If the currently executing module was not loaded from a firmware volume, then EFI_NOT_FOUND is returned.\r
   an FFS file based on SectionType and SectionInstance.\r
 \r
   If the currently executing module was not loaded from a firmware volume, then EFI_NOT_FOUND is returned.\r

-  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails, \r
+  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails,\r

   the search will be retried with a section type of EFI_SECTION_PE32.\r
   the search will be retried with a section type of EFI_SECTION_PE32.\r

-  \r
+\r

   This function must be called with a TPL <= TPL_NOTIFY.\r
   If NameGuid is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If Size is NULL, then ASSERT().\r
 \r
   This function must be called with a TPL <= TPL_NOTIFY.\r
   If NameGuid is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If Size is NULL, then ASSERT().\r
 \r

-  @param  NameGuid             A pointer to to the FFS filename GUID to search for \r
-                               within the firmware volumes that the currently \r
+  @param  NameGuid             A pointer to to the FFS filename GUID to search for\r
+                               within the firmware volumes that the currently\r

                                executing module was loaded from.\r
                                executing module was loaded from.\r

-  @param  SectionType          Indicates the FFS section type to search for within \r
+  @param  SectionType          Indicates the FFS section type to search for within\r

                                the FFS file specified by NameGuid.\r
                                the FFS file specified by NameGuid.\r

-  @param  SectionInstance      Indicates which section instance within the FFS file \r
+  @param  SectionInstance      Indicates which section instance within the FFS file\r

                                specified by NameGuid to retrieve.\r
                                specified by NameGuid to retrieve.\r

-  @param  Buffer               On output, a pointer to a callee allocated buffer \r
-                               containing the FFS file section that was found.  \r
-                               Is it the caller's responsibility to free this buffer \r
+  @param  Buffer               On output, a pointer to a callee allocated buffer\r
+                               containing the FFS file section that was found.\r
+                               Is it the caller's responsibility to free this buffer\r

                                using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r
                                using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r

-  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve \r
+  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve\r

                                 the matching FFS section.\r
                                 the matching FFS section.\r

-  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a \r
+  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a\r

                                 device error.\r
                                 device error.\r

-  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the \r
-                                firmware volume that contains the matching FFS \r
-                                section does not allow reads.  \r
+  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the\r
+                                firmware volume that contains the matching FFS\r
+                                section does not allow reads.\r

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


@@ -523,43 +523,43 @@ GetSectionFromFv (
   Searches the FFS file the the currently executing module was loaded from and returns the first matching FFS section.\r
 \r
   This function searches the FFS file that the currently executing module was loaded from for a FFS sections of type SectionType.\r
   Searches the FFS file the the currently executing module was loaded from and returns the first matching FFS section.\r
 \r
   This function searches the FFS file that the currently executing module was loaded from for a FFS sections of type SectionType.\r

-  If the FFS file contains at least SectionInstance instances of the FFS section specified by SectionType, \r
-  then the SectionInstance instance is returned in Buffer. Buffer is allocated using AllocatePool(), \r
-  and the size of the allocated buffer is returned in Size. It is the caller's responsibility \r
-  to use FreePool() to free the allocated buffer. See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for \r
+  If the FFS file contains at least SectionInstance instances of the FFS section specified by SectionType,\r
+  then the SectionInstance instance is returned in Buffer. Buffer is allocated using AllocatePool(),\r
+  and the size of the allocated buffer is returned in Size. It is the caller's responsibility\r
+  to use FreePool() to free the allocated buffer. See EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection() for\r

   details on how sections are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r
   If the currently executing module was not loaded from an FFS file, then EFI_NOT_FOUND is returned.\r
   details on how sections are retrieved from an FFS file based on SectionType and SectionInstance.\r
 \r
   If the currently executing module was not loaded from an FFS file, then EFI_NOT_FOUND is returned.\r

-  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails, \r
+  If SectionType is EFI_SECTION_TE, and the search with an FFS file fails,\r

   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r
   the search will be retried with a section type of EFI_SECTION_PE32.\r
   This function must be called with a TPL <= TPL_NOTIFY.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Size is NULL, then ASSERT().\r
 \r
 \r
   If Buffer is NULL, then ASSERT().\r
   If Size is NULL, then ASSERT().\r
 \r
 \r

-  @param  SectionType          Indicates the FFS section type to search for within \r
-                               the FFS file that the currently executing module \r
+  @param  SectionType          Indicates the FFS section type to search for within\r
+                               the FFS file that the currently executing module\r

                                was loaded from.\r
                                was loaded from.\r

-  @param  SectionInstance      Indicates which section instance to retrieve within \r
-                               the FFS file that the currently executing module \r
+  @param  SectionInstance      Indicates which section instance to retrieve within\r
+                               the FFS file that the currently executing module\r

                                was loaded from.\r
                                was loaded from.\r

-  @param  Buffer               On output, a pointer to a callee allocated buffer \r
-                               containing the FFS file section that was found.  \r
-                               Is it the caller's responsibility to free this buffer \r
+  @param  Buffer               On output, a pointer to a callee allocated buffer\r
+                               containing the FFS file section that was found.\r
+                               Is it the caller's responsibility to free this buffer\r

                                using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r
                                using FreePool().\r
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.\r
 \r
   @retval  EFI_SUCCESS          The specified FFS section was returned.\r
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.\r

-  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve \r
+  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve\r

                                 the matching FFS section.\r
                                 the matching FFS section.\r

-  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a \r
+  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a\r

                                 device error.\r
                                 device error.\r

-  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the \r
-                                firmware volume that contains the matching FFS \r
-                                section does not allow reads.  \r
-  \r
+  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the\r
+                                firmware volume that contains the matching FFS\r
+                                section does not allow reads.\r
+\r

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


@@ -582,26 +582,26 @@ GetSectionFromFfs (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Get the image file buffer data and buffer size by its device path. \r
-  \r
-  Access the file either from a firmware volume, from a file system interface, \r
+  Get the image file buffer data and buffer size by its device path.\r
+\r
+  Access the file either from a firmware volume, from a file system interface,\r

   or from the load file interface.\r
   or from the load file interface.\r

-  \r
+\r

   Allocate memory to store the found image. The caller is responsible to free memory.\r
 \r
   If FilePath is NULL, then NULL is returned.\r
   If FileSize is NULL, then NULL is returned.\r
   If AuthenticationStatus is NULL, then NULL is returned.\r
 \r
   Allocate memory to store the found image. The caller is responsible to free memory.\r
 \r
   If FilePath is NULL, then NULL is returned.\r
   If FileSize is NULL, then NULL is returned.\r
   If AuthenticationStatus is NULL, then NULL is returned.\r
 \r

-  @param[in]       BootPolicy           Policy for Open Image File.If TRUE, indicates \r
-                                        that the request originates from the boot \r
+  @param[in]       BootPolicy           Policy for Open Image File.If TRUE, indicates\r
+                                        that the request originates from the boot\r

                                         manager, and that the boot manager is\r
                                         attempting to load FilePath as a boot\r
                                         manager, and that the boot manager is\r
                                         attempting to load FilePath as a boot\r

-                                        selection. If FALSE, then FilePath must \r
+                                        selection. If FALSE, then FilePath must\r

                                         match an exact file to be loaded.\r
   @param[in]       FilePath             The pointer to the device path of the file\r
                                         that is absracted to the file buffer.\r
                                         match an exact file to be loaded.\r
   @param[in]       FilePath             The pointer to the device path of the file\r
                                         that is absracted to the file buffer.\r

-  @param[out]      FileSize             The pointer to the size of the abstracted \r
+  @param[out]      FileSize             The pointer to the size of the abstracted\r

                                         file buffer.\r
   @param[out]      AuthenticationStatus Pointer to the authentication status.\r
 \r
                                         file buffer.\r
   @param[out]      AuthenticationStatus Pointer to the authentication status.\r
 \r


@@ -654,7 +654,7 @@ GetFileBufferByFilePath (
   ImageBuffer         = NULL;\r
   ImageBufferSize     = 0;\r
   *AuthenticationStatus = 0;\r
   ImageBuffer         = NULL;\r
   ImageBufferSize     = 0;\r
   *AuthenticationStatus = 0;\r

-  \r
+\r

   //\r
   // Copy File Device Path\r
   //\r
   //\r
   // Copy File Device Path\r
   //\r


@@ -758,10 +758,10 @@ GetFileBufferByFilePath (
             Status = EFI_UNSUPPORTED;\r
             break;\r
           }\r
             Status = EFI_UNSUPPORTED;\r
             break;\r
           }\r

-  \r
+\r

           LastHandle = FileHandle;\r
           FileHandle = NULL;\r
           LastHandle = FileHandle;\r
           FileHandle = NULL;\r

-  \r
+\r

           Status = LastHandle->Open (\r
                                 LastHandle,\r
                                 &FileHandle,\r
           Status = LastHandle->Open (\r
                                 LastHandle,\r
                                 &FileHandle,\r


@@ -769,15 +769,15 @@ GetFileBufferByFilePath (
                                 EFI_FILE_MODE_READ,\r
                                 0\r
                                 );\r
                                 EFI_FILE_MODE_READ,\r
                                 0\r
                                 );\r

-  \r
+\r

           //\r
           // Close the previous node\r
           //\r
           LastHandle->Close (LastHandle);\r
           //\r
           // Close the previous node\r
           //\r
           LastHandle->Close (LastHandle);\r

-  \r
+\r

           DevicePathNode = NextDevicePathNode (DevicePathNode);\r
         }\r
           DevicePathNode = NextDevicePathNode (DevicePathNode);\r
         }\r

-  \r
+\r

         if (!EFI_ERROR (Status)) {\r
           //\r
           // We have found the file. Now we need to read it. Before we can read the file we need to\r
         if (!EFI_ERROR (Status)) {\r
           //\r
           // We have found the file. Now we need to read it. Before we can read the file we need to\r


@@ -791,7 +791,7 @@ GetFileBufferByFilePath (
                                 &FileInfoSize,\r
                                 FileInfo\r
                                 );\r
                                 &FileInfoSize,\r
                                 FileInfo\r
                                 );\r

-  \r
+\r

           if (Status == EFI_BUFFER_TOO_SMALL) {\r
             FileInfo = AllocatePool (FileInfoSize);\r
             if (FileInfo == NULL) {\r
           if (Status == EFI_BUFFER_TOO_SMALL) {\r
             FileInfo = AllocatePool (FileInfoSize);\r
             if (FileInfo == NULL) {\r


@@ -805,7 +805,7 @@ GetFileBufferByFilePath (
                                     );\r
             }\r
           }\r
                                     );\r
             }\r
           }\r

-          \r
+\r

           if (!EFI_ERROR (Status) && (FileInfo != NULL)) {\r
             if ((FileInfo->Attribute & EFI_FILE_DIRECTORY) == 0) {\r
               //\r
           if (!EFI_ERROR (Status) && (FileInfo != NULL)) {\r
             if ((FileInfo->Attribute & EFI_FILE_DIRECTORY) == 0) {\r
               //\r


@@ -826,7 +826,7 @@ GetFileBufferByFilePath (
         }\r
         //\r
         // Close the file and Free FileInfo and TempDevicePathNode since we are done\r
         }\r
         //\r
         // Close the file and Free FileInfo and TempDevicePathNode since we are done\r

-        // \r
+        //\r

         if (FileInfo != NULL) {\r
           FreePool (FileInfo);\r
         }\r
         if (FileInfo != NULL) {\r
           FreePool (FileInfo);\r
         }\r

diff --git a/MdePkg/Library/DxeServicesLib/DxeServicesLib.inf b/MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
index 50ae24f8ee22341a653ba821e1ecb8ce86a255d4..4fed3437c43ba54b6544e7bd3745201a69960b76 100644 (file)
--- a/MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
+++ b/MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
@@ -2,10 +2,10 @@
 # DXE Services Library instance provides functions that simplify the development of DXE Drivers.\r
 #\r
 # DXE Services Library provides access data from sections of FFS files based on FV protocol.\r
 # DXE Services Library instance provides functions that simplify the development of DXE Drivers.\r
 #\r
 # DXE Services Library provides access data from sections of FFS files based on FV protocol.\r

-# It also provides access file based on file path from a firmware volume, \r
+# It also provides access file based on file path from a firmware volume,\r

 # from a file system interface, or from the load file interface.\r
 #\r
 # from a file system interface, or from the load file interface.\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


@@ -60,6 +60,6 @@
   gEfiFirmwareVolume2ProtocolGuid               ## SOMETIMES_CONSUMES\r
   gEfiLoadedImageProtocolGuid                   ## SOMETIMES_CONSUMES\r
   gEfiLoadFileProtocolGuid                      ## SOMETIMES_CONSUMES\r
   gEfiFirmwareVolume2ProtocolGuid               ## SOMETIMES_CONSUMES\r
   gEfiLoadedImageProtocolGuid                   ## SOMETIMES_CONSUMES\r
   gEfiLoadFileProtocolGuid                      ## SOMETIMES_CONSUMES\r

-  gEfiLoadFile2ProtocolGuid                     ## SOMETIMES_CONSUMES \r
-  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES \r
+  gEfiLoadFile2ProtocolGuid                     ## SOMETIMES_CONSUMES\r
+  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES\r

 \r
 \r

diff --git a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c b/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
index 7cb94cee70b05173ddc220ef330f1a78682939ce..69794234a9eea966e9a4a7b12dd15238dea3e3b9 100644 (file)
--- a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
+++ b/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
@@ -1,18 +1,18 @@
 /** @file\r
   This library implement library class DxeServiceTableLib.\r
   It produce EFI_DXE_SERVICE pointer in global variable gDS in library's constructure.\r
 /** @file\r
   This library implement library class DxeServiceTableLib.\r
   It produce EFI_DXE_SERVICE pointer in global variable gDS in library's constructure.\r

-  \r
+\r

   A DXE driver can use gDS pointer to access services in EFI_DXE_SERVICE, if this\r
   A DXE driver can use gDS pointer to access services in EFI_DXE_SERVICE, if this\r

-  DXE driver declare that use DxeServicesTableLib library class and link to this \r
+  DXE driver declare that use DxeServicesTableLib library class and link to this\r

   library instance.\r
 \r
   library instance.\r
 \r

-  Please attention this library instance can not be used util EFI_SYSTEM_TABLE was \r
+  Please attention this library instance can not be used util EFI_SYSTEM_TABLE was\r

   initialized.\r
   initialized.\r

-  \r
+\r

   This library contains contruct function to retrieve EFI_DXE_SERIVCE, this construct\r
   function will be invoked in DXE driver's autogen file.\r
 \r
   This library contains contruct function to retrieve EFI_DXE_SERIVCE, this construct\r
   function will be invoked in DXE driver's autogen file.\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

diff --git a/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.c b/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.c
index 985085c136de3f9e5622e2a135a5d402858328bd..1c35b35bdddf7cc94bd070a5f3db4ef1ba0fcfd9 100644 (file)
--- a/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.c
+++ b/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.c
@@ -1,7 +1,7 @@
 /** @file\r
 Implementation of SmBusLib class library for DXE phase.\r
 \r
 /** @file\r
 Implementation of SmBusLib class 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


@@ -57,15 +57,15 @@ SmbusLibConstructor (
   as defined in the SmBus Specification. The data can either be of\r
   the Length byte, word, or a block of data.\r
 \r
   as defined in the SmBus Specification. The data can either be of\r
   the Length byte, word, or a block of data.\r
 \r

-  @param  SmbusOperation  Signifies which particular SMBus hardware protocol instance \r
+  @param  SmbusOperation  Signifies which particular SMBus hardware protocol instance\r

                           that it will use to execute the SMBus transactions.\r
   @param  SmBusAddress    The address that encodes the SMBUS Slave Address,\r
                           SMBUS Command, SMBUS Data Length, and PEC.\r
                           that it will use to execute the SMBus transactions.\r
   @param  SmBusAddress    The address that encodes the SMBUS Slave Address,\r
                           SMBUS Command, SMBUS Data Length, and PEC.\r

-  @param  Length          Signifies the number of bytes that this operation will do. \r
-                          The maximum number of bytes can be revision specific \r
+  @param  Length          Signifies the number of bytes that this operation will do.\r
+                          The maximum number of bytes can be revision specific\r

                           and operation specific.\r
                           and operation specific.\r

-  @param  Buffer          Contains the value of data to execute to the SMBus slave \r
-                          device. Not all operations require this argument. The \r
+  @param  Buffer          Contains the value of data to execute to the SMBus slave\r
+                          device. Not all operations require this argument. The\r

                           length of this buffer is identified by Length.\r
   @param  Status          Return status for the executed command.\r
                           This is an optional parameter and may be NULL.\r
                           length of this buffer is identified by Length.\r
   @param  Status          Return status for the executed command.\r
                           This is an optional parameter and may be NULL.\r

diff --git a/MdePkg/Library/DxeSmbusLib/InternalSmbusLib.h b/MdePkg/Library/DxeSmbusLib/InternalSmbusLib.h
index da7e58fc78a749528f2dab4139e6efef0ffc9b9f..b2b9455cbd4eb345c667adb6730e7dbff937f5d9 100644 (file)
--- a/MdePkg/Library/DxeSmbusLib/InternalSmbusLib.h
+++ b/MdePkg/Library/DxeSmbusLib/InternalSmbusLib.h
@@ -1,7 +1,7 @@
 /** @file\r
 Internal header file for Smbus library.\r
 \r
 /** @file\r
 Internal header file for Smbus library.\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


@@ -38,15 +38,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   as defined in the SmBus Specification. The data can either be of\r
   the Length byte, word, or a block of data.\r
 \r
   as defined in the SmBus Specification. The data can either be of\r
   the Length byte, word, or a block of data.\r
 \r

-  @param  SmbusOperation  Signifies which particular SMBus hardware protocol instance \r
+  @param  SmbusOperation  Signifies which particular SMBus hardware protocol instance\r

                           that it will use toexecute the SMBus transactions.\r
   @param  SmBusAddress    The address that encodes the SMBUS Slave Address,\r
                           SMBUS Command, SMBUS Data Length, and PEC.\r
                           that it will use toexecute the SMBus transactions.\r
   @param  SmBusAddress    The address that encodes the SMBUS Slave Address,\r
                           SMBUS Command, SMBUS Data Length, and PEC.\r

-  @param  Length          Signifies the number of bytes that this operation will \r
-                          do. The maximum number of bytes can be revision specific \r
+  @param  Length          Signifies the number of bytes that this operation will\r
+                          do. The maximum number of bytes can be revision specific\r

                           and operation specific.\r
   @param  Buffer          Contains the value of data to execute to the SMBus slave\r
                           and operation specific.\r
   @param  Buffer          Contains the value of data to execute to the SMBus slave\r

-                          device. Not all operations require this argument. The \r
+                          device. Not all operations require this argument. The\r

                           length of this buffer is identified by Length.\r
   @param  Status          Return status for the executed command.\r
                           This is an optional parameter and may be NULL.\r
                           length of this buffer is identified by Length.\r
   @param  Status          Return status for the executed command.\r
                           This is an optional parameter and may be NULL.\r

diff --git a/MdePkg/Library/DxeSmbusLib/SmbusLib.c b/MdePkg/Library/DxeSmbusLib/SmbusLib.c
index fe1a0944dc0ebab67f76ca484eaad6015460515f..5550d2a4be3e126a022b73ee0ddcd6ce3400dcd0 100644 (file)
--- a/MdePkg/Library/DxeSmbusLib/SmbusLib.c
+++ b/MdePkg/Library/DxeSmbusLib/SmbusLib.c
@@ -1,7 +1,7 @@
 /** @file\r
 Implementation of SmBusLib class library for DXE phase.\r
 \r
 /** @file\r
 Implementation of SmBusLib class 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


@@ -31,13 +31,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS:  The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS:  The SMBUS command was executed.\r

-                        RETURN_TIMEOUT:  A timeout occurred while executing the \r
-                        SMBUS command. \r
-                        RETURN_DEVICE_ERROR: The request was not \r
-                        completed because a failure reflected in the Host Status \r
-                        Register bit.  Device errors are a result of a transaction \r
-                        collision, illegal command field, unclaimed cycle (host \r
-                        initiated), or bus errors (collisions). \r
+                        RETURN_TIMEOUT:  A timeout occurred while executing the\r
+                        SMBUS command.\r
+                        RETURN_DEVICE_ERROR: The request was not\r
+                        completed because a failure reflected in the Host Status\r
+                        Register bit.  Device errors are a result of a transaction\r
+                        collision, illegal command field, unclaimed cycle (host\r
+                        initiated), or bus errors (collisions).\r

                         RETURN_UNSUPPORTED: The SMBus operation is not supported.\r
 \r
 **/\r
                         RETURN_UNSUPPORTED: The SMBus operation is not supported.\r
 \r
 **/\r


@@ -72,12 +72,12 @@ SmBusQuickRead (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
-                        illegal command field, unclaimed cycle (host initiated), \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r
+                        illegal command field, unclaimed cycle (host initiated),\r

                         or bus errors (collisions).\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r
                         or bus errors (collisions).\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r


@@ -113,12 +113,12 @@ SmBusQuickWrite (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r

                         a failure reflected in the Host Status Register bit.  Device\r
                         a failure reflected in the Host Status Register bit.  Device\r

-                        errors are a result of a transaction collision, illegal \r
-                        command field, unclaimed cycle(host initiated), or bus \r
+                        errors are a result of a transaction collision, illegal\r
+                        command field, unclaimed cycle(host initiated), or bus\r

                         errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
                         errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r


@@ -161,12 +161,12 @@ SmBusReceiveByte (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         RETURN_DEVICE_ERROR:  The request was not completed because\r
                         SMBUS command.\r
                         RETURN_DEVICE_ERROR:  The request was not completed because\r

-                        a failure reflected in the Host Status Register bit.  Device \r
-                        errors are a result of a transaction collision, illegal \r
-                        command field, unclaimed cycle(host initiated), or bus \r
+                        a failure reflected in the Host Status Register bit.  Device\r
+                        errors are a result of a transaction collision, illegal\r
+                        command field, unclaimed cycle(host initiated), or bus\r

                         errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct (PEC is incorrect)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
                         errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct (PEC is incorrect)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r


@@ -209,12 +209,12 @@ SmBusSendByte (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failurereflected in the Host Status Register bit.  Device \r
-                        errors are a result of a transaction collision, illegal \r
-                        command field, unclaimed cycle (host initiated), or bus \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failurereflected in the Host Status Register bit.  Device\r
+                        errors are a result of a transaction collision, illegal\r
+                        command field, unclaimed cycle (host initiated), or bus\r

                         errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct (PEC is incorrect)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
                         errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct (PEC is incorrect)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r


@@ -256,12 +256,12 @@ SmBusReadDataByte (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  Device \r
-                        errors are a result of a transaction collision, illegal \r
-                        command field, unclaimed cycle host initiated), or bus \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.  Device\r
+                        errors are a result of a transaction collision, illegal\r
+                        command field, unclaimed cycle host initiated), or bus\r

                         errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
                         errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r


@@ -297,20 +297,20 @@ SmBusWriteDataByte (
   If Status is not NULL, then the status of the executed command is returned in Status.\r
   If Length in SmBusAddress is not zero, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r
   If Status is not NULL, then the status of the executed command is returned in Status.\r
   If Length in SmBusAddress is not zero, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r

-  \r
+\r

   @param  SmBusAddress  The address that encodes the SMBUS Slave Address,\r
                         SMBUS Command, SMBUS Data Length, and PEC.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  SmBusAddress  The address that encodes the SMBUS Slave Address,\r
                         SMBUS Command, SMBUS Data Length, and PEC.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
-                        illegal command field, unclaimed cycle (host initiated), \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r
+                        illegal command field, unclaimed cycle (host initiated),\r

                         or bus errors (collisions).\r
                         or bus errors (collisions).\r

-                        RETURN_CRC_ERROR:  The checksum is not correct. (PEC is \r
+                        RETURN_CRC_ERROR:  The checksum is not correct. (PEC is\r

                         incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r
                         incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r


@@ -351,14 +351,14 @@ SmBusReadDataWord (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the SMBUS \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the SMBUS\r

                         command.\r
                         command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
-                        illegal command field, unclaimed cycle (host initiated), \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r
+                        illegal command field, unclaimed cycle (host initiated),\r

                         or bus errors (collisions).\r
                         or bus errors (collisions).\r

-                        RETURN_CRC_ERROR:  The checksum is not correct. \r
+                        RETURN_CRC_ERROR:  The checksum is not correct.\r

                         (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r
                         (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r


@@ -401,14 +401,14 @@ SmBusWriteDataWord (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
-                        illegal command field, unclaimed cycle (host initiated), \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r
+                        illegal command field, unclaimed cycle (host initiated),\r

                         or bus errors (collisions).\r
                         or bus errors (collisions).\r

-                        RETURN_CRC_ERROR:  The checksum is not correct. (PEC is \r
+                        RETURN_CRC_ERROR:  The checksum is not correct. (PEC is\r

                         incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r
                         incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r


@@ -447,19 +447,19 @@ SmBusProcessCall (
 \r
   @param  SmBusAddress  The address that encodes the SMBUS Slave Address,\r
                         SMBUS Command, SMBUS Data Length, and PEC.\r
 \r
   @param  SmBusAddress  The address that encodes the SMBUS Slave Address,\r
                         SMBUS Command, SMBUS Data Length, and PEC.\r

-  @param  Buffer        The pointer to the buffer to store the bytes read from \r
+  @param  Buffer        The pointer to the buffer to store the bytes read from\r

                         the SMBUS.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
                         the SMBUS.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the SMBUS \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the SMBUS\r

                         command.\r
                         command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  Device \r
-                        errors are a result of a transaction collision, illegal \r
-                        command field, unclaimed cycle (host initiated), or bus \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.  Device\r
+                        errors are a result of a transaction collision, illegal\r
+                        command field, unclaimed cycle (host initiated), or bus\r

                         errors (collisions).\r
                         errors (collisions).\r

-                        RETURN_CRC_ERROR:  The checksum is not correct. (PEC is \r
+                        RETURN_CRC_ERROR:  The checksum is not correct. (PEC is\r

                         incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r
                         incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r


@@ -488,25 +488,25 @@ SmBusReadBlock (
   The SMBUS slave address, SMBUS command, and SMBUS length fields of SmBusAddress are required.\r
   Bytes are written to the SMBUS from Buffer.\r
   The number of bytes written is returned, and will never return a value larger than 32-bytes.\r
   The SMBUS slave address, SMBUS command, and SMBUS length fields of SmBusAddress are required.\r
   Bytes are written to the SMBUS from Buffer.\r
   The number of bytes written is returned, and will never return a value larger than 32-bytes.\r

-  If Status is not NULL, then the status of the executed command is returned in Status.  \r
+  If Status is not NULL, then the status of the executed command is returned in Status.\r

   If Length in SmBusAddress is zero or greater than 32, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r
 \r
   @param  SmBusAddress  The address that encodes the SMBUS Slave Address,\r
                         MBUS Command, SMBUS Data Length, and PEC.\r
   If Length in SmBusAddress is zero or greater than 32, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r
 \r
   @param  SmBusAddress  The address that encodes the SMBUS Slave Address,\r
                         MBUS Command, SMBUS Data Length, and PEC.\r

-  @param  Buffer        The pointer to the buffer to store the bytes read from \r
+  @param  Buffer        The pointer to the buffer to store the bytes read from\r

                         the SMBUS.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         the SMBUS.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  Device \r
-                        errors are a result of a transaction collision, illegal \r
-                        command field, unclaimed cycle (host initiated), or bus \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.  Device\r
+                        errors are a result of a transaction collision, illegal\r
+                        command field, unclaimed cycle (host initiated), or bus\r

                         errors (collisions).\r
                         errors (collisions).\r

-                        RETURN_CRC_ERROR:  The checksum is not correct. (PEC is \r
+                        RETURN_CRC_ERROR:  The checksum is not correct. (PEC is\r

                         incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r
                         incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r


@@ -552,14 +552,14 @@ SmBusWriteBlock (
   @param  ReadBuffer    The pointer to the buffer of bytes to read from the SMBUS.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
   @param  ReadBuffer    The pointer to the buffer of bytes to read from the SMBUS.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR: The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  Device \r
-                        errors are a result of a transaction collision, illegal \r
-                        command field, unclaimed cycle (host initiated), or bus \r
+                        RETURN_DEVICE_ERROR: The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.  Device\r
+                        errors are a result of a transaction collision, illegal\r
+                        command field, unclaimed cycle (host initiated), or bus\r

                         errors (collisions).\r
                         errors (collisions).\r

-                        RETURN_CRC_ERROR:  The checksum is not correct. (PEC is \r
+                        RETURN_CRC_ERROR:  The checksum is not correct. (PEC is\r

                         incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r
                         incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
 \r

diff --git a/MdePkg/Library/DxeTimerLibEsal/DxeTimerLibEsal.c b/MdePkg/Library/DxeTimerLibEsal/DxeTimerLibEsal.c
index 8ca3ec6f8b360c1d3671bee6f23aff877bd741c0..460ff42679dcac303e75eac34a1ce093b054437d 100644 (file)
--- a/MdePkg/Library/DxeTimerLibEsal/DxeTimerLibEsal.c
+++ b/MdePkg/Library/DxeTimerLibEsal/DxeTimerLibEsal.c
@@ -1,7 +1,7 @@
 /** @file\r
   This library implements the Timer Library using the Extended SAL Stall Services Class.\r
 \r
 /** @file\r
   This library implements the Timer Library using the Extended SAL Stall Services Class.\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


@@ -42,13 +42,13 @@ MicroSecondDelay (
   EsalCall (\r
     EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_LO,\r
     EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_HI,\r
   EsalCall (\r
     EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_LO,\r
     EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_HI,\r

-    StallFunctionId, \r
-    MicroSeconds, \r
-    0, \r
-    0, \r
-    0, \r
-    0, \r
-    0, \r
+    StallFunctionId,\r
+    MicroSeconds,\r
+    0,\r
+    0,\r
+    0,\r
+    0,\r
+    0,\r

     0\r
     );\r
   return MicroSeconds;\r
     0\r
     );\r
   return MicroSeconds;\r


@@ -82,13 +82,13 @@ NanoSecondDelay (
   EsalCall (\r
     EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_LO,\r
     EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_HI,\r
   EsalCall (\r
     EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_LO,\r
     EFI_EXTENDED_SAL_STALL_SERVICES_PROTOCOL_GUID_HI,\r

-    StallFunctionId, \r
-    MicroSeconds, \r
-    0, \r
-    0, \r
-    0, \r
-    0, \r
-    0, \r
+    StallFunctionId,\r
+    MicroSeconds,\r
+    0,\r
+    0,\r
+    0,\r
+    0,\r
+    0,\r

     0\r
     );\r
   return NanoSeconds;\r
     0\r
     );\r
   return NanoSeconds;\r

diff --git a/MdePkg/Library/DxeTimerLibEsal/DxeTimerLibEsal.inf b/MdePkg/Library/DxeTimerLibEsal/DxeTimerLibEsal.inf
index 0f24989ab9fe45747cfda08f5916f978d3d6c91c..27f99ea8816384eebbd848e76c7fe597740e4c9b 100644 (file)
--- a/MdePkg/Library/DxeTimerLibEsal/DxeTimerLibEsal.inf
+++ b/MdePkg/Library/DxeTimerLibEsal/DxeTimerLibEsal.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This library implements the Timer Library using the Extended SAL Stall Services Class.\r
 #\r
 ## @file\r
 #  This library implements the Timer Library using the Extended SAL Stall Services Class.\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


@@ -19,7 +19,7 @@
   FILE_GUID                      = F672AE85-3769-4fb8-A5A0-70B38FB0A7C4\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = F672AE85-3769-4fb8-A5A0-70B38FB0A7C4\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = TimerLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION \r
+  LIBRARY_CLASS                  = TimerLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION\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/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c
index 5662ccff15f0db3a874a98397a921760019b46a2..8fc4f129c6e393309c13304f5a102bda1d4d1d92 100644 (file)
--- a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c
+++ b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c
@@ -1,7 +1,7 @@
 /** @file\r
   Entry point to a the PEI Core.\r
 \r
 /** @file\r
   Entry point to a the PEI Core.\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


@@ -39,35 +39,35 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   the PEI Services Table and the file handle for the PEI Core itself have been established.\r
   If ProcessModuleEntryPointList() returns, then ASSERT() and halt the system.\r
 \r
   the PEI Services Table and the file handle for the PEI Core itself have been established.\r
   If ProcessModuleEntryPointList() returns, then ASSERT() and halt the system.\r
 \r

-  @param SecCoreData  Points to a data structure containing information about the \r
-                      PEI core's operating environment, such as the size and \r
-                      location of temporary RAM, the stack location and the BFV \r
+  @param SecCoreData  Points to a data structure containing information about the\r
+                      PEI core's operating environment, such as the size and\r
+                      location of temporary RAM, the stack location and the BFV\r

                       location.\r
                       location.\r

-                      \r
-  @param PpiList      Points to a list of one or more PPI descriptors to be \r
-                      installed initially by the PEI core. An empty PPI list \r
-                      consists of a single descriptor with the end-tag \r
+\r
+  @param PpiList      Points to a list of one or more PPI descriptors to be\r
+                      installed initially by the PEI core. An empty PPI list\r
+                      consists of a single descriptor with the end-tag\r

                       EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST.\r
                       As part of its initialization phase, the PEI Foundation will\r
                       EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST.\r
                       As part of its initialization phase, the PEI Foundation will\r

-                      add these SEC-hosted PPIs to its PPI database, such that both \r
-                      the PEI Foundation and any modules can leverage the associated \r
+                      add these SEC-hosted PPIs to its PPI database, such that both\r
+                      the PEI Foundation and any modules can leverage the associated\r

                       service calls and/or code in these early PPIs.\r
 \r
 **/\r
 VOID\r
                       service calls and/or code in these early PPIs.\r
 \r
 **/\r
 VOID\r

-EFIAPI \r
+EFIAPI\r

 _ModuleEntryPoint(\r
   IN CONST  EFI_SEC_PEI_HAND_OFF    *SecCoreData,\r
   IN CONST  EFI_PEI_PPI_DESCRIPTOR  *PpiList\r
 )\r
 {\r
   ProcessModuleEntryPointList (SecCoreData, PpiList, NULL);\r
 _ModuleEntryPoint(\r
   IN CONST  EFI_SEC_PEI_HAND_OFF    *SecCoreData,\r
   IN CONST  EFI_PEI_PPI_DESCRIPTOR  *PpiList\r
 )\r
 {\r
   ProcessModuleEntryPointList (SecCoreData, PpiList, NULL);\r

-  \r
+\r

   //\r
   // Should never return\r
   //\r
   ASSERT(FALSE);\r
   //\r
   // Should never return\r
   //\r
   ASSERT(FALSE);\r

-  CpuDeadLoop ();  \r
+  CpuDeadLoop ();\r

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


@@ -78,15 +78,15 @@ _ModuleEntryPoint(
 \r
   @param SecCoreData  Points to a data structure containing information about the PEI core's\r
                       operating environment, such as the size and location of temporary RAM,\r
 \r
   @param SecCoreData  Points to a data structure containing information about the PEI core's\r
                       operating environment, such as the size and location of temporary RAM,\r

-                      the stack location and the BFV location. \r
+                      the stack location and the BFV location.\r

 \r
   @param PpiList      Points to a list of one or more PPI descriptors to be installed\r
 \r
   @param PpiList      Points to a list of one or more PPI descriptors to be installed\r

-                      initially by the PEI core.  An empty PPI list consists of \r
-                      a single descriptor with the end-tag \r
+                      initially by the PEI core.  An empty PPI list consists of\r
+                      a single descriptor with the end-tag\r

                       EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST.\r
                       EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST.\r

-                      As part of its initialization phase, the PEI Foundation will \r
-                      add these SEC-hosted PPIs to its PPI database, such that both \r
-                      the PEI Foundationand any modules can leverage the associated \r
+                      As part of its initialization phase, the PEI Foundation will\r
+                      add these SEC-hosted PPIs to its PPI database, such that both\r
+                      the PEI Foundationand any modules can leverage the associated\r

                       service calls and/or code in these early PPIs.\r
 \r
 **/\r
                       service calls and/or code in these early PPIs.\r
 \r
 **/\r

diff --git a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PostCode.c b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PostCode.c
index e4a05d091b29eeb03e891953df38bab3c345664b..2df13b54ad80b098c15991b28c568661ea61385a 100644 (file)
--- a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PostCode.c
+++ b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PostCode.c
@@ -2,7 +2,7 @@
   Post code library instace bases on report status code library\r
   PostCode Library for PEIMs and DXE drivers that send PostCode to ReportStatusCode\r
 \r
   Post code library instace bases on report status code library\r
   PostCode Library for PEIMs and DXE drivers that send PostCode to ReportStatusCode\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


@@ -39,14 +39,14 @@
 /**\r
   Sends an 32-bit value to a POST card.\r
 \r
 /**\r
   Sends an 32-bit value to a POST card.\r
 \r

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.  \r
-  Some implementations of this library function may perform I/O operations \r
-  directly to a POST card device.  Other implementations may send Value to \r
-  ReportStatusCode(), and the status code reporting mechanism will eventually \r
+  Sends the 32-bit value specified by Value to a POST card, and returns Value.\r
+  Some implementations of this library function may perform I/O operations\r
+  directly to a POST card device.  Other implementations may send Value to\r
+  ReportStatusCode(), and the status code reporting mechanism will eventually\r

   display the 32-bit value on the status reporting device.\r
   display the 32-bit value on the status reporting device.\r

-  \r
-  PostCode() must actively prevent recursion.  If PostCode() is called while \r
-  processing another any other Post Code Library function, then \r
+\r
+  PostCode() must actively prevent recursion.  If PostCode() is called while\r
+  processing another any other Post Code Library function, then\r

   PostCode() must return Value immediately.\r
 \r
   @param  Value  The 32-bit value to write to the POST card.\r
   PostCode() must return Value immediately.\r
 \r
   @param  Value  The 32-bit value to write to the POST card.\r


@@ -69,21 +69,21 @@ PostCode (
   Sends an 32-bit value to a POST and associated ASCII string.\r
 \r
   Sends the 32-bit value specified by Value to a POST card, and returns Value.\r
   Sends an 32-bit value to a POST and associated ASCII string.\r
 \r
   Sends the 32-bit value specified by Value to a POST card, and returns Value.\r

-  If Description is not NULL, then the ASCII string specified by Description is \r
-  also passed to the handler that displays the POST card value.  Some \r
-  implementations of this library function may perform I/O operations directly \r
-  to a POST card device.  Other implementations may send Value to ReportStatusCode(), \r
-  and the status code reporting mechanism will eventually display the 32-bit \r
-  value on the status reporting device.  \r
-\r
-  PostCodeWithDescription()must actively prevent recursion.  If \r
-  PostCodeWithDescription() is called while processing another any other Post \r
-  Code Library function, then PostCodeWithDescription() must return Value \r
+  If Description is not NULL, then the ASCII string specified by Description is\r
+  also passed to the handler that displays the POST card value.  Some\r
+  implementations of this library function may perform I/O operations directly\r
+  to a POST card device.  Other implementations may send Value to ReportStatusCode(),\r
+  and the status code reporting mechanism will eventually display the 32-bit\r
+  value on the status reporting device.\r
+\r
+  PostCodeWithDescription()must actively prevent recursion.  If\r
+  PostCodeWithDescription() is called while processing another any other Post\r
+  Code Library function, then PostCodeWithDescription() must return Value\r

   immediately.\r
 \r
   @param  Value        The 32-bit value to write to the POST card.\r
   immediately.\r
 \r
   @param  Value        The 32-bit value to write to the POST card.\r

-  @param  Description  The pointer to an ASCII string that is a description of the \r
-                       POST code value.  This is an optional parameter that may \r
+  @param  Description  The pointer to an ASCII string that is a description of the\r
+                       POST code value.  This is an optional parameter that may\r

                        be NULL.\r
 \r
   @return The 32-bit value to write to the POST card.\r
                        be NULL.\r
 \r
   @return The 32-bit value to write to the POST card.\r


@@ -117,12 +117,12 @@ PostCodeWithDescription (
 /**\r
   Returns TRUE if POST Codes are enabled.\r
 \r
 /**\r
   Returns TRUE if POST Codes are enabled.\r
 \r

-  This function returns TRUE if the POST_CODE_PROPERTY_POST_CODE_ENABLED \r
+  This function returns TRUE if the POST_CODE_PROPERTY_POST_CODE_ENABLED\r

   bit of PcdPostCodePropertyMask is set.  Otherwise FALSE is returned.\r
 \r
   bit of PcdPostCodePropertyMask is set.  Otherwise FALSE is returned.\r
 \r

-  @retval  TRUE   The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of \r
+  @retval  TRUE   The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of\r

                   PcdPostCodeProperyMask is set.\r
                   PcdPostCodeProperyMask is set.\r

-  @retval  FALSE  The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of \r
+  @retval  FALSE  The POST_CODE_PROPERTY_POST_CODE_ENABLED bit of\r

                   PcdPostCodeProperyMask is clear.\r
 \r
 **/\r
                   PcdPostCodeProperyMask is clear.\r
 \r
 **/\r

diff --git a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.c b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.c
index d7bc98b180229c6314910b71243c3a7a2c6f44f4..793c6220e2b00c00cc91e07e6ed2c90e70996828 100644 (file)
--- a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.c
+++ b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Provide generic extract guided section functions for PEI phase.\r
 \r
 /** @file\r
   Provide generic extract guided section functions for PEI phase.\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


@@ -46,7 +46,7 @@ PeiGetExtractGuidedSectionHandlerInfo (
 {\r
   PEI_EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r
   EFI_PEI_HOB_POINTERS                    Hob;\r
 {\r
   PEI_EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r
   EFI_PEI_HOB_POINTERS                    Hob;\r

-  \r
+\r

   //\r
   // First try to get handler information from guid hob specified by CallerId.\r
   //\r
   //\r
   // First try to get handler information from guid hob specified by CallerId.\r
   //\r


@@ -61,12 +61,12 @@ PeiGetExtractGuidedSectionHandlerInfo (
         if (HandlerInfo->ExtractHandlerGuidTable != (GUID *) (HandlerInfo + 1)) {\r
           HandlerInfo->ExtractHandlerGuidTable    = (GUID *) (HandlerInfo + 1);\r
           HandlerInfo->ExtractDecodeHandlerTable  = (EXTRACT_GUIDED_SECTION_DECODE_HANDLER *) (\r
         if (HandlerInfo->ExtractHandlerGuidTable != (GUID *) (HandlerInfo + 1)) {\r
           HandlerInfo->ExtractHandlerGuidTable    = (GUID *) (HandlerInfo + 1);\r
           HandlerInfo->ExtractDecodeHandlerTable  = (EXTRACT_GUIDED_SECTION_DECODE_HANDLER *) (\r

-                                                      (UINT8 *)HandlerInfo->ExtractHandlerGuidTable + \r
+                                                      (UINT8 *)HandlerInfo->ExtractHandlerGuidTable +\r

                                                       PcdGet32 (PcdMaximumGuidedExtractHandler) * sizeof (GUID)\r
                                                      );\r
           HandlerInfo->ExtractGetInfoHandlerTable = (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER *) (\r
                                                       PcdGet32 (PcdMaximumGuidedExtractHandler) * sizeof (GUID)\r
                                                      );\r
           HandlerInfo->ExtractGetInfoHandlerTable = (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER *) (\r

-                                                      (UINT8 *)HandlerInfo->ExtractDecodeHandlerTable + \r
-                                                      PcdGet32 (PcdMaximumGuidedExtractHandler) * \r
+                                                      (UINT8 *)HandlerInfo->ExtractDecodeHandlerTable +\r
+                                                      PcdGet32 (PcdMaximumGuidedExtractHandler) *\r

                                                       sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER)\r
                                                      );\r
         }\r
                                                       sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER)\r
                                                      );\r
         }\r


@@ -80,14 +80,14 @@ PeiGetExtractGuidedSectionHandlerInfo (
     Hob.Raw = GET_NEXT_HOB (Hob);\r
     Hob.Raw = GetNextHob (EFI_HOB_TYPE_GUID_EXTENSION, Hob.Raw);\r
   }\r
     Hob.Raw = GET_NEXT_HOB (Hob);\r
     Hob.Raw = GetNextHob (EFI_HOB_TYPE_GUID_EXTENSION, Hob.Raw);\r
   }\r

-  \r
+\r

   //\r
   // If Guid Hob is not found, Build CallerId Guid hob to store Handler Info\r
   //\r
   HandlerInfo = BuildGuidHob (\r
   //\r
   // If Guid Hob is not found, Build CallerId Guid hob to store Handler Info\r
   //\r
   HandlerInfo = BuildGuidHob (\r

-                 &gEfiCallerIdGuid, \r
+                 &gEfiCallerIdGuid,\r

                  sizeof (PEI_EXTRACT_GUIDED_SECTION_HANDLER_INFO) +\r
                  sizeof (PEI_EXTRACT_GUIDED_SECTION_HANDLER_INFO) +\r

-                 PcdGet32 (PcdMaximumGuidedExtractHandler) * \r
+                 PcdGet32 (PcdMaximumGuidedExtractHandler) *\r

                  (sizeof (GUID) + sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER) + sizeof (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER))\r
                 );\r
   if (HandlerInfo == NULL) {\r
                  (sizeof (GUID) + sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER) + sizeof (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER))\r
                 );\r
   if (HandlerInfo == NULL) {\r


@@ -104,12 +104,12 @@ PeiGetExtractGuidedSectionHandlerInfo (
   HandlerInfo->NumberOfExtractHandler     = 0;\r
   HandlerInfo->ExtractHandlerGuidTable    = (GUID *) (HandlerInfo + 1);\r
   HandlerInfo->ExtractDecodeHandlerTable  = (EXTRACT_GUIDED_SECTION_DECODE_HANDLER *) (\r
   HandlerInfo->NumberOfExtractHandler     = 0;\r
   HandlerInfo->ExtractHandlerGuidTable    = (GUID *) (HandlerInfo + 1);\r
   HandlerInfo->ExtractDecodeHandlerTable  = (EXTRACT_GUIDED_SECTION_DECODE_HANDLER *) (\r

-                                              (UINT8 *)HandlerInfo->ExtractHandlerGuidTable + \r
+                                              (UINT8 *)HandlerInfo->ExtractHandlerGuidTable +\r

                                               PcdGet32 (PcdMaximumGuidedExtractHandler) * sizeof (GUID)\r
                                              );\r
   HandlerInfo->ExtractGetInfoHandlerTable = (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER *) (\r
                                               PcdGet32 (PcdMaximumGuidedExtractHandler) * sizeof (GUID)\r
                                              );\r
   HandlerInfo->ExtractGetInfoHandlerTable = (EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER *) (\r

-                                              (UINT8 *)HandlerInfo->ExtractDecodeHandlerTable + \r
-                                              PcdGet32 (PcdMaximumGuidedExtractHandler) * \r
+                                              (UINT8 *)HandlerInfo->ExtractDecodeHandlerTable +\r
+                                              PcdGet32 (PcdMaximumGuidedExtractHandler) *\r

                                               sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER)\r
                                              );\r
   //\r
                                               sizeof (EXTRACT_GUIDED_SECTION_DECODE_HANDLER)\r
                                              );\r
   //\r


@@ -124,7 +124,7 @@ PeiGetExtractGuidedSectionHandlerInfo (
 \r
   Sets ExtractHandlerGuidTable so it points at a callee allocated array of registered GUIDs.\r
   The total number of GUIDs in the array are returned. Since the array of GUIDs is callee allocated\r
 \r
   Sets ExtractHandlerGuidTable so it points at a callee allocated array of registered GUIDs.\r
   The total number of GUIDs in the array are returned. Since the array of GUIDs is callee allocated\r

-  and caller must treat this array of GUIDs as read-only data. \r
+  and caller must treat this array of GUIDs as read-only data.\r

   If ExtractHandlerGuidTable is NULL, then ASSERT().\r
 \r
   @param[out]  ExtractHandlerGuidTable  A pointer to the array of GUIDs that have been registered through\r
   If ExtractHandlerGuidTable is NULL, then ASSERT().\r
 \r
   @param[out]  ExtractHandlerGuidTable  A pointer to the array of GUIDs that have been registered through\r


@@ -168,7 +168,7 @@ ExtractGuidedSectionGetGuidList (
   Registers the handlers specified by GetInfoHandler and DecodeHandler with the GUID specified by SectionGuid.\r
   If the GUID value specified by SectionGuid has already been registered, then return RETURN_ALREADY_STARTED.\r
   If there are not enough resources available to register the handlers  then RETURN_OUT_OF_RESOURCES is returned.\r
   Registers the handlers specified by GetInfoHandler and DecodeHandler with the GUID specified by SectionGuid.\r
   If the GUID value specified by SectionGuid has already been registered, then return RETURN_ALREADY_STARTED.\r
   If there are not enough resources available to register the handlers  then RETURN_OUT_OF_RESOURCES is returned.\r

-  \r
+\r

   If SectionGuid is NULL, then ASSERT().\r
   If GetInfoHandler is NULL, then ASSERT().\r
   If DecodeHandler is NULL, then ASSERT().\r
   If SectionGuid is NULL, then ASSERT().\r
   If GetInfoHandler is NULL, then ASSERT().\r
   If DecodeHandler is NULL, then ASSERT().\r


@@ -179,7 +179,7 @@ ExtractGuidedSectionGetGuidList (
                              size of the decoded buffer and the size of an optional scratch buffer\r
                              required to actually decode the data in a GUIDed section.\r
   @param[in]  DecodeHandler  The pointer to a function that decodes a GUIDed section into a caller\r
                              size of the decoded buffer and the size of an optional scratch buffer\r
                              required to actually decode the data in a GUIDed section.\r
   @param[in]  DecodeHandler  The pointer to a function that decodes a GUIDed section into a caller\r

-                             allocated output buffer. \r
+                             allocated output buffer.\r

 \r
   @retval  RETURN_SUCCESS           The handlers were registered.\r
   @retval  RETURN_OUT_OF_RESOURCES  There are not enough resources available to register the handlers.\r
 \r
   @retval  RETURN_SUCCESS           The handlers were registered.\r
   @retval  RETURN_OUT_OF_RESOURCES  There are not enough resources available to register the handlers.\r


@@ -235,7 +235,7 @@ ExtractGuidedSectionRegisterHandlers (
   if (HandlerInfo->NumberOfExtractHandler >= PcdGet32 (PcdMaximumGuidedExtractHandler)) {\r
     return RETURN_OUT_OF_RESOURCES;\r
   }\r
   if (HandlerInfo->NumberOfExtractHandler >= PcdGet32 (PcdMaximumGuidedExtractHandler)) {\r
     return RETURN_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   //\r
   // Register new Handler and guid value.\r
   //\r
   //\r
   // Register new Handler and guid value.\r
   //\r


@@ -262,14 +262,14 @@ ExtractGuidedSectionRegisterHandlers (
   The selected handler is used to retrieve and return the size of the decoded buffer and the size of an\r
   optional scratch buffer required to actually decode the data in a GUIDed section.\r
 \r
   The selected handler is used to retrieve and return the size of the decoded buffer and the size of an\r
   optional 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 any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r
   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r

-  then RETURN_UNSUPPORTED is returned.  \r
-  If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler \r
+  then RETURN_UNSUPPORTED is returned.\r
+  If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r

   of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to retrieve the OututBufferSize, ScratchSize, and Attributes values. The return status from the handler of\r
   type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER is returned.\r
   of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to retrieve the OututBufferSize, ScratchSize, and Attributes values. The return status from the handler of\r
   type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER is returned.\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


@@ -296,14 +296,14 @@ ExtractGuidedSectionGetInfo (
   IN  CONST VOID    *InputSection,\r
   OUT       UINT32  *OutputBufferSize,\r
   OUT       UINT32  *ScratchBufferSize,\r
   IN  CONST VOID    *InputSection,\r
   OUT       UINT32  *OutputBufferSize,\r
   OUT       UINT32  *ScratchBufferSize,\r

-  OUT       UINT16  *SectionAttribute   \r
+  OUT       UINT16  *SectionAttribute\r

   )\r
 {\r
   UINT32 Index;\r
   EFI_STATUS Status;\r
   PEI_EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r
   EFI_GUID *SectionDefinitionGuid;\r
   )\r
 {\r
   UINT32 Index;\r
   EFI_STATUS Status;\r
   PEI_EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r
   EFI_GUID *SectionDefinitionGuid;\r

-  \r
+\r

   //\r
   // Check input parameter\r
   //\r
   //\r
   // Check input parameter\r
   //\r


@@ -345,7 +345,7 @@ ExtractGuidedSectionGetInfo (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Not found, the input guided section is not supported. \r
+  // Not found, the input guided section is not supported.\r

   //\r
   return RETURN_UNSUPPORTED;\r
 }\r
   //\r
   return RETURN_UNSUPPORTED;\r
 }\r


@@ -356,26 +356,26 @@ ExtractGuidedSectionGetInfo (
   The selected handler is used to decode the data in a GUIDed section and return the result in a caller\r
   allocated output buffer.\r
 \r
   The selected handler is used to decode the data in a GUIDed section and return the result in a caller\r
   allocated output buffer.\r
 \r

-  Decodes the GUIDed section specified by InputSection.  \r
+  Decodes the GUIDed section specified by InputSection.\r

   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r
   If GUID for InputSection does not match any of the GUIDs registered through ExtractGuidedSectionRegisterHandlers(),\r

-  then RETURN_UNSUPPORTED is returned.  \r
+  then RETURN_UNSUPPORTED is returned.\r

   If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r
   of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to decode InputSection 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 data in InputSection,\r
   then OutputBuffer is set to point at the data in InputSection.  Otherwise, the decoded data will be placed in caller\r
   allocated buffer specified by OutputBuffer.    This function is responsible for computing the  EFI_AUTH_STATUS_PLATFORM_OVERRIDE\r
   If the GUID of InputSection does match the GUID that this handler supports, then the the associated handler\r
   of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER that was registered with ExtractGuidedSectionRegisterHandlers()\r
   is used to decode InputSection 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 data in InputSection,\r
   then OutputBuffer is set to point at the data in InputSection.  Otherwise, the decoded data will be placed in caller\r
   allocated buffer specified by OutputBuffer.    This function is responsible for computing the  EFI_AUTH_STATUS_PLATFORM_OVERRIDE\r

-  bit of in AuthenticationStatus.  The return status from the handler of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER is returned. \r
-   \r
+  bit of in AuthenticationStatus.  The return status from the handler of type EXTRACT_GUIDED_SECTION_DECODE_HANDLER is returned.\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

-  If AuthenticationStatus is NULL, then ASSERT().  \r
+  If AuthenticationStatus is NULL, then ASSERT().\r

 \r
   @param[in]  InputSection   A pointer to a GUIDed section of an FFS formatted file.\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[in]  ScratchBuffer  A caller allocated buffer that may be required by this function as a scratch buffer to perform the decode operation. \r
-  @param[out] AuthenticationStatus \r
+  @param[out] OutputBuffer   A pointer to a buffer that contains the result of a decode operation.\r
+  @param[in]  ScratchBuffer  A caller allocated buffer that may be required by this function 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. See the definition\r
                              of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI\r
                              Specification.\r
                              A pointer to the authentication status of the decoded output buffer. See the definition\r
                              of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI\r
                              Specification.\r


@@ -391,14 +391,14 @@ ExtractGuidedSectionDecode (
   IN  CONST VOID    *InputSection,\r
   OUT       VOID    **OutputBuffer,\r
   IN        VOID    *ScratchBuffer,        OPTIONAL\r
   IN  CONST VOID    *InputSection,\r
   OUT       VOID    **OutputBuffer,\r
   IN        VOID    *ScratchBuffer,        OPTIONAL\r

-  OUT       UINT32  *AuthenticationStatus  \r
+  OUT       UINT32  *AuthenticationStatus\r

   )\r
 {\r
   UINT32     Index;\r
   EFI_STATUS Status;\r
   PEI_EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r
   EFI_GUID *SectionDefinitionGuid;\r
   )\r
 {\r
   UINT32     Index;\r
   EFI_STATUS Status;\r
   PEI_EXTRACT_GUIDED_SECTION_HANDLER_INFO *HandlerInfo;\r
   EFI_GUID *SectionDefinitionGuid;\r

-  \r
+\r

   //\r
   // Check input parameter\r
   //\r
   //\r
   // Check input parameter\r
   //\r


@@ -408,7 +408,7 @@ ExtractGuidedSectionDecode (
 \r
   //\r
   // Get all registered handler information.\r
 \r
   //\r
   // Get all registered handler information.\r

-  //  \r
+  //\r

   Status = PeiGetExtractGuidedSectionHandlerInfo (&HandlerInfo);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   Status = PeiGetExtractGuidedSectionHandlerInfo (&HandlerInfo);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r


@@ -439,29 +439,29 @@ ExtractGuidedSectionDecode (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Not found, the input guided section is not supported. \r
+  // Not found, the input guided section is not supported.\r

   //\r
   return RETURN_UNSUPPORTED;\r
 }\r
 \r
 /**\r
   //\r
   return RETURN_UNSUPPORTED;\r
 }\r
 \r
 /**\r

-  Retrieves handlers of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER and \r
+  Retrieves handlers of type EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER and\r

   EXTRACT_GUIDED_SECTION_DECODE_HANDLER for a specific GUID section type.\r
   EXTRACT_GUIDED_SECTION_DECODE_HANDLER for a specific GUID section type.\r

-  \r
-  Retrieves the handlers associated with SectionGuid and returns them in \r
+\r
+  Retrieves the handlers associated with SectionGuid and returns them in\r

   GetInfoHandler and DecodeHandler.\r
 \r
   GetInfoHandler and DecodeHandler.\r
 \r

-  If the GUID value specified by SectionGuid has not been registered, then \r
+  If the GUID value specified by SectionGuid has not been registered, then\r

   return RETURN_NOT_FOUND.\r
   return RETURN_NOT_FOUND.\r

-  \r
+\r

   If SectionGuid is NULL, then ASSERT().\r
 \r
   If SectionGuid is NULL, then ASSERT().\r
 \r

-  @param[in]  SectionGuid    A pointer to the GUID associated with the handlersof the GUIDed \r
+  @param[in]  SectionGuid    A pointer to the GUID associated with the handlersof the GUIDed\r

                              section type being retrieved.\r
                              section type being retrieved.\r

-  @param[out] GetInfoHandler Pointer to a function that examines a GUIDed section and returns \r
-                             the size of the decoded buffer and the size of an optional scratch \r
-                             buffer required to actually decode the data in a GUIDed section.  \r
-                             This is an optional parameter that may be NULL. If it is NULL, then \r
+  @param[out] GetInfoHandler Pointer to a function that examines a GUIDed section and returns\r
+                             the size of the decoded buffer and the size of an optional scratch\r
+                             buffer required to actually decode the data in a GUIDed section.\r
+                             This is an optional parameter that may be NULL. If it is NULL, then\r

                              the previously registered handler is not returned.\r
   @param[out] DecodeHandler  Pointer to a function that decodes a GUIDed section into a caller\r
                              allocated output buffer. This is an optional parameter that may be NULL.\r
                              the previously registered handler is not returned.\r
   @param[out] DecodeHandler  Pointer to a function that decodes a GUIDed section into a caller\r
                              allocated output buffer. This is an optional parameter that may be NULL.\r

diff --git a/MdePkg/Library/PeiHobLib/HobLib.c b/MdePkg/Library/PeiHobLib/HobLib.c
index 5c0eeb992f009e965cdef0d465d3ce1c0143f011..34c169870b8d02f7c6c787b6ea8fa2557af00330 100644 (file)
--- a/MdePkg/Library/PeiHobLib/HobLib.c
+++ b/MdePkg/Library/PeiHobLib/HobLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Provide Hob Library functions for Pei phase.\r
 \r
 /** @file\r
   Provide Hob Library functions for Pei phase.\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


@@ -25,15 +25,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Returns the pointer to the HOB list.\r
 \r
   This function returns the pointer to first HOB in the list.\r
   Returns the pointer to the HOB list.\r
 \r
   This function returns the pointer to first HOB in the list.\r

-  For PEI phase, the PEI service GetHobList() can be used to retrieve the pointer \r
+  For PEI phase, the PEI service GetHobList() can be used to retrieve the pointer\r

   to the HOB list.  For the DXE phase, the HOB list pointer can be retrieved through\r
   the EFI System Table by looking up theHOB list GUID in the System Configuration Table.\r
   to the HOB list.  For the DXE phase, the HOB list pointer can be retrieved through\r
   the EFI System Table by looking up theHOB list GUID in the System Configuration Table.\r

-  Since the System Configuration Table does not exist that the time the DXE Core is \r
-  launched, the DXE Core uses a global variable from the DXE Core Entry Point Library \r
+  Since the System Configuration Table does not exist that the time the DXE Core is\r
+  launched, the DXE Core uses a global variable from the DXE Core Entry Point Library\r

   to manage the pointer to the HOB list.\r
   to manage the pointer to the HOB list.\r

-  \r
+\r

   If the pointer to the HOB list is NULL, then ASSERT().\r
   If the pointer to the HOB list is NULL, then ASSERT().\r

-  \r
+\r

   @return The pointer to the HOB list.\r
 \r
 **/\r
   @return The pointer to the HOB list.\r
 \r
 **/\r


@@ -56,12 +56,12 @@ GetHobList (
 /**\r
   Returns the next instance of a HOB type from the starting HOB.\r
 \r
 /**\r
   Returns the next instance of a HOB type from the starting HOB.\r
 \r

-  This function searches the first instance of a HOB type from the starting HOB pointer. \r
+  This function searches the first instance of a HOB type from the starting HOB pointer.\r

   If there does not exist such HOB type from the starting HOB pointer, it will return NULL.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r
   If there does not exist such HOB type from the starting HOB pointer, it will return NULL.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r

-  \r
+\r

   If HobStart is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r
   If HobStart is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r


@@ -80,7 +80,7 @@ GetNextHob (
   EFI_PEI_HOB_POINTERS  Hob;\r
 \r
   ASSERT (HobStart != NULL);\r
   EFI_PEI_HOB_POINTERS  Hob;\r
 \r
   ASSERT (HobStart != NULL);\r

-   \r
+\r

   Hob.Raw = (UINT8 *) HobStart;\r
   //\r
   // Parse the HOB list until end of list or matching type is found.\r
   Hob.Raw = (UINT8 *) HobStart;\r
   //\r
   // Parse the HOB list until end of list or matching type is found.\r


@@ -97,9 +97,9 @@ GetNextHob (
 /**\r
   Returns the first instance of a HOB type among the whole HOB list.\r
 \r
 /**\r
   Returns the first instance of a HOB type among the whole HOB list.\r
 \r

-  This function searches the first instance of a HOB type among the whole HOB list. \r
-  If there does not exist such HOB type in the HOB list, it will return NULL. \r
-  \r
+  This function searches the first instance of a HOB type among the whole HOB list.\r
+  If there does not exist such HOB type in the HOB list, it will return NULL.\r
+\r

   If the pointer to the HOB list is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r
   If the pointer to the HOB list is NULL, then ASSERT().\r
 \r
   @param  Type          The HOB type to return.\r


@@ -121,17 +121,17 @@ GetFirstHob (
 \r
 /**\r
   Returns the next instance of the matched GUID HOB from the starting HOB.\r
 \r
 /**\r
   Returns the next instance of the matched GUID HOB from the starting HOB.\r

-  \r
-  This function searches the first instance of a HOB from the starting HOB pointer. \r
-  Such HOB should satisfy two conditions: \r
-  its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid. \r
-  If there does not exist such HOB from the starting HOB pointer, it will return NULL. \r
+\r
+  This function searches the first instance of a HOB from the starting HOB pointer.\r
+  Such HOB should satisfy two conditions:\r
+  its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid.\r
+  If there does not exist such HOB from the starting HOB pointer, it will return NULL.\r

   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r
   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r
   unconditionally: it returns HobStart back if HobStart itself meets the requirement;\r
   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If HobStart is NULL, then ASSERT().\r
 \r
   If Guid is NULL, then ASSERT().\r
   If HobStart is NULL, then ASSERT().\r
 \r


@@ -162,14 +162,14 @@ GetNextGuidHob (
 \r
 /**\r
   Returns the first instance of the matched GUID HOB among the whole HOB list.\r
 \r
 /**\r
   Returns the first instance of the matched GUID HOB among the whole HOB list.\r

-  \r
-  This function searches the first instance of a HOB among the whole HOB list. \r
+\r
+  This function searches the first instance of a HOB among the whole HOB list.\r

   Such HOB should satisfy two conditions:\r
   its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid.\r
   If there does not exist such HOB from the starting HOB pointer, it will return NULL.\r
   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r
   Such HOB should satisfy two conditions:\r
   its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid.\r
   If there does not exist such HOB from the starting HOB pointer, it will return NULL.\r
   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()\r
   to extract the data section and its size information, respectively.\r

-  \r
+\r

   If the pointer to the HOB list is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
 \r
   If the pointer to the HOB list is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
 \r


@@ -193,11 +193,11 @@ GetFirstGuidHob (
 /**\r
   Get the system boot mode from the HOB list.\r
 \r
 /**\r
   Get the system boot mode from the HOB list.\r
 \r

-  This function returns the system boot mode information from the \r
+  This function returns the system boot mode information from the\r

   PHIT HOB in HOB list.\r
 \r
   If the pointer to the HOB list is NULL, then ASSERT().\r
   PHIT HOB in HOB list.\r
 \r
   If the pointer to the HOB list is NULL, then ASSERT().\r

-  \r
+\r

   @param  VOID.\r
 \r
   @return The Boot Mode.\r
   @param  VOID.\r
 \r
   @return The Boot Mode.\r


@@ -257,7 +257,7 @@ InternalPeiCreateHob (
   This function builds a HOB for a loaded PE32 module.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for a loaded PE32 module.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If ModuleName is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   If ModuleName is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r


@@ -295,7 +295,7 @@ BuildModuleHob (
   // Zero the reserved space to match HOB spec\r
   //\r
   ZeroMem (Hob->MemoryAllocationHeader.Reserved, sizeof (Hob->MemoryAllocationHeader.Reserved));\r
   // Zero the reserved space to match HOB spec\r
   //\r
   ZeroMem (Hob->MemoryAllocationHeader.Reserved, sizeof (Hob->MemoryAllocationHeader.Reserved));\r

-  \r
+\r

   CopyGuid (&Hob->ModuleName, ModuleName);\r
   Hob->EntryPoint = EntryPoint;\r
 }\r
   CopyGuid (&Hob->ModuleName, ModuleName);\r
   Hob->EntryPoint = EntryPoint;\r
 }\r


@@ -306,7 +306,7 @@ BuildModuleHob (
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r


@@ -347,7 +347,7 @@ BuildResourceDescriptorWithOwnerHob (
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB that describes a chunk of system memory.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  ResourceType        The type of resource described by this HOB.\r


@@ -380,15 +380,15 @@ BuildResourceDescriptorHob (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Builds a customized HOB tagged with a GUID for identification and returns \r
+  Builds a customized HOB tagged with a GUID for identification and returns\r

   the start address of GUID HOB data.\r
 \r
   the start address of GUID HOB data.\r
 \r

-  This function builds a customized HOB tagged with a GUID for identification \r
-  and returns the start address of GUID HOB data so that caller can fill the customized data. \r
+  This function builds a customized HOB tagged with a GUID for identification\r
+  and returns the start address of GUID HOB data so that caller can fill the customized data.\r

   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
   If DataLength > (0xFFF8 - sizeof (EFI_HOB_GUID_TYPE)), then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
   If DataLength > (0xFFF8 - sizeof (EFI_HOB_GUID_TYPE)), then ASSERT().\r


@@ -414,7 +414,7 @@ BuildGuidHob (
   // Make sure Guid is valid\r
   //\r
   ASSERT (Guid != NULL);\r
   // Make sure Guid is valid\r
   //\r
   ASSERT (Guid != NULL);\r

-  \r
+\r

   //\r
   // Make sure that data length is not too long.\r
   //\r
   //\r
   // Make sure that data length is not too long.\r
   //\r


@@ -429,16 +429,16 @@ BuildGuidHob (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Builds a customized HOB tagged with a GUID for identification, copies the input data to the HOB \r
+  Builds a customized HOB tagged with a GUID for identification, copies the input data to the HOB\r

   data field, and returns the start address of the GUID HOB data.\r
 \r
   This function builds a customized HOB tagged with a GUID for identification and copies the input\r
   data field, and returns the start address of the GUID HOB data.\r
 \r
   This function builds a customized HOB tagged with a GUID for identification and copies the input\r

-  data to the HOB data field and returns the start address of the GUID HOB data.  It can only be \r
-  invoked during PEI phase; for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.  \r
+  data to the HOB data field and returns the start address of the GUID HOB data.  It can only be\r
+  invoked during PEI phase; for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   The HOB Header and Name field is already stripped.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If Data is NULL and DataLength > 0, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If Data is NULL and DataLength > 0, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r


@@ -535,7 +535,7 @@ InternalCheckFvAlignment (
   This function builds a Firmware Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a Firmware Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r
   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r


@@ -572,7 +572,7 @@ BuildFvHob (
   This function builds a EFI_HOB_TYPE_FV2 HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a EFI_HOB_TYPE_FV2 HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r
   If there is no additional space for HOB creation, then ASSERT().\r
   If the FvImage buffer is not at its required alignment, then ASSERT().\r
 \r


@@ -580,7 +580,7 @@ BuildFvHob (
   @param  Length        The size of the Firmware Volume in bytes.\r
   @param  FvName        The name of the Firmware Volume.\r
   @param  FileName      The name of the file.\r
   @param  Length        The size of the Firmware Volume in bytes.\r
   @param  FvName        The name of the Firmware Volume.\r
   @param  FileName      The name of the file.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -669,7 +669,7 @@ BuildFv3Hob (
   This function builds a Capsule Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a Capsule Volume HOB.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If the platform does not support Capsule Volume HOBs, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   If the platform does not support Capsule Volume HOBs, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r


@@ -701,7 +701,7 @@ BuildCvHob (
   This function builds a HOB for the CPU.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for the CPU.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  SizeOfMemorySpace   The maximum physical memory addressability of the processor.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  SizeOfMemorySpace   The maximum physical memory addressability of the processor.\r


@@ -728,7 +728,7 @@ BuildCpuHob (
   //\r
   // Zero the reserved space to match HOB spec\r
   //\r
   //\r
   // Zero the reserved space to match HOB spec\r
   //\r

-  ZeroMem (Hob->Reserved, sizeof (Hob->Reserved)); \r
+  ZeroMem (Hob->Reserved, sizeof (Hob->Reserved));\r

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


@@ -737,7 +737,7 @@ BuildCpuHob (
   This function builds a HOB for the stack.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for the stack.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the Stack.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the Stack.\r


@@ -778,7 +778,7 @@ BuildStackHob (
   This function builds a HOB for BSP store.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for BSP store.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the BSP.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the BSP.\r


@@ -821,7 +821,7 @@ BuildBspStoreHob (
   This function builds a HOB for the memory allocation.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   This function builds a HOB for the memory allocation.\r
   It can only be invoked during PEI phase;\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r

-  \r
+\r

   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the memory.\r
   If there is no additional space for HOB creation, then ASSERT().\r
 \r
   @param  BaseAddress   The 64 bit physical address of the memory.\r


@@ -841,12 +841,12 @@ BuildMemoryAllocationHob (
 \r
   ASSERT (((BaseAddress & (EFI_PAGE_SIZE - 1)) == 0) &&\r
           ((Length & (EFI_PAGE_SIZE - 1)) == 0));\r
 \r
   ASSERT (((BaseAddress & (EFI_PAGE_SIZE - 1)) == 0) &&\r
           ((Length & (EFI_PAGE_SIZE - 1)) == 0));\r

-  \r
+\r

   Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION));\r
   if (Hob == NULL) {\r
     return;\r
   }\r
   Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION));\r
   if (Hob == NULL) {\r
     return;\r
   }\r

-  \r
+\r

   ZeroMem (&(Hob->AllocDescriptor.Name), sizeof (EFI_GUID));\r
   Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;\r
   Hob->AllocDescriptor.MemoryLength      = Length;\r
   ZeroMem (&(Hob->AllocDescriptor.Name), sizeof (EFI_GUID));\r
   Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;\r
   Hob->AllocDescriptor.MemoryLength      = Length;\r

diff --git a/MdePkg/Library/PeiHobLib/PeiHobLib.inf b/MdePkg/Library/PeiHobLib/PeiHobLib.inf
index 027ba6f8560414401bd0ac89df37358ed0ef683e..c58a8f758c6597b658c6b0a54926748ec464949a 100644 (file)
--- a/MdePkg/Library/PeiHobLib/PeiHobLib.inf
+++ b/MdePkg/Library/PeiHobLib/PeiHobLib.inf
@@ -3,7 +3,7 @@
 #\r
 # HOB Library implementation that uses PEI Services to retrieve the HOB List.\r
 #\r
 #\r
 # HOB Library implementation that uses PEI Services to retrieve the HOB List.\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


@@ -52,5 +52,5 @@
 #   MEMORY_ALLOCATION     ## SOMETIMES_PRODUCES\r
 #   RESOURCE_DESCRIPTOR   ## SOMETIMES_PRODUCES\r
 #   FIRMWARE_VOLUME       ## SOMETIMES_PRODUCES\r
 #   MEMORY_ALLOCATION     ## SOMETIMES_PRODUCES\r
 #   RESOURCE_DESCRIPTOR   ## SOMETIMES_PRODUCES\r
 #   FIRMWARE_VOLUME       ## SOMETIMES_PRODUCES\r

-#   \r
+#\r

 \r
 \r

diff --git a/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c b/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c
index ce73658e84e368cf2aa16416495f0b0224c07783..4b9ac433cc0e075767d3a02404ca844cc83087e6 100644 (file)
--- a/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c
+++ b/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c
@@ -4,7 +4,7 @@
   All assertions for bit field operations are handled bit field functions in the\r
   Base Library.\r
 \r
   All assertions for bit field operations are handled bit field functions in the\r
   Base 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


@@ -80,7 +80,7 @@ IoAnd8 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 8-bit I/O port.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 8-bit I/O port.\r
 \r
   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -146,7 +146,7 @@ IoBitFieldRead8 (
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r
   by the StartBit and the EndBit. All other bits in the destination I/O\r
 \r
   Writes Value to the bit field of the I/O register. The bit field is specified\r
   by the StartBit and the EndBit. All other bits in the destination I/O\r

-  register are preserved. The value written to the I/O port is returned. \r
+  register are preserved. The value written to the I/O port is returned.\r

 \r
   If 8-bit I/O port operations are not supported, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r
 \r
   If 8-bit I/O port operations are not supported, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r


@@ -348,7 +348,7 @@ IoOr16 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
 \r
   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
 \r


@@ -366,7 +366,7 @@ IoAnd16 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 16-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads a 16-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 16-bit I/O port.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 16-bit I/O port.\r
 \r
   Reads the 16-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -378,7 +378,7 @@ IoAnd16 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
   @param  OrData  The value to OR with the result of the AND operation.\r
   @param  Port    The I/O port to write.\r
   @param  AndData The value to AND with the read value from the I/O port.\r
   @param  OrData  The value to OR with the result of the AND operation.\r


@@ -659,7 +659,7 @@ IoAnd32 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 32-bit I/O port.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 32-bit I/O port.\r
 \r
   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -952,7 +952,7 @@ IoAnd64 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 64-bit I/O port, performs a bitwise AND followed by a bitwise \r
+  Reads a 64-bit I/O port, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 64-bit I/O port.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND between\r
   OR, and writes the result back to the 64-bit I/O port.\r
 \r
   Reads the 64-bit I/O port specified by Port, performs a bitwise AND between\r


@@ -1190,7 +1190,7 @@ IoBitFieldAndThenOr64 (
   Reads an 8-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 8-bit MMIO register.\r
 \r
   Reads an 8-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 8-bit MMIO register.\r
 \r

-  Reads the 8-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 8-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1243,7 +1243,7 @@ MmioAnd8 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 8-bit MMIO register.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 8-bit MMIO register.\r
 \r
   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1347,7 +1347,7 @@ MmioBitFieldWrite8 (
   Reads a bit field in an 8-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 8-bit MMIO register.\r
 \r
   Reads a bit field in an 8-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 8-bit MMIO register.\r
 \r

-  Reads the 8-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 8-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 8-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1477,7 +1477,7 @@ MmioBitFieldAndThenOr8 (
   Reads a 16-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 16-bit MMIO register.\r
 \r
   Reads a 16-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 16-bit MMIO register.\r
 \r

-  Reads the 16-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 16-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1532,7 +1532,7 @@ MmioAnd16 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 16-bit MMIO register.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 16-bit MMIO register.\r
 \r
   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1638,7 +1638,7 @@ MmioBitFieldWrite16 (
   Reads a bit field in a 16-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 16-bit MMIO register.\r
 \r
   Reads a bit field in a 16-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 16-bit MMIO register.\r
 \r

-  Reads the 16-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 16-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 16-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1771,7 +1771,7 @@ MmioBitFieldAndThenOr16 (
   Reads a 32-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 32-bit MMIO register.\r
 \r
   Reads a 32-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 32-bit MMIO register.\r
 \r

-  Reads the 32-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 32-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -1826,7 +1826,7 @@ MmioAnd32 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 32-bit MMIO register.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 32-bit MMIO register.\r
 \r
   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -1932,7 +1932,7 @@ MmioBitFieldWrite32 (
   Reads a bit field in a 32-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 32-bit MMIO register.\r
 \r
   Reads a bit field in a 32-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 32-bit MMIO register.\r
 \r

-  Reads the 32-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 32-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 32-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -2065,7 +2065,7 @@ MmioBitFieldAndThenOr32 (
   Reads a 64-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 64-bit MMIO register.\r
 \r
   Reads a 64-bit MMIO register, performs a bitwise OR, and writes the\r
   result back to the 64-bit MMIO register.\r
 \r

-  Reads the 64-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 64-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r


@@ -2120,7 +2120,7 @@ MmioAnd64 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise \r
+  Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise\r

   OR, and writes the result back to the 64-bit MMIO register.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r
   OR, and writes the result back to the 64-bit MMIO register.\r
 \r
   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND\r


@@ -2226,7 +2226,7 @@ MmioBitFieldWrite64 (
   Reads a bit field in a 64-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 64-bit MMIO register.\r
 \r
   Reads a bit field in a 64-bit MMIO register, performs a bitwise OR, and\r
   writes the result back to the bit field in the 64-bit MMIO register.\r
 \r

-  Reads the 64-bit MMIO register specified by Address, performs a bitwise \r
+  Reads the 64-bit MMIO register specified by Address, performs a bitwise\r

   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r
   OR between the read result and the value specified by OrData, and\r
   writes the result to the 64-bit MMIO register specified by Address. The value\r
   written to the MMIO register is returned. This function must guarantee that\r

diff --git a/MdePkg/Library/PeiIoLibCpuIo/IoLib.c b/MdePkg/Library/PeiIoLibCpuIo/IoLib.c
index e09bec9b9e5f0522df8b55cb7d5bba0c0b2943e4..fff8215b49705e5055481df77540994563f44a96 100644 (file)
--- a/MdePkg/Library/PeiIoLibCpuIo/IoLib.c
+++ b/MdePkg/Library/PeiIoLibCpuIo/IoLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   I/O Library. The implementations are based on EFI_PEI_SERVICE->CpuIo interface.\r
 \r
 /** @file\r
   I/O Library. The implementations are based on EFI_PEI_SERVICE->CpuIo interface.\r
 \r

-  Copyright (c) 2006 - 2008, 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


@@ -203,7 +203,7 @@ IoRead16 (
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r


@@ -240,7 +240,7 @@ IoWrite16 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r
   @param  Port  The I/O port to read.\r
 \r
   @return The value read.\r


@@ -274,7 +274,7 @@ IoRead32 (
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
 \r


@@ -598,7 +598,7 @@ MmioRead8 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r


@@ -667,7 +667,7 @@ MmioRead16 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r


@@ -739,7 +739,7 @@ MmioRead32 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r

-  \r
+\r

   @return Value.\r
 \r
 **/\r
   @return Value.\r
 \r
 **/\r

diff --git a/MdePkg/Library/PeiIoLibCpuIo/IoLibMmioBuffer.c b/MdePkg/Library/PeiIoLibCpuIo/IoLibMmioBuffer.c
index 328d03c4315f671685cc1159e403f75bbc5b8c18..10f60bd560a98b949657775576b29899f62541a7 100644 (file)
--- a/MdePkg/Library/PeiIoLibCpuIo/IoLibMmioBuffer.c
+++ b/MdePkg/Library/PeiIoLibCpuIo/IoLibMmioBuffer.c
@@ -2,7 +2,7 @@
   I/O Library MMIO Buffer Functions.\r
   The implementations are based on EFI_PEI_SERVICE->CpuIo interface.\r
 \r
   I/O Library MMIO Buffer Functions.\r
   The implementations are based on EFI_PEI_SERVICE->CpuIo interface.\r
 \r

-  Copyright (c) 2007 - 2009, 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,11 +24,11 @@
 /**\r
   Copy data from MMIO region to system memory by using 8-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 8-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 8-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 8-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -51,9 +51,9 @@ MmioReadBuffer8 (
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length-- != 0) {\r
     *(Buffer++) = MmioRead8 (StartAddress++);\r
   }\r
   while (Length-- != 0) {\r
     *(Buffer++) = MmioRead8 (StartAddress++);\r
   }\r


@@ -64,13 +64,13 @@ MmioReadBuffer8 (
 /**\r
   Copy data from MMIO region to system memory by using 16-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 16-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 16-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 16-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -94,15 +94,15 @@ MmioReadBuffer16 (
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT16) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT16) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     *(Buffer++) = MmioRead16 (StartAddress);\r
     StartAddress += sizeof (UINT16);\r
   while (Length != 0) {\r
     *(Buffer++) = MmioRead16 (StartAddress);\r
     StartAddress += sizeof (UINT16);\r


@@ -115,13 +115,13 @@ MmioReadBuffer16 (
 /**\r
   Copy data from MMIO region to system memory by using 32-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 32-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 32-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 32-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -145,15 +145,15 @@ MmioReadBuffer32 (
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT32) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT32) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     *(Buffer++) = MmioRead32 (StartAddress);\r
     StartAddress += sizeof (UINT32);\r
   while (Length != 0) {\r
     *(Buffer++) = MmioRead32 (StartAddress);\r
     StartAddress += sizeof (UINT32);\r


@@ -166,13 +166,13 @@ MmioReadBuffer32 (
 /**\r
   Copy data from MMIO region to system memory by using 64-bit access.\r
 \r
 /**\r
   Copy data from MMIO region to system memory by using 64-bit access.\r
 \r

-  Copy data from MMIO region specified by starting address StartAddress \r
-  to system memory specified by Buffer by using 64-bit access. The total \r
+  Copy data from MMIO region specified by starting address StartAddress\r
+  to system memory specified by Buffer by using 64-bit access. The total\r

   number of byte to be copied is specified by Length. Buffer is returned.\r
   number of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r


@@ -196,15 +196,15 @@ MmioReadBuffer64 (
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT64) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length & (sizeof (UINT64) - 1)) == 0);\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r

- \r
+\r

   ReturnBuffer = Buffer;\r
   ReturnBuffer = Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     *(Buffer++) = MmioRead64 (StartAddress);\r
     StartAddress += sizeof (UINT64);\r
   while (Length != 0) {\r
     *(Buffer++) = MmioRead64 (StartAddress);\r
     StartAddress += sizeof (UINT64);\r


@@ -218,11 +218,11 @@ MmioReadBuffer64 (
 /**\r
   Copy data from system memory to MMIO region by using 8-bit access.\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 8-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 8-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 8-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+\r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
 \r


@@ -245,27 +245,27 @@ MmioWriteBuffer8 (
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r

- \r
+\r

   ReturnBuffer = (UINT8 *) Buffer;\r
   ReturnBuffer = (UINT8 *) Buffer;\r

-  \r
+\r

   while (Length-- != 0) {\r
      MmioWrite8 (StartAddress++, *(Buffer++));\r
   }\r
 \r
   return ReturnBuffer;\r
   while (Length-- != 0) {\r
      MmioWrite8 (StartAddress++, *(Buffer++));\r
   }\r
 \r
   return ReturnBuffer;\r

- \r
+\r

 }\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 16-bit access.\r
 \r
 }\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 16-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 16-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 16-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -290,7 +290,7 @@ MmioWriteBuffer16 (
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r
   UINT16    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r


@@ -298,10 +298,10 @@ MmioWriteBuffer16 (
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT16 *) Buffer;\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT16 *) Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     MmioWrite16 (StartAddress, *(Buffer++));\r
   while (Length != 0) {\r
     MmioWrite16 (StartAddress, *(Buffer++));\r

-    \r
+\r

     StartAddress += sizeof (UINT16);\r
     Length -= sizeof (UINT16);\r
   }\r
     StartAddress += sizeof (UINT16);\r
     Length -= sizeof (UINT16);\r
   }\r


@@ -313,13 +313,13 @@ MmioWriteBuffer16 (
 /**\r
   Copy data from system memory to MMIO region by using 32-bit access.\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 32-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 32-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 32-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 32-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r


@@ -344,7 +344,7 @@ MmioWriteBuffer32 (
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r
   UINT32    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r


@@ -352,10 +352,10 @@ MmioWriteBuffer32 (
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT32 *) Buffer;\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT32 *) Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     MmioWrite32 (StartAddress, *(Buffer++));\r
   while (Length != 0) {\r
     MmioWrite32 (StartAddress, *(Buffer++));\r

-    \r
+\r

     StartAddress += sizeof (UINT32);\r
     Length -= sizeof (UINT32);\r
   }\r
     StartAddress += sizeof (UINT32);\r
     Length -= sizeof (UINT32);\r
   }\r


@@ -366,13 +366,13 @@ MmioWriteBuffer32 (
 /**\r
   Copy data from system memory to MMIO region by using 64-bit access.\r
 \r
 /**\r
   Copy data from system memory to MMIO region by using 64-bit access.\r
 \r

-  Copy data from system memory specified by Buffer to MMIO region specified \r
-  by starting address StartAddress by using 64-bit access. The total number \r
+  Copy data from system memory specified by Buffer to MMIO region specified\r
+  by starting address StartAddress by using 64-bit access. The total number\r

   of byte to be copied is specified by Length. Buffer is returned.\r
   of byte to be copied is specified by Length. Buffer is returned.\r

-  \r
+\r

   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   If StartAddress is not aligned on a 64-bit boundary, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - StartAddress + 1), then ASSERT().\r

   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS -Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r


@@ -397,7 +397,7 @@ MmioWriteBuffer64 (
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r
   UINT64    *ReturnBuffer;\r
 \r
   ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);\r

-  \r
+\r

   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));\r
   ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));\r
 \r


@@ -405,10 +405,10 @@ MmioWriteBuffer64 (
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT64 *) Buffer;\r
   ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);\r
 \r
   ReturnBuffer = (UINT64 *) Buffer;\r

-  \r
+\r

   while (Length != 0) {\r
     MmioWrite64 (StartAddress, *(Buffer++));\r
   while (Length != 0) {\r
     MmioWrite64 (StartAddress, *(Buffer++));\r

-    \r
+\r

     StartAddress += sizeof (UINT64);\r
     Length -= sizeof (UINT64);\r
   }\r
     StartAddress += sizeof (UINT64);\r
     Length -= sizeof (UINT64);\r
   }\r

diff --git a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
index d12418127e668a911e8cf377597ffaa7a47e5a8a..e4fce34404cb1ae5ea7759fffeebe4685bdc38ef 100644 (file)
--- a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
+++ b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
@@ -4,7 +4,7 @@
 # I/O Library implementation that uses the CPU I/O PPI for I/O\r
 #  and MMIO operations.\r
 #\r
 # I/O Library implementation that uses the CPU I/O PPI for I/O\r
 #  and MMIO operations.\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


@@ -34,7 +34,7 @@
   IoHighLevel.c\r
   IoLib.c\r
   IoLibMmioBuffer.c\r
   IoHighLevel.c\r
   IoLib.c\r
   IoLibMmioBuffer.c\r

- \r
+\r

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

diff --git a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c b/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
index 5cd24a38a3c66c6526618ee326453897a267fdab..4f1a3041a4734b8b60b994da81677b99370b5a39 100644 (file)
--- a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  Support routines for memory allocation routines \r
+  Support routines for memory allocation routines\r

   based on PeiService for PEI phase drivers.\r
 \r
   based on PeiService for PEI phase drivers.\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


@@ -132,11 +132,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


@@ -167,7 +167,7 @@ FreePages (
 \r
   @param  MemoryType            The type of memory to allocate.\r
   @param  Pages                 The number of 4 KB pages to allocate.\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


@@ -176,7 +176,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


@@ -249,12 +249,12 @@ 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
   @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


@@ -278,12 +278,12 @@ 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
   @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


@@ -307,12 +307,12 @@ 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
   @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


@@ -335,13 +335,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


@@ -375,14 +375,14 @@ 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
   //\r
   IN UINTN            AllocationSize\r
   )\r
 {\r
   //\r

-  // If we need lots of small runtime/reserved memory type from PEI in the future, \r
-  // we can consider providing a more complex algorithm that allocates runtime pages and \r
-  // provide pool allocations from those pages. \r
+  // If we need lots of small runtime/reserved memory type from PEI in the future,\r
+  // we can consider providing a more complex algorithm that allocates runtime pages and\r
+  // provide pool allocations from those pages.\r

   //\r
   return InternalAllocatePages (MemoryType, EFI_SIZE_TO_PAGES (AllocationSize));\r
 }\r
   //\r
   return InternalAllocatePages (MemoryType, EFI_SIZE_TO_PAGES (AllocationSize));\r
 }\r


@@ -407,7 +407,7 @@ AllocatePool (
 {\r
   EFI_STATUS        Status;\r
   VOID              *Buffer;\r
 {\r
   EFI_STATUS        Status;\r
   VOID              *Buffer;\r

-  \r
+\r

   Status = PeiServicesAllocatePool (AllocationSize, &Buffer);\r
   if (EFI_ERROR (Status)) {\r
     Buffer = NULL;\r
   Status = PeiServicesAllocatePool (AllocationSize, &Buffer);\r
   if (EFI_ERROR (Status)) {\r
     Buffer = NULL;\r


@@ -473,9 +473,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


@@ -566,7 +566,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


@@ -577,10 +577,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


@@ -592,7 +592,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


@@ -601,9 +601,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


@@ -637,9 +637,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


@@ -664,9 +664,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


@@ -688,19 +688,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 \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


@@ -708,7 +708,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


@@ -728,18 +728,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


@@ -760,10 +760,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


@@ -771,7 +771,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


@@ -792,10 +792,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


@@ -803,7 +803,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 \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


@@ -827,7 +827,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/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c b/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
index f525c17bae9e9ce961190613dfe521d0733d73c6..34e9b66a06f35d60748ed67d5a660593c79a2b00 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   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 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r


@@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @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

diff --git a/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c b/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
index 9b76f0f1e1e742b7cdb44cf8463ea7259a079b3f..437253339f08c988052fcfcd885bbd25765b453e 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
@@ -2,7 +2,7 @@
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/MemLib.c b/MdePkg/Library/PeiMemoryLib/MemLib.c
index 4f1f01749c60dc51a9aef8d1224318a8fc3f0e04..17fec54b543be73928865d2cd0223cdd9918683b 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/MemLib.c
+++ b/MdePkg/Library/PeiMemoryLib/MemLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Base Memory Library functions implementation bases on PeiServcie.\r
 \r
 /** @file\r
   Base Memory Library functions implementation bases on PeiServcie.\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


@@ -18,7 +18,7 @@
   Copies a source buffer to a destination buffer, and returns the destination buffer.\r
 \r
   This function wraps the gPS->CopyMem ().\r
   Copies a source buffer to a destination buffer, and returns the destination buffer.\r
 \r
   This function wraps the gPS->CopyMem ().\r

-  \r
+\r

   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r
   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r


@@ -46,7 +46,7 @@ InternalMemCopyMem (
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function wraps the gPS->SetMem ().\r
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function wraps the gPS->SetMem ().\r

-  \r
+\r

   @param  Buffer    Memory to set.\r
   @param  Size      The number of bytes to set.\r
   @param  Value     Value of the set operation.\r
   @param  Buffer    Memory to set.\r
   @param  Size      The number of bytes to set.\r
   @param  Value     Value of the set operation.\r

diff --git a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c b/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
index cbb385fddfba8b4b7de2df526202264e8ce101f1..4cc95d3aab563392e6901f2ee5bf24d8cb5aadfd 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
@@ -2,7 +2,7 @@
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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 @@
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r

-  \r
+\r

   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r
   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r


@@ -63,7 +63,7 @@ CopyGuid (
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r

-  \r
+\r

   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r
   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r


@@ -103,7 +103,7 @@ CompareGuid (
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/PeiMemoryLib/MemLibInternals.h b/MdePkg/Library/PeiMemoryLib/MemLibInternals.h
index 85b42922e330853e35bf56554173d13cd81a0486..cf9b87387d03b058a22580b9d3883771efc74f23 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/MemLibInternals.h
+++ b/MdePkg/Library/PeiMemoryLib/MemLibInternals.h
@@ -1,7 +1,7 @@
 /** @file\r
   Declaration of internal functions for Base Memory Library.\r
 \r
 /** @file\r
   Declaration of internal functions for Base Memory Library.\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


@@ -26,7 +26,7 @@
   Copies a source buffer to a destination buffer, and returns the destination buffer.\r
 \r
   This function wraps the (*PeiServices)->CopyMem ().\r
   Copies a source buffer to a destination buffer, and returns the destination buffer.\r
 \r
   This function wraps the (*PeiServices)->CopyMem ().\r

-  \r
+\r

   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r
   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r


@@ -46,7 +46,7 @@ InternalMemCopyMem (
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function wraps the (*PeiServices)->SetMem ().\r
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function wraps the (*PeiServices)->SetMem ().\r

-  \r
+\r

   @param  Buffer    The memory to set.\r
   @param  Size      The number of bytes to set.\r
   @param  Value     Value of the set operation.\r
   @param  Buffer    The memory to set.\r
   @param  Size      The number of bytes to set.\r
   @param  Value     Value of the set operation.\r

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
index 69a2ce97869b0eed08ad3f952c866e73bbf540cd..3eb0cbb2133e247a4431ec9105ce98a306fdb83c 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
index 31f1d558a0d6255b0a1d8599920edabcc4487671..54bc4339e1656366a1a6da0dd82d79618115f9bd 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -32,7 +32,7 @@
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
index 3819456b69d2ada1a9130ec2119091bbfbcc1edf..19f98fa1f95bfeadb99e1f8d81e60a5cc8737a27 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
index efbbe20a7089b102963adf9b08932a76787d40a3..ef63a54b7114b7bfa616d0410e3880ceae857d38 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r


@@ -57,19 +57,19 @@ ScanMem8 (
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r

- \r
+\r

   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r
   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r

-  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching \r
+  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching\r

   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r

diff --git a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
index 8a3392718f46845728c28cd228b6e138cd1825c5..6e86472ace43dfec4450237b200bafafc29f5bf5 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    The memory to set.\r

diff --git a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
index a3aa7d10a689f53ec95fc196aec1faa721c1383d..9ab315b8cfe3758050375bc7980cc6cb8632c206 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
@@ -11,8 +11,8 @@
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\r
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/PeiPalLib/PeiPalLib.c b/MdePkg/Library/PeiPalLib/PeiPalLib.c
index 8209e1d478655e4d5bb879f673e99e139f081ab2..c35bf0118a575254aaeda312598f77ca4a3e3849 100644 (file)
--- a/MdePkg/Library/PeiPalLib/PeiPalLib.c
+++ b/MdePkg/Library/PeiPalLib/PeiPalLib.c
@@ -1,15 +1,15 @@
 /** @file\r
   PAL Call Services Function.\r
 \r
 /** @file\r
   PAL Call Services Function.\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
-    \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
 \r

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index 2496701862fdb789ad25408547b2b1b63f1ce09f..468eff7cb40857dce58d906929f9d95bc3956c36 100644 (file)
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
@@ -1,14 +1,14 @@
 /** @file\r
 Implementation of PcdLib class library for PEI phase.\r
 \r
 /** @file\r
 Implementation of PcdLib class library for PEI phase.\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
-THE PROGRAM 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


@@ -31,20 +31,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Retrieve the PCD_PPI pointer.\r
 \r
 /**\r
   Retrieve the PCD_PPI pointer.\r
 \r

-  This function is to locate PCD_PPI PPI via PeiService. \r
+  This function is to locate PCD_PPI PPI via PeiService.\r

   If fail to locate PCD_PPI, then ASSERT_EFI_ERROR().\r
   If fail to locate PCD_PPI, then ASSERT_EFI_ERROR().\r

-  \r
+\r

   @retval PCD_PPI * The pointer to the PCD_PPI.\r
 \r
 **/\r
 PCD_PPI  *\r
 GetPcdPpiPointer (\r
   VOID\r
   @retval PCD_PPI * The pointer to the PCD_PPI.\r
 \r
 **/\r
 PCD_PPI  *\r
 GetPcdPpiPointer (\r
   VOID\r

-  ) \r
+  )\r

 {\r
   EFI_STATUS        Status;\r
   PCD_PPI           *PcdPpi;\r
 {\r
   EFI_STATUS        Status;\r
   PCD_PPI           *PcdPpi;\r

-  \r
+\r

   Status = PeiServicesLocatePpi (&gPcdPpiGuid, 0, NULL, (VOID **)&PcdPpi);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = PeiServicesLocatePpi (&gPcdPpiGuid, 0, NULL, (VOID **)&PcdPpi);\r
   ASSERT_EFI_ERROR (Status);\r
 \r


@@ -54,9 +54,9 @@ GetPcdPpiPointer (
 /**\r
   Retrieve the pointer of EFI_PEI_PCD_PPI defined in PI 1.2 Vol 3.\r
 \r
 /**\r
   Retrieve the pointer of EFI_PEI_PCD_PPI defined in PI 1.2 Vol 3.\r
 \r

-  This function is to locate EFI_PEI_PCD_PPI PPI via PeiService. \r
+  This function is to locate EFI_PEI_PCD_PPI PPI via PeiService.\r

   If fail to locate EFI_PEI_PCD_PPI, then ASSERT_EFI_ERROR().\r
   If fail to locate EFI_PEI_PCD_PPI, then ASSERT_EFI_ERROR().\r

-  \r
+\r

   @retval EFI_PEI_PCD_PPI * The pointer to the EFI_PEI_PCD_PPI.\r
 \r
 **/\r
   @retval EFI_PEI_PCD_PPI * The pointer to the EFI_PEI_PCD_PPI.\r
 \r
 **/\r


@@ -67,17 +67,17 @@ GetPiPcdPpiPointer (
 {\r
   EFI_STATUS        Status;\r
   EFI_PEI_PCD_PPI   *PiPcdPpi;\r
 {\r
   EFI_STATUS        Status;\r
   EFI_PEI_PCD_PPI   *PiPcdPpi;\r

-  \r
+\r

   Status = PeiServicesLocatePpi (&gEfiPeiPcdPpiGuid, 0, NULL, (VOID **)&PiPcdPpi);\r
   ASSERT_EFI_ERROR (Status);\r
   Status = PeiServicesLocatePpi (&gEfiPeiPcdPpiGuid, 0, NULL, (VOID **)&PiPcdPpi);\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   return PiPcdPpi;\r
   return PiPcdPpi;\r

-}  \r
+}\r

 \r
 /**\r
   Retrieve the GET_PCD_INFO_PPI pointer.\r
 \r
 \r
 /**\r
   Retrieve the GET_PCD_INFO_PPI pointer.\r
 \r

-  This function is to locate GET_PCD_INFO_PPI PPI via PeiService. \r
+  This function is to locate GET_PCD_INFO_PPI PPI via PeiService.\r

   If fail to locate GET_PCD_INFO_PPI, then ASSERT_EFI_ERROR().\r
 \r
   @retval GET_PCD_INFO_PPI * The pointer to the GET_PCD_INFO_PPI.\r
   If fail to locate GET_PCD_INFO_PPI, then ASSERT_EFI_ERROR().\r
 \r
   @retval GET_PCD_INFO_PPI * The pointer to the GET_PCD_INFO_PPI.\r


@@ -86,11 +86,11 @@ GetPiPcdPpiPointer (
 GET_PCD_INFO_PPI *\r
 GetPcdInfoPpiPointer (\r
   VOID\r
 GET_PCD_INFO_PPI *\r
 GetPcdInfoPpiPointer (\r
   VOID\r

-  ) \r
+  )\r

 {\r
   EFI_STATUS            Status;\r
   GET_PCD_INFO_PPI      *PcdInfoPpi;\r
 {\r
   EFI_STATUS            Status;\r
   GET_PCD_INFO_PPI      *PcdInfoPpi;\r

-  \r
+\r

   Status = PeiServicesLocatePpi (&gGetPcdInfoPpiGuid, 0, NULL, (VOID **)&PcdInfoPpi);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = PeiServicesLocatePpi (&gGetPcdInfoPpiGuid, 0, NULL, (VOID **)&PcdInfoPpi);\r
   ASSERT_EFI_ERROR (Status);\r
 \r


@@ -100,7 +100,7 @@ GetPcdInfoPpiPointer (
 /**\r
   Retrieve the pointer of EFI_GET_PCD_INFO_PPI defined in PI 1.2.1 Vol 3.\r
 \r
 /**\r
   Retrieve the pointer of EFI_GET_PCD_INFO_PPI defined in PI 1.2.1 Vol 3.\r
 \r

-  This function is to locate EFI_GET_PCD_INFO_PPI PPI via PeiService. \r
+  This function is to locate EFI_GET_PCD_INFO_PPI PPI via PeiService.\r

   If fail to locate EFI_GET_PCD_INFO_PPI, then ASSERT_EFI_ERROR().\r
 \r
   @retval EFI_GET_PCD_INFO_PPI * The pointer to the EFI_GET_PCD_INFO_PPI.\r
   If fail to locate EFI_GET_PCD_INFO_PPI, then ASSERT_EFI_ERROR().\r
 \r
   @retval EFI_GET_PCD_INFO_PPI * The pointer to the EFI_GET_PCD_INFO_PPI.\r


@@ -113,19 +113,19 @@ GetPiPcdInfoPpiPointer (
 {\r
   EFI_STATUS            Status;\r
   EFI_GET_PCD_INFO_PPI  *PiPcdInfoPpi;\r
 {\r
   EFI_STATUS            Status;\r
   EFI_GET_PCD_INFO_PPI  *PiPcdInfoPpi;\r

-  \r
+\r

   Status = PeiServicesLocatePpi (&gEfiGetPcdInfoPpiGuid, 0, NULL, (VOID **)&PiPcdInfoPpi);\r
   ASSERT_EFI_ERROR (Status);\r
   Status = PeiServicesLocatePpi (&gEfiGetPcdInfoPpiGuid, 0, NULL, (VOID **)&PiPcdInfoPpi);\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   return PiPcdInfoPpi;\r
   return PiPcdInfoPpi;\r

-}  \r
+}\r

 \r
 /**\r
   This function provides a means by which SKU support can be established in the PCD infrastructure.\r
 \r
   Sets the current SKU in the PCD database to the value specified by SkuId.  SkuId is returned.\r
 \r
 \r
 /**\r
   This function provides a means by which SKU support can be established in the PCD infrastructure.\r
 \r
   Sets the current SKU in the PCD database to the value specified by SkuId.  SkuId is returned.\r
 \r

-  @param  SkuId   The SKU value that will be used when the PCD service retrieves \r
+  @param  SkuId   The SKU value that will be used when the PCD service retrieves\r

                   and sets values associated with a PCD token.\r
 \r
   @return  Return the SKU ID that just be set.\r
                   and sets values associated with a PCD token.\r
 \r
   @return  Return the SKU ID that just be set.\r


@@ -138,7 +138,7 @@ LibPcdSetSku (
   )\r
 {\r
   GetPiPcdPpiPointer()->SetSku (SkuId);\r
   )\r
 {\r
   GetPiPcdPpiPointer()->SetSku (SkuId);\r

-  \r
+\r

   return SkuId;\r
 }\r
 \r
   return SkuId;\r
 }\r
 \r


@@ -146,12 +146,12 @@ LibPcdSetSku (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 8-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 8-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the 8-bit value for the token specified by TokenNumber. \r
+  @return Returns the 8-bit value for the token specified by TokenNumber.\r

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


@@ -167,12 +167,12 @@ LibPcdGet8 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 16-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 16-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the 16-bit value for the token specified by TokenNumber. \r
+  @return Returns the 16-bit value for the token specified by TokenNumber.\r

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


@@ -188,8 +188,8 @@ LibPcdGet16 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 32-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 32-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r


@@ -209,7 +209,7 @@ LibPcdGet32 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 64-bit value for the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
   Returns the 64-bit value for the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r


@@ -230,7 +230,7 @@ LibPcdGet64 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the pointer to the buffer of the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
   Returns the pointer to the buffer of the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r


@@ -251,15 +251,15 @@ LibPcdGetPtr (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the Boolean value of the token specified by TokenNumber. \r
+\r
+  Returns the Boolean value of the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the Boolean value of the token specified by TokenNumber. \r
+  @return Returns the Boolean value of the token specified by TokenNumber.\r

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

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 LibPcdGetBool (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 LibPcdGetBool (\r
   IN UINTN             TokenNumber\r


@@ -275,7 +275,7 @@ LibPcdGetBool (
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the size of the token specified by TokenNumber. \r
+  @return Returns the size of the token specified by TokenNumber.\r

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


@@ -291,12 +291,12 @@ LibPcdGetSize (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 8-bit value for the token specified by TokenNumber and Guid.\r
   Returns the 8-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid         The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid         The pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -321,10 +321,10 @@ LibPcdGetEx8 (
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
   Returns the 16-bit value for the token specified by TokenNumber and Guid.\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
   Returns the 16-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid         The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid         The pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -348,9 +348,9 @@ LibPcdGetEx16 (
 \r
 /**\r
   Returns the 32-bit value for the token specified by TokenNumber and Guid.\r
 \r
 /**\r
   Returns the 32-bit value for the token specified by TokenNumber and Guid.\r

-  If Guid is NULL, then ASSERT(). \r
+  If Guid is NULL, then ASSERT().\r

 \r
 \r

-  @param[in]  Guid         The pointer to a 128-bit unique value that designates \r
+  @param[in]  Guid         The pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -374,12 +374,12 @@ LibPcdGetEx32 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 64-bit value for the token specified by TokenNumber and Guid.\r
   Returns the 64-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -401,12 +401,12 @@ LibPcdGetEx64 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the pointer to the buffer of token specified by TokenNumber and Guid.\r
   Returns the pointer to the buffer of token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -429,12 +429,12 @@ LibPcdGetExPtr (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the Boolean value of the token specified by TokenNumber and Guid. \r
-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  Returns the Boolean value of the token specified by TokenNumber and Guid.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -456,12 +456,12 @@ LibPcdGetExBool (
 \r
 /**\r
   This function provides a means by which to retrieve the size of a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve the size of a given PCD token.\r

-  \r
-  Returns the size of the token specified by TokenNumber and Guid. \r
-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that designates \r
+  Returns the size of the token specified by TokenNumber and Guid.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -484,8 +484,8 @@ LibPcdGetExSize (
 #ifndef DISABLE_NEW_DEPRECATED_INTERFACES\r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 #ifndef DISABLE_NEW_DEPRECATED_INTERFACES\r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 8-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -502,7 +502,7 @@ LibPcdSet8 (
   )\r
 {\r
   (GetPcdPpiPointer ())->Set8 (TokenNumber, Value);\r
   )\r
 {\r
   (GetPcdPpiPointer ())->Set8 (TokenNumber, Value);\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -510,8 +510,8 @@ LibPcdSet8 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 16-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -528,7 +528,7 @@ LibPcdSet16 (
   )\r
 {\r
   (GetPcdPpiPointer ())->Set16 (TokenNumber, Value);\r
   )\r
 {\r
   (GetPcdPpiPointer ())->Set16 (TokenNumber, Value);\r

-  \r
+\r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -536,8 +536,8 @@ LibPcdSet16 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 32-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -562,8 +562,8 @@ LibPcdSet32 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 64-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -588,19 +588,19 @@ LibPcdSet64 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets a buffer for the token specified by TokenNumber to the value \r
-  specified by Buffer and SizeOfBuffer.  Buffer is returned.  \r
-  If SizeOfBuffer is greater than the maximum size support by TokenNumber, \r
-  then set SizeOfBuffer to the maximum size supported by TokenNumber and \r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value\r
+  specified by Buffer and SizeOfBuffer.  Buffer is returned.\r
+  If SizeOfBuffer is greater than the maximum size support by TokenNumber,\r
+  then set SizeOfBuffer to the maximum size supported by TokenNumber and\r

   return NULL to indicate that the set operation was not actually performed.\r
 \r
   return NULL to indicate that the set operation was not actually performed.\r
 \r

-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the \r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the\r

   maximum size supported by TokenName and NULL must be returned.\r
   maximum size supported by TokenName and NULL must be returned.\r

-  \r
+\r

   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
+\r

   @param[in]      TokenNumber   The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
   @param[in]      Buffer        A pointer to the buffer to set.\r
   @param[in]      TokenNumber   The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
   @param[in]      Buffer        A pointer to the buffer to set.\r


@@ -638,8 +638,8 @@ LibPcdSetPtr (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the Boolean value for the token specified by TokenNumber \r
+\r
+  Sets the Boolean value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   to the value specified by Value.  Value is returned.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r


@@ -664,13 +664,13 @@ LibPcdSetBool (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 8-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r


@@ -697,13 +697,13 @@ LibPcdSetEx8 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 16-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r


@@ -730,13 +730,13 @@ LibPcdSetEx16 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 32-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r


@@ -763,13 +763,13 @@ LibPcdSetEx32 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 64-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r


@@ -796,18 +796,18 @@ LibPcdSetEx64 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets a buffer for the token specified by TokenNumber to the value specified by \r
-  Buffer and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  the maximum size support by TokenNumber, then set SizeOfBuffer to the maximum size \r
-  supported by TokenNumber and return NULL to indicate that the set operation \r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value specified by\r
+  Buffer and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  the maximum size support by TokenNumber, then set SizeOfBuffer to the maximum size\r
+  supported by TokenNumber and return NULL to indicate that the set operation\r

   was not actually performed.\r
   was not actually performed.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
-  @param[in]  Guid              The pointer to a 128-bit unique value that \r
+\r
+  @param[in]  Guid              The pointer to a 128-bit unique value that\r

                                 designates which namespace to set a value from.\r
   @param[in]  TokenNumber       The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
                                 designates which namespace to set a value from.\r
   @param[in]  TokenNumber       The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r


@@ -847,13 +847,13 @@ LibPcdSetExPtr (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the Boolean value for the token specified by TokenNumber and \r
+\r
+  Sets the Boolean value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r
   Guid to the value specified by Value. Value is returned.\r
 \r
   If Guid is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid          The pointer to a 128-bit unique value that \r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The Boolean value to set.\r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The Boolean value to set.\r


@@ -1215,17 +1215,17 @@ LibPcdSetExBoolS (
 \r
 /**\r
   Set up a notification function that is called when a specified token is set.\r
 \r
 /**\r
   Set up a notification function that is called when a specified token is set.\r

-  \r
-  When the token specified by TokenNumber and Guid is set, \r
-  then notification function specified by NotificationFunction is called.  \r
+\r
+  When the token specified by TokenNumber and Guid is set,\r
+  then notification function specified by NotificationFunction is called.\r

   If Guid is NULL, then the default token space is used.\r
   If NotificationFunction is NULL, then ASSERT().\r
 \r
   If Guid is NULL, then the default token space is used.\r
   If NotificationFunction is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid                  The pointer to a 128-bit unique value that \r
-                                    designates which namespace to set a value from.  \r
+  @param[in]  Guid                  The pointer to a 128-bit unique value that\r
+                                    designates which namespace to set a value from.\r

                                     If NULL, then the default token space is used.\r
   @param[in]  TokenNumber           The PCD token number to monitor.\r
                                     If NULL, then the default token space is used.\r
   @param[in]  TokenNumber           The PCD token number to monitor.\r

-  @param[in]  NotificationFunction  The function to call when the token \r
+  @param[in]  NotificationFunction  The function to call when the token\r

                                     specified by Guid and TokenNumber is set.\r
 \r
 **/\r
                                     specified by Guid and TokenNumber is set.\r
 \r
 **/\r


@@ -1252,12 +1252,12 @@ LibPcdCallbackOnSet (
 \r
 /**\r
   Disable a notification function that was established with LibPcdCallbackonSet().\r
 \r
 /**\r
   Disable a notification function that was established with LibPcdCallbackonSet().\r

-  \r
+\r

   Disable a notification function that was previously established with LibPcdCallbackOnSet().\r
   If NotificationFunction is NULL, then ASSERT().\r
   Disable a notification function that was previously established with LibPcdCallbackOnSet().\r
   If NotificationFunction is NULL, then ASSERT().\r

-  If LibPcdCallbackOnSet() was not previously called with Guid, TokenNumber, \r
+  If LibPcdCallbackOnSet() was not previously called with Guid, TokenNumber,\r

   and NotificationFunction, then ASSERT().\r
   and NotificationFunction, then ASSERT().\r

-  \r
+\r

   @param[in]  Guid                 Specify the GUID token space.\r
   @param[in]  TokenNumber          Specify the token number.\r
   @param[in]  NotificationFunction The callback function to be unregistered.\r
   @param[in]  Guid                 Specify the GUID token space.\r
   @param[in]  TokenNumber          Specify the token number.\r
   @param[in]  NotificationFunction The callback function to be unregistered.\r


@@ -1286,24 +1286,24 @@ LibPcdCancelCallback (
 \r
 /**\r
   Retrieves the next token in a token space.\r
 \r
 /**\r
   Retrieves the next token in a token space.\r

-  \r
-  Retrieves the next PCD token number from the token space specified by Guid.  \r
-  If Guid is NULL, then the default token space is used.  If TokenNumber is 0, \r
-  then the first token number is returned.  Otherwise, the token number that \r
-  follows TokenNumber in the token space is returned.  If TokenNumber is the last \r
-  token number in the token space, then 0 is returned.  \r
-  \r
+\r
+  Retrieves the next PCD token number from the token space specified by Guid.\r
+  If Guid is NULL, then the default token space is used.  If TokenNumber is 0,\r
+  then the first token number is returned.  Otherwise, the token number that\r
+  follows TokenNumber in the token space is returned.  If TokenNumber is the last\r
+  token number in the token space, then 0 is returned.\r
+\r

   If TokenNumber is not 0 and is not in the token space specified by Guid, then ASSERT().\r
 \r
   If TokenNumber is not 0 and is not in the token space specified by Guid, then ASSERT().\r
 \r

-  @param[in]  Guid        The pointer to a 128-bit unique value that designates which namespace \r
+  @param[in]  Guid        The pointer to a 128-bit unique value that designates which namespace\r

                           to set a value from.  If NULL, then the default token space is used.\r
                           to set a value from.  If NULL, then the default token space is used.\r

-  @param[in]  TokenNumber The previous PCD token number.  If 0, then retrieves the first PCD \r
+  @param[in]  TokenNumber The previous PCD token number.  If 0, then retrieves the first PCD\r

                           token number.\r
 \r
   @return The next valid token number.\r
 \r
 **/\r
                           token number.\r
 \r
   @return The next valid token number.\r
 \r
 **/\r

-UINTN           \r
+UINTN\r

 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r


@@ -1321,12 +1321,12 @@ LibPcdGetNextToken (
 \r
 /**\r
   Used to retrieve the list of available PCD token space GUIDs.\r
 \r
 /**\r
   Used to retrieve the list of available PCD token space GUIDs.\r

-  \r
+\r

   Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces\r
   in the platform.\r
   If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.\r
   If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.\r
   Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces\r
   in the platform.\r
   If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.\r
   If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.\r

-  \r
+\r

   @param  TokenSpaceGuid  The pointer to the a PCD token space GUID\r
 \r
   @return The next valid token namespace.\r
   @param  TokenSpaceGuid  The pointer to the a PCD token space GUID\r
 \r
   @return The next valid token namespace.\r


@@ -1347,24 +1347,24 @@ LibPcdGetNextTokenSpace (
 \r
 /**\r
   Sets a value of a patchable PCD entry that is type pointer.\r
 \r
 /**\r
   Sets a value of a patchable PCD entry that is type pointer.\r

-  \r
-  Sets the PCD entry specified by PatchVariable to the value specified by Buffer \r
-  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return \r
-  NULL to indicate that the set operation was not actually performed.  \r
-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to \r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified by Buffer\r
+  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return\r
+  NULL to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r

   MaximumDatumSize and NULL must be returned.\r
   MaximumDatumSize and NULL must be returned.\r

-  \r
+\r

   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r
   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r

-  @param[out] PatchVariable     A pointer to the global variable in a module that is \r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r

                                 the target of the set operation.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
                                 the target of the set operation.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return Return the pointer to the buffer been set.\r
 \r
 **/\r
   @return Return the pointer to the buffer been set.\r
 \r
 **/\r


@@ -1379,7 +1379,7 @@ LibPatchPcdSetPtr (
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r


@@ -1389,9 +1389,9 @@ LibPatchPcdSetPtr (
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r

-    \r
+\r

   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r

-  \r
+\r

   return (VOID *) Buffer;\r
 }\r
 \r
   return (VOID *) Buffer;\r
 }\r
 \r


@@ -1414,7 +1414,7 @@ LibPatchPcdSetPtr (
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return The status of the set operation.\r
 \r
 **/\r
   @return The status of the set operation.\r
 \r
 **/\r


@@ -1429,7 +1429,7 @@ LibPatchPcdSetPtrS (
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r


@@ -1448,26 +1448,26 @@ LibPatchPcdSetPtrS (
 \r
 /**\r
   Sets a value and size of a patchable PCD entry that is type pointer.\r
 \r
 /**\r
   Sets a value and size of a patchable PCD entry that is type pointer.\r

-  \r
-  Sets the PCD entry specified by PatchVariable to the value specified by Buffer \r
-  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return \r
-  NULL to indicate that the set operation was not actually performed.  \r
-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to \r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified by Buffer\r
+  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return\r
+  NULL to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r

   MaximumDatumSize and NULL must be returned.\r
   MaximumDatumSize and NULL must be returned.\r

-  \r
+\r

   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfPatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r
   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfPatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r

-  @param[out] PatchVariable     A pointer to the global variable in a module that is \r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r

                                 the target of the set operation.\r
   @param[out] SizeOfPatchVariable A pointer to the size, in bytes, of PatchVariable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
                                 the target of the set operation.\r
   @param[out] SizeOfPatchVariable A pointer to the size, in bytes, of PatchVariable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return Return the pointer to the buffer been set.\r
 \r
 **/\r
   @return Return the pointer to the buffer been set.\r
 \r
 **/\r


@@ -1484,7 +1484,7 @@ LibPatchPcdSetPtrAndSize (
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r


@@ -1494,10 +1494,10 @@ LibPatchPcdSetPtrAndSize (
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r

-    \r
+\r

   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
   *SizeOfPatchVariable = *SizeOfBuffer;\r
   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
   *SizeOfPatchVariable = *SizeOfBuffer;\r

-  \r
+\r

   return (VOID *) Buffer;\r
 }\r
 \r
   return (VOID *) Buffer;\r
 }\r
 \r


@@ -1522,7 +1522,7 @@ LibPatchPcdSetPtrAndSize (
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return The status of the set operation.\r
 \r
 **/\r
   @return The status of the set operation.\r
 \r
 **/\r


@@ -1539,7 +1539,7 @@ LibPatchPcdSetPtrAndSizeS (
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfPatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
index 75786c1d4ff8a73e6ab37649c101be2f7fa36a77..0234dd5ecd2d1c06b31a23b47aaccba2f0b247a1 100644 (file)
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
@@ -2,10 +2,10 @@
 # Instance of PCD Library using PCD PPI.\r
 #\r
 # There are two PCD PPIs as follows:\r
 # Instance of PCD Library using PCD PPI.\r
 #\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
 # This library instance uses the PCD_PPI to handle dynamic PCD request and use\r
 #      type Pcd.\r
 # For dynamicEx type PCD, it is compatible between PCD_PPI and EFI_PEI_PCD_PPI.\r
 # This library instance uses the PCD_PPI to handle dynamic PCD request and use\r


@@ -15,7 +15,7 @@
 #\r
 # PCD Library that uses the PCD PPI to access Dynamic and DynamicEx PCD entries\r
 #\r
 #\r
 # PCD Library that uses the PCD PPI to access Dynamic and DynamicEx PCD entries\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

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.uni b/MdePkg/Library/PeiPcdLib/PeiPcdLib.uni
index 460105763fa3336e992ddc34b3614b1000d2706a..ef49b463f437dafa8c84f6a101fb174ecccc5921 100644 (file)
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.uni
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.uni
@@ -10,12 +10,12 @@
 // For dynamicEx type PCD, it is compatible between PCD_PPI and EFI_PEI_PCD_PPI.\r
 // This library instance uses the PCD_PPI to handle dynamic PCD request and use\r
 // EFI_PEI_PCD_PPI to handle dynamicEx type PCD.\r
 // For dynamicEx type PCD, it is compatible between PCD_PPI and EFI_PEI_PCD_PPI.\r
 // This library instance uses the PCD_PPI to handle dynamic PCD request and use\r
 // EFI_PEI_PCD_PPI to handle dynamicEx type PCD.\r

-// \r
+//\r

 // This library instance assume the PCD_PPI and EFI_PEI_PCD_PPI are both installed early.\r
 // This library instance assume the PCD_PPI and EFI_PEI_PCD_PPI are both installed early.\r

-// \r
+//\r

 // PCD Library that uses the PCD PPI to access Dynamic and DynamicEx PCD entries\r
 //\r
 // PCD Library that uses the PCD PPI to access Dynamic and DynamicEx PCD entries\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

diff --git a/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c b/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c
index ce9121b63fd75963c0f77100ae5d81cce34e0a30..4154f7abcc1ddebf59f32b3073c89a811087cf31 100644 (file)
--- a/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c
+++ b/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c
@@ -1,13 +1,13 @@
 /** @file\r
   PCI Library using PCI CFG2 PPI.\r
 \r
 /** @file\r
   PCI Library using PCI CFG2 PPI.\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 are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php.\r
   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   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


@@ -129,19 +129,19 @@ PeiPciLibPciCfg2WriteWorker (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Registers a PCI device so PCI configuration registers may be accessed after \r
+  Registers a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
-  Registers the PCI device specified by Address so all the PCI configuration registers \r
+\r
+  Registers the PCI device specified by Address so all the PCI configuration registers\r

   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r
   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r

-  \r
+\r

   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r

diff --git a/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c b/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c
index 8af168d7f9b0244ce9c9d3a0bcfef224639afa76..26db2183ce80f28ddb8ab543bb903543ee57630c 100644 (file)
--- a/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c
+++ b/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c
@@ -1,13 +1,13 @@
 /** @file\r
   PCI Segment Library implementation using PCI CFG2 PPI.\r
 \r
 /** @file\r
   PCI Segment Library implementation using PCI CFG2 PPI.\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 are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php.\r
   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   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


@@ -49,7 +49,7 @@
 \r
   This internal function retrieves PCI CFG2 PPI from PPI database.\r
 \r
 \r
   This internal function retrieves PCI CFG2 PPI from PPI database.\r
 \r

-  @param  Address       The address that encodes the PCI Segment, Bus, Device, \r
+  @param  Address       The address that encodes the PCI Segment, Bus, Device,\r

                         Function and Register.\r
 \r
   @return The pointer to PCI CFG2 PPI.\r
                         Function and Register.\r
 \r
   @return The pointer to PCI CFG2 PPI.\r


@@ -163,16 +163,16 @@ PeiPciSegmentLibPciCfg2WriteWorker (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Register a PCI device so PCI configuration registers may be accessed after \r
+  Register a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
+\r

   If any reserved bits in Address are set, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If any reserved bits in Address are set, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r

diff --git a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
index 55ae63b1f1cd24d97ece824d1dd2cdfe0d7d0fcf..b4d6b73be149648cb28014b2415c2164882a187a 100644 (file)
--- a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
+++ b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
@@ -1,14 +1,14 @@
 /** @file\r
   Resource Publication Library that uses PEI Core Services to publish system memory.\r
 \r
 /** @file\r
   Resource Publication Library that uses PEI Core Services to publish system memory.\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
+  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


@@ -28,9 +28,9 @@
   Declares that the system memory buffer specified by MemoryBegin and MemoryLength\r
   as permanent memory that may be used for general purpose use by software.\r
   The amount of memory available to software may be less than MemoryLength\r
   Declares that the system memory buffer specified by MemoryBegin and MemoryLength\r
   as permanent memory that may be used for general purpose use by software.\r
   The amount of memory available to software may be less than MemoryLength\r

-  if published memory has alignment restrictions. \r
+  if published memory has alignment restrictions.\r

   If MemoryLength is 0, then ASSERT().\r
   If MemoryLength is 0, then ASSERT().\r

-  If MemoryLength is greater than (MAX_ADDRESS - MemoryBegin + 1), then ASSERT(). \r
+  If MemoryLength is greater than (MAX_ADDRESS - MemoryBegin + 1), then ASSERT().\r

 \r
   @param  MemoryBegin               The start address of the memory being declared.\r
   @param  MemoryLength              The number of bytes of memory being declared.\r
 \r
   @param  MemoryBegin               The start address of the memory being declared.\r
   @param  MemoryLength              The number of bytes of memory being declared.\r


@@ -52,7 +52,7 @@ PublishSystemMemory (
   ASSERT (MemoryLength <= (MAX_ADDRESS - MemoryBegin + 1));\r
 \r
   Status      = PeiServicesInstallPeiMemory (MemoryBegin, MemoryLength);\r
   ASSERT (MemoryLength <= (MAX_ADDRESS - MemoryBegin + 1));\r
 \r
   Status      = PeiServicesInstallPeiMemory (MemoryBegin, MemoryLength);\r

-     \r
+\r

   return (RETURN_STATUS) Status;\r
 }\r
 \r
   return (RETURN_STATUS) Status;\r
 }\r
 \r

diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
index 881b9cd52e1a2ca52986ad3c6aae9ecd260da387..74a54afca36ab68ee0cb93dbafdb6e750e51a513 100644 (file)
--- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
+++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
@@ -109,7 +109,7 @@ PeiServicesLocatePpi (
   This service enables PEIMs to register a given service to be invoked when another service is\r
   installed or reinstalled.\r
 \r
   This service enables PEIMs to register a given service to be invoked when another service is\r
   installed or reinstalled.\r
 \r

-  @param  NotifyList            A pointer to the list of notification interfaces \r
+  @param  NotifyList            A pointer to the list of notification interfaces\r

                                 that the caller shall install.\r
 \r
   @retval EFI_SUCCESS           The interface was successfully installed.\r
                                 that the caller shall install.\r
 \r
   @retval EFI_SUCCESS           The interface was successfully installed.\r


@@ -176,9 +176,9 @@ PeiServicesSetBootMode (
 /**\r
   This service enables a PEIM to ascertain the address of the list of HOBs in memory.\r
 \r
 /**\r
   This service enables a PEIM to ascertain the address of the list of HOBs in memory.\r
 \r

-  @param  HobList               A pointer to the list of HOBs that the PEI Foundation \r
+  @param  HobList               A pointer to the list of HOBs that the PEI Foundation\r

                                 will initialize.\r
                                 will initialize.\r

-  \r
+\r

   @retval EFI_SUCCESS           The list was successfully returned.\r
   @retval EFI_NOT_AVAILABLE_YET The HOB list is not yet published.\r
 \r
   @retval EFI_SUCCESS           The list was successfully returned.\r
   @retval EFI_NOT_AVAILABLE_YET The HOB list is not yet published.\r
 \r


@@ -200,7 +200,7 @@ PeiServicesGetHobList (
 \r
   @param  Type                  The type of HOB to be installed.\r
   @param  Length                The length of the HOB to be added.\r
 \r
   @param  Type                  The type of HOB to be installed.\r
   @param  Length                The length of the HOB to be added.\r

-  @param  Hob                   The address of a pointer that will contain the \r
+  @param  Hob                   The address of a pointer that will contain the\r

                                 HOB header.\r
 \r
   @retval EFI_SUCCESS           The HOB was successfully created.\r
                                 HOB header.\r
 \r
   @retval EFI_SUCCESS           The HOB was successfully created.\r


@@ -224,7 +224,7 @@ PeiServicesCreateHob (
 /**\r
   This service enables PEIMs to discover additional firmware volumes.\r
 \r
 /**\r
   This service enables PEIMs to discover additional firmware volumes.\r
 \r

-  @param  Instance              This instance of the firmware volume to find.  The \r
+  @param  Instance              This instance of the firmware volume to find.  The\r

                                 value 0 is the Boot Firmware Volume (BFV).\r
   @param  VolumeHandle          Handle of the firmware volume header of the volume\r
                                 to return.\r
                                 value 0 is the Boot Firmware Volume (BFV).\r
   @param  VolumeHandle          Handle of the firmware volume header of the volume\r
                                 to return.\r


@@ -251,9 +251,9 @@ PeiServicesFfsFindNextVolume (
   This service enables PEIMs to discover additional firmware files.\r
 \r
   @param  SearchType            A filter to find files only of this type.\r
   This service enables PEIMs to discover additional firmware files.\r
 \r
   @param  SearchType            A filter to find files only of this type.\r

-  @param  VolumeHandle          The pointer to the firmware volume header of the \r
-                                volume to search. This parameter must point to a \r
-                                valid FFS volume. \r
+  @param  VolumeHandle          The pointer to the firmware volume header of the\r
+                                volume to search. This parameter must point to a\r
+                                valid FFS volume.\r

   @param  FileHandle            Handle of the current file from which to begin searching.\r
 \r
   @retval EFI_SUCCESS           The file was found.\r
   @param  FileHandle            Handle of the current file from which to begin searching.\r
 \r
   @retval EFI_SUCCESS           The file was found.\r


@@ -279,7 +279,7 @@ PeiServicesFfsFindNextFile (
   This service enables PEIMs to discover sections of a given type within a valid FFS file.\r
 \r
   @param  SectionType           The value of the section type to find.\r
   This service enables PEIMs to discover sections of a given type within a valid FFS file.\r
 \r
   @param  SectionType           The value of the section type to find.\r

-  @param  FileHandle            A pointer to the file header that contains the set \r
+  @param  FileHandle            A pointer to the file header that contains the set\r

                                 of sections to be searched.\r
   @param  SectionData           A pointer to the discovered section, if successful.\r
 \r
                                 of sections to be searched.\r
   @param  SectionData           A pointer to the discovered section, if successful.\r
 \r


@@ -306,7 +306,7 @@ PeiServicesFfsFindSectionData (
 \r
   @param  SectionType           The value of the section type to find.\r
   @param  SectionInstance       Section instance to find.\r
 \r
   @param  SectionType           The value of the section type to find.\r
   @param  SectionInstance       Section instance to find.\r

-  @param  FileHandle            A pointer to the file header that contains the set \r
+  @param  FileHandle            A pointer to the file header that contains the set\r

                                 of sections to be searched.\r
   @param  SectionData           A pointer to the discovered section, if successful.\r
   @param  AuthenticationStatus  A pointer to the authentication status for this section.\r
                                 of sections to be searched.\r
   @param  SectionData           A pointer to the discovered section, if successful.\r
   @param  AuthenticationStatus  A pointer to the authentication status for this section.\r


@@ -413,7 +413,7 @@ PeiServicesFreePages (
   This service allocates memory from the Hand-Off Block (HOB) heap.\r
 \r
   @param  Size                  The number of bytes to allocate from the pool.\r
   This service allocates memory from the Hand-Off Block (HOB) heap.\r
 \r
   @param  Size                  The number of bytes to allocate from the pool.\r

-  @param  Buffer                If the call succeeds, a pointer to a pointer to \r
+  @param  Buffer                If the call succeeds, a pointer to a pointer to\r

                                 the allocate buffer; otherwise, undefined.\r
 \r
   @retval EFI_SUCCESS           The allocation was successful\r
                                 the allocate buffer; otherwise, undefined.\r
 \r
   @retval EFI_SUCCESS           The allocation was successful\r


@@ -453,13 +453,13 @@ PeiServicesResetSystem (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This service is a wrapper for the PEI Service RegisterForShadow(), except the \r
-  pointer to the PEI Services Table has been removed.  See the Platform \r
-  Initialization Pre-EFI Initialization Core Interface Specification for details. \r
+  This service is a wrapper for the PEI Service RegisterForShadow(), except the\r
+  pointer to the PEI Services Table has been removed.  See the Platform\r
+  Initialization Pre-EFI Initialization Core Interface Specification for details.\r

 \r
   @param FileHandle             PEIM's file handle. Must be the currently\r
                                 executing PEIM.\r
 \r
   @param FileHandle             PEIM's file handle. Must be the currently\r
                                 executing PEIM.\r

-  \r
+\r

   @retval EFI_SUCCESS           The PEIM was successfully registered for\r
                                 shadowing.\r
 \r
   @retval EFI_SUCCESS           The PEIM was successfully registered for\r
                                 shadowing.\r
 \r


@@ -479,9 +479,9 @@ PeiServicesRegisterForShadow (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This service is a wrapper for the PEI Service FfsGetFileInfo(), except the pointer to the PEI Services \r
-  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface \r
-  Specification for details. \r
+  This service is a wrapper for the PEI Service FfsGetFileInfo(), except the pointer to the PEI Services\r
+  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface\r
+  Specification for details.\r

 \r
   @param FileHandle              The handle of the file.\r
 \r
 \r
   @param FileHandle              The handle of the file.\r
 \r


@@ -489,15 +489,15 @@ PeiServicesRegisterForShadow (
                                   information.\r
 \r
   @retval EFI_SUCCESS             File information returned.\r
                                   information.\r
 \r
   @retval EFI_SUCCESS             File information returned.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r
   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   FileInfo is NULL.\r
   @retval EFI_INVALID_PARAMETER   FileInfo is NULL.\r

-  \r
+\r

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

-EFIAPI \r
+EFIAPI\r

 PeiServicesFfsGetFileInfo (\r
   IN CONST  EFI_PEI_FILE_HANDLE   FileHandle,\r
   OUT EFI_FV_FILE_INFO            *FileInfo\r
 PeiServicesFfsGetFileInfo (\r
   IN CONST  EFI_PEI_FILE_HANDLE   FileHandle,\r
   OUT EFI_FV_FILE_INFO            *FileInfo\r


@@ -532,9 +532,9 @@ PeiServicesFfsGetFileInfo2 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This service is a wrapper for the PEI Service FfsFindByName(), except the pointer to the PEI Services \r
-  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface \r
-  Specification for details. \r
+  This service is a wrapper for the PEI Service FfsFindByName(), except the pointer to the PEI Services\r
+  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface\r
+  Specification for details.\r

 \r
   @param FileName                 A pointer to the name of the file to\r
                                   find within the firmware volume.\r
 \r
   @param FileName                 A pointer to the name of the file to\r
                                   find within the firmware volume.\r


@@ -542,7 +542,7 @@ PeiServicesFfsGetFileInfo2 (
   @param VolumeHandle             The firmware volume to search FileHandle\r
                                   Upon exit, points to the found file's\r
                                   handle or NULL if it could not be found.\r
   @param VolumeHandle             The firmware volume to search FileHandle\r
                                   Upon exit, points to the found file's\r
                                   handle or NULL if it could not be found.\r

-  @param FileHandle               The pointer to found file handle \r
+  @param FileHandle               The pointer to found file handle\r

 \r
   @retval EFI_SUCCESS             File was found.\r
 \r
 \r
   @retval EFI_SUCCESS             File was found.\r
 \r


@@ -565,9 +565,9 @@ PeiServicesFfsFindFileByName (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  This service is a wrapper for the PEI Service FfsGetVolumeInfo(), except the pointer to the PEI Services \r
-  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface \r
-  Specification for details. \r
+  This service is a wrapper for the PEI Service FfsGetVolumeInfo(), except the pointer to the PEI Services\r
+  Table has been removed.  See the Platform Initialization Pre-EFI Initialization Core Interface\r
+  Specification for details.\r

 \r
   @param VolumeHandle             Handle of the volume.\r
 \r
 \r
   @param VolumeHandle             Handle of the volume.\r
 \r


@@ -575,10 +575,10 @@ PeiServicesFfsFindFileByName (
                                   information.\r
 \r
   @retval EFI_SUCCESS             File information returned.\r
                                   information.\r
 \r
   @retval EFI_SUCCESS             File information returned.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r
   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r
 \r
 **/\r


@@ -636,7 +636,7 @@ InternalPeiServicesInstallFvInfoPpi (
   IN       UINT32                  AuthenticationStatus\r
   )\r
 {\r
   IN       UINT32                  AuthenticationStatus\r
   )\r
 {\r

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

   EFI_PEI_FIRMWARE_VOLUME_INFO_PPI *FvInfoPpi;\r
   EFI_PEI_PPI_DESCRIPTOR           *FvInfoPpiDescriptor;\r
   EFI_GUID                         *ParentFvNameValue;\r
   EFI_PEI_FIRMWARE_VOLUME_INFO_PPI *FvInfoPpi;\r
   EFI_PEI_PPI_DESCRIPTOR           *FvInfoPpiDescriptor;\r
   EFI_GUID                         *ParentFvNameValue;\r

diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf b/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
index ed992661d683b28be6a3715dab441aff9434d9c6..56cb5a75ec01e40caa6442ec63e76b2bedc2c104 100644 (file)
--- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
+++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # PEI Services Library implementation.\r
 #\r
 ## @file\r
 # PEI Services Library implementation.\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


@@ -20,7 +20,7 @@
   FILE_GUID                      = a804239b-4155-446f-acc8-f0825d74908c\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = a804239b-4155-446f-acc8-f0825d74908c\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PeiServicesLib|SEC PEIM PEI_CORE \r
+  LIBRARY_CLASS                  = PeiServicesLib|SEC PEIM PEI_CORE\r

   PI_SPECIFICATION_VERSION       = 0x0001000A\r
 \r
 #\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r
 \r
 #\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
index efcaac929fc0fcb8a3e66825b04fdbf2092e7c35..c4468e0f365bea6a51d48e537cd80b6957227e8d 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
@@ -1,10 +1,10 @@
 /** @file\r
   PEI Services Table Pointer Library.\r
 /** @file\r
   PEI Services Table Pointer Library.\r

-  \r
+\r

   This library is used for PEIM which does executed from flash device directly but\r
   executed in memory.\r
 \r
   This library is used for PEIM which does executed from flash device directly but\r
   executed in memory.\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


@@ -22,14 +22,14 @@
 CONST EFI_PEI_SERVICES  **gPeiServices;\r
 \r
 /**\r
 CONST EFI_PEI_SERVICES  **gPeiServices;\r
 \r
 /**\r

-  Caches a pointer PEI Services Table. \r
- \r
-  Caches the pointer to the PEI Services Table specified by PeiServicesTablePointer \r
-  in a CPU specific manner as specified in the CPU binding section of the Platform Initialization \r
-  Pre-EFI Initialization Core Interface Specification. \r
-  \r
+  Caches a pointer PEI Services Table.\r
+\r
+  Caches the pointer to the PEI Services Table specified by PeiServicesTablePointer\r
+  in a CPU specific manner as specified in the CPU binding section of the Platform Initialization\r
+  Pre-EFI Initialization Core Interface Specification.\r
+\r

   If PeiServicesTablePointer is NULL, then ASSERT().\r
   If PeiServicesTablePointer is NULL, then ASSERT().\r

-  \r
+\r

   @param    PeiServicesTablePointer   The address of PeiServices pointer.\r
 **/\r
 VOID\r
   @param    PeiServicesTablePointer   The address of PeiServices pointer.\r
 **/\r
 VOID\r


@@ -45,10 +45,10 @@ SetPeiServicesTablePointer (
 /**\r
   Retrieves the cached value of the PEI Services Table pointer.\r
 \r
 /**\r
   Retrieves the cached value of the PEI Services Table pointer.\r
 \r

-  Returns the cached value of the PEI Services Table pointer in a CPU specific manner \r
-  as specified in the CPU binding section of the Platform Initialization Pre-EFI \r
+  Returns the cached value of the PEI Services Table pointer in a CPU specific manner\r
+  as specified in the CPU binding section of the Platform Initialization Pre-EFI\r

   Initialization Core Interface Specification.\r
   Initialization Core Interface Specification.\r

-  \r
+\r

   If the cached PEI Services Table pointer is NULL, then ASSERT().\r
 \r
   @return  The pointer to PeiServices.\r
   If the cached PEI Services Table pointer is NULL, then ASSERT().\r
 \r
   @return  The pointer to PeiServices.\r


@@ -67,7 +67,7 @@ GetPeiServicesTablePointer (
 \r
 /**\r
   The constructor function caches the pointer to PEI services.\r
 \r
 /**\r
   The constructor function caches the pointer to PEI services.\r

-  \r
+\r

   The constructor function caches the pointer to PEI services.\r
   It will always return EFI_SUCCESS.\r
 \r
   The constructor function caches the pointer to PEI services.\r
   It will always return EFI_SUCCESS.\r
 \r


@@ -89,16 +89,16 @@ PeiServicesTablePointerLibConstructor (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Perform CPU specific actions required to migrate the PEI Services Table \r
+  Perform CPU specific actions required to migrate the PEI Services Table\r

   pointer from temporary RAM to permanent RAM.\r
 \r
   pointer from temporary RAM to permanent RAM.\r
 \r

-  For IA32 CPUs, the PEI Services Table pointer is stored in the 4 bytes \r
+  For IA32 CPUs, the PEI Services Table pointer is stored in the 4 bytes\r

   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r

-  For X64 CPUs, the PEI Services Table pointer is stored in the 8 bytes \r
+  For X64 CPUs, the PEI Services Table pointer is stored in the 8 bytes\r

   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   For Itanium and ARM CPUs, a the PEI Services Table Pointer is stored in\r
   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   For Itanium and ARM CPUs, a the PEI Services Table Pointer is stored in\r

-  a dedicated CPU register.  This means that there is no memory storage \r
-  associated with storing the PEI Services Table pointer, so no additional \r
+  a dedicated CPU register.  This means that there is no memory storage\r
+  associated with storing the PEI Services Table pointer, so no additional\r

   migration actions are required for Itanium or ARM CPUs.\r
 \r
 **/\r
   migration actions are required for Itanium or ARM CPUs.\r
 \r
 **/\r


@@ -109,7 +109,7 @@ MigratePeiServicesTablePointer (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  //  PEI Services Table pointer is cached in the global variable. No additional \r
+  //  PEI Services Table pointer is cached in the global variable. No additional\r

   //  migration actions are required.\r
   //\r
   return;\r
   //  migration actions are required.\r
   //\r
   return;\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
index dd0a78d6536efb0088cfabad1a527b775238cb52..98aeeb6fc1bd2fccedeb983f575d33f2afef8de1 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
@@ -3,15 +3,15 @@
 \r
   According to PI specification, the peiservice pointer is stored prior at IDT\r
   table in IA32 and x64 architecture.\r
 \r
   According to PI specification, the peiservice pointer is stored prior at IDT\r
   table in IA32 and x64 architecture.\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
 \r

-  THE PROGRAM 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


@@ -25,10 +25,10 @@
 /**\r
   Retrieves the cached value of the PEI Services Table pointer.\r
 \r
 /**\r
   Retrieves the cached value of the PEI Services Table pointer.\r
 \r

-  Returns the cached value of the PEI Services Table pointer in a CPU specific manner \r
-  as specified in the CPU binding section of the Platform Initialization Pre-EFI \r
+  Returns the cached value of the PEI Services Table pointer in a CPU specific manner\r
+  as specified in the CPU binding section of the Platform Initialization Pre-EFI\r

   Initialization Core Interface Specification.\r
   Initialization Core Interface Specification.\r

-  \r
+\r

   If the cached PEI Services Table pointer is NULL, then ASSERT().\r
 \r
   @return  The pointer to PeiServices.\r
   If the cached PEI Services Table pointer is NULL, then ASSERT().\r
 \r
   @return  The pointer to PeiServices.\r


@@ -42,7 +42,7 @@ GetPeiServicesTablePointer (
 {\r
   CONST EFI_PEI_SERVICES  **PeiServices;\r
   IA32_DESCRIPTOR   Idtr;\r
 {\r
   CONST EFI_PEI_SERVICES  **PeiServices;\r
   IA32_DESCRIPTOR   Idtr;\r

-  \r
+\r

   AsmReadIdtr (&Idtr);\r
   PeiServices = (CONST EFI_PEI_SERVICES **) (*(UINTN*)(Idtr.Base - sizeof (UINTN)));\r
   ASSERT (PeiServices != NULL);\r
   AsmReadIdtr (&Idtr);\r
   PeiServices = (CONST EFI_PEI_SERVICES **) (*(UINTN*)(Idtr.Base - sizeof (UINTN)));\r
   ASSERT (PeiServices != NULL);\r


@@ -50,16 +50,16 @@ GetPeiServicesTablePointer (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Caches a pointer PEI Services Table. \r
- \r
-  Caches the pointer to the PEI Services Table specified by PeiServicesTablePointer \r
-  in a CPU specific manner as specified in the CPU binding section of the Platform Initialization \r
-  Pre-EFI Initialization Core Interface Specification. \r
+  Caches a pointer PEI Services Table.\r
+\r
+  Caches the pointer to the PEI Services Table specified by PeiServicesTablePointer\r
+  in a CPU specific manner as specified in the CPU binding section of the Platform Initialization\r
+  Pre-EFI Initialization Core Interface Specification.\r

   The function set the pointer of PEI services immediately preceding the IDT table\r
   according to PI specification.\r
   The function set the pointer of PEI services immediately preceding the IDT table\r
   according to PI specification.\r

-  \r
+\r

   If PeiServicesTablePointer is NULL, then ASSERT().\r
   If PeiServicesTablePointer is NULL, then ASSERT().\r

-  \r
+\r

   @param    PeiServicesTablePointer   The address of PeiServices pointer.\r
 **/\r
 VOID\r
   @param    PeiServicesTablePointer   The address of PeiServices pointer.\r
 **/\r
 VOID\r


@@ -69,23 +69,23 @@ SetPeiServicesTablePointer (
   )\r
 {\r
   IA32_DESCRIPTOR        Idtr;\r
   )\r
 {\r
   IA32_DESCRIPTOR        Idtr;\r

-  \r
+\r

   ASSERT (PeiServicesTablePointer != NULL);\r
   AsmReadIdtr (&Idtr);\r
   (*(UINTN*)(Idtr.Base - sizeof (UINTN))) = (UINTN)PeiServicesTablePointer;\r
 }\r
 \r
 /**\r
   ASSERT (PeiServicesTablePointer != NULL);\r
   AsmReadIdtr (&Idtr);\r
   (*(UINTN*)(Idtr.Base - sizeof (UINTN))) = (UINTN)PeiServicesTablePointer;\r
 }\r
 \r
 /**\r

-  Perform CPU specific actions required to migrate the PEI Services Table \r
+  Perform CPU specific actions required to migrate the PEI Services Table\r

   pointer from temporary RAM to permanent RAM.\r
 \r
   pointer from temporary RAM to permanent RAM.\r
 \r

-  For IA32 CPUs, the PEI Services Table pointer is stored in the 4 bytes \r
+  For IA32 CPUs, the PEI Services Table pointer is stored in the 4 bytes\r

   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r

-  For X64 CPUs, the PEI Services Table pointer is stored in the 8 bytes \r
+  For X64 CPUs, the PEI Services Table pointer is stored in the 8 bytes\r

   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   For Itanium and ARM CPUs, a the PEI Services Table Pointer is stored in\r
   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   For Itanium and ARM CPUs, a the PEI Services Table Pointer is stored in\r

-  a dedicated CPU register.  This means that there is no memory storage \r
-  associated with storing the PEI Services Table pointer, so no additional \r
+  a dedicated CPU register.  This means that there is no memory storage\r
+  associated with storing the PEI Services Table pointer, so no additional\r

   migration actions are required for Itanium or ARM CPUs.\r
 \r
   If The cached PEI Services Table pointer is NULL, then ASSERT().\r
   migration actions are required for Itanium or ARM CPUs.\r
 \r
   If The cached PEI Services Table pointer is NULL, then ASSERT().\r


@@ -112,7 +112,7 @@ MigratePeiServicesTablePointer (
   // Allocate the permanent memory.\r
   //\r
   Status = (*PeiServices)->AllocatePages (\r
   // Allocate the permanent memory.\r
   //\r
   Status = (*PeiServices)->AllocatePages (\r

-                            PeiServices, \r
+                            PeiServices,\r

                             EfiBootServicesCode,\r
                             EFI_SIZE_TO_PAGES(Idtr.Limit + 1 + sizeof (UINTN)),\r
                             &IdtBase\r
                             EfiBootServicesCode,\r
                             EFI_SIZE_TO_PAGES(Idtr.Limit + 1 + sizeof (UINTN)),\r
                             &IdtBase\r


@@ -124,7 +124,7 @@ MigratePeiServicesTablePointer (
   CopyMem ((VOID *) (UINTN) IdtBase, (VOID *) (Idtr.Base - sizeof (UINTN)), Idtr.Limit + 1 + sizeof (UINTN));\r
   Idtr.Base = (UINTN) IdtBase + sizeof (UINTN);\r
   AsmWriteIdtr (&Idtr);\r
   CopyMem ((VOID *) (UINTN) IdtBase, (VOID *) (Idtr.Base - sizeof (UINTN)), Idtr.Limit + 1 + sizeof (UINTN));\r
   Idtr.Base = (UINTN) IdtBase + sizeof (UINTN);\r
   AsmWriteIdtr (&Idtr);\r

-  \r
+\r

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

diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
index 66cf7bc471577ee19e0da9624c45f35e465945f5..24eea3b6a7fca0aec8abc1839a6dcef584d51421 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
@@ -2,7 +2,7 @@
   PEI Services Table Pointer Library implementation for IPF that uses Kernel\r
   Register 7 to store the pointer.\r
 \r
   PEI Services Table Pointer Library implementation for IPF that uses Kernel\r
   Register 7 to store the pointer.\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


@@ -20,10 +20,10 @@
 /**\r
   Retrieves the cached value of the PEI Services Table pointer.\r
 \r
 /**\r
   Retrieves the cached value of the PEI Services Table pointer.\r
 \r

-  Returns the cached value of the PEI Services Table pointer in a CPU specific manner \r
-  as specified in the CPU binding section of the Platform Initialization Pre-EFI \r
+  Returns the cached value of the PEI Services Table pointer in a CPU specific manner\r
+  as specified in the CPU binding section of the Platform Initialization Pre-EFI\r

   Initialization Core Interface Specification.\r
   Initialization Core Interface Specification.\r

-  \r
+\r

   If the cached PEI Services Table pointer is NULL, then ASSERT().\r
 \r
   @return  The pointer to PeiServices.\r
   If the cached PEI Services Table pointer is NULL, then ASSERT().\r
 \r
   @return  The pointer to PeiServices.\r


@@ -44,16 +44,16 @@ GetPeiServicesTablePointer (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Caches a pointer PEI Services Table. \r
- \r
-  Caches the pointer to the PEI Services Table specified by PeiServicesTablePointer \r
-  in a CPU specific manner as specified in the CPU binding section of the Platform Initialization \r
-  Pre-EFI Initialization Core Interface Specification. \r
-  The function set the pointer of PEI services in KR7 register \r
+  Caches a pointer PEI Services Table.\r
+\r
+  Caches the pointer to the PEI Services Table specified by PeiServicesTablePointer\r
+  in a CPU specific manner as specified in the CPU binding section of the Platform Initialization\r
+  Pre-EFI Initialization Core Interface Specification.\r
+  The function set the pointer of PEI services in KR7 register\r

   according to PI specification.\r
   according to PI specification.\r

-  \r
+\r

   If PeiServicesTablePointer is NULL, then ASSERT().\r
   If PeiServicesTablePointer is NULL, then ASSERT().\r

-  \r
+\r

   @param    PeiServicesTablePointer   The address of PeiServices pointer.\r
 **/\r
 VOID\r
   @param    PeiServicesTablePointer   The address of PeiServices pointer.\r
 **/\r
 VOID\r


@@ -65,18 +65,18 @@ SetPeiServicesTablePointer (
   ASSERT (PeiServicesTablePointer != NULL);\r
   AsmWriteKr7 ((UINT64)(UINTN)PeiServicesTablePointer);\r
 }\r
   ASSERT (PeiServicesTablePointer != NULL);\r
   AsmWriteKr7 ((UINT64)(UINTN)PeiServicesTablePointer);\r
 }\r

-  \r
+\r

 /**\r
 /**\r

-  Perform CPU specific actions required to migrate the PEI Services Table \r
+  Perform CPU specific actions required to migrate the PEI Services Table\r

   pointer from temporary RAM to permanent RAM.\r
 \r
   pointer from temporary RAM to permanent RAM.\r
 \r

-  For IA32 CPUs, the PEI Services Table pointer is stored in the 4 bytes \r
+  For IA32 CPUs, the PEI Services Table pointer is stored in the 4 bytes\r

   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r

-  For X64 CPUs, the PEI Services Table pointer is stored in the 8 bytes \r
+  For X64 CPUs, the PEI Services Table pointer is stored in the 8 bytes\r

   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   For Itanium and ARM CPUs, a the PEI Services Table Pointer is stored in\r
   immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
   For Itanium and ARM CPUs, a the PEI Services Table Pointer is stored in\r

-  a dedicated CPU register.  This means that there is no memory storage \r
-  associated with storing the PEI Services Table pointer, so no additional \r
+  a dedicated CPU register.  This means that there is no memory storage\r
+  associated with storing the PEI Services Table pointer, so no additional\r

   migration actions are required for Itanium or ARM CPUs.\r
 \r
 **/\r
   migration actions are required for Itanium or ARM CPUs.\r
 \r
 **/\r

diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/InternalSmbusLib.h b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/InternalSmbusLib.h
index 00f8078f7628462581c4181e8baca742c8e59832..633b18bc2905e7e526980fad8b0b2abc55bb53d4 100644 (file)
--- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/InternalSmbusLib.h
+++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/InternalSmbusLib.h
@@ -1,7 +1,7 @@
 /** @file\r
 Internal header file for Smbus library.\r
 \r
 /** @file\r
 Internal header file for Smbus library.\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


@@ -52,15 +52,15 @@ InternalGetSmbusPpi (
   as defined in the SmBus Specification. The data can either be of\r
   the Length byte, word, or a block of data.\r
 \r
   as defined in the SmBus Specification. The data can either be of\r
   the Length byte, word, or a block of data.\r
 \r

-  @param  SmbusOperation  Signifies which particular SMBus hardware protocol \r
+  @param  SmbusOperation  Signifies which particular SMBus hardware protocol\r

                           instance that it will use to execute the SMBus transactions.\r
   @param  SmBusAddress    The address that encodes the SMBUS Slave Address,\r
                           SMBUS Command, SMBUS Data Length, and PEC.\r
                           instance that it will use to execute the SMBus transactions.\r
   @param  SmBusAddress    The address that encodes the SMBUS Slave Address,\r
                           SMBUS Command, SMBUS Data Length, and PEC.\r

-  @param  Length          Signifies the number of bytes that this operation will \r
-                          do. The maximum number of bytes can be revision specific \r
+  @param  Length          Signifies the number of bytes that this operation will\r
+                          do. The maximum number of bytes can be revision specific\r

                           and operation specific.\r
                           and operation specific.\r

-  @param  Buffer          Contains the value of data to execute to the SMBus slave \r
-                          device. Not all operations require this argument. The \r
+  @param  Buffer          Contains the value of data to execute to the SMBus slave\r
+                          device. Not all operations require this argument. The\r

                           length of this buffer is identified by Length.\r
   @param  Status          Return status for the executed command.\r
                           This is an optional parameter and may be NULL.\r
                           length of this buffer is identified by Length.\r
   @param  Status          Return status for the executed command.\r
                           This is an optional parameter and may be NULL.\r

diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c
index 5821e9bb6d8066acaf7e9931c927ae946214e211..239d7b6e2ebfb76b2c7d2ac2b71528f1a2d8ca84 100644 (file)
--- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c
+++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c
@@ -1,7 +1,7 @@
 /** @file\r
 Implementation of SmBusLib class library for PEI phase.\r
 \r
 /** @file\r
 Implementation of SmBusLib class library for PEI 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


@@ -46,15 +46,15 @@ InternalGetSmbusPpi (
   as defined in the SmBus Specification. The data can either be of\r
   the Length byte, word, or a block of data.\r
 \r
   as defined in the SmBus Specification. The data can either be of\r
   the Length byte, word, or a block of data.\r
 \r

-  @param  SmbusOperation  Signifies which particular SMBus hardware protocol instance \r
+  @param  SmbusOperation  Signifies which particular SMBus hardware protocol instance\r

                           that it will use to execute the SMBus transactions.\r
   @param  SmBusAddress    The address that encodes the SMBUS Slave Address,\r
                           SMBUS Command, SMBUS Data Length, and PEC.\r
                           that it will use to execute the SMBus transactions.\r
   @param  SmBusAddress    The address that encodes the SMBUS Slave Address,\r
                           SMBUS Command, SMBUS Data Length, and PEC.\r

-  @param  Length          Signifies the number of bytes that this operation will \r
-                          do. The maximum number of bytes can be revision specific \r
+  @param  Length          Signifies the number of bytes that this operation will\r
+                          do. The maximum number of bytes can be revision specific\r

                           and operation specific.\r
                           and operation specific.\r

-  @param  Buffer          Contains the value of data to execute to the SMBus slave \r
-                          device. Not all operations require this argument. The \r
+  @param  Buffer          Contains the value of data to execute to the SMBus slave\r
+                          device. Not all operations require this argument. The\r

                           length of this buffer is identified by Length.\r
   @param  Status          Return status for the executed command.\r
                           This is an optional parameter and may be NULL.\r
                           length of this buffer is identified by Length.\r
   @param  Status          Return status for the executed command.\r
                           This is an optional parameter and may be NULL.\r

diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
index cef8e03ad890f8b4340244ab991496ce9f915c36..31cea95bdeb9ea1f761c44303dfd7d20bc7fa649 100644 (file)
--- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
+++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # SMBUS library that layers on top of the SMBUS2 PPI.\r
 #\r
 ## @file\r
 # SMBUS library that layers on top of the SMBUS2 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 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


@@ -46,5 +46,5 @@
   gEfiPeiSmbus2PpiGuid                           ## CONSUMES\r
 \r
 [Depex.common.PEIM]\r
   gEfiPeiSmbus2PpiGuid                           ## CONSUMES\r
 \r
 [Depex.common.PEIM]\r

-  gEfiPeiSmbus2PpiGuid \r
+  gEfiPeiSmbus2PpiGuid\r

 \r
 \r

diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/SmbusLib.c b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/SmbusLib.c
index 42e9513f5788c9c2469069b60b1e2509f75e4183..639a2e7e6fa341f8e9382d6d6a2bbb1e23c6aa5d 100644 (file)
--- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/SmbusLib.c
+++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/SmbusLib.c
@@ -1,7 +1,7 @@
 /** @file\r
 Implementation of SmBusLib class library for PEI phase.\r
 \r
 /** @file\r
 Implementation of SmBusLib class library for PEI phase.\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


@@ -31,11 +31,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS:  The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS:  The SMBUS command was executed.\r

-                        RETURN_TIMEOUT:  A timeout occurred while executing the \r
+                        RETURN_TIMEOUT:  A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR: The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
+                        RETURN_DEVICE_ERROR: The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r

                         illegal command field, unclaimed cycle\r
                         (host initiated), or bus errors (collisions).\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
                         illegal command field, unclaimed cycle\r
                         (host initiated), or bus errors (collisions).\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r


@@ -72,12 +72,12 @@ SmBusQuickRead (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  Device \r
-                        errors are a result of a transaction collision, illegal \r
-                        command field, unclaimed cycle (host initiated), or bus \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.  Device\r
+                        errors are a result of a transaction collision, illegal\r
+                        command field, unclaimed cycle (host initiated), or bus\r

                         errors (collisions).\r
                         RETURN_UNSUPPORTED::  The SMBus operation is not supported.\r
 \r
                         errors (collisions).\r
                         RETURN_UNSUPPORTED::  The SMBus operation is not supported.\r
 \r


@@ -113,11 +113,11 @@ SmBusQuickWrite (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r

                         illegal command field, unclaimed cycle (host initiated),\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         illegal command field, unclaimed cycle (host initiated),\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r


@@ -161,12 +161,12 @@ SmBusReceiveByte (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  Device \r
-                        errors are a result of a transaction collision, illegal \r
-                        command field, unclaimed cycle (host initiated), or bus \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.  Device\r
+                        errors are a result of a transaction collision, illegal\r
+                        command field, unclaimed cycle (host initiated), or bus\r

                         errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
                         errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r


@@ -209,11 +209,11 @@ SmBusSendByte (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r

                         illegal command field, unclaimed cycle (host initiated),\r
                        or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         illegal command field, unclaimed cycle (host initiated),\r
                        or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r


@@ -256,11 +256,11 @@ SmBusReadDataByte (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r

                         illegal command field, unclaimed cycle (host initiated),\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         illegal command field, unclaimed cycle (host initiated),\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r


@@ -297,17 +297,17 @@ SmBusWriteDataByte (
   If Status is not NULL, then the status of the executed command is returned in Status.\r
   If Length in SmBusAddress is not zero, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r
   If Status is not NULL, then the status of the executed command is returned in Status.\r
   If Length in SmBusAddress is not zero, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r

-  \r
+\r

   @param  SmBusAddress  The address that encodes the SMBUS Slave Address,\r
                         SMBUS Command, SMBUS Data Length, and PEC.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  SmBusAddress  The address that encodes the SMBUS Slave Address,\r
                         SMBUS Command, SMBUS Data Length, and PEC.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r

                         illegal command field, unclaimed cycle (host initiated),\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         illegal command field, unclaimed cycle (host initiated),\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r


@@ -350,11 +350,11 @@ SmBusReadDataWord (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r

                         illegal command field, unclaimed cycle (host initiated),\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         illegal command field, unclaimed cycle (host initiated),\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r


@@ -399,11 +399,11 @@ SmBusWriteDataWord (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r

                         illegal command field, unclaimed cycle (host initiated),\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         illegal command field, unclaimed cycle (host initiated),\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r


@@ -448,12 +448,12 @@ SmBusProcessCall (
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
                         RETURN_SUCCESS: The SMBUS command was executed.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
-                        illegal command field, unclaimed cycle (host initiated), \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r
+                        illegal command field, unclaimed cycle (host initiated),\r

                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct. (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r


@@ -483,7 +483,7 @@ SmBusReadBlock (
   The SMBUS slave address, SMBUS command, and SMBUS length fields of SmBusAddress are required.\r
   Bytes are written to the SMBUS from Buffer.\r
   The number of bytes written is returned, and will never return a value larger than 32-bytes.\r
   The SMBUS slave address, SMBUS command, and SMBUS length fields of SmBusAddress are required.\r
   Bytes are written to the SMBUS from Buffer.\r
   The number of bytes written is returned, and will never return a value larger than 32-bytes.\r

-  If Status is not NULL, then the status of the executed command is returned in Status.  \r
+  If Status is not NULL, then the status of the executed command is returned in Status.\r

   If Length in SmBusAddress is zero or greater than 32, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r
   If Length in SmBusAddress is zero or greater than 32, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If any reserved bits of SmBusAddress are set, then ASSERT().\r


@@ -493,12 +493,12 @@ SmBusReadBlock (
   @param  Buffer        The pointer to the buffer to store the bytes read from the SMBUS.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
   @param  Buffer        The pointer to the buffer to store the bytes read from the SMBUS.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
-                        illegal command field, unclaimed cycle (host initiated), \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r
+                        illegal command field, unclaimed cycle (host initiated),\r

                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct (PEC is incorrect)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR:  The checksum is not correct (PEC is incorrect)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r


@@ -545,12 +545,12 @@ SmBusWriteBlock (
   @param  ReadBuffer    The pointer to the buffer of bytes to read from the SMBUS.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r
   @param  ReadBuffer    The pointer to the buffer of bytes to read from the SMBUS.\r
   @param  Status        Return status for the executed command.\r
                         This is an optional parameter and may be NULL.\r

-                        RETURN_TIMEOUT: A timeout occurred while executing the \r
+                        RETURN_TIMEOUT: A timeout occurred while executing the\r

                         SMBUS command.\r
                         SMBUS command.\r

-                        RETURN_DEVICE_ERROR:  The request was not completed because \r
-                        a failure reflected in the Host Status Register bit.  \r
-                        Device errors are a result of a transaction collision, \r
-                        illegal command field, unclaimed cycle (host initiated), \r
+                        RETURN_DEVICE_ERROR:  The request was not completed because\r
+                        a failure reflected in the Host Status Register bit.\r
+                        Device errors are a result of a transaction collision,\r
+                        illegal command field, unclaimed cycle (host initiated),\r

                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR  The checksum is not correct. (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r
                         or bus errors (collisions).\r
                         RETURN_CRC_ERROR  The checksum is not correct. (PEC is incorrect.)\r
                         RETURN_UNSUPPORTED:  The SMBus operation is not supported.\r

diff --git a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
index 83a1bd8ccc328480242876a09b8926a6905aa635..5b473c56689c76e3a42bf4f769245772fffc083c 100644 (file)
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
+++ b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
@@ -1,7 +1,7 @@
 /** @file\r
   Entry point to a PEIM.\r
 \r
 /** @file\r
   Entry point to a PEIM.\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


@@ -22,11 +22,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   The entry point of PE/COFF Image for a PEIM.\r
 \r
 /**\r
   The entry point of PE/COFF Image for a PEIM.\r
 \r

-  This function is the entry point for a PEIM.  This function must call ProcessLibraryConstructorList() \r
+  This function is the entry point for a PEIM.  This function must call ProcessLibraryConstructorList()\r

   and ProcessModuleEntryPointList().  The return value from ProcessModuleEntryPointList() is returned.\r
   If _gPeimRevision is not zero and PeiServices->Hdr.Revision is less than _gPeimRevison, then ASSERT().\r
 \r
   and ProcessModuleEntryPointList().  The return value from ProcessModuleEntryPointList() is returned.\r
   If _gPeimRevision is not zero and PeiServices->Hdr.Revision is less than _gPeimRevison, then ASSERT().\r
 \r

-  @param  FileHandle  Handle of the file being invoked. \r
+  @param  FileHandle  Handle of the file being invoked.\r

   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval  EFI_SUCCESS   The PEIM executed normally.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval  EFI_SUCCESS   The PEIM executed normally.\r


@@ -60,10 +60,10 @@ _ModuleEntryPoint (
 \r
 /**\r
   Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().\r
 \r
 /**\r
   Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().\r

-  \r
+\r

   This function is required to call _ModuleEntryPoint() passing in FileHandle and PeiServices.\r
 \r
   This function is required to call _ModuleEntryPoint() passing in FileHandle and PeiServices.\r
 \r

-  @param  FileHandle  Handle of the file being invoked. \r
+  @param  FileHandle  Handle of the file being invoked.\r

   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval EFI_SUCCESS  The PEIM executed normally.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval EFI_SUCCESS  The PEIM executed normally.\r

diff --git a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
index a2db9e058bbecaec304d759e26dd626cd07da9e1..459cb3df5033d997345ff4118de64be5a48fbc17 100644 (file)
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
+++ b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # Module entry point library for PEIM.\r
 #\r
 ## @file\r
 # Module entry point library for PEIM.\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


@@ -20,7 +20,7 @@
   FILE_GUID                      = fa177ff7-1fc7-458d-a358-d9d62ae61cec\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = fa177ff7-1fc7-458d-a358-d9d62ae61cec\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = PeimEntryPoint|PEIM \r
+  LIBRARY_CLASS                  = PeimEntryPoint|PEIM\r

 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r

diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
index a00ebb0eeb64525ac2d19f8a224822e0377ada7d..0feb42f0b366b529d414ced52c5aa16a83dc20b8 100644 (file)
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
@@ -3,9 +3,9 @@
 #\r
 # Timer Library that only uses CPU resources to provide calibrated delays\r
 #  on IA-32, x64, and IPF.\r
 #\r
 # Timer Library that only uses CPU resources to provide calibrated delays\r
 #  on IA-32, x64, and IPF.\r

-# Note: A driver of type DXE_RUNTIME_DRIVER and DXE_SMM_DRIVER can use this TimerLib \r
-#  in their initialization without any issues. They only have to be careful in \r
-#  the implementation of runtime services and SMI handlers.  \r
+# Note: A driver of type DXE_RUNTIME_DRIVER and DXE_SMM_DRIVER can use this TimerLib\r
+#  in their initialization without any issues. They only have to be careful in\r
+#  the implementation of runtime services and SMI handlers.\r

 #  Because CPU Local APIC and ITC could be programmed by OS, it cannot be\r
 #  used by SMM drivers and runtime drivers, ACPI timer is recommended for SMM\r
 #  drivers and runtime drivers.\r
 #  Because CPU Local APIC and ITC could be programmed by OS, it cannot be\r
 #  used by SMM drivers and runtime drivers, ACPI timer is recommended for SMM\r
 #  drivers and runtime drivers.\r


@@ -13,7 +13,7 @@
 # Note that for IA-32 and x64, this library only supports xAPIC mode. If x2APIC\r
 # support is desired, the SecPeiDxeTimerLibUefiCpu library can be used.\r
 #\r
 # Note that for IA-32 and x64, this library only supports xAPIC mode. If x2APIC\r
 # support is desired, the SecPeiDxeTimerLibUefiCpu library can be used.\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

diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.uni b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.uni
index c2d5b6ea35caba2afed5eb80636983d79207325c..227a6a089394e2582ed963fac0a111970bba74ef 100644 (file)
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.uni
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.uni
@@ -9,11 +9,11 @@
 // Because CPU Local APIC and ITC could be programmed by OS, it cannot be\r
 // used by SMM drivers and runtime drivers, ACPI timer is recommended for SMM\r
 // drivers and runtime drivers.\r
 // Because CPU Local APIC and ITC could be programmed by OS, it cannot be\r
 // used by SMM drivers and runtime drivers, ACPI timer is recommended for SMM\r
 // drivers and runtime drivers.\r

-// \r
+//\r

 // Note that for IA-32 and x64, this library only supports xAPIC mode. If x2APIC\r
 // support is desired, the SecPeiDxeTimerLibUefiCpu library can be used.\r
 //\r
 // Note that for IA-32 and x64, this library only supports xAPIC mode. If x2APIC\r
 // support is desired, the SecPeiDxeTimerLibUefiCpu library can be used.\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

diff --git a/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c
index 69acb80f2d6a03419cb066a48d717248d8fbecc6..49802aa8d022c728a827c2ac81d8de7da359a2e9 100644 (file)
--- a/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c
+++ b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c
@@ -1,9 +1,9 @@
 /** @file\r
   I/O Library.\r
 /** @file\r
   I/O Library.\r

-  The implementation of I/O operation for this library instance \r
+  The implementation of I/O operation for this library instance\r

   are based on EFI_CPU_IO_PROTOCOL.\r
   are based on EFI_CPU_IO_PROTOCOL.\r

-  \r
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+\r
+  Copyright (c) 2009 - 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


@@ -120,7 +120,7 @@ MmioReadWorker (
                         The caller is responsible for aligning the Address if required.\r
   @param  Width         The width of the I/O operation.\r
   @param  Data          The value to write to the I/O port.\r
                         The caller is responsible for aligning the Address if required.\r
   @param  Width         The width of the I/O operation.\r
   @param  Data          The value to write to the I/O port.\r

-  \r
+\r

   @return Data read from registers in the EFI system memory space.\r
 \r
 **/\r
   @return Data read from registers in the EFI system memory space.\r
 \r
 **/\r


@@ -196,7 +196,7 @@ IoWrite8 (
   serialized.\r
 \r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r
   serialized.\r
 \r
   If Port is not aligned on a 16-bit boundary, then ASSERT().\r

- \r
+\r

   If 16-bit I/O port operations are not supported, then ASSERT().\r
 \r
   @param  Port  The I/O port to read.\r
   If 16-bit I/O port operations are not supported, then ASSERT().\r
 \r
   @param  Port  The I/O port to read.\r


@@ -254,7 +254,7 @@ IoWrite16 (
   Reads the 32-bit I/O port specified by Port. The 32-bit read value is returned.\r
   This function must guarantee that all I/O read and write operations are\r
   serialized.\r
   Reads the 32-bit I/O port specified by Port. The 32-bit read value is returned.\r
   This function must guarantee that all I/O read and write operations are\r
   serialized.\r

- \r
+\r

   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r
   If Port is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   If 32-bit I/O port operations are not supported, then ASSERT().\r


@@ -345,7 +345,7 @@ IoRead64 (
   operations are serialized.\r
 \r
   If Port is not aligned on a 64-bit boundary, then ASSERT().\r
   operations are serialized.\r
 \r
   If Port is not aligned on a 64-bit boundary, then ASSERT().\r

- \r
+\r

   If 64-bit I/O port operations are not supported, then ASSERT().\r
 \r
   @param  Port  The I/O port to write.\r
   If 64-bit I/O port operations are not supported, then ASSERT().\r
 \r
   @param  Port  The I/O port to write.\r


@@ -636,7 +636,7 @@ MmioWrite8 (
   operations are serialized.\r
 \r
   If Address is not aligned on a 16-bit boundary, then ASSERT().\r
   operations are serialized.\r
 \r
   If Address is not aligned on a 16-bit boundary, then ASSERT().\r

- \r
+\r

   If 16-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r
   If 16-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r


@@ -665,7 +665,7 @@ MmioRead16 (
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 16-bit boundary, then ASSERT().\r
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 16-bit boundary, then ASSERT().\r

- \r
+\r

   If 16-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r
   If 16-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r


@@ -694,7 +694,7 @@ MmioWrite16 (
   operations are serialized.\r
 \r
   If Address is not aligned on a 32-bit boundary, then ASSERT().\r
   operations are serialized.\r
 \r
   If Address is not aligned on a 32-bit boundary, then ASSERT().\r

-  \r
+\r

   If 32-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r
   If 32-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r


@@ -723,7 +723,7 @@ MmioRead32 (
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 32-bit boundary, then ASSERT().\r
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 32-bit boundary, then ASSERT().\r

- \r
+\r

   If 32-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r
   If 32-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r


@@ -752,7 +752,7 @@ MmioWrite32 (
   operations are serialized.\r
 \r
   If Address is not aligned on a 64-bit boundary, then ASSERT().\r
   operations are serialized.\r
 \r
   If Address is not aligned on a 64-bit boundary, then ASSERT().\r

- \r
+\r

   If 64-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r
   If 64-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r


@@ -781,7 +781,7 @@ MmioRead64 (
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 64-bit boundary, then ASSERT().\r
   and write operations are serialized.\r
 \r
   If Address is not aligned on a 64-bit boundary, then ASSERT().\r

- \r
+\r

   If 64-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r
   If 64-bit MMIO register operations are not supported, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r

diff --git a/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLibMmioBuffer.c b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLibMmioBuffer.c
index 8682d51dab82b5c9ca4e05130427ebd63c59437f..9dcb30d0827dd240cd9fb08813161479499b9854 100644 (file)
--- a/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLibMmioBuffer.c
+++ b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLibMmioBuffer.c
@@ -1,7 +1,7 @@
 /** @file\r
   I/O Library MMIO Buffer Functions.\r
 \r
 /** @file\r
   I/O Library MMIO Buffer Functions.\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


@@ -67,7 +67,7 @@ MmioReadBuffer8 (
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r

-  \r
+\r

   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied from.\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied from.\r


@@ -170,7 +170,7 @@ MmioReadBuffer32 (
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

- \r
+\r

   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied from.\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied from.\r


@@ -223,7 +223,7 @@ MmioReadBuffer64 (
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied to.\r
   @param  Length          The size in bytes of the copy.\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied to.\r
   @param  Length          The size in bytes of the copy.\r

-  @param  Buffer          The pointer to a system memory buffer containing the \r
+  @param  Buffer          The pointer to a system memory buffer containing the\r

                           data to write.\r
 \r
   @return Buffer\r
                           data to write.\r
 \r
   @return Buffer\r


@@ -270,7 +270,7 @@ MmioWriteBuffer8 (
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied to.\r
   @param  Length          The size in bytes of the copy.\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied to.\r
   @param  Length          The size in bytes of the copy.\r

-  @param  Buffer          The pointer to a system memory buffer containing the \r
+  @param  Buffer          The pointer to a system memory buffer containing the\r

                           data to write.\r
 \r
   @return Buffer\r
                           data to write.\r
 \r
   @return Buffer\r


@@ -325,7 +325,7 @@ MmioWriteBuffer16 (
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied to.\r
   @param  Length          The size in bytes of the copy.\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied to.\r
   @param  Length          The size in bytes of the copy.\r

-  @param  Buffer          The pointer to a system memory buffer containing the \r
+  @param  Buffer          The pointer to a system memory buffer containing the\r

                           data to write.\r
 \r
   @return Buffer\r
                           data to write.\r
 \r
   @return Buffer\r


@@ -379,7 +379,7 @@ MmioWriteBuffer32 (
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied to.\r
   @param  Length          The size in bytes of the copy.\r
 \r
   @param  StartAddress    The starting address for the MMIO region to be copied to.\r
   @param  Length          The size in bytes of the copy.\r

-  @param  Buffer          The pointer to a system memory buffer containing the \r
+  @param  Buffer          The pointer to a system memory buffer containing the\r

                           data to write.\r
 \r
   @return Buffer\r
                           data to write.\r
 \r
   @return Buffer\r

diff --git a/MdePkg/Library/SmmIoLibSmmCpuIo2/SmmCpuIoLibInternal.h b/MdePkg/Library/SmmIoLibSmmCpuIo2/SmmCpuIoLibInternal.h
index ced6358c27ff4ec30037da2bf2f0860c8ef35cdc..5aa3f9eedd791dbfdff4b60cf37dfb0fcc38d9e0 100644 (file)
--- a/MdePkg/Library/SmmIoLibSmmCpuIo2/SmmCpuIoLibInternal.h
+++ b/MdePkg/Library/SmmIoLibSmmCpuIo2/SmmCpuIoLibInternal.h
@@ -1,10 +1,10 @@
 /** @file\r
   Internal include file of SMM CPU IO Library.\r
   It includes all necessary protocol/library class's header file\r
 /** @file\r
   Internal include file of SMM CPU IO Library.\r
   It includes all necessary protocol/library class's header file\r

-  for implementation of IoLib library instance. It is included \r
+  for implementation of IoLib library instance. It is included\r

   all source code of this library instance.\r
   all source code of this library instance.\r

-  \r
-  Copyright (c) 2009 - 2010, 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\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -103,7 +103,7 @@ MmioReadWorker (
                         The caller is responsible for aligning the Address if required.\r
   @param  Width         The width of the I/O operation.\r
   @param  Data          The value to write to the I/O port.\r
                         The caller is responsible for aligning the Address if required.\r
   @param  Width         The width of the I/O operation.\r
   @param  Data          The value to write to the I/O port.\r

-  \r
+\r

   @return Data read from registers in the EFI system memory space.\r
 \r
 **/\r
   @return Data read from registers in the EFI system memory space.\r
 \r
 **/\r

diff --git a/MdePkg/Library/SmmLibNull/SmmLibNull.c b/MdePkg/Library/SmmLibNull/SmmLibNull.c
index 60c8adb13306f60a3b30b54346a5c6bf16b1b035..fb4c3da80b10b00177322dbf887b254ff0ad664d 100644 (file)
--- a/MdePkg/Library/SmmLibNull/SmmLibNull.c
+++ b/MdePkg/Library/SmmLibNull/SmmLibNull.c
@@ -1,14 +1,14 @@
 /** @file\r
   NULL instance of SMM Library.\r
 \r
 /** @file\r
   NULL instance of SMM Library.\r
 \r

-  Copyright (c) 2009 - 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) 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
 \r

-  THE PROGRAM 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 @@
 #include <Library/SmmLib.h>\r
 \r
 /**\r
 #include <Library/SmmLib.h>\r
 \r
 /**\r

-  Triggers an SMI at boot time.  \r
+  Triggers an SMI at boot time.\r

 \r
   This function triggers a software SMM interrupt at boot time.\r
 \r
 \r
   This function triggers a software SMM interrupt at boot time.\r
 \r


@@ -32,7 +32,7 @@ TriggerBootServiceSoftwareSmi (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Triggers an SMI at run time.  \r
+  Triggers an SMI at run time.\r

 \r
   This function triggers a software SMM interrupt at run time.\r
 \r
 \r
   This function triggers a software SMM interrupt at run time.\r
 \r


@@ -49,10 +49,10 @@ TriggerRuntimeSoftwareSmi (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Test if a boot time software SMI happened.  \r
+  Test if a boot time software SMI happened.\r

 \r
 \r

-  This function tests if a software SMM interrupt happened. If a software SMM \r
-  interrupt happened and it was triggered at boot time, it returns TRUE. Otherwise, \r
+  This function tests if a software SMM interrupt happened. If a software SMM\r
+  interrupt happened and it was triggered at boot time, it returns TRUE. Otherwise,\r

   it returns FALSE.\r
 \r
   @retval TRUE   A software SMI triggered at boot time happened.\r
   it returns FALSE.\r
 \r
   @retval TRUE   A software SMI triggered at boot time happened.\r


@@ -70,10 +70,10 @@ IsBootServiceSoftwareSmi (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Test if a run time software SMI happened.  \r
+  Test if a run time software SMI happened.\r

 \r
 \r

-  This function tests if a software SMM interrupt happened. If a software SMM \r
-  interrupt happened and it was triggered at run time, it returns TRUE. Otherwise, \r
+  This function tests if a software SMM interrupt happened. If a software SMM\r
+  interrupt happened and it was triggered at run time, it returns TRUE. Otherwise,\r

   it returns FALSE.\r
 \r
   @retval TRUE   A software SMI triggered at run time happened.\r
   it returns FALSE.\r
 \r
   @retval TRUE   A software SMI triggered at run time happened.\r


@@ -90,8 +90,8 @@ IsRuntimeSoftwareSmi (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Clear APM SMI Status Bit; Set the EOS bit. \r
-  \r
+  Clear APM SMI Status Bit; Set the EOS bit.\r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r

diff --git a/MdePkg/Library/SmmLibNull/SmmLibNull.inf b/MdePkg/Library/SmmLibNull/SmmLibNull.inf
index 597b884df25fdf4e4cfcbba14f984c1226b13836..b7c0bcdda7b6d620f8c58dcfc81bc059cb7588b8 100644 (file)
--- a/MdePkg/Library/SmmLibNull/SmmLibNull.inf
+++ b/MdePkg/Library/SmmLibNull/SmmLibNull.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # NULL instance of SMM Library.\r
 #\r
 ## @file\r
 # NULL instance of SMM Library.\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


@@ -30,7 +30,7 @@
 \r
 [Sources]\r
   SmmLibNull.c\r
 \r
 [Sources]\r
   SmmLibNull.c\r

-  \r
+\r

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

diff --git a/MdePkg/Library/SmmMemLib/SmmMemLib.c b/MdePkg/Library/SmmMemLib/SmmMemLib.c
index db55a1a6c15063cdd42c0290e50d95f3f3ac9828..8c78a0b426f2fd5a0effa7cb6d26002945a583d1 100644 (file)
--- a/MdePkg/Library/SmmMemLib/SmmMemLib.c
+++ b/MdePkg/Library/SmmMemLib/SmmMemLib.c
@@ -6,7 +6,7 @@
   all SMRAM range via SMM_ACCESS2_PROTOCOL, including the range for firmware (like SMM Core\r
   and SMM driver) and/or specific dedicated hardware.\r
 \r
   all SMRAM range via SMM_ACCESS2_PROTOCOL, including the range for firmware (like SMM Core\r
   and SMM driver) and/or specific dedicated hardware.\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


@@ -86,9 +86,9 @@ SmmMemLibInternalCalculateMaximumSupportAddress (
   if (PhysicalAddressBits > 48) {\r
     PhysicalAddressBits = 48;\r
   }\r
   if (PhysicalAddressBits > 48) {\r
     PhysicalAddressBits = 48;\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // Save the maximum support address in one global variable  \r
+  // Save the maximum support address in one global variable\r

   //\r
   mSmmMemLibInternalMaximumSupportAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)(LShiftU64 (1, PhysicalAddressBits) - 1);\r
   DEBUG ((EFI_D_INFO, "mSmmMemLibInternalMaximumSupportAddress = 0x%lx\n", mSmmMemLibInternalMaximumSupportAddress));\r
   //\r
   mSmmMemLibInternalMaximumSupportAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)(LShiftU64 (1, PhysicalAddressBits) - 1);\r
   DEBUG ((EFI_D_INFO, "mSmmMemLibInternalMaximumSupportAddress = 0x%lx\n", mSmmMemLibInternalMaximumSupportAddress));\r


@@ -111,7 +111,7 @@ SmmIsBufferOutsideSmmValid (
   )\r
 {\r
   UINTN  Index;\r
   )\r
 {\r
   UINTN  Index;\r

-  \r
+\r

   //\r
   // Check override.\r
   // NOTE: (B:0->L:4G) is invalid for IA32, but (B:1->L:4G-1)/(B:4G-1->L:1) is valid.\r
   //\r
   // Check override.\r
   // NOTE: (B:0->L:4G) is invalid for IA32, but (B:1->L:4G-1)/(B:4G-1->L:1) is valid.\r


@@ -131,7 +131,7 @@ SmmIsBufferOutsideSmmValid (
       ));\r
     return FALSE;\r
   }\r
       ));\r
     return FALSE;\r
   }\r

-  \r
+\r

   for (Index = 0; Index < mSmmMemLibInternalSmramCount; Index ++) {\r
     if (((Buffer >= mSmmMemLibInternalSmramRanges[Index].CpuStart) && (Buffer < mSmmMemLibInternalSmramRanges[Index].CpuStart + mSmmMemLibInternalSmramRanges[Index].PhysicalSize)) ||\r
         ((mSmmMemLibInternalSmramRanges[Index].CpuStart >= Buffer) && (mSmmMemLibInternalSmramRanges[Index].CpuStart < Buffer + Length))) {\r
   for (Index = 0; Index < mSmmMemLibInternalSmramCount; Index ++) {\r
     if (((Buffer >= mSmmMemLibInternalSmramRanges[Index].CpuStart) && (Buffer < mSmmMemLibInternalSmramRanges[Index].CpuStart + mSmmMemLibInternalSmramRanges[Index].PhysicalSize)) ||\r
         ((mSmmMemLibInternalSmramRanges[Index].CpuStart >= Buffer) && (mSmmMemLibInternalSmramRanges[Index].CpuStart < Buffer + Length))) {\r


@@ -157,7 +157,7 @@ SmmIsBufferOutsideSmmValid (
   if (mSmmReadyToLock) {\r
     EFI_MEMORY_DESCRIPTOR          *MemoryMap;\r
     BOOLEAN                        InValidCommunicationRegion;\r
   if (mSmmReadyToLock) {\r
     EFI_MEMORY_DESCRIPTOR          *MemoryMap;\r
     BOOLEAN                        InValidCommunicationRegion;\r

-    \r
+\r

     InValidCommunicationRegion = FALSE;\r
     MemoryMap = mMemoryMap;\r
     for (Index = 0; Index < mMemoryMapEntryCount; Index++) {\r
     InValidCommunicationRegion = FALSE;\r
     MemoryMap = mMemoryMap;\r
     for (Index = 0; Index < mMemoryMapEntryCount; Index++) {\r


@@ -222,7 +222,7 @@ SmmCopyMemToSmram (
   If the check passes, it copies memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r
   The implementation must be reentrant.\r
   If the check passes, it copies memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r
   The implementation must be reentrant.\r

-  \r
+\r

   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r
   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r


@@ -255,7 +255,7 @@ SmmCopyMemFromSmram (
   If the check passes, it copies memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r
   The implementation must be reentrant, and it must handle the case where source buffer overlaps destination buffer.\r
   If the check passes, it copies memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r
   The implementation must be reentrant, and it must handle the case where source buffer overlaps destination buffer.\r

-  \r
+\r

   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r
   @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        The pointer to the source buffer of the memory copy.\r
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.\r


@@ -292,11 +292,11 @@ SmmCopyMem (
   It checks if target buffer is valid per processor architecture and not overlap with SMRAM.\r
   If the check passes, it fills memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r
   It checks if target buffer is valid per processor architecture and not overlap with SMRAM.\r
   If the check passes, it fills memory and returns EFI_SUCCESS.\r
   If the check fails, it returns EFI_SECURITY_VIOLATION.\r

-  \r
+\r

   @param  Buffer    The memory to set.\r
   @param  Length    The number of bytes to set.\r
   @param  Value     The value with which to fill Length bytes of Buffer.\r
   @param  Buffer    The memory to set.\r
   @param  Length    The number of bytes to set.\r
   @param  Value     The value with which to fill Length bytes of Buffer.\r

-  \r
+\r

   @retval EFI_SECURITY_VIOLATION The Buffer is invalid per processor architecture or overlap with SMRAM.\r
   @retval EFI_SUCCESS            Memory is set.\r
 \r
   @retval EFI_SECURITY_VIOLATION The Buffer is invalid per processor architecture or overlap with SMRAM.\r
   @retval EFI_SUCCESS            Memory is set.\r
 \r


@@ -359,7 +359,7 @@ SmmLibInternalEndOfDxeNotify (
   do {\r
     Status = gBS->AllocatePool (EfiBootServicesData, MemoryMapSize, (VOID **)&MemoryMap);\r
     ASSERT (MemoryMap != NULL);\r
   do {\r
     Status = gBS->AllocatePool (EfiBootServicesData, MemoryMapSize, (VOID **)&MemoryMap);\r
     ASSERT (MemoryMap != NULL);\r

-  \r
+\r

     Status = gBS->GetMemoryMap (\r
                &MemoryMapSize,\r
                MemoryMap,\r
     Status = gBS->GetMemoryMap (\r
                &MemoryMapSize,\r
                MemoryMap,\r


@@ -391,7 +391,7 @@ SmmLibInternalEndOfDxeNotify (
     MemoryMap = NEXT_MEMORY_DESCRIPTOR(MemoryMap, DescriptorSize);\r
   }\r
   MemoryMap = MemoryMapStart;\r
     MemoryMap = NEXT_MEMORY_DESCRIPTOR(MemoryMap, DescriptorSize);\r
   }\r
   MemoryMap = MemoryMapStart;\r

-  \r
+\r

   //\r
   // Get Data\r
   //\r
   //\r
   // Get Data\r
   //\r


@@ -412,7 +412,7 @@ SmmLibInternalEndOfDxeNotify (
   }\r
   mMemoryMap = SmmMemoryMapStart;\r
   MemoryMap = MemoryMapStart;\r
   }\r
   mMemoryMap = SmmMemoryMapStart;\r
   MemoryMap = MemoryMapStart;\r

-  \r
+\r

   gBS->FreePool (MemoryMap);\r
 \r
   return EFI_SUCCESS;\r
   gBS->FreePool (MemoryMap);\r
 \r
   return EFI_SUCCESS;\r


@@ -458,7 +458,7 @@ SmmMemLibConstructor (
   EFI_STATUS                    Status;\r
   EFI_SMM_ACCESS2_PROTOCOL      *SmmAccess;\r
   UINTN                         Size;\r
   EFI_STATUS                    Status;\r
   EFI_SMM_ACCESS2_PROTOCOL      *SmmAccess;\r
   UINTN                         Size;\r

-  \r
+\r

   //\r
   // Get SMRAM information\r
   //\r
   //\r
   // Get SMRAM information\r
   //\r

diff --git a/MdePkg/Library/SmmMemLib/SmmMemLib.inf b/MdePkg/Library/SmmMemLib/SmmMemLib.inf
index b1691cc2778820045d8941f53e26d72c9628def0..e4edad3af2bcd6eaea3c9b67775deb347168d7fe 100644 (file)
--- a/MdePkg/Library/SmmMemLib/SmmMemLib.inf
+++ b/MdePkg/Library/SmmMemLib/SmmMemLib.inf
@@ -5,16 +5,16 @@
 #  to get SMRAM information. In order to use this library instance, the platform should produce\r
 #  all SMRAM range via SMM_ACCESS2_PROTOCOL, including the range for firmware (like SMM Core\r
 #  and SMM driver) and/or specific dedicated hardware.\r
 #  to get SMRAM information. In order to use this library instance, the platform should produce\r
 #  all SMRAM range via SMM_ACCESS2_PROTOCOL, including the range for firmware (like SMM Core\r
 #  and SMM driver) and/or specific dedicated hardware.\r

-#  \r
-#  Copyright (c) 2015 - 2016, 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
 #  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


@@ -36,10 +36,10 @@
 \r
 [Sources]\r
   SmmMemLib.c\r
 \r
 [Sources]\r
   SmmMemLib.c\r

-  \r
+\r

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

-  \r
+\r

 [LibraryClasses]\r
   SmmServicesTableLib\r
   UefiBootServicesTableLib\r
 [LibraryClasses]\r
   SmmServicesTableLib\r
   UefiBootServicesTableLib\r


@@ -52,6 +52,6 @@
   gEfiSmmAccess2ProtocolGuid     ## CONSUMES\r
   gEfiSmmReadyToLockProtocolGuid ## CONSUMES\r
   gEfiSmmEndOfDxeProtocolGuid    ## CONSUMES\r
   gEfiSmmAccess2ProtocolGuid     ## CONSUMES\r
   gEfiSmmReadyToLockProtocolGuid ## CONSUMES\r
   gEfiSmmEndOfDxeProtocolGuid    ## CONSUMES\r

-  \r
+\r

 [Depex]\r
   gEfiSmmAccess2ProtocolGuid\r
 [Depex]\r
   gEfiSmmAccess2ProtocolGuid\r

diff --git a/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c b/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
index 592cced5a475aeb13a74a619f0b28a985ab699e0..f3bb40cd738a6fa1678aa0b76737af31863ac496 100644 (file)
--- a/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdePkg/Library/SmmMemoryAllocationLib/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.\r
   on SMM Services Table services for SMM phase drivers.\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


@@ -37,10 +37,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


@@ -64,8 +64,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


@@ -89,7 +89,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


@@ -126,7 +126,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


@@ -138,9 +138,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


@@ -151,12 +151,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


@@ -172,9 +172,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


@@ -194,9 +194,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


@@ -216,9 +216,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


@@ -239,15 +239,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


@@ -281,16 +281,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


@@ -299,7 +299,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


@@ -315,7 +315,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


@@ -329,7 +329,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


@@ -368,16 +368,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


@@ -397,16 +397,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


@@ -426,16 +426,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


@@ -456,15 +456,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


@@ -498,9 +498,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


@@ -511,7 +511,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


@@ -528,9 +528,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


@@ -550,9 +550,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


@@ -572,9 +572,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


@@ -594,9 +594,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


@@ -607,9 +607,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


@@ -623,9 +623,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


@@ -645,9 +645,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


@@ -667,9 +667,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


@@ -689,12 +689,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


@@ -705,10 +705,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


@@ -720,19 +720,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


@@ -753,14 +753,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


@@ -781,14 +781,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


@@ -810,19 +810,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


@@ -830,7 +830,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


@@ -850,18 +850,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


@@ -882,18 +882,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


@@ -914,18 +914,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


@@ -943,15 +943,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/MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf b/MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
index 8210c9702f93d866039ea2e2718c6dbcfe817d56..3ead028e0796e8e52d512bfb6fc14a62628ffed3 100644 (file)
--- a/MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
+++ b/MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
@@ -1,10 +1,10 @@
 ## @file\r
 # Instance of Memory Allocation Library using SMM Services Table.\r
 #\r
 ## @file\r
 # Instance of Memory Allocation Library using SMM Services Table.\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.\r
 #\r
 # allocate and free memory.\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


@@ -22,7 +22,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
 \r
   CONSTRUCTOR                    = SmmMemoryAllocationLibConstructor\r
   DESTRUCTOR                     = SmmMemoryAllocationLibDestructor\r
 \r


@@ -43,7 +43,7 @@
   UefiBootServicesTableLib\r
 \r
 [Protocols]\r
   UefiBootServicesTableLib\r
 \r
 [Protocols]\r

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

 \r
 [Depex]\r
   gEfiSmmAccess2ProtocolGuid\r
 \r
 [Depex]\r
   gEfiSmmAccess2ProtocolGuid\r

diff --git a/MdePkg/Library/SmmPciLibPciRootBridgeIo/PciLib.c b/MdePkg/Library/SmmPciLibPciRootBridgeIo/PciLib.c
index cdd35c19470597d3c26d8ba636a6567b3cdc2247..8877f4537454ba95573c30659c78a691ab3ccdae 100644 (file)
--- a/MdePkg/Library/SmmPciLibPciRootBridgeIo/PciLib.c
+++ b/MdePkg/Library/SmmPciLibPciRootBridgeIo/PciLib.c
@@ -1,13 +1,13 @@
 /** @file\r
   PCI Library using SMM PCI Root Bridge I/O Protocol.\r
 \r
 /** @file\r
   PCI Library using SMM PCI Root Bridge I/O Protocol.\r
 \r

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

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


@@ -44,17 +44,17 @@
 //\r
 // Global varible to cache pointer to PCI Root Bridge I/O protocol.\r
 //\r
 //\r
 // Global varible to cache pointer to PCI Root Bridge I/O protocol.\r
 //\r

-EFI_SMM_PCI_ROOT_BRIDGE_IO_PROTOCOL      *mSmmPciRootBridgeIo = NULL; \r
+EFI_SMM_PCI_ROOT_BRIDGE_IO_PROTOCOL      *mSmmPciRootBridgeIo = NULL;\r

 \r
 /**\r
   The constructor function caches the pointer to PCI Root Bridge I/O protocol.\r
 \r
 /**\r
   The constructor function caches the pointer to PCI Root Bridge I/O protocol.\r

-  \r
+\r

   The constructor function locates PCI Root Bridge I/O protocol from protocol database.\r
   The constructor function locates PCI Root Bridge I/O 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


@@ -66,7 +66,7 @@ PciLibConstructor (
   )\r
 {\r
   EFI_STATUS  Status;\r
   )\r
 {\r
   EFI_STATUS  Status;\r

-  \r
+\r

   Status = gSmst->SmmLocateProtocol (&gEfiSmmPciRootBridgeIoProtocolGuid, NULL, (VOID**) &mSmmPciRootBridgeIo);\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (mSmmPciRootBridgeIo != NULL);\r
   Status = gSmst->SmmLocateProtocol (&gEfiSmmPciRootBridgeIoProtocolGuid, NULL, (VOID**) &mSmmPciRootBridgeIo);\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (mSmmPciRootBridgeIo != NULL);\r


@@ -141,19 +141,19 @@ SmmPciLibPciRootBridgeIoWriteWorker (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Registers a PCI device so PCI configuration registers may be accessed after \r
+  Registers a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
-  Registers the PCI device specified by Address so all the PCI configuration registers \r
+\r
+  Registers the PCI device specified by Address so all the PCI configuration registers\r

   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r
   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r

-  \r
+\r

   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r

diff --git a/MdePkg/Library/SmmPciLibPciRootBridgeIo/SmmPciLibPciRootBridgeIo.inf b/MdePkg/Library/SmmPciLibPciRootBridgeIo/SmmPciLibPciRootBridgeIo.inf
index a74d48f853daf07ee181de0b5be00937d233180a..7f567d83b2791d7576a393f8d5786446692a3986 100644 (file)
--- a/MdePkg/Library/SmmPciLibPciRootBridgeIo/SmmPciLibPciRootBridgeIo.inf
+++ b/MdePkg/Library/SmmPciLibPciRootBridgeIo/SmmPciLibPciRootBridgeIo.inf
@@ -7,7 +7,7 @@
 #  This library binds to the first SMM PCI Root Bridge I/O Protocol in the platform. As a result,\r
 #  it should only be used on platforms that contain a single PCI root bridge.\r
 #\r
 #  This library binds to the first SMM PCI Root Bridge I/O Protocol in the platform. As a result,\r
 #  it should only be used on platforms that contain a single PCI root bridge.\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


@@ -49,7 +49,7 @@
 \r
 [Protocols]\r
   gEfiSmmPciRootBridgeIoProtocolGuid               ## CONSUMES\r
 \r
 [Protocols]\r
   gEfiSmmPciRootBridgeIoProtocolGuid               ## CONSUMES\r

-  \r
+\r

 [Depex.common.DXE_SMM_DRIVER]\r
   gEfiSmmPciRootBridgeIoProtocolGuid\r
 \r
 [Depex.common.DXE_SMM_DRIVER]\r
   gEfiSmmPciRootBridgeIoProtocolGuid\r
 \r

diff --git a/MdePkg/Library/SmmPeriodicSmiLib/SmmPeriodicSmiLib.c b/MdePkg/Library/SmmPeriodicSmiLib/SmmPeriodicSmiLib.c
index ca6967c9beeb13d53f48f1c0e9778a15df121ce0..dc9250a1a300953646f67f187f73732e1730d25d 100644 (file)
--- a/MdePkg/Library/SmmPeriodicSmiLib/SmmPeriodicSmiLib.c
+++ b/MdePkg/Library/SmmPeriodicSmiLib/SmmPeriodicSmiLib.c
@@ -62,13 +62,13 @@ typedef struct {
   ///\r
   UINT64                                   TickPeriod;\r
   ///\r
   ///\r
   UINT64                                   TickPeriod;\r
   ///\r

-  /// The Cpu number that is required to execute DispatchFunction.  If Cpu is \r
-  /// set to PERIODIC_SMI_LIBRARY_ANY_CPU, then DispatchFunction may be executed \r
+  /// The Cpu number that is required to execute DispatchFunction.  If Cpu is\r
+  /// set to PERIODIC_SMI_LIBRARY_ANY_CPU, then DispatchFunction may be executed\r

   /// on any CPU.\r
   ///\r
   UINTN                                    Cpu;\r
   ///\r
   /// on any CPU.\r
   ///\r
   UINTN                                    Cpu;\r
   ///\r

-  /// The size, in bytes, of the stack allocated for a periodic SMI handler.  \r
+  /// The size, in bytes, of the stack allocated for a periodic SMI handler.\r

   /// This value must be a multiple of EFI_PAGE_SIZE.\r
   ///\r
   UINTN                                    StackSize;\r
   /// This value must be a multiple of EFI_PAGE_SIZE.\r
   ///\r
   UINTN                                    StackSize;\r


@@ -82,27 +82,27 @@ typedef struct {
   ///\r
   SPIN_LOCK                                DispatchLock;\r
   ///\r
   ///\r
   SPIN_LOCK                                DispatchLock;\r
   ///\r

-  /// The rate in Hz of the performance counter that is used to measure the \r
+  /// The rate in Hz of the performance counter that is used to measure the\r

   /// amount of time that a periodic SMI handler executes.\r
   ///\r
   UINT64                                   PerfomanceCounterRate;\r
   ///\r
   /// amount of time that a periodic SMI handler executes.\r
   ///\r
   UINT64                                   PerfomanceCounterRate;\r
   ///\r

-  /// The start count value of the performance counter that is used to measure \r
+  /// The start count value of the performance counter that is used to measure\r

   /// the amount of time that a periodic SMI handler executes.\r
   ///\r
   UINT64                                   PerfomanceCounterStartValue;\r
   ///\r
   /// the amount of time that a periodic SMI handler executes.\r
   ///\r
   UINT64                                   PerfomanceCounterStartValue;\r
   ///\r

-  /// The end count value of the performance counter that is used to measure \r
+  /// The end count value of the performance counter that is used to measure\r

   /// the amount of time that a periodic SMI handler executes.\r
   ///\r
   UINT64                                   PerfomanceCounterEndValue;\r
   ///\r
   /// the amount of time that a periodic SMI handler executes.\r
   ///\r
   UINT64                                   PerfomanceCounterEndValue;\r
   ///\r

-  /// The context record passed into the Register() function of the SMM Periodic \r
+  /// The context record passed into the Register() function of the SMM Periodic\r

   /// Timer Dispatch Protocol when a periodic SMI handler is enabled.\r
   ///\r
   EFI_SMM_PERIODIC_TIMER_REGISTER_CONTEXT  RegisterContext;\r
   ///\r
   /// Timer Dispatch Protocol when a periodic SMI handler is enabled.\r
   ///\r
   EFI_SMM_PERIODIC_TIMER_REGISTER_CONTEXT  RegisterContext;\r
   ///\r

-  /// The handle returned from the Register() function of the SMM Periodic \r
+  /// The handle returned from the Register() function of the SMM Periodic\r

   /// Timer Dispatch Protocol when a periodic SMI handler is enabled.\r
   ///\r
   EFI_HANDLE                               DispatchHandle;\r
   /// Timer Dispatch Protocol when a periodic SMI handler is enabled.\r
   ///\r
   EFI_HANDLE                               DispatchHandle;\r


@@ -112,7 +112,7 @@ typedef struct {
   ///\r
   UINT64                                   DispatchTotalTime;\r
   ///\r
   ///\r
   UINT64                                   DispatchTotalTime;\r
   ///\r

-  /// The performance counter value that was captured the last time that the \r
+  /// The performance counter value that was captured the last time that the\r

   /// periodic SMI handler called PeriodcSmiExecutionTime().  This allows the\r
   /// time value returned by PeriodcSmiExecutionTime() to be accurate even when\r
   /// the performance counter rolls over.\r
   /// periodic SMI handler called PeriodcSmiExecutionTime().  This allows the\r
   /// time value returned by PeriodcSmiExecutionTime() to be accurate even when\r
   /// the performance counter rolls over.\r


@@ -120,19 +120,19 @@ typedef struct {
   UINT64                                   DispatchCheckPointTime;\r
   ///\r
   /// Buffer used to save the context when control is transfer from this library\r
   UINT64                                   DispatchCheckPointTime;\r
   ///\r
   /// Buffer used to save the context when control is transfer from this library\r

-  /// to an enabled periodic SMI handler.  This saved context is used when the \r
-  /// periodic SMI handler exits or yields.  \r
+  /// to an enabled periodic SMI handler.  This saved context is used when the\r
+  /// periodic SMI handler exits or yields.\r

   ///\r
   BASE_LIBRARY_JUMP_BUFFER                 DispatchJumpBuffer;\r
   ///\r
   ///\r
   BASE_LIBRARY_JUMP_BUFFER                 DispatchJumpBuffer;\r
   ///\r

-  /// Flag that is set to TRUE when a periodic SMI handler requests to yield \r
-  /// using PeriodicSmiYield().  When this flag IS TRUE, YieldJumpBuffer is \r
+  /// Flag that is set to TRUE when a periodic SMI handler requests to yield\r
+  /// using PeriodicSmiYield().  When this flag IS TRUE, YieldJumpBuffer is\r

   /// valid.  When this flag is FALSE, YieldJumpBuffer is not valid.\r
   ///\r
   BOOLEAN                                  YieldFlag;\r
   ///\r
   /// valid.  When this flag is FALSE, YieldJumpBuffer is not valid.\r
   ///\r
   BOOLEAN                                  YieldFlag;\r
   ///\r

-  /// Buffer used to save the context when a periodic SMI handler requests to \r
-  /// yield using PeriodicSmiYield().  This context is used to resume the \r
+  /// Buffer used to save the context when a periodic SMI handler requests to\r
+  /// yield using PeriodicSmiYield().  This context is used to resume the\r

   /// execution of a periodic SMI handler the next time control is transferd\r
   /// to the periodic SMI handler that yielded.\r
   ///\r
   /// execution of a periodic SMI handler the next time control is transferd\r
   /// to the periodic SMI handler that yielded.\r
   ///\r


@@ -145,7 +145,7 @@ typedef struct {
 } PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT;\r
 \r
 /**\r
 } PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT;\r
 \r
 /**\r

- Macro that returns a pointer to a PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT \r
+ Macro that returns a pointer to a PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT\r

  structure based on a pointer to a Link field.\r
 \r
 **/\r
  structure based on a pointer to a Link field.\r
 \r
 **/\r


@@ -163,10 +163,10 @@ typedef struct {
 EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL  *gSmmPeriodicTimerDispatch2           = NULL;\r
 \r
 ///\r
 EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL  *gSmmPeriodicTimerDispatch2           = NULL;\r
 \r
 ///\r

-/// Pointer to a table of supported periodic SMI tick periods in 100 ns units \r
+/// Pointer to a table of supported periodic SMI tick periods in 100 ns units\r

 /// sorted from largest to smallest terminated by a tick period value of 0.\r
 /// sorted from largest to smallest terminated by a tick period value of 0.\r

-/// This table is allocated using AllocatePool() in the constructor and filled \r
-/// in based on the values returned from the SMM Periodic Timer Dispatch 2 Protocol \r
+/// This table is allocated using AllocatePool() in the constructor and filled\r
+/// in based on the values returned from the SMM Periodic Timer Dispatch 2 Protocol\r

 /// function GetNextShorterInterval().\r
 ///\r
 UINT64                                     *gSmiTickPeriodTable                  = NULL;\r
 /// function GetNextShorterInterval().\r
 ///\r
 UINT64                                     *gSmiTickPeriodTable                  = NULL;\r


@@ -190,15 +190,15 @@ LIST_ENTRY                                 gPeriodicSmiLibraryHandlers
 PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT       *gActivePeriodicSmiLibraryHandler     = NULL;\r
 \r
 /**\r
 PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT       *gActivePeriodicSmiLibraryHandler     = NULL;\r
 \r
 /**\r

-  Internal worker function that returns a pointer to the \r
-  PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT structure associated with the periodic \r
-  SMI handler that is currently being executed.  If a periodic SMI handler is \r
+  Internal worker function that returns a pointer to the\r
+  PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT structure associated with the periodic\r
+  SMI handler that is currently being executed.  If a periodic SMI handler is\r

   not currently being executed, the NULL is returned.\r
   not currently being executed, the NULL is returned.\r

-  \r
+\r

   @retval  NULL   A periodic SMI handler is not currently being executed.\r
   @retval  other  Pointer to the PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT\r
                   associated with the active periodic SMI handler.\r
   @retval  NULL   A periodic SMI handler is not currently being executed.\r
   @retval  other  Pointer to the PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT\r
                   associated with the active periodic SMI handler.\r

-  \r
+\r

 **/\r
 PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT *\r
 GetActivePeriodicSmiLibraryHandler (\r
 **/\r
 PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT *\r
 GetActivePeriodicSmiLibraryHandler (\r


@@ -209,26 +209,26 @@ GetActivePeriodicSmiLibraryHandler (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Internal worker function that returns a pointer to the \r
-  PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT structure associated with the \r
+  Internal worker function that returns a pointer to the\r
+  PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT structure associated with the\r

   DispatchHandle that was returned when the periodic SMI handler was enabled\r
   DispatchHandle that was returned when the periodic SMI handler was enabled\r

-  with PeriodicSmiEnable().  If DispatchHandle is NULL, then the active \r
+  with PeriodicSmiEnable().  If DispatchHandle is NULL, then the active\r

   periodic SMI handler is returned.  If DispatchHandle is NULL and there is\r
   no active periodic SMI handler, then NULL is returned.\r
   periodic SMI handler is returned.  If DispatchHandle is NULL and there is\r
   no active periodic SMI handler, then NULL is returned.\r

-  \r
-  @param[in] DispatchHandle  DispatchHandle that was returned when the periodic \r
-                             SMI handler was enabled with PeriodicSmiEnable().  \r
+\r
+  @param[in] DispatchHandle  DispatchHandle that was returned when the periodic\r
+                             SMI handler was enabled with PeriodicSmiEnable().\r

                              This is an optional parameter that may be NULL.\r
                              If this parameter is NULL, then the active periodic\r
                              SMI handler is returned.\r
                              This is an optional parameter that may be NULL.\r
                              If this parameter is NULL, then the active periodic\r
                              SMI handler is returned.\r

-  \r
-  @retval  NULL   DispatchHandle is NULL and there is no active periodic SMI \r
+\r
+  @retval  NULL   DispatchHandle is NULL and there is no active periodic SMI\r

                   handler.\r
   @retval  NULL   DispatchHandle does not match any of the periodic SMI handlers\r
                   that have been enabled with PeriodicSmiEnable().\r
   @retval  other  Pointer to the PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT\r
                   associated with the DispatchHandle.\r
                   handler.\r
   @retval  NULL   DispatchHandle does not match any of the periodic SMI handlers\r
                   that have been enabled with PeriodicSmiEnable().\r
   @retval  other  Pointer to the PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT\r
                   associated with the DispatchHandle.\r

-  \r
+\r

 **/\r
 PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT *\r
 LookupPeriodicSmiLibraryHandler (\r
 **/\r
 PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT *\r
 LookupPeriodicSmiLibraryHandler (\r


@@ -258,7 +258,7 @@ LookupPeriodicSmiLibraryHandler (
       return PeriodicSmiLibraryHandler;\r
     }\r
   }\r
       return PeriodicSmiLibraryHandler;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // No entries match DispatchHandle, so return NULL\r
   //\r
   //\r
   // No entries match DispatchHandle, so return NULL\r
   //\r


@@ -266,11 +266,11 @@ LookupPeriodicSmiLibraryHandler (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Internal worker function that sets that active periodic SMI handler based on \r
+  Internal worker function that sets that active periodic SMI handler based on\r

   the DispatchHandle that was returned when the periodic SMI handler was enabled\r
   the DispatchHandle that was returned when the periodic SMI handler was enabled\r

-  with PeriodicSmiEnable(). If DispatchHandle is NULL, then the \r
+  with PeriodicSmiEnable(). If DispatchHandle is NULL, then the\r

   state is updated to show that there is not active periodic SMI handler.\r
   state is updated to show that there is not active periodic SMI handler.\r

-  A pointer to the active PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT structure \r
+  A pointer to the active PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT structure\r

   is returned.\r
 \r
   @param [in] DispatchHandle DispatchHandle that was returned when the periodic\r
   is returned.\r
 \r
   @param [in] DispatchHandle DispatchHandle that was returned when the periodic\r


@@ -281,7 +281,7 @@ LookupPeriodicSmiLibraryHandler (
   @retval  NULL   DispatchHandle is NULL.\r
   @retval  other  Pointer to the PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT\r
                   associated with DispatchHandle.\r
   @retval  NULL   DispatchHandle is NULL.\r
   @retval  other  Pointer to the PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT\r
                   associated with DispatchHandle.\r

-  \r
+\r

 **/\r
 PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT *\r
 SetActivePeriodicSmiLibraryHandler (\r
 **/\r
 PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT *\r
 SetActivePeriodicSmiLibraryHandler (\r


@@ -354,10 +354,10 @@ EnlargeFreePeriodicSmiLibraryHandlerList (
   Internal worker function that returns a free entry for a new periodic\r
   SMI handler.  If no free entries are available, then additional\r
   entries are allocated.\r
   Internal worker function that returns a free entry for a new periodic\r
   SMI handler.  If no free entries are available, then additional\r
   entries are allocated.\r

-  \r
+\r

   @retval  NULL   There are not enough resources available to to allocate a free entry.\r
   @retval  other  Pointer to a free PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT structure.\r
   @retval  NULL   There are not enough resources available to to allocate a free entry.\r
   @retval  other  Pointer to a free PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT structure.\r

-  \r
+\r

 **/\r
 PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT *\r
 FindFreePeriodicSmiLibraryHandler (\r
 **/\r
 PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT *\r
 FindFreePeriodicSmiLibraryHandler (\r


@@ -365,7 +365,7 @@ FindFreePeriodicSmiLibraryHandler (
   )\r
 {\r
   PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *PeriodicSmiLibraryHandler;\r
   )\r
 {\r
   PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *PeriodicSmiLibraryHandler;\r

-  \r
+\r

   if (IsListEmpty (&gFreePeriodicSmiLibraryHandlers)) {\r
     if (!EnlargeFreePeriodicSmiLibraryHandlerList ()) {\r
       return NULL;\r
   if (IsListEmpty (&gFreePeriodicSmiLibraryHandlers)) {\r
     if (!EnlargeFreePeriodicSmiLibraryHandlerList ()) {\r
       return NULL;\r


@@ -386,15 +386,15 @@ FindFreePeriodicSmiLibraryHandler (
 \r
 /**\r
   This function returns a pointer to a table of supported periodic\r
 \r
 /**\r
   This function returns a pointer to a table of supported periodic\r

-  SMI tick periods in 100 ns units sorted from largest to smallest.  \r
-  The table contains a array of UINT64 values terminated by a tick \r
+  SMI tick periods in 100 ns units sorted from largest to smallest.\r
+  The table contains a array of UINT64 values terminated by a tick\r

   period value of 0.  The returned table must be treated as read-only\r
   data and must not be freed.\r
   period value of 0.  The returned table must be treated as read-only\r
   data and must not be freed.\r

-  \r
-  @return  A pointer to a table of UINT64 tick period values in \r
-           100ns units sorted from largest to smallest terminated \r
+\r
+  @return  A pointer to a table of UINT64 tick period values in\r
+           100ns units sorted from largest to smallest terminated\r

            by a tick period of 0.\r
            by a tick period of 0.\r

-  \r
+\r

 **/\r
 UINT64 *\r
 EFIAPI\r
 **/\r
 UINT64 *\r
 EFIAPI\r


@@ -430,21 +430,21 @@ PeriodicSmiExecutionTime (
   UINT64                                Count;\r
 \r
   //\r
   UINT64                                Count;\r
 \r
   //\r

-  // If there is no active periodic SMI handler, then return 0 \r
+  // If there is no active periodic SMI handler, then return 0\r

   //\r
   PeriodicSmiLibraryHandler = GetActivePeriodicSmiLibraryHandler ();\r
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return 0;\r
   }\r
   //\r
   PeriodicSmiLibraryHandler = GetActivePeriodicSmiLibraryHandler ();\r
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return 0;\r
   }\r

-  \r
+\r

   //\r
   // Get the current performance counter value\r
   //\r
   Current = GetPerformanceCounter ();\r
   //\r
   // Get the current performance counter value\r
   //\r
   Current = GetPerformanceCounter ();\r

-  \r
+\r

   //\r
   //\r

-  // Count the number of performance counter ticks since the periodic SMI handler \r
-  // was dispatched or the last time this function was called. \r
+  // Count the number of performance counter ticks since the periodic SMI handler\r
+  // was dispatched or the last time this function was called.\r

   //\r
   if (PeriodicSmiLibraryHandler->PerfomanceCounterEndValue > PeriodicSmiLibraryHandler->PerfomanceCounterStartValue) {\r
     //\r
   //\r
   if (PeriodicSmiLibraryHandler->PerfomanceCounterEndValue > PeriodicSmiLibraryHandler->PerfomanceCounterStartValue) {\r
     //\r


@@ -465,58 +465,58 @@ PeriodicSmiExecutionTime (
       Count = (PeriodicSmiLibraryHandler->DispatchCheckPointTime - PeriodicSmiLibraryHandler->PerfomanceCounterEndValue) + (PeriodicSmiLibraryHandler->PerfomanceCounterStartValue - Current);\r
     }\r
   }\r
       Count = (PeriodicSmiLibraryHandler->DispatchCheckPointTime - PeriodicSmiLibraryHandler->PerfomanceCounterEndValue) + (PeriodicSmiLibraryHandler->PerfomanceCounterStartValue - Current);\r
     }\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // Accumulate the total number of performance counter ticks since the periodic \r
+  // Accumulate the total number of performance counter ticks since the periodic\r

   // SMI handler was dispatched or resumed.\r
   //\r
   PeriodicSmiLibraryHandler->DispatchTotalTime += Count;\r
   // SMI handler was dispatched or resumed.\r
   //\r
   PeriodicSmiLibraryHandler->DispatchTotalTime += Count;\r

-  \r
+\r

   //\r
   // Update the checkpoint value to the current performance counter value\r
   //\r
   PeriodicSmiLibraryHandler->DispatchCheckPointTime = Current;\r
   //\r
   // Update the checkpoint value to the current performance counter value\r
   //\r
   PeriodicSmiLibraryHandler->DispatchCheckPointTime = Current;\r

-  \r
+\r

   //\r
   // Convert the total number of performance counter ticks to 100 ns units\r
   //\r
   return DivU64x64Remainder (\r
   //\r
   // Convert the total number of performance counter ticks to 100 ns units\r
   //\r
   return DivU64x64Remainder (\r

-           MultU64x32 (PeriodicSmiLibraryHandler->DispatchTotalTime, 10000000), \r
-           PeriodicSmiLibraryHandler->PerfomanceCounterRate, \r
+           MultU64x32 (PeriodicSmiLibraryHandler->DispatchTotalTime, 10000000),\r
+           PeriodicSmiLibraryHandler->PerfomanceCounterRate,\r

            NULL\r
            );\r
 }\r
 \r
 /**\r
            NULL\r
            );\r
 }\r
 \r
 /**\r

-  This function returns control back to the SMM Foundation.  When the next \r
+  This function returns control back to the SMM Foundation.  When the next\r

   periodic SMI for the currently executing handler is triggered, the periodic\r
   SMI handler will restarted from its registered DispatchFunction entry point.\r
   periodic SMI for the currently executing handler is triggered, the periodic\r
   SMI handler will restarted from its registered DispatchFunction entry point.\r

-  If this function is not called from within an enabled periodic SMI handler, \r
+  If this function is not called from within an enabled periodic SMI handler,\r

   then control is returned to the calling function.\r
 \r
 **/\r
 VOID\r
   then control is returned to the calling function.\r
 \r
 **/\r
 VOID\r

-EFIAPI  \r
+EFIAPI\r

 PeriodicSmiExit (\r
   VOID\r
   )\r
 {\r
   PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *PeriodicSmiLibraryHandler;\r
 PeriodicSmiExit (\r
   VOID\r
   )\r
 {\r
   PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *PeriodicSmiLibraryHandler;\r

-  \r
+\r

   //\r
   //\r

-  // If there is no active periodic SMI handler, then return \r
+  // If there is no active periodic SMI handler, then return\r

   //\r
   PeriodicSmiLibraryHandler = GetActivePeriodicSmiLibraryHandler ();\r
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return;\r
   }\r
   //\r
   PeriodicSmiLibraryHandler = GetActivePeriodicSmiLibraryHandler ();\r
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return;\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // Perform a long jump back to the point when the currently executing dispatch \r
+  // Perform a long jump back to the point when the currently executing dispatch\r

   // function was dispatched.\r
   //\r
   LongJump (&PeriodicSmiLibraryHandler->DispatchJumpBuffer, 1);\r
   // function was dispatched.\r
   //\r
   LongJump (&PeriodicSmiLibraryHandler->DispatchJumpBuffer, 1);\r

-  \r
+\r

   //\r
   // Must never return\r
   //\r
   //\r
   // Must never return\r
   //\r


@@ -525,16 +525,16 @@ PeriodicSmiExit (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function yields control back to the SMM Foundation.  When the next \r
+  This function yields control back to the SMM Foundation.  When the next\r

   periodic SMI for the currently executing handler is triggered, the periodic\r
   periodic SMI for the currently executing handler is triggered, the periodic\r

-  SMI handler will be resumed and this function will return.  Use of this \r
+  SMI handler will be resumed and this function will return.  Use of this\r

   function requires a seperate stack for the periodic SMI handler.  A non zero\r
   function requires a seperate stack for the periodic SMI handler.  A non zero\r

-  stack size must be specified in PeriodicSmiEnable() for this function to be \r
-  used.  \r
-  \r
+  stack size must be specified in PeriodicSmiEnable() for this function to be\r
+  used.\r
+\r

   If the stack size passed into PeriodicSmiEnable() was zero, the 0 is returned.\r
   If the stack size passed into PeriodicSmiEnable() was zero, the 0 is returned.\r

-  \r
-  If this function is not called from within an enabled periodic SMI handler, \r
+\r
+  If this function is not called from within an enabled periodic SMI handler,\r

   then 0 is returned.\r
 \r
   @return  The actual time in 100ns units elapsed since this function was\r
   then 0 is returned.\r
 \r
   @return  The actual time in 100ns units elapsed since this function was\r


@@ -542,7 +542,7 @@ PeriodicSmiExit (
 \r
 **/\r
 UINT64\r
 \r
 **/\r
 UINT64\r

-EFIAPI  \r
+EFIAPI\r

 PeriodicSmiYield (\r
   VOID\r
   )\r
 PeriodicSmiYield (\r
   VOID\r
   )\r


@@ -551,30 +551,30 @@ PeriodicSmiYield (
   UINTN                                 SetJumpFlag;\r
 \r
   //\r
   UINTN                                 SetJumpFlag;\r
 \r
   //\r

-  // If there is no active periodic SMI handler, then return \r
+  // If there is no active periodic SMI handler, then return\r

   //\r
   PeriodicSmiLibraryHandler = GetActivePeriodicSmiLibraryHandler ();\r
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return 0;\r
   }\r
   //\r
   PeriodicSmiLibraryHandler = GetActivePeriodicSmiLibraryHandler ();\r
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return 0;\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // If PeriodicSmiYield() is called without an allocated stack, then just return \r
+  // If PeriodicSmiYield() is called without an allocated stack, then just return\r

   // immediately with an elapsed time of 0.\r
   //\r
   if (PeriodicSmiLibraryHandler->Stack == NULL) {\r
     return 0;\r
   }\r
   // immediately with an elapsed time of 0.\r
   //\r
   if (PeriodicSmiLibraryHandler->Stack == NULL) {\r
     return 0;\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // Set a flag so the next periodic SMI event will resume at where SetJump() \r
+  // Set a flag so the next periodic SMI event will resume at where SetJump()\r

   // is called below.\r
   //\r
   PeriodicSmiLibraryHandler->YieldFlag = TRUE;\r
 \r
   //\r
   // Save context in YieldJumpBuffer\r
   // is called below.\r
   //\r
   PeriodicSmiLibraryHandler->YieldFlag = TRUE;\r
 \r
   //\r
   // Save context in YieldJumpBuffer\r

-  //  \r
+  //\r

   SetJumpFlag = SetJump (&PeriodicSmiLibraryHandler->YieldJumpBuffer);\r
   if (SetJumpFlag == 0) {\r
     //\r
   SetJumpFlag = SetJump (&PeriodicSmiLibraryHandler->YieldJumpBuffer);\r
   if (SetJumpFlag == 0) {\r
     //\r


@@ -583,10 +583,10 @@ PeriodicSmiYield (
     //\r
     PeriodicSmiExit ();\r
   }\r
     //\r
     PeriodicSmiExit ();\r
   }\r

-  \r
+\r

   //\r
   // We get here when a LongJump is performed from PeriodicSmiDispatchFunctionOnCpu()\r
   //\r
   // We get here when a LongJump is performed from PeriodicSmiDispatchFunctionOnCpu()\r

-  // to resume a periodic SMI handler that called PeriodicSmiYield() on the \r
+  // to resume a periodic SMI handler that called PeriodicSmiYield() on the\r

   // previous time this periodic SMI handler was dispatched.\r
   //\r
   // Clear the flag so the next periodic SMI dispatch will not resume.\r
   // previous time this periodic SMI handler was dispatched.\r
   //\r
   // Clear the flag so the next periodic SMI dispatch will not resume.\r


@@ -595,14 +595,14 @@ PeriodicSmiYield (
 \r
   //\r
   // Return the amount elapsed time that occured while yielded\r
 \r
   //\r
   // Return the amount elapsed time that occured while yielded\r

-  //  \r
+  //\r

   return PeriodicSmiLibraryHandler->ElapsedTime;\r
 }\r
 \r
 /**\r
   return PeriodicSmiLibraryHandler->ElapsedTime;\r
 }\r
 \r
 /**\r

-  Internal worker function that transfers control to an enabled periodic SMI \r
-  handler.  If the enabled periodic SMI handler was allocated its own stack, \r
-  then this function is called on that allocated stack through the BaseLin \r
+  Internal worker function that transfers control to an enabled periodic SMI\r
+  handler.  If the enabled periodic SMI handler was allocated its own stack,\r
+  then this function is called on that allocated stack through the BaseLin\r

   function SwitchStack().\r
 \r
   @param[in] Context1  Context1 parameter passed into SwitchStack().\r
   function SwitchStack().\r
 \r
   @param[in] Context1  Context1 parameter passed into SwitchStack().\r


@@ -619,37 +619,37 @@ PeriodicSmiDispatchFunctionSwitchStack (
   PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *PeriodicSmiLibraryHandler;\r
 \r
   //\r
   PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *PeriodicSmiLibraryHandler;\r
 \r
   //\r

-  // Convert Context1 to PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT * \r
-  //  \r
+  // Convert Context1 to PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT *\r
+  //\r

   PeriodicSmiLibraryHandler = (PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT *)Context1;\r
 \r
   //\r
   // Dispatch the registered handler passing in the context that was registered\r
   PeriodicSmiLibraryHandler = (PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT *)Context1;\r
 \r
   //\r
   // Dispatch the registered handler passing in the context that was registered\r

-  // and the amount of time that has elapsed since the previous time this \r
+  // and the amount of time that has elapsed since the previous time this\r

   // periodic SMI handler was dispacthed.\r
   // periodic SMI handler was dispacthed.\r

-  //  \r
+  //\r

   PeriodicSmiLibraryHandler->DispatchFunction (\r
     PeriodicSmiLibraryHandler->Context,\r
     PeriodicSmiLibraryHandler->ElapsedTime\r
     );\r
   PeriodicSmiLibraryHandler->DispatchFunction (\r
     PeriodicSmiLibraryHandler->Context,\r
     PeriodicSmiLibraryHandler->ElapsedTime\r
     );\r

-    \r
+\r

   //\r
   // If this DispatchFunction() returns, then unconditially call PeriodicSmiExit()\r
   //\r
   // If this DispatchFunction() returns, then unconditially call PeriodicSmiExit()\r

-  // to perform a LongJump() back to PeriodicSmiDispatchFunctionOnCpu(). The \r
+  // to perform a LongJump() back to PeriodicSmiDispatchFunctionOnCpu(). The\r

   // LongJump() will resume exection on the original stack.\r
   // LongJump() will resume exection on the original stack.\r

-  //  \r
+  //\r

   PeriodicSmiExit ();\r
 }\r
 \r
 /**\r
   PeriodicSmiExit ();\r
 }\r
 \r
 /**\r

-  Internal worker function that transfers control to an enabled periodic SMI \r
-  handler on the specified logial CPU.  This function determines if the periodic \r
-  SMI handler yielded and needs to be resumed.  It also and switches to an \r
+  Internal worker function that transfers control to an enabled periodic SMI\r
+  handler on the specified logial CPU.  This function determines if the periodic\r
+  SMI handler yielded and needs to be resumed.  It also and switches to an\r

   allocated stack if one was allocated in PeriodicSmiEnable().\r
 \r
   @param[in] PeriodicSmiLibraryHandler  A pointer to the context for the periodic\r
                                         SMI handler to execute.\r
   allocated stack if one was allocated in PeriodicSmiEnable().\r
 \r
   @param[in] PeriodicSmiLibraryHandler  A pointer to the context for the periodic\r
                                         SMI handler to execute.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -658,44 +658,44 @@ PeriodicSmiDispatchFunctionOnCpu (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // Save context in DispatchJumpBuffer.  The intial call to SetJump() always \r
-  // returns 0.  If this is the initial call, then either resume from a prior \r
-  // call to PeriodicSmiYield() or call the DispatchFunction registerd in \r
+  // Save context in DispatchJumpBuffer.  The intial call to SetJump() always\r
+  // returns 0.  If this is the initial call, then either resume from a prior\r
+  // call to PeriodicSmiYield() or call the DispatchFunction registerd in\r

   // PeriodicSmiEnable() using an allocated stack if one was specified.\r
   // PeriodicSmiEnable() using an allocated stack if one was specified.\r

-  //  \r
+  //\r

   if (SetJump (&PeriodicSmiLibraryHandler->DispatchJumpBuffer) != 0) {\r
     return;\r
   }\r
   if (SetJump (&PeriodicSmiLibraryHandler->DispatchJumpBuffer) != 0) {\r
     return;\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // Capture the performance counter value just before the periodic SMI handler \r
-  // is resumed so the amount of time the periodic SMI handler executes can be \r
+  // Capture the performance counter value just before the periodic SMI handler\r
+  // is resumed so the amount of time the periodic SMI handler executes can be\r

   // calculated.\r
   //\r
   PeriodicSmiLibraryHandler->DispatchTotalTime      = 0;\r
   PeriodicSmiLibraryHandler->DispatchCheckPointTime = GetPerformanceCounter();\r
   // calculated.\r
   //\r
   PeriodicSmiLibraryHandler->DispatchTotalTime      = 0;\r
   PeriodicSmiLibraryHandler->DispatchCheckPointTime = GetPerformanceCounter();\r

-  \r
+\r

   if (PeriodicSmiLibraryHandler->YieldFlag) {\r
     //\r
   if (PeriodicSmiLibraryHandler->YieldFlag) {\r
     //\r

-    // Perform a long jump back to the point where the previously dispatched \r
-    // function called PeriodicSmiYield(). \r
+    // Perform a long jump back to the point where the previously dispatched\r
+    // function called PeriodicSmiYield().\r

     //\r
     LongJump (&PeriodicSmiLibraryHandler->YieldJumpBuffer, 1);\r
   } else if (PeriodicSmiLibraryHandler->Stack == NULL) {\r
     //\r
     //\r
     LongJump (&PeriodicSmiLibraryHandler->YieldJumpBuffer, 1);\r
   } else if (PeriodicSmiLibraryHandler->Stack == NULL) {\r
     //\r

-    // If Stack is NULL then call DispatchFunction using current stack passing \r
-    // in the context that was registered and the amount of time that has \r
+    // If Stack is NULL then call DispatchFunction using current stack passing\r
+    // in the context that was registered and the amount of time that has\r

     // elapsed since the previous time this periodic SMI handler was dispacthed.\r
     // elapsed since the previous time this periodic SMI handler was dispacthed.\r

-    //  \r
+    //\r

     PeriodicSmiLibraryHandler->DispatchFunction (\r
       PeriodicSmiLibraryHandler->Context,\r
       PeriodicSmiLibraryHandler->ElapsedTime\r
       );\r
     PeriodicSmiLibraryHandler->DispatchFunction (\r
       PeriodicSmiLibraryHandler->Context,\r
       PeriodicSmiLibraryHandler->ElapsedTime\r
       );\r

-      \r
+\r

     //\r
     // If this DispatchFunction() returns, then unconditially call PeriodicSmiExit()\r
     // to perform a LongJump() back to this function.\r
     //\r
     // If this DispatchFunction() returns, then unconditially call PeriodicSmiExit()\r
     // to perform a LongJump() back to this function.\r

-    //  \r
+    //\r

     PeriodicSmiExit ();\r
   } else {\r
     //\r
     PeriodicSmiExit ();\r
   } else {\r
     //\r


@@ -707,7 +707,7 @@ PeriodicSmiDispatchFunctionOnCpu (
       NULL,\r
       (UINT8 *)PeriodicSmiLibraryHandler->Stack + PeriodicSmiLibraryHandler->StackSize\r
       );\r
       NULL,\r
       (UINT8 *)PeriodicSmiLibraryHandler->Stack + PeriodicSmiLibraryHandler->StackSize\r
       );\r

-  }    \r
+  }\r

 \r
   //\r
   // Must never return\r
 \r
   //\r
   // Must never return\r


@@ -717,10 +717,10 @@ PeriodicSmiDispatchFunctionOnCpu (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Internal worker function that transfers control to an enabled periodic SMI \r
-  handler on the specified logial CPU.  This worker function is only called \r
-  using the SMM Services Table function SmmStartupThisAp() to execute the \r
-  periodic SMI handler on a logical CPU that is different than the one that is \r
+  Internal worker function that transfers control to an enabled periodic SMI\r
+  handler on the specified logial CPU.  This worker function is only called\r
+  using the SMM Services Table function SmmStartupThisAp() to execute the\r
+  periodic SMI handler on a logical CPU that is different than the one that is\r

   running the SMM Foundation.  When the periodic SMI handler returns, a lock is\r
   released to notify the CPU that is running the SMM Foundation that the periodic\r
   SMI handler execution has finished its execution.\r
   running the SMM Foundation.  When the periodic SMI handler returns, a lock is\r
   released to notify the CPU that is running the SMM Foundation that the periodic\r
   SMI handler execution has finished its execution.\r


@@ -735,17 +735,17 @@ PeriodicSmiDispatchFunctionWithLock (
   )\r
 {\r
   PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *PeriodicSmiLibraryHandler;\r
   )\r
 {\r
   PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *PeriodicSmiLibraryHandler;\r

-  \r
+\r

   //\r
   // Get context\r
   //\r
   // Get context\r

-  //  \r
+  //\r

   PeriodicSmiLibraryHandler = (PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *)Buffer;\r
 \r
   //\r
   // Execute dispatch function on the currently excuting logical CPU\r
   PeriodicSmiLibraryHandler = (PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *)Buffer;\r
 \r
   //\r
   // Execute dispatch function on the currently excuting logical CPU\r

-  //  \r
+  //\r

   PeriodicSmiDispatchFunctionOnCpu (PeriodicSmiLibraryHandler);\r
   PeriodicSmiDispatchFunctionOnCpu (PeriodicSmiLibraryHandler);\r

-  \r
+\r

   //\r
   // Release the dispatch spin lock\r
   //\r
   //\r
   // Release the dispatch spin lock\r
   //\r


@@ -756,12 +756,12 @@ PeriodicSmiDispatchFunctionWithLock (
   Internal worker function that transfers control to a periodic SMI handler that\r
   was enabled using PeriodicSmiEnable().\r
 \r
   Internal worker function that transfers control to a periodic SMI handler that\r
   was enabled using PeriodicSmiEnable().\r
 \r

-  @param[in]     DispatchHandle  The unique handle assigned to this handler by \r
+  @param[in]     DispatchHandle  The unique handle assigned to this handler by\r

                                  SmiHandlerRegister().\r
                                  SmiHandlerRegister().\r

-  @param[in]     Context         Points to an optional handler context which was \r
+  @param[in]     Context         Points to an optional handler context which was\r

                                  specified when the handler was registered.\r
   @param[in, out] CommBuffer     A pointer to a collection of data in memory that\r
                                  specified when the handler was registered.\r
   @param[in, out] CommBuffer     A pointer to a collection of data in memory that\r

-                                 will be conveyed from a non-SMM environment into \r
+                                 will be conveyed from a non-SMM environment into\r

                                  an SMM environment.\r
   @param[in, out] CommBufferSize The size of the CommBuffer.\r
 \r
                                  an SMM environment.\r
   @param[in, out] CommBufferSize The size of the CommBuffer.\r
 \r


@@ -772,7 +772,7 @@ PeriodicSmiDispatchFunctionWithLock (
   @retval EFI_WARN_INTERRUPT_SOURCE_PENDING   The interrupt is still pending and other\r
                                               handlers should still be called.\r
   @retval EFI_INTERRUPT_PENDING               The interrupt could not be quiesced.\r
   @retval EFI_WARN_INTERRUPT_SOURCE_PENDING   The interrupt is still pending and other\r
                                               handlers should still 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


@@ -786,15 +786,15 @@ PeriodicSmiDispatchFunction (
   PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *PeriodicSmiLibraryHandler;\r
   EFI_SMM_PERIODIC_TIMER_CONTEXT        *TimerContext;\r
   EFI_STATUS                            Status;\r
   PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT  *PeriodicSmiLibraryHandler;\r
   EFI_SMM_PERIODIC_TIMER_CONTEXT        *TimerContext;\r
   EFI_STATUS                            Status;\r

-  \r
+\r

   //\r
   // Set the active periodic SMI handler\r
   //\r
   // Set the active periodic SMI handler\r

-  //  \r
+  //\r

   PeriodicSmiLibraryHandler = SetActivePeriodicSmiLibraryHandler (DispatchHandle);\r
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
   PeriodicSmiLibraryHandler = SetActivePeriodicSmiLibraryHandler (DispatchHandle);\r
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   //\r
   // Retrieve the elapsed time since the last time this periodic SMI handler was called\r
   //\r
   //\r
   // Retrieve the elapsed time since the last time this periodic SMI handler was called\r
   //\r


@@ -821,9 +821,9 @@ PeriodicSmiDispatchFunction (
     // spin lock when it is done executing the periodic SMI handler.\r
     //\r
     AcquireSpinLock (&PeriodicSmiLibraryHandler->DispatchLock);\r
     // spin lock when it is done executing the periodic SMI handler.\r
     //\r
     AcquireSpinLock (&PeriodicSmiLibraryHandler->DispatchLock);\r

-  \r
+\r

     //\r
     //\r

-    // Execute the periodic SMI handler on the CPU that was specified in \r
+    // Execute the periodic SMI handler on the CPU that was specified in\r

     // PeriodicSmiEnable().\r
     //\r
     Status = gSmst->SmmStartupThisAp (\r
     // PeriodicSmiEnable().\r
     //\r
     Status = gSmst->SmmStartupThisAp (\r


@@ -839,7 +839,7 @@ PeriodicSmiDispatchFunction (
         CpuPause ();\r
       }\r
     }\r
         CpuPause ();\r
       }\r
     }\r

-    \r
+\r

     //\r
     // Release the spin lock for the periodic SMI handler.\r
     //\r
     //\r
     // Release the spin lock for the periodic SMI handler.\r
     //\r


@@ -852,56 +852,56 @@ PeriodicSmiDispatchFunction (
   if (PeriodicSmiLibraryHandler->DispatchHandle == NULL) {\r
     ReclaimPeriodicSmiLibraryHandler (PeriodicSmiLibraryHandler);\r
   }\r
   if (PeriodicSmiLibraryHandler->DispatchHandle == NULL) {\r
     ReclaimPeriodicSmiLibraryHandler (PeriodicSmiLibraryHandler);\r
   }\r

-  \r
+\r

   //\r
   // Update state to show that there is no active periodic SMI handler\r
   //\r
   // Update state to show that there is no active periodic SMI handler\r

-  //  \r
+  //\r

   SetActivePeriodicSmiLibraryHandler (NULL);\r
 \r
   return EFI_SUCCESS;\r
 }\r
   SetActivePeriodicSmiLibraryHandler (NULL);\r
 \r
   return EFI_SUCCESS;\r
 }\r

-  \r
+\r

 /**\r
   This function enables a periodic SMI handler.\r
 /**\r
   This function enables a periodic SMI handler.\r

-  \r
-  @param[in, out] DispatchHandle   A pointer to the handle associated with the \r
-                                   enabled periodic SMI handler.  This is an \r
-                                   optional parameter that may be NULL.  If it is \r
-                                   NULL, then the handle will not be returned, \r
-                                   which means that the periodic SMI handler can \r
+\r
+  @param[in, out] DispatchHandle   A pointer to the handle associated with the\r
+                                   enabled periodic SMI handler.  This is an\r
+                                   optional parameter that may be NULL.  If it is\r
+                                   NULL, then the handle will not be returned,\r
+                                   which means that the periodic SMI handler can\r

                                    never be disabled.\r
   @param[in]     DispatchFunction  A pointer to a periodic SMI handler function.\r
   @param[in]     Context           Optional content to pass into DispatchFunction.\r
                                    never be disabled.\r
   @param[in]     DispatchFunction  A pointer to a periodic SMI handler function.\r
   @param[in]     Context           Optional content to pass into DispatchFunction.\r

-  @param[in]     TickPeriod        The requested tick period in 100ns units that \r
+  @param[in]     TickPeriod        The requested tick period in 100ns units that\r

                                    control should be givien to the periodic SMI\r
                                    handler.  Must be one of the supported values\r
                                    returned by PeriodicSmiSupportedPickPeriod().\r
   @param[in]     Cpu               Specifies the CPU that is required to execute\r
                                    control should be givien to the periodic SMI\r
                                    handler.  Must be one of the supported values\r
                                    returned by PeriodicSmiSupportedPickPeriod().\r
   @param[in]     Cpu               Specifies the CPU that is required to execute\r

-                                   the periodic SMI handler.  If Cpu is \r
-                                   PERIODIC_SMI_LIBRARY_ANY_CPU, then the periodic \r
-                                   SMI handler will always be executed on the SMST \r
-                                   CurrentlyExecutingCpu, which may vary across \r
-                                   periodic SMIs.  If Cpu is between 0 and the SMST \r
+                                   the periodic SMI handler.  If Cpu is\r
+                                   PERIODIC_SMI_LIBRARY_ANY_CPU, then the periodic\r
+                                   SMI handler will always be executed on the SMST\r
+                                   CurrentlyExecutingCpu, which may vary across\r
+                                   periodic SMIs.  If Cpu is between 0 and the SMST\r

                                    NumberOfCpus, then the periodic SMI will always\r
                                    be executed on the requested CPU.\r
   @param[in]     StackSize         The size, in bytes, of the stack to allocate for\r
                                    use by the periodic SMI handler.  If 0, then the\r
                                    default stack will be used.\r
                                    NumberOfCpus, then the periodic SMI will always\r
                                    be executed on the requested CPU.\r
   @param[in]     StackSize         The size, in bytes, of the stack to allocate for\r
                                    use by the periodic SMI handler.  If 0, then the\r
                                    default stack will be used.\r

-                            \r
+\r

   @retval EFI_INVALID_PARAMETER  DispatchFunction is NULL.\r
   @retval EFI_INVALID_PARAMETER  DispatchFunction is NULL.\r

-  @retval EFI_UNSUPPORTED        TickPeriod is not a supported tick period.  The \r
-                                 supported tick periods can be retrieved using \r
+  @retval EFI_UNSUPPORTED        TickPeriod is not a supported tick period.  The\r
+                                 supported tick periods can be retrieved using\r

                                  PeriodicSmiSupportedTickPeriod().\r
                                  PeriodicSmiSupportedTickPeriod().\r

-  @retval EFI_INVALID_PARAMETER  Cpu is not PERIODIC_SMI_LIBRARY_ANY_CPU or in \r
+  @retval EFI_INVALID_PARAMETER  Cpu is not PERIODIC_SMI_LIBRARY_ANY_CPU or in\r

                                  the range 0 to SMST NumberOfCpus.\r
                                  the range 0 to SMST NumberOfCpus.\r

-  @retval EFI_OUT_OF_RESOURCES   There are not enough resources to enable the \r
+  @retval EFI_OUT_OF_RESOURCES   There are not enough resources to enable the\r

                                  periodic SMI handler.\r
                                  periodic SMI handler.\r

-  @retval EFI_OUT_OF_RESOURCES   There are not enough resources to allocate the \r
+  @retval EFI_OUT_OF_RESOURCES   There are not enough resources to allocate the\r

                                  stack speficied by StackSize.\r
   @retval EFI_SUCCESS            The periodic SMI handler was enabled.\r
                                  stack speficied by StackSize.\r
   @retval EFI_SUCCESS            The periodic SMI handler was enabled.\r

-  \r
+\r

 **/\r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 EFIAPI\r
 PeriodicSmiEnable (\r
   IN OUT EFI_HANDLE                    *DispatchHandle,    OPTIONAL\r
 EFIAPI\r
 PeriodicSmiEnable (\r
   IN OUT EFI_HANDLE                    *DispatchHandle,    OPTIONAL\r


@@ -918,27 +918,27 @@ PeriodicSmiEnable (
 \r
   //\r
   // Make sure all the input parameters are valid\r
 \r
   //\r
   // Make sure all the input parameters are valid\r

-  //  \r
+  //\r

   if (DispatchFunction == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (DispatchFunction == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   for (Index = 0; gSmiTickPeriodTable[Index] != 0; Index++) {\r
     if (gSmiTickPeriodTable[Index] == TickPeriod) {\r
       break;\r
     }\r
   for (Index = 0; gSmiTickPeriodTable[Index] != 0; Index++) {\r
     if (gSmiTickPeriodTable[Index] == TickPeriod) {\r
       break;\r
     }\r

-  }  \r
+  }\r

   if (gSmiTickPeriodTable[Index] == 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (gSmiTickPeriodTable[Index] == 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
+\r

   if (Cpu != PERIODIC_SMI_LIBRARY_ANY_CPU && Cpu >= gSmst->NumberOfCpus) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
   // Find a free periodic SMI handler entry\r
   if (Cpu != PERIODIC_SMI_LIBRARY_ANY_CPU && Cpu >= gSmst->NumberOfCpus) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
   // Find a free periodic SMI handler entry\r

-  //  \r
+  //\r

   PeriodicSmiLibraryHandler = FindFreePeriodicSmiLibraryHandler();\r
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   PeriodicSmiLibraryHandler = FindFreePeriodicSmiLibraryHandler();\r
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r


@@ -980,34 +980,34 @@ PeriodicSmiEnable (
     ReclaimPeriodicSmiLibraryHandler (PeriodicSmiLibraryHandler);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
     ReclaimPeriodicSmiLibraryHandler (PeriodicSmiLibraryHandler);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   //\r
   // Return the registered handle if the optional DispatchHandle parameter is not NULL\r
   //\r
   if (DispatchHandle != NULL) {\r
     *DispatchHandle = PeriodicSmiLibraryHandler->DispatchHandle;\r
   }\r
   //\r
   // Return the registered handle if the optional DispatchHandle parameter is not NULL\r
   //\r
   if (DispatchHandle != NULL) {\r
     *DispatchHandle = PeriodicSmiLibraryHandler->DispatchHandle;\r
   }\r

-  return EFI_SUCCESS;                                         \r
+  return EFI_SUCCESS;\r

 }\r
 \r
 /**\r
   This function disables a periodic SMI handler that has been previously\r
   enabled with PeriodicSmiEnable().\r
 }\r
 \r
 /**\r
   This function disables a periodic SMI handler that has been previously\r
   enabled with PeriodicSmiEnable().\r

-  \r
-  @param[in] DispatchHandle  A handle associated with a previously enabled periodic \r
+\r
+  @param[in] DispatchHandle  A handle associated with a previously enabled periodic\r

                              SMI handler.  This is an optional parameter that may\r
                              be NULL.  If it is NULL, then the active periodic SMI\r
                              handlers is disabled.\r
 \r
   @retval FALSE  DispatchHandle is NULL and there is no active periodic SMI handler.\r
                              SMI handler.  This is an optional parameter that may\r
                              be NULL.  If it is NULL, then the active periodic SMI\r
                              handlers is disabled.\r
 \r
   @retval FALSE  DispatchHandle is NULL and there is no active periodic SMI handler.\r

-  @retval FALSE  The periodic SMI handler specified by DispatchHandle has \r
+  @retval FALSE  The periodic SMI handler specified by DispatchHandle has\r

                  not been enabled with PeriodicSmiEnable().\r
                  not been enabled with PeriodicSmiEnable().\r

-  @retval TRUE   The periodic SMI handler specified by DispatchHandle has \r
+  @retval TRUE   The periodic SMI handler specified by DispatchHandle has\r

                  been disabled.  If DispatchHandle is NULL, then the active\r
                  periodic SMI handler has been disabled.\r
                  been disabled.  If DispatchHandle is NULL, then the active\r
                  periodic SMI handler has been disabled.\r

-  \r
+\r

 **/\r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 PeriodicSmiDisable (\r
   IN EFI_HANDLE  DispatchHandle    OPTIONAL\r
 EFIAPI\r
 PeriodicSmiDisable (\r
   IN EFI_HANDLE  DispatchHandle    OPTIONAL\r


@@ -1023,7 +1023,7 @@ PeriodicSmiDisable (
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return FALSE;\r
   }\r
   if (PeriodicSmiLibraryHandler == NULL) {\r
     return FALSE;\r
   }\r

-  \r
+\r

   //\r
   // Unregister the periodic SMI handler from the SMM Periodic Timer Dispatch 2 Protocol\r
   //\r
   //\r
   // Unregister the periodic SMI handler from the SMM Periodic Timer Dispatch 2 Protocol\r
   //\r


@@ -1049,7 +1049,7 @@ PeriodicSmiDisable (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This constructor function caches the pointer to the SMM Periodic Timer \r
+  This constructor function caches the pointer to the SMM Periodic Timer\r

   Dispatch 2 Protocol and collects the list SMI tick rates that the hardware\r
   supports.\r
 \r
   Dispatch 2 Protocol and collects the list SMI tick rates that the hardware\r
   supports.\r
 \r


@@ -1082,7 +1082,7 @@ SmmPeriodicSmiLibConstructor (
   ASSERT (gSmmPeriodicTimerDispatch2 != NULL);\r
 \r
   //\r
   ASSERT (gSmmPeriodicTimerDispatch2 != NULL);\r
 \r
   //\r

-  // Count the number of periodic SMI tick intervals that the SMM Periodic Timer \r
+  // Count the number of periodic SMI tick intervals that the SMM Periodic Timer\r

   // Dipatch 2 Protocol supports.\r
   //\r
   SmiTickInterval = NULL;\r
   // Dipatch 2 Protocol supports.\r
   //\r
   SmiTickInterval = NULL;\r


@@ -1092,15 +1092,15 @@ SmmPeriodicSmiLibConstructor (
                                            gSmmPeriodicTimerDispatch2,\r
                                            &SmiTickInterval\r
                                            );\r
                                            gSmmPeriodicTimerDispatch2,\r
                                            &SmiTickInterval\r
                                            );\r

-    Count++;                                           \r
-  } while (SmiTickInterval != NULL);                                           \r
+    Count++;\r
+  } while (SmiTickInterval != NULL);\r

 \r
   //\r
   // Allocate a buffer for the table of supported periodic SMI tick periods.\r
 \r
   //\r
   // Allocate a buffer for the table of supported periodic SMI tick periods.\r

-  //  \r
+  //\r

   gSmiTickPeriodTable = AllocateZeroPool (Count * sizeof (UINT64));\r
   ASSERT (gSmiTickPeriodTable != NULL);\r
   gSmiTickPeriodTable = AllocateZeroPool (Count * sizeof (UINT64));\r
   ASSERT (gSmiTickPeriodTable != NULL);\r

-  \r
+\r

   //\r
   // Fill in the table of supported periodic SMI tick periods.\r
   //\r
   //\r
   // Fill in the table of supported periodic SMI tick periods.\r
   //\r


@@ -1127,7 +1127,7 @@ SmmPeriodicSmiLibConstructor (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  The constructor function caches the pointer to the SMM Periodic Timer Dispatch 2 \r
+  The constructor function caches the pointer to the SMM Periodic Timer Dispatch 2\r

   Protocol and collects the list SMI tick rates that the hardware supports.\r
 \r
   @param[in] ImageHandle  The firmware allocated handle for the EFI image.\r
   Protocol and collects the list SMI tick rates that the hardware supports.\r
 \r
   @param[in] ImageHandle  The firmware allocated handle for the EFI image.\r


@@ -1165,7 +1165,7 @@ SmmPeriodicSmiLibDestructor (
   //\r
   // Free all the periodic SMI handler entries\r
   //\r
   //\r
   // Free all the periodic SMI handler entries\r
   //\r

-  for (Link = GetFirstNode (&gFreePeriodicSmiLibraryHandlers); !IsNull (&gFreePeriodicSmiLibraryHandlers, Link);) {    \r
+  for (Link = GetFirstNode (&gFreePeriodicSmiLibraryHandlers); !IsNull (&gFreePeriodicSmiLibraryHandlers, Link);) {\r

     PeriodicSmiLibraryHandler = PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT_FROM_LINK (Link);\r
     Link = RemoveEntryList (Link);\r
     FreePool (PeriodicSmiLibraryHandler);\r
     PeriodicSmiLibraryHandler = PERIODIC_SMI_LIBRARY_HANDLER_CONTEXT_FROM_LINK (Link);\r
     Link = RemoveEntryList (Link);\r
     FreePool (PeriodicSmiLibraryHandler);\r

diff --git a/MdePkg/Library/SmmPeriodicSmiLib/SmmPeriodicSmiLib.inf b/MdePkg/Library/SmmPeriodicSmiLib/SmmPeriodicSmiLib.inf
index b1817645b4e2e0e10d104ec6a9d68702f81af11b..f1e23c0f55f624cdcd1e55106e040dd920e7b2b1 100644 (file)
--- a/MdePkg/Library/SmmPeriodicSmiLib/SmmPeriodicSmiLib.inf
+++ b/MdePkg/Library/SmmPeriodicSmiLib/SmmPeriodicSmiLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # SMM Periodic SMI Library.\r
 #\r
 ## @file\r
 # SMM Periodic SMI Library.\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


@@ -24,7 +24,7 @@
   PI_SPECIFICATION_VERSION       = 0x0001000A\r
   CONSTRUCTOR                    = SmmPeriodicSmiLibConstructor\r
   DESTRUCTOR                     = SmmPeriodicSmiLibDestructor\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r
   CONSTRUCTOR                    = SmmPeriodicSmiLibConstructor\r
   DESTRUCTOR                     = SmmPeriodicSmiLibDestructor\r

-  \r
+\r

 #\r
 #  VALID_ARCHITECTURES           = IA32 X64\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64\r
 #\r


@@ -43,10 +43,10 @@
   TimerLib\r
   MemoryAllocationLib\r
   SmmServicesTableLib\r
   TimerLib\r
   MemoryAllocationLib\r
   SmmServicesTableLib\r

-  \r
+\r

 [Protocols]\r
   gEfiSmmPeriodicTimerDispatch2ProtocolGuid  ## CONSUMES\r
 [Protocols]\r
   gEfiSmmPeriodicTimerDispatch2ProtocolGuid  ## CONSUMES\r

-  \r
+\r

 [Depex]\r
   gEfiSmmPeriodicTimerDispatch2ProtocolGuid\r
 \r
 [Depex]\r
   gEfiSmmPeriodicTimerDispatch2ProtocolGuid\r
 \r

diff --git a/MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.c b/MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.c
index 81e5ce8e3f4ecb8cab5ed957c0769c72ce79f514..658b2643da9efc06fa307d6a2a180ed7ea91a152 100644 (file)
--- a/MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.c
+++ b/MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   SMM Services Table Library.\r
 \r
 /** @file\r
   SMM Services Table Library.\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


@@ -41,8 +41,8 @@ SmmServicesTableLibConstructor (
   InternalSmmBase2 = NULL;\r
   //\r
   // Retrieve SMM Base2 Protocol,  Do not use gBS from UefiBootServicesTableLib on purpose\r
   InternalSmmBase2 = NULL;\r
   //\r
   // Retrieve SMM Base2 Protocol,  Do not use gBS from UefiBootServicesTableLib on purpose\r

-  // to prevent inclusion of gBS, gST, and gImageHandle from SMM Drivers unless the \r
-  // SMM driver explicity declares that dependency. \r
+  // to prevent inclusion of gBS, gST, and gImageHandle from SMM Drivers unless the\r
+  // SMM driver explicity declares that dependency.\r

   //\r
   Status = SystemTable->BootServices->LocateProtocol (\r
                                         &gEfiSmmBase2ProtocolGuid,\r
   //\r
   Status = SystemTable->BootServices->LocateProtocol (\r
                                         &gEfiSmmBase2ProtocolGuid,\r


@@ -62,14 +62,14 @@ SmmServicesTableLibConstructor (
 }\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/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c b/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
index dc05b23fd823a26abe298f2d26ecdf1aab838b7b..20cef444eaeace86a2bca529cdb0f4e0c662c91e 100644 (file)
--- a/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
+++ b/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
@@ -1,7 +1,7 @@
 /** @file\r
   Entry point library instance to a UEFI application.\r
 \r
 /** @file\r
   Entry point library instance to a UEFI application.\r
 \r

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


@@ -78,13 +78,13 @@ _ModuleEntryPoint (
 \r
 /**\r
   Invokes the library destructors for all dependent libraries and terminates\r
 \r
 /**\r
   Invokes the library destructors for all dependent libraries and terminates\r

-  the UEFI Application. \r
+  the UEFI Application.\r

 \r
   This function calls ProcessLibraryDestructorList() and the EFI Boot Service Exit()\r
   with a status specified by Status.\r
 \r
   @param  Status  Status returned by the application that is exiting.\r
 \r
   This function calls ProcessLibraryDestructorList() and the EFI Boot Service Exit()\r
   with a status specified by Status.\r
 \r
   @param  Status  Status returned by the application that is exiting.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -100,7 +100,7 @@ Exit (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Required by the EBC compiler and identical in functionality to _ModuleEntryPoint(). \r
+  Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().\r

 \r
   @param  ImageHandle  The image handle of the UEFI Application.\r
   @param  SystemTable  A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle  The image handle of the UEFI Application.\r
   @param  SystemTable  A pointer to the EFI System Table.\r

diff --git a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
index 750a26800101a4d4b1aea07361733d562ab22782..aa4789ee2e9959264b08a77816db8bfef8e06614 100644 (file)
--- a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
+++ b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  This library retrieve the EFI_BOOT_SERVICES pointer from EFI system table in \r
+  This library retrieve the EFI_BOOT_SERVICES pointer from EFI system table in\r

   library's constructor.\r
 \r
   library's constructor.\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


@@ -25,7 +25,7 @@ EFI_BOOT_SERVICES  *gBS         = NULL;
 \r
 /**\r
   The constructor function caches the pointer of Boot Services Table.\r
 \r
 /**\r
   The constructor function caches the pointer of Boot Services Table.\r

-    \r
+\r

   The constructor function caches the pointer of Boot Services Table through System Table.\r
   It will ASSERT() if the pointer of System Table is NULL.\r
   It will ASSERT() if the pointer of Boot Services Table is NULL.\r
   The constructor function caches the pointer of Boot Services Table through System Table.\r
   It will ASSERT() if the pointer of System Table is NULL.\r
   It will ASSERT() if the pointer of Boot Services Table is NULL.\r

diff --git a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
index 22a2d634fe78e5e79ffcee169cbd95c71552f7d7..bfe7ca9aba23dfc480f4c1b82162e07216a052ab 100644 (file)
--- a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+++ b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # UEFI Boot Services Table Library implementation.\r
 ## @file\r
 # UEFI Boot Services Table 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

diff --git a/MdePkg/Library/UefiDebugLibConOut/DebugLib.c b/MdePkg/Library/UefiDebugLibConOut/DebugLib.c
index 0bc112fd1b6f5ba17f37b1805459e93721acad6d..f04207c93fe8a6f788333d6da1e0cbd39201fe00 100644 (file)
--- a/MdePkg/Library/UefiDebugLibConOut/DebugLib.c
+++ b/MdePkg/Library/UefiDebugLibConOut/DebugLib.c
@@ -1,14 +1,14 @@
 /** @file\r
   UEFI Debug Library that sends messages to the Console Output Device in the EFI System Table.\r
 \r
 /** @file\r
   UEFI Debug Library that sends messages to the Console Output Device in the EFI System Table.\r
 \r

-  Copyright (c) 2006 - 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) 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


@@ -23,22 +23,22 @@
 #include <Library/DebugPrintErrorLevelLib.h>\r
 \r
 //\r
 #include <Library/DebugPrintErrorLevelLib.h>\r
 \r
 //\r

-// Define the maximum debug and assert message length that this library supports \r
+// Define the maximum debug and assert message length that this library supports\r

 //\r
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100\r
 \r
 /**\r
   Prints a debug message to the debug output device if the specified error level is enabled.\r
 \r
 //\r
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100\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
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      Format string for the debug message to print.\r
   associated variable argument list to the debug output device.\r
 \r
   If Format is NULL, then ASSERT().\r
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      Format string for the debug message to print.\r

-  @param  ...         A variable argument list whose contents are accessed \r
+  @param  ...         A 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


@@ -83,14 +83,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


@@ -98,9 +98,9 @@ DebugPrint (
   If FileName is NULL, then a <FileName> string of "(NULL) Filename" is printed.\r
   If Description is NULL, then a <Description> string of "(NULL) Description" is printed.\r
 \r
   If FileName is NULL, then a <FileName> string of "(NULL) Filename" is printed.\r
   If Description is NULL, then a <Description> string of "(NULL) Description" is printed.\r
 \r

-  @param  FileName     The pointer to the name of the source file that generated \r
+  @param  FileName     The pointer to the name of the source file that generated\r

                        the assert condition.\r
                        the assert condition.\r

-  @param  LineNumber   The line number in the source file that generated the \r
+  @param  LineNumber   The line number in the source file that generated the\r

                        assert condition\r
   @param  Description  The pointer to the description of the assert condition.\r
 \r
                        assert condition\r
   @param  Description  The pointer to the description of the assert condition.\r
 \r


@@ -119,15 +119,15 @@ DebugAssert (
   // Generate the ASSERT() message in Unicode format\r
   //\r
   UnicodeSPrintAsciiFormat (\r
   // Generate the ASSERT() message in Unicode format\r
   //\r
   UnicodeSPrintAsciiFormat (\r

-    Buffer, \r
-    sizeof (Buffer), \r
+    Buffer,\r
+    sizeof (Buffer),\r

     "ASSERT [%a] %a(%d): %a\n",\r
     gEfiCallerBaseName,\r
     "ASSERT [%a] %a(%d): %a\n",\r
     gEfiCallerBaseName,\r

-    FileName, \r
-    LineNumber, \r
+    FileName,\r
+    LineNumber,\r

     Description\r
     );\r
     Description\r
     );\r

-    \r
+\r

   //\r
   // Send the print string to the Console Output device\r
   //\r
   //\r
   // Send the print string to the Console Output device\r
   //\r


@@ -149,14 +149,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  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r
 \r
   @param   Buffer  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r

-  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. \r
+  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue.\r

 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r
 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r


@@ -183,7 +183,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


@@ -200,10 +200,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


@@ -220,10 +220,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


@@ -240,10 +240,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/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
index 583872f54e810b50bece16ce8d1eae9bc4bca919..8308fc7cb1009a3f768946f982f1b64b5a066a4d 100644 (file)
--- a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
+++ b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
@@ -3,7 +3,7 @@
 #\r
 #  Debug Lib that sends messages to the Console Output Device in the EFI System Table.\r
 #\r
 #\r
 #  Debug Lib that sends messages to the Console Output Device in the EFI System Table.\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
 #\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                      = 5cddfaf3-e9a7-4d16-bdce-1e002df475bb\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 5cddfaf3-e9a7-4d16-bdce-1e002df475bb\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = DebugLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = DebugLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

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

diff --git a/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c b/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c
index 44bf6ba128a5aa57f4ed55ca6975f7385c599953..c2209f412336bd18e6fe9f8ed2e08c60098378a2 100644 (file)
--- a/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c
+++ b/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c
@@ -1,14 +1,14 @@
 /** @file\r
   UEFI Debug Library that sends messages to EFI_DEBUGPORT_PROTOCOL.Write.\r
 \r
 /** @file\r
   UEFI Debug Library that sends messages to EFI_DEBUGPORT_PROTOCOL.Write.\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
+  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
 \r

-  THE PROGRAM 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


@@ -25,12 +25,12 @@
 #include <Protocol/DebugPort.h>\r
 \r
 //\r
 #include <Protocol/DebugPort.h>\r
 \r
 //\r

-// Define the maximum debug and assert message length that this library supports \r
+// Define the maximum debug and assert message length that this library supports\r

 //\r
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100\r
 \r
 //\r
 //\r
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100\r
 \r
 //\r

-// Define the timeout for EFI_DEBUGPORT_PROTOCOL.Write \r
+// Define the timeout for EFI_DEBUGPORT_PROTOCOL.Write\r

 //\r
 #define WRITE_TIMEOUT 1000\r
 \r
 //\r
 #define WRITE_TIMEOUT 1000\r
 \r


@@ -87,15 +87,15 @@ UefiDebugLibDebugPortProtocolWrite (
 /**\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
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      Format string for the debug message to print.\r
   associated variable argument list to the debug output device.\r
 \r
   If Format is NULL, then ASSERT().\r
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      Format string for the debug message to print.\r

-  @param  ...         A variable argument list whose contents are accessed \r
+  @param  ...         A 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


@@ -137,14 +137,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


@@ -152,9 +152,9 @@ DebugPrint (
   If FileName is NULL, then a <FileName> string of "(NULL) Filename" is printed.\r
   If Description is NULL, then a <Description> string of "(NULL) Description" is printed.\r
 \r
   If FileName is NULL, then a <FileName> string of "(NULL) Filename" is printed.\r
   If Description is NULL, then a <Description> string of "(NULL) Description" is printed.\r
 \r

-  @param  FileName     The pointer to the name of the source file that generated \r
+  @param  FileName     The pointer to the name of the source file that generated\r

                        the assert condition.\r
                        the assert condition.\r

-  @param  LineNumber   The line number in the source file that generated the \r
+  @param  LineNumber   The line number in the source file that generated the\r

                        assert condition\r
   @param  Description  The pointer to the description of the assert condition.\r
 \r
                        assert condition\r
   @param  Description  The pointer to the description of the assert condition.\r
 \r


@@ -173,12 +173,12 @@ DebugAssert (
   // Generate the ASSERT() message in ASCII format\r
   //\r
   AsciiSPrint (\r
   // Generate the ASSERT() message in ASCII format\r
   //\r
   AsciiSPrint (\r

-    Buffer, \r
-    sizeof (Buffer), \r
+    Buffer,\r
+    sizeof (Buffer),\r

     "ASSERT [%a] %a(%d): %a\n",\r
     gEfiCallerBaseName,\r
     "ASSERT [%a] %a(%d): %a\n",\r
     gEfiCallerBaseName,\r

-    FileName, \r
-    LineNumber, \r
+    FileName,\r
+    LineNumber,\r

     Description\r
     );\r
 \r
     Description\r
     );\r
 \r


@@ -201,14 +201,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  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r
 \r
   @param   Buffer  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r

-  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. \r
+  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue.\r

 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r
 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r


@@ -235,7 +235,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


@@ -252,10 +252,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


@@ -272,10 +272,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


@@ -292,10 +292,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/MdePkg/Library/UefiDebugLibDebugPortProtocol/UefiDebugLibDebugPortProtocol.inf b/MdePkg/Library/UefiDebugLibDebugPortProtocol/UefiDebugLibDebugPortProtocol.inf
index 0f18c27a1130cc35fcc22b59b9cae785fa47136f..8bceee42c309d46903193530b0a2322ae1bcdc2f 100644 (file)
--- a/MdePkg/Library/UefiDebugLibDebugPortProtocol/UefiDebugLibDebugPortProtocol.inf
+++ b/MdePkg/Library/UefiDebugLibDebugPortProtocol/UefiDebugLibDebugPortProtocol.inf
@@ -3,7 +3,7 @@
 #\r
 #  Debug Lib that sends messages to EFI_DEBUGPORT_PROTOCOL.Write.\r
 #\r
 #\r
 #  Debug Lib that sends messages to EFI_DEBUGPORT_PROTOCOL.Write.\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


@@ -22,7 +22,7 @@
   FILE_GUID                      = 102287b4-6b12-4D41-91e1-ebee1f3aa614\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 102287b4-6b12-4D41-91e1-ebee1f3aa614\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = DebugLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = DebugLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

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

diff --git a/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c b/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c
index cacb90a2442a2c722f6c8b17de399d7f1707c371..6830a3caa1fe950d1fc8ca706464e44f527d3b6c 100644 (file)
--- a/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c
+++ b/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c
@@ -1,14 +1,14 @@
 /** @file\r
   UEFI Debug Lib that sends messages to the Standard Error Device in the EFI System Table.\r
 \r
 /** @file\r
   UEFI Debug Lib that sends messages to the Standard Error Device in the EFI System Table.\r
 \r

-  Copyright (c) 2006 - 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) 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


@@ -24,7 +24,7 @@
 #include <Library/DebugPrintErrorLevelLib.h>\r
 \r
 //\r
 #include <Library/DebugPrintErrorLevelLib.h>\r
 \r
 //\r

-// Define the maximum debug and assert message length that this library supports \r
+// Define the maximum debug and assert message length that this library supports\r

 //\r
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100\r
 \r
 //\r
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100\r
 \r


@@ -32,15 +32,15 @@
 /**\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
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      The format string for the debug message to print.\r
   associated variable argument list to the debug output device.\r
 \r
   If Format is NULL, then ASSERT().\r
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      The format string for the debug message to print.\r

-  @param  ...         The variable argument list whose contents are accessed \r
+  @param  ...         The 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


@@ -84,14 +84,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


@@ -99,9 +99,9 @@ DebugPrint (
   If FileName is NULL, then a <FileName> string of "(NULL) Filename" is printed.\r
   If Description is NULL, then a <Description> string of "(NULL) Description" is printed.\r
 \r
   If FileName is NULL, then a <FileName> string of "(NULL) Filename" is printed.\r
   If Description is NULL, then a <Description> string of "(NULL) Description" is printed.\r
 \r

-  @param  FileName     The pointer to the name of the source file that generated \r
+  @param  FileName     The pointer to the name of the source file that generated\r

                        the assert condition.\r
                        the assert condition.\r

-  @param  LineNumber   The line number in the source file that generated the \r
+  @param  LineNumber   The line number in the source file that generated the\r

                        assert condition\r
   @param  Description  The pointer to the description of the assert condition.\r
 \r
                        assert condition\r
   @param  Description  The pointer to the description of the assert condition.\r
 \r


@@ -120,15 +120,15 @@ DebugAssert (
   // Generate the ASSERT() message in Unicode format\r
   //\r
   UnicodeSPrintAsciiFormat (\r
   // Generate the ASSERT() message in Unicode format\r
   //\r
   UnicodeSPrintAsciiFormat (\r

-    Buffer, \r
+    Buffer,\r

     sizeof (Buffer),\r
     "ASSERT [%a] %a(%d): %a\n",\r
     gEfiCallerBaseName,\r
     sizeof (Buffer),\r
     "ASSERT [%a] %a(%d): %a\n",\r
     gEfiCallerBaseName,\r

-    FileName, \r
-    LineNumber, \r
+    FileName,\r
+    LineNumber,\r

     Description\r
     );\r
     Description\r
     );\r

-    \r
+\r

   //\r
   // Send the print string to the Standard Error device\r
   //\r
   //\r
   // Send the print string to the Standard Error device\r
   //\r


@@ -150,14 +150,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  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r
 \r
   @param   Buffer  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r

-  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. \r
+  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue.\r

 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r
 \r
   @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r


@@ -184,7 +184,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


@@ -201,10 +201,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


@@ -221,10 +221,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


@@ -241,10 +241,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/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
index 196487cf8c05dcd1d570d13105094e3a71af8157..b294ea21fcb8c91f673d792b4a5557784339ebb9 100644 (file)
--- a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
+++ b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
@@ -3,7 +3,7 @@
 #\r
 #  Debug Lib that sends messages to the the Standard Error Device in the EFI System Table.\r
 #\r
 #\r
 #  Debug Lib that sends messages to the the Standard Error Device in the EFI System Table.\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
 #\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                      = b57a1df6-ffdb-4247-a3df-3a562176751a\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = b57a1df6-ffdb-4247-a3df-3a562176751a\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = DebugLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = DebugLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

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

diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
index 35a73e83ff2181e067a212d2e67f630c809b3b81..c5f3764fc096475de834c76695e4b71bdc45d334 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
+++ b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
@@ -279,7 +279,7 @@ IsHexStr (
   while ((*Str != 0) && *Str == L'0') {\r
     Str ++;\r
   }\r
   while ((*Str != 0) && *Str == L'0') {\r
     Str ++;\r
   }\r

-  \r
+\r

   return (BOOLEAN) (*Str == L'x' || *Str == L'X');\r
 }\r
 \r
   return (BOOLEAN) (*Str == L'x' || *Str == L'X');\r
 }\r
 \r


@@ -980,7 +980,7 @@ DevPathFromTextAcpiAdr (
       ASSERT (AcpiAdr != NULL);\r
       SetDevicePathNodeLength (AcpiAdr, Length + sizeof (UINT32));\r
     }\r
       ASSERT (AcpiAdr != NULL);\r
       SetDevicePathNodeLength (AcpiAdr, Length + sizeof (UINT32));\r
     }\r

-    \r
+\r

     (&AcpiAdr->ADR)[Index] = (UINT32) Strtoi (DisplayDeviceStr);\r
   }\r
 \r
     (&AcpiAdr->ADR)[Index] = (UINT32) Strtoi (DisplayDeviceStr);\r
   }\r
 \r


@@ -2757,18 +2757,18 @@ DevPathFromTextDns (
   }\r
 \r
   DeviceNodeStrPtr = DeviceNodeStr;\r
   }\r
 \r
   DeviceNodeStrPtr = DeviceNodeStr;\r

-  \r
+\r

   DnsServerIpCount = 0;\r
   while (DeviceNodeStrPtr != NULL && *DeviceNodeStrPtr != L'\0') {\r
     GetNextParamStr (&DeviceNodeStrPtr);\r
   DnsServerIpCount = 0;\r
   while (DeviceNodeStrPtr != NULL && *DeviceNodeStrPtr != L'\0') {\r
     GetNextParamStr (&DeviceNodeStrPtr);\r

-    DnsServerIpCount ++; \r
+    DnsServerIpCount ++;\r

   }\r
 \r
   FreePool (DeviceNodeStr);\r
   DeviceNodeStr = NULL;\r
 \r
   //\r
   }\r
 \r
   FreePool (DeviceNodeStr);\r
   DeviceNodeStr = NULL;\r
 \r
   //\r

-  // One or more instances of the DNS server address in EFI_IP_ADDRESS, \r
+  // One or more instances of the DNS server address in EFI_IP_ADDRESS,\r

   // otherwise, NULL will be returned.\r
   //\r
   if (DnsServerIpCount == 0) {\r
   // otherwise, NULL will be returned.\r
   //\r
   if (DnsServerIpCount == 0) {\r


@@ -2814,7 +2814,7 @@ DevPathFromTextDns (
       StrToIpv6Address (DnsServerIp, NULL, &(DnsDeviceNode->DnsServerIp[DnsServerIpIndex].v6), NULL);\r
     }\r
   }\r
       StrToIpv6Address (DnsServerIp, NULL, &(DnsDeviceNode->DnsServerIp[DnsServerIpIndex].v6), NULL);\r
     }\r
   }\r

-  \r
+\r

   return (EFI_DEVICE_PATH_PROTOCOL *) DnsDeviceNode;\r
 }\r
 \r
   return (EFI_DEVICE_PATH_PROTOCOL *) DnsDeviceNode;\r
 }\r
 \r

diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
index 813ea243343d4c9921ea231dacb7d1c1f5acbc0b..7d8d304f6f00050daf626c723abd027b47f7b2eb 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
+++ b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
@@ -56,7 +56,7 @@ UefiDevicePathLibCatPrint (
   VA_START (Args, Fmt);\r
   UnicodeVSPrint (&Str->Str[Str->Count], Str->Capacity - Str->Count * sizeof (CHAR16), Fmt, Args);\r
   Str->Count += Count;\r
   VA_START (Args, Fmt);\r
   UnicodeVSPrint (&Str->Str[Str->Count], Str->Capacity - Str->Count * sizeof (CHAR16), Fmt, Args);\r
   Str->Count += Count;\r

-  \r
+\r

   VA_END (Args);\r
   return Str->Str;\r
 }\r
   VA_END (Args);\r
   return Str->Str;\r
 }\r


@@ -435,7 +435,7 @@ DevPathToTextAcpiEx (
 \r
   //\r
   // Converts EISA identification to string.\r
 \r
   //\r
   // Converts EISA identification to string.\r

-  // \r
+  //\r

   UnicodeSPrint (\r
     HIDText,\r
     sizeof (HIDText),\r
   UnicodeSPrint (\r
     HIDText,\r
     sizeof (HIDText),\r


@@ -1364,7 +1364,7 @@ DevPathToTextIPv6 (
     UefiDevicePathLibCatPrint (Str, L")");\r
     return ;\r
   }\r
     UefiDevicePathLibCatPrint (Str, L")");\r
     return ;\r
   }\r

-  \r
+\r

   UefiDevicePathLibCatPrint (Str, L",");\r
   CatNetworkProtocol (Str, IPDevPath->Protocol);\r
 \r
   UefiDevicePathLibCatPrint (Str, L",");\r
   CatNetworkProtocol (Str, IPDevPath->Protocol);\r
 \r


@@ -1727,7 +1727,7 @@ DevPathToTextDns (
   DnsServerIpCount = (UINT32) (DevicePathNodeLength(DnsDevPath) - sizeof (EFI_DEVICE_PATH_PROTOCOL) - sizeof (DnsDevPath->IsIPv6)) / sizeof (EFI_IP_ADDRESS);\r
 \r
   UefiDevicePathLibCatPrint (Str, L"Dns(");\r
   DnsServerIpCount = (UINT32) (DevicePathNodeLength(DnsDevPath) - sizeof (EFI_DEVICE_PATH_PROTOCOL) - sizeof (DnsDevPath->IsIPv6)) / sizeof (EFI_IP_ADDRESS);\r
 \r
   UefiDevicePathLibCatPrint (Str, L"Dns(");\r

-  \r
+\r

   for (DnsServerIpIndex = 0; DnsServerIpIndex < DnsServerIpCount; DnsServerIpIndex++) {\r
     if (DnsDevPath->IsIPv6 == 0x00) {\r
       CatIPv4Address (Str, &(DnsDevPath->DnsServerIp[DnsServerIpIndex].v4));\r
   for (DnsServerIpIndex = 0; DnsServerIpIndex < DnsServerIpCount; DnsServerIpIndex++) {\r
     if (DnsDevPath->IsIPv6 == 0x00) {\r
       CatIPv4Address (Str, &(DnsDevPath->DnsServerIp[DnsServerIpIndex].v4));\r


@@ -2409,14 +2409,14 @@ UefiDevicePathLibConvertDevicePathToText (
         UefiDevicePathLibCatPrint (&Str, L"/");\r
       }\r
     }\r
         UefiDevicePathLibCatPrint (&Str, L"/");\r
       }\r
     }\r

-    \r
+\r

     AlignedNode = AllocateCopyPool (DevicePathNodeLength (Node), Node);\r
     //\r
     // Print this node of the device path\r
     //\r
     ToText (&Str, AlignedNode, DisplayOnly, AllowShortcuts);\r
     FreePool (AlignedNode);\r
     AlignedNode = AllocateCopyPool (DevicePathNodeLength (Node), Node);\r
     //\r
     // Print this node of the device path\r
     //\r
     ToText (&Str, AlignedNode, DisplayOnly, AllowShortcuts);\r
     FreePool (AlignedNode);\r

-    \r
+\r

     //\r
     // Next device path node\r
     //\r
     //\r
     // Next device path node\r
     //\r

diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c b/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c
index bb4a56398e3c92c6b249d765d90b3144f72f492c..665e5a4adcd392a3d07398c5ad4bba4d4190b7f8 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c
+++ b/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c
@@ -8,14 +8,14 @@
   environment varibles. Multi-instance device paths should never be placed\r
   on a Handle.\r
 \r
   environment varibles. Multi-instance device paths should never be placed\r
   on a Handle.\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


@@ -152,9 +152,9 @@ DevicePathSubType (
 /**\r
   Returns the 16-bit Length field of a device path node.\r
 \r
 /**\r
   Returns the 16-bit Length field of a device path node.\r
 \r

-  Returns the 16-bit Length field of the device path node specified by Node.  \r
+  Returns the 16-bit Length field of the device path node specified by Node.\r

   Node is not required to be aligned on a 16-bit boundary, so it is recommended\r
   Node is not required to be aligned on a 16-bit boundary, so it is recommended\r

-  that a function such as ReadUnaligned16() be used to extract the contents of \r
+  that a function such as ReadUnaligned16() be used to extract the contents of\r

   the Length field.\r
 \r
   If Node is NULL, then ASSERT().\r
   the Length field.\r
 \r
   If Node is NULL, then ASSERT().\r


@@ -177,14 +177,14 @@ DevicePathNodeLength (
 /**\r
   Returns a pointer to the next node in a device path.\r
 \r
 /**\r
   Returns a pointer to the next node in a device path.\r
 \r

-  Returns a pointer to the device path node that follows the device path node \r
+  Returns a pointer to the device path node that follows the device path node\r

   specified by Node.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r
   specified by Node.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r

-  @return a pointer to the device path node that follows the device path node \r
+  @return a pointer to the device path node that follows the device path node\r

   specified by Node.\r
 \r
 **/\r
   specified by Node.\r
 \r
 **/\r


@@ -200,23 +200,23 @@ NextDevicePathNode (
 \r
 /**\r
   Determines if a device path node is an end node of a device path.\r
 \r
 /**\r
   Determines if a device path node is an end node of a device path.\r

-  This includes nodes that are the end of a device path instance and nodes that \r
+  This includes nodes that are the end of a device path instance and nodes that\r

   are the end of an entire device path.\r
 \r
   are the end of an entire device path.\r
 \r

-  Determines if the device path node specified by Node is an end node of a device path.  \r
-  This includes nodes that are the end of a device path instance and nodes that are the \r
-  end of an entire device path.  If Node represents an end node of a device path, \r
+  Determines if the device path node specified by Node is an end node of a device path.\r
+  This includes nodes that are the end of a device path instance and nodes that are the\r
+  end of an entire device path.  If Node represents an end node of a device path,\r

   then TRUE is returned.  Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r
   then TRUE is returned.  Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r

-  @retval TRUE      The device path node specified by Node is an end node of a \r
+  @retval TRUE      The device path node specified by Node is an end node of a\r

                     device path.\r
                     device path.\r

-  @retval FALSE     The device path node specified by Node is not an end node of \r
+  @retval FALSE     The device path node specified by Node is not an end node of\r

                     a device path.\r
                     a device path.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -231,17 +231,17 @@ IsDevicePathEndType (
 /**\r
   Determines if a device path node is an end node of an entire device path.\r
 \r
 /**\r
   Determines if a device path node is an end node of an entire device path.\r
 \r

-  Determines if a device path node specified by Node is an end node of an entire \r
-  device path. If Node represents the end of an entire device path, then TRUE is \r
+  Determines if a device path node specified by Node is an end node of an entire\r
+  device path. If Node represents the end of an entire device path, then TRUE is\r

   returned.  Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r
   returned.  Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r

-  @retval TRUE      The device path node specified by Node is the end of an entire \r
+  @retval TRUE      The device path node specified by Node is the end of an entire\r

                     device path.\r
                     device path.\r

-  @retval FALSE     The device path node specified by Node is not the end of an \r
+  @retval FALSE     The device path node specified by Node is not the end of an\r

                     entire device path.\r
 \r
 **/\r
                     entire device path.\r
 \r
 **/\r


@@ -258,17 +258,17 @@ IsDevicePathEnd (
 /**\r
   Determines if a device path node is an end node of a device path instance.\r
 \r
 /**\r
   Determines if a device path node is an end node of a device path instance.\r
 \r

-  Determines if a device path node specified by Node is an end node of a device \r
-  path instance. If Node represents the end of a device path instance, then TRUE \r
+  Determines if a device path node specified by Node is an end node of a device\r
+  path instance. If Node represents the end of a device path instance, then TRUE\r

   is returned.  Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r
   is returned.  Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r

-  @retval TRUE      The device path node specified by Node is the end of a device \r
+  @retval TRUE      The device path node specified by Node is the end of a device\r

                     path instance.\r
                     path instance.\r

-  @retval FALSE     The device path node specified by Node is not the end of a \r
+  @retval FALSE     The device path node specified by Node is not the end of a\r

                     device path instance.\r
 \r
 **/\r
                     device path instance.\r
 \r
 **/\r


@@ -285,8 +285,8 @@ IsDevicePathEndInstance (
 /**\r
   Sets the length, in bytes, of a device path node.\r
 \r
 /**\r
   Sets the length, in bytes, of a device path node.\r
 \r

-  Sets the length of the device path node specified by Node to the value specified \r
-  by NodeLength.  NodeLength is returned.  Node is not required to be aligned on \r
+  Sets the length of the device path node specified by Node to the value specified\r
+  by NodeLength.  NodeLength is returned.  Node is not required to be aligned on\r

   a 16-bit boundary, so it is recommended that a function such as WriteUnaligned16()\r
   be used to set the contents of the Length field.\r
 \r
   a 16-bit boundary, so it is recommended that a function such as WriteUnaligned16()\r
   be used to set the contents of the Length field.\r
 \r


@@ -315,15 +315,15 @@ SetDevicePathNodeLength (
 /**\r
   Fills in all the fields of a device path node that is the end of an entire device path.\r
 \r
 /**\r
   Fills in all the fields of a device path node that is the end of an entire device path.\r
 \r

-  Fills in all the fields of a device path node specified by Node so Node represents \r
-  the end of an entire device path.  The Type field of Node is set to \r
-  END_DEVICE_PATH_TYPE, the SubType field of Node is set to \r
-  END_ENTIRE_DEVICE_PATH_SUBTYPE, and the Length field of Node is set to \r
-  END_DEVICE_PATH_LENGTH.  Node is not required to be aligned on a 16-bit boundary, \r
-  so it is recommended that a function such as WriteUnaligned16() be used to set \r
-  the contents of the Length field. \r
+  Fills in all the fields of a device path node specified by Node so Node represents\r
+  the end of an entire device path.  The Type field of Node is set to\r
+  END_DEVICE_PATH_TYPE, the SubType field of Node is set to\r
+  END_ENTIRE_DEVICE_PATH_SUBTYPE, and the Length field of Node is set to\r
+  END_DEVICE_PATH_LENGTH.  Node is not required to be aligned on a 16-bit boundary,\r
+  so it is recommended that a function such as WriteUnaligned16() be used to set\r
+  the contents of the Length field.\r

 \r
 \r

-  If Node is NULL, then ASSERT(). \r
+  If Node is NULL, then ASSERT().\r

 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r


@@ -341,7 +341,7 @@ SetDevicePathEndNode (
 /**\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
+  This function returns the size, in bytes, of the device path data structure\r

   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r
   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r


@@ -384,18 +384,18 @@ UefiDevicePathLibGetDevicePathSize (
 /**\r
   Creates a new copy of an existing device path.\r
 \r
 /**\r
   Creates a new copy of an existing device path.\r
 \r

-  This function allocates space for a new copy of the device path specified by DevicePath.  \r
-  If DevicePath is NULL, then NULL is returned.  If the memory is successfully \r
-  allocated, then the contents of DevicePath are copied to the newly allocated \r
-  buffer, and a pointer to that buffer is returned.  Otherwise, NULL is returned.  \r
-  The memory for the new device path is allocated from EFI boot services memory. \r
-  It is the responsibility of the caller to free the memory allocated. \r
-  \r
+  This function allocates space for a new copy of the device path specified by DevicePath.\r
+  If DevicePath is NULL, then NULL is returned.  If the memory is successfully\r
+  allocated, then the contents of DevicePath are copied to the newly allocated\r
+  buffer, and a pointer to that buffer is returned.  Otherwise, NULL is returned.\r
+  The memory for the new device path is allocated from EFI boot services memory.\r
+  It is the responsibility of the caller to free the memory allocated.\r
+\r

   @param  DevicePath    A pointer to a device path data structure.\r
 \r
   @retval NULL          DevicePath is NULL or invalid.\r
   @retval Others        A pointer to the duplicated device path.\r
   @param  DevicePath    A pointer to a device path data structure.\r
 \r
   @retval NULL          DevicePath is NULL or invalid.\r
   @retval Others        A pointer to the duplicated device path.\r

-  \r
+\r

 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r


@@ -423,21 +423,21 @@ UefiDevicePathLibDuplicateDevicePath (
 /**\r
   Creates a new device path by appending a second device path to a first device path.\r
 \r
 /**\r
   Creates a new device path by appending a second device path to a first device path.\r
 \r

-  This function creates a new device path by appending a copy of SecondDevicePath \r
-  to a copy of FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path \r
-  device node from SecondDevicePath is retained. The newly created device path is \r
-  returned. If FirstDevicePath is NULL, then it is ignored, and a duplicate of \r
-  SecondDevicePath is returned.  If SecondDevicePath is NULL, then it is ignored, \r
-  and a duplicate of FirstDevicePath is returned. If both FirstDevicePath and \r
-  SecondDevicePath are NULL, then a copy of an end-of-device-path is returned.  \r
-  \r
+  This function creates a new device path by appending a copy of SecondDevicePath\r
+  to a copy of FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path\r
+  device node from SecondDevicePath is retained. The newly created device path is\r
+  returned. If FirstDevicePath is NULL, then it is ignored, and a duplicate of\r
+  SecondDevicePath is returned.  If SecondDevicePath is NULL, then it is ignored,\r
+  and a duplicate of FirstDevicePath is returned. If both FirstDevicePath and\r
+  SecondDevicePath are NULL, then a copy of an end-of-device-path is returned.\r
+\r

   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r
   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r

-  The memory for the new device path is allocated from EFI boot services memory. \r
+  The memory for the new device path is allocated from EFI boot services memory.\r

   It is the responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r
   It is the responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r

-  \r
+\r

   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r
   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r


@@ -498,18 +498,18 @@ UefiDevicePathLibAppendDevicePath (
 /**\r
   Creates a new path by appending the device node to the device path.\r
 \r
 /**\r
   Creates a new path by appending the device node to the device path.\r
 \r

-  This function creates a new device path by appending a copy of the device node \r
-  specified by DevicePathNode to a copy of the device path specified by DevicePath \r
-  in an allocated buffer. The end-of-device-path device node is moved after the \r
+  This function creates a new device path by appending a copy of the device node\r
+  specified by DevicePathNode to a copy of the device path specified by DevicePath\r
+  in an allocated buffer. The end-of-device-path device node is moved after the\r

   end of the appended device node.\r
   If DevicePathNode is NULL then a copy of DevicePath is returned.\r
   end of the appended device node.\r
   If DevicePathNode is NULL then a copy of DevicePath is returned.\r

-  If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device \r
+  If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device\r

   path device node is returned.\r
   path device node is returned.\r

-  If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path \r
+  If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path\r

   device node is returned.\r
   device node is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r
   of the caller to free the memory allocated.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r


@@ -517,9 +517,9 @@ UefiDevicePathLibAppendDevicePath (
 \r
   @retval NULL      If there is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r
 \r
   @retval NULL      If there is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r

-                    A copy of DevicePathNode followed by an end-of-device-path node \r
+                    A copy of DevicePathNode followed by an end-of-device-path node\r

                     if both FirstDevicePath and SecondDevicePath are NULL.\r
                     if both FirstDevicePath and SecondDevicePath are NULL.\r

-                    A copy of an end-of-device-path node if both FirstDevicePath \r
+                    A copy of an end-of-device-path node if both FirstDevicePath\r

                     and SecondDevicePath are NULL.\r
 \r
 **/\r
                     and SecondDevicePath are NULL.\r
 \r
 **/\r


@@ -566,20 +566,20 @@ UefiDevicePathLibAppendDevicePathNode (
 /**\r
   Creates a new device path by appending the specified device path instance to the specified device\r
   path.\r
 /**\r
   Creates a new device path by appending the specified device path instance to the specified device\r
   path.\r

- \r
-  This function creates a new device path by appending a copy of the device path \r
-  instance specified by DevicePathInstance to a copy of the device path specified \r
+\r
+  This function creates a new device path by appending a copy of the device path\r
+  instance specified by DevicePathInstance to a copy of the device path specified\r

   by DevicePath in a allocated buffer.\r
   by DevicePath in a allocated buffer.\r

-  The end-of-device-path device node is moved after the end of the appended device \r
-  path instance and a new end-of-device-path-instance node is inserted between. \r
+  The end-of-device-path device node is moved after the end of the appended device\r
+  path instance and a new end-of-device-path-instance node is inserted between.\r

   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r
   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
   of the caller to free the memory allocated.\r

-  \r
+\r

   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r


@@ -615,13 +615,13 @@ UefiDevicePathLibAppendDevicePathInstance (
 \r
   NewDevicePath = AllocatePool (SrcSize + InstanceSize);\r
   if (NewDevicePath != NULL) {\r
 \r
   NewDevicePath = AllocatePool (SrcSize + InstanceSize);\r
   if (NewDevicePath != NULL) {\r

-    \r
+\r

     TempDevicePath = CopyMem (NewDevicePath, DevicePath, SrcSize);;\r
     TempDevicePath = CopyMem (NewDevicePath, DevicePath, SrcSize);;\r

- \r
+\r

     while (!IsDevicePathEnd (TempDevicePath)) {\r
       TempDevicePath = NextDevicePathNode (TempDevicePath);\r
     }\r
     while (!IsDevicePathEnd (TempDevicePath)) {\r
       TempDevicePath = NextDevicePathNode (TempDevicePath);\r
     }\r

-    \r
+\r

     TempDevicePath->SubType  = END_INSTANCE_DEVICE_PATH_SUBTYPE;\r
     TempDevicePath           = NextDevicePathNode (TempDevicePath);\r
     CopyMem (TempDevicePath, DevicePathInstance, InstanceSize);\r
     TempDevicePath->SubType  = END_INSTANCE_DEVICE_PATH_SUBTYPE;\r
     TempDevicePath           = NextDevicePathNode (TempDevicePath);\r
     CopyMem (TempDevicePath, DevicePathInstance, InstanceSize);\r


@@ -634,25 +634,25 @@ UefiDevicePathLibAppendDevicePathInstance (
   Creates a copy of the current device path instance and returns a pointer to the next device path\r
   instance.\r
 \r
   Creates a copy of the current device path instance and returns a pointer to the next device path\r
   instance.\r
 \r

-  This function creates a copy of the current device path instance. It also updates \r
-  DevicePath to point to the next device path instance in the device path (or NULL \r
+  This function creates a copy of the current device path instance. It also updates\r
+  DevicePath to point to the next device path instance in the device path (or NULL\r

   if no more) and updates Size to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r
   If DevicePath points to a invalid device path, then NULL is returned.\r
   if no more) and updates Size to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r
   If DevicePath points to a invalid device path, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
   If Size is NULL, then ASSERT().\r
   of the caller to free the memory allocated.\r
   If Size is NULL, then ASSERT().\r

- \r
-  @param  DevicePath                 On input, this holds the pointer to the current \r
-                                     device path instance. On output, this holds \r
-                                     the pointer to the next device path instance \r
+\r
+  @param  DevicePath                 On input, this holds the pointer to the current\r
+                                     device path instance. On output, this holds\r
+                                     the pointer to the next device path instance\r

                                      or NULL if there are no more device path\r
                                      or NULL if there are no more device path\r

-                                     instances in the device path pointer to a \r
+                                     instances in the device path pointer to a\r

                                      device path data structure.\r
                                      device path data structure.\r

-  @param  Size                       On output, this holds the size of the device \r
-                                     path instance, in bytes or zero, if DevicePath \r
+  @param  Size                       On output, this holds the size of the device\r
+                                     path instance, in bytes or zero, if DevicePath\r

                                      is NULL.\r
 \r
   @return A pointer to the current device path instance.\r
                                      is NULL.\r
 \r
   @return A pointer to the current device path instance.\r


@@ -692,7 +692,7 @@ UefiDevicePathLibGetNextDevicePathInstance (
   // Compute the size of the device path instance\r
   //\r
   *Size = ((UINTN) DevPath - (UINTN) (*DevicePath)) + sizeof (EFI_DEVICE_PATH_PROTOCOL);\r
   // Compute the size of the device path instance\r
   //\r
   *Size = ((UINTN) DevPath - (UINTN) (*DevicePath)) + sizeof (EFI_DEVICE_PATH_PROTOCOL);\r

- \r
+\r

   //\r
   // Make a copy and return the device path instance\r
   //\r
   //\r
   // Make a copy and return the device path instance\r
   //\r


@@ -717,13 +717,13 @@ UefiDevicePathLibGetNextDevicePathInstance (
 /**\r
   Creates a device node.\r
 \r
 /**\r
   Creates a device node.\r
 \r

-  This function creates a new device node in a newly allocated buffer of size \r
-  NodeLength and initializes the device path node header with NodeType and NodeSubType.  \r
+  This function creates a new device node in a newly allocated buffer of size\r
+  NodeLength and initializes the device path node header with NodeType and NodeSubType.\r

   The new device path node is returned.\r
   The new device path node is returned.\r

-  If NodeLength is smaller than a device path header, then NULL is returned.  \r
-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If NodeLength is smaller than a device path header, then NULL is returned.\r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
 \r
   @param  NodeType                   The device node type for the new device node.\r
   of the caller to free the memory allocated.\r
 \r
   @param  NodeType                   The device node type for the new device node.\r


@@ -749,7 +749,7 @@ UefiDevicePathLibCreateDeviceNode (
     //\r
     return NULL;\r
   }\r
     //\r
     return NULL;\r
   }\r

- \r
+\r

   DevicePath = AllocateZeroPool (NodeLength);\r
   if (DevicePath != NULL) {\r
      DevicePath->Type    = NodeType;\r
   DevicePath = AllocateZeroPool (NodeLength);\r
   if (DevicePath != NULL) {\r
      DevicePath->Type    = NodeType;\r


@@ -771,7 +771,7 @@ UefiDevicePathLibCreateDeviceNode (
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval  TRUE                      DevicePath is multi-instance.\r
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval  TRUE                      DevicePath is multi-instance.\r

-  @retval  FALSE                     DevicePath is not multi-instance, or DevicePath \r
+  @retval  FALSE                     DevicePath is not multi-instance, or DevicePath\r

                                      is NULL or invalid.\r
 \r
 **/\r
                                      is NULL or invalid.\r
 \r
 **/\r


@@ -807,11 +807,11 @@ UefiDevicePathLibIsDevicePathMultiInstance (
 /**\r
   Retrieves the device path protocol from a handle.\r
 \r
 /**\r
   Retrieves the device path protocol from a handle.\r
 \r

-  This function returns the device path protocol from the handle specified by Handle.  \r
-  If Handle is NULL or Handle does not contain a device path protocol, then NULL \r
+  This function returns the device path protocol from the handle specified by Handle.\r
+  If Handle is NULL or Handle does not contain a device path protocol, then NULL\r

   is returned.\r
   is returned.\r

- \r
-  @param  Handle                     The handle from which to retrieve the device \r
+\r
+  @param  Handle                     The handle from which to retrieve the device\r

                                      path protocol.\r
 \r
   @return The device path protocol from the handle specified by Handle.\r
                                      path protocol.\r
 \r
   @return The device path protocol from the handle specified by Handle.\r


@@ -847,11 +847,11 @@ DevicePathFromHandle (
   path node for the file specified by FileName is allocated and returned.\r
   The memory for the new device path is allocated from EFI boot services memory. It is the responsibility\r
   of the caller to free the memory allocated.\r
   path node for the file specified by FileName is allocated and returned.\r
   The memory for the new device path is allocated from EFI boot services memory. It is the responsibility\r
   of the caller to free the memory allocated.\r

-  \r
+\r

   If FileName is NULL, then ASSERT().\r
   If FileName is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If FileName is NULL, then ASSERT().\r
   If FileName is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  @param  Device                     A pointer to a device handle.  This parameter \r
+  @param  Device                     A pointer to a device handle.  This parameter\r

                                      is optional and may be NULL.\r
   @param  FileName                   A pointer to a Null-terminated Unicode string.\r
 \r
                                      is optional and may be NULL.\r
   @param  FileName                   A pointer to a Null-terminated Unicode string.\r
 \r

diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
index baad7bc1f7f156ecee63b2befdd50166a2675895..6f8fa8603119c943accd4fedd3ee33537704a751 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
@@ -8,14 +8,14 @@
   environment varibles. Multi-instance device paths should never be placed\r
   on a Handle.\r
 \r
   environment varibles. Multi-instance device paths should never be placed\r
   on a Handle.\r
 \r

-  Copyright (c) 2006 - 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) 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


@@ -25,7 +25,7 @@
 /**\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
+  This function returns the size, in bytes, of the device path data structure\r

   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r
   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r


@@ -47,18 +47,18 @@ GetDevicePathSize (
 /**\r
   Creates a new copy of an existing device path.\r
 \r
 /**\r
   Creates a new copy of an existing device path.\r
 \r

-  This function allocates space for a new copy of the device path specified by DevicePath.  \r
-  If DevicePath is NULL, then NULL is returned.  If the memory is successfully \r
-  allocated, then the contents of DevicePath are copied to the newly allocated \r
-  buffer, and a pointer to that buffer is returned.  Otherwise, NULL is returned.  \r
-  The memory for the new device path is allocated from EFI boot services memory. \r
-  It is the responsibility of the caller to free the memory allocated. \r
-  \r
+  This function allocates space for a new copy of the device path specified by DevicePath.\r
+  If DevicePath is NULL, then NULL is returned.  If the memory is successfully\r
+  allocated, then the contents of DevicePath are copied to the newly allocated\r
+  buffer, and a pointer to that buffer is returned.  Otherwise, NULL is returned.\r
+  The memory for the new device path is allocated from EFI boot services memory.\r
+  It is the responsibility of the caller to free the memory allocated.\r
+\r

   @param  DevicePath    A pointer to a device path data structure.\r
 \r
   @retval NULL          DevicePath is NULL or invalid.\r
   @retval Others        A pointer to the duplicated device path.\r
   @param  DevicePath    A pointer to a device path data structure.\r
 \r
   @retval NULL          DevicePath is NULL or invalid.\r
   @retval Others        A pointer to the duplicated device path.\r

-  \r
+\r

 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r


@@ -72,21 +72,21 @@ DuplicateDevicePath (
 /**\r
   Creates a new device path by appending a second device path to a first device path.\r
 \r
 /**\r
   Creates a new device path by appending a second device path to a first device path.\r
 \r

-  This function creates a new device path by appending a copy of SecondDevicePath \r
-  to a copy of FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path \r
-  device node from SecondDevicePath is retained. The newly created device path is \r
-  returned. If FirstDevicePath is NULL, then it is ignored, and a duplicate of \r
-  SecondDevicePath is returned.  If SecondDevicePath is NULL, then it is ignored, \r
-  and a duplicate of FirstDevicePath is returned. If both FirstDevicePath and \r
-  SecondDevicePath are NULL, then a copy of an end-of-device-path is returned.  \r
-  \r
+  This function creates a new device path by appending a copy of SecondDevicePath\r
+  to a copy of FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path\r
+  device node from SecondDevicePath is retained. The newly created device path is\r
+  returned. If FirstDevicePath is NULL, then it is ignored, and a duplicate of\r
+  SecondDevicePath is returned.  If SecondDevicePath is NULL, then it is ignored,\r
+  and a duplicate of FirstDevicePath is returned. If both FirstDevicePath and\r
+  SecondDevicePath are NULL, then a copy of an end-of-device-path is returned.\r
+\r

   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r
   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r

-  The memory for the new device path is allocated from EFI boot services memory. \r
+  The memory for the new device path is allocated from EFI boot services memory.\r

   It is the responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r
   It is the responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r

-  \r
+\r

   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r
   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r


@@ -106,18 +106,18 @@ AppendDevicePath (
 /**\r
   Creates a new path by appending the device node to the device path.\r
 \r
 /**\r
   Creates a new path by appending the device node to the device path.\r
 \r

-  This function creates a new device path by appending a copy of the device node \r
-  specified by DevicePathNode to a copy of the device path specified by DevicePath \r
-  in an allocated buffer. The end-of-device-path device node is moved after the \r
+  This function creates a new device path by appending a copy of the device node\r
+  specified by DevicePathNode to a copy of the device path specified by DevicePath\r
+  in an allocated buffer. The end-of-device-path device node is moved after the\r

   end of the appended device node.\r
   If DevicePathNode is NULL then a copy of DevicePath is returned.\r
   end of the appended device node.\r
   If DevicePathNode is NULL then a copy of DevicePath is returned.\r

-  If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device \r
+  If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device\r

   path device node is returned.\r
   path device node is returned.\r

-  If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path \r
+  If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path\r

   device node is returned.\r
   device node is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r
   of the caller to free the memory allocated.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r


@@ -125,9 +125,9 @@ AppendDevicePath (
 \r
   @retval NULL      If there is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r
 \r
   @retval NULL      If there is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r

-                    A copy of DevicePathNode followed by an end-of-device-path node \r
+                    A copy of DevicePathNode followed by an end-of-device-path node\r

                     if both FirstDevicePath and SecondDevicePath are NULL.\r
                     if both FirstDevicePath and SecondDevicePath are NULL.\r

-                    A copy of an end-of-device-path node if both FirstDevicePath \r
+                    A copy of an end-of-device-path node if both FirstDevicePath\r

                     and SecondDevicePath are NULL.\r
 \r
 **/\r
                     and SecondDevicePath are NULL.\r
 \r
 **/\r


@@ -144,20 +144,20 @@ AppendDevicePathNode (
 /**\r
   Creates a new device path by appending the specified device path instance to the specified device\r
   path.\r
 /**\r
   Creates a new device path by appending the specified device path instance to the specified device\r
   path.\r

- \r
-  This function creates a new device path by appending a copy of the device path \r
-  instance specified by DevicePathInstance to a copy of the device path specified \r
+\r
+  This function creates a new device path by appending a copy of the device path\r
+  instance specified by DevicePathInstance to a copy of the device path specified\r

   by DevicePath in a allocated buffer.\r
   by DevicePath in a allocated buffer.\r

-  The end-of-device-path device node is moved after the end of the appended device \r
-  path instance and a new end-of-device-path-instance node is inserted between. \r
+  The end-of-device-path device node is moved after the end of the appended device\r
+  path instance and a new end-of-device-path-instance node is inserted between.\r

   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r
   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
   of the caller to free the memory allocated.\r

-  \r
+\r

   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r


@@ -178,25 +178,25 @@ AppendDevicePathInstance (
   Creates a copy of the current device path instance and returns a pointer to the next device path\r
   instance.\r
 \r
   Creates a copy of the current device path instance and returns a pointer to the next device path\r
   instance.\r
 \r

-  This function creates a copy of the current device path instance. It also updates \r
-  DevicePath to point to the next device path instance in the device path (or NULL \r
+  This function creates a copy of the current device path instance. It also updates\r
+  DevicePath to point to the next device path instance in the device path (or NULL\r

   if no more) and updates Size to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r
   If DevicePath points to a invalid device path, then NULL is returned.\r
   if no more) and updates Size to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r
   If DevicePath points to a invalid device path, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
   If Size is NULL, then ASSERT().\r
   of the caller to free the memory allocated.\r
   If Size is NULL, then ASSERT().\r

- \r
-  @param  DevicePath                 On input, this holds the pointer to the current \r
-                                     device path instance. On output, this holds \r
-                                     the pointer to the next device path instance \r
+\r
+  @param  DevicePath                 On input, this holds the pointer to the current\r
+                                     device path instance. On output, this holds\r
+                                     the pointer to the next device path instance\r

                                      or NULL if there are no more device path\r
                                      or NULL if there are no more device path\r

-                                     instances in the device path pointer to a \r
+                                     instances in the device path pointer to a\r

                                      device path data structure.\r
                                      device path data structure.\r

-  @param  Size                       On output, this holds the size of the device \r
-                                     path instance, in bytes or zero, if DevicePath \r
+  @param  Size                       On output, this holds the size of the device\r
+                                     path instance, in bytes or zero, if DevicePath\r

                                      is NULL.\r
 \r
   @return A pointer to the current device path instance.\r
                                      is NULL.\r
 \r
   @return A pointer to the current device path instance.\r


@@ -215,13 +215,13 @@ GetNextDevicePathInstance (
 /**\r
   Creates a device node.\r
 \r
 /**\r
   Creates a device node.\r
 \r

-  This function creates a new device node in a newly allocated buffer of size \r
-  NodeLength and initializes the device path node header with NodeType and NodeSubType.  \r
+  This function creates a new device node in a newly allocated buffer of size\r
+  NodeLength and initializes the device path node header with NodeType and NodeSubType.\r

   The new device path node is returned.\r
   The new device path node is returned.\r

-  If NodeLength is smaller than a device path header, then NULL is returned.  \r
-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If NodeLength is smaller than a device path header, then NULL is returned.\r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
 \r
   @param  NodeType                   The device node type for the new device node.\r
   of the caller to free the memory allocated.\r
 \r
   @param  NodeType                   The device node type for the new device node.\r


@@ -253,7 +253,7 @@ CreateDeviceNode (
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval  TRUE                      DevicePath is multi-instance.\r
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval  TRUE                      DevicePath is multi-instance.\r

-  @retval  FALSE                     DevicePath is not multi-instance, or DevicePath \r
+  @retval  FALSE                     DevicePath is not multi-instance, or DevicePath\r

                                      is NULL or invalid.\r
 \r
 **/\r
                                      is NULL or invalid.\r
 \r
 **/\r

diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h
index 72587c6ebb13eb76567b0e5033d62c183e193317..40f06eed594c7bffaceb48d4ab75f361bf740e55 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h
+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Definition for Device Path library.\r
 \r
 /** @file\r
   Definition for Device Path library.\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


@@ -155,7 +155,7 @@ typedef struct {
 /**\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
+  This function returns the size, in bytes, of the device path data structure\r

   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r
   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r


@@ -174,18 +174,18 @@ UefiDevicePathLibGetDevicePathSize (
 /**\r
   Creates a new copy of an existing device path.\r
 \r
 /**\r
   Creates a new copy of an existing device path.\r
 \r

-  This function allocates space for a new copy of the device path specified by DevicePath.  \r
-  If DevicePath is NULL, then NULL is returned.  If the memory is successfully \r
-  allocated, then the contents of DevicePath are copied to the newly allocated \r
-  buffer, and a pointer to that buffer is returned.  Otherwise, NULL is returned.  \r
-  The memory for the new device path is allocated from EFI boot services memory. \r
-  It is the responsibility of the caller to free the memory allocated. \r
-  \r
+  This function allocates space for a new copy of the device path specified by DevicePath.\r
+  If DevicePath is NULL, then NULL is returned.  If the memory is successfully\r
+  allocated, then the contents of DevicePath are copied to the newly allocated\r
+  buffer, and a pointer to that buffer is returned.  Otherwise, NULL is returned.\r
+  The memory for the new device path is allocated from EFI boot services memory.\r
+  It is the responsibility of the caller to free the memory allocated.\r
+\r

   @param  DevicePath    A pointer to a device path data structure.\r
 \r
   @retval NULL          DevicePath is NULL or invalid.\r
   @retval Others        A pointer to the duplicated device path.\r
   @param  DevicePath    A pointer to a device path data structure.\r
 \r
   @retval NULL          DevicePath is NULL or invalid.\r
   @retval Others        A pointer to the duplicated device path.\r

-  \r
+\r

 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r


@@ -196,21 +196,21 @@ UefiDevicePathLibDuplicateDevicePath (
 /**\r
   Creates a new device path by appending a second device path to a first device path.\r
 \r
 /**\r
   Creates a new device path by appending a second device path to a first device path.\r
 \r

-  This function creates a new device path by appending a copy of SecondDevicePath \r
-  to a copy of FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path \r
-  device node from SecondDevicePath is retained. The newly created device path is \r
-  returned. If FirstDevicePath is NULL, then it is ignored, and a duplicate of \r
-  SecondDevicePath is returned.  If SecondDevicePath is NULL, then it is ignored, \r
-  and a duplicate of FirstDevicePath is returned. If both FirstDevicePath and \r
-  SecondDevicePath are NULL, then a copy of an end-of-device-path is returned.  \r
-  \r
+  This function creates a new device path by appending a copy of SecondDevicePath\r
+  to a copy of FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path\r
+  device node from SecondDevicePath is retained. The newly created device path is\r
+  returned. If FirstDevicePath is NULL, then it is ignored, and a duplicate of\r
+  SecondDevicePath is returned.  If SecondDevicePath is NULL, then it is ignored,\r
+  and a duplicate of FirstDevicePath is returned. If both FirstDevicePath and\r
+  SecondDevicePath are NULL, then a copy of an end-of-device-path is returned.\r
+\r

   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r
   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r

-  The memory for the new device path is allocated from EFI boot services memory. \r
+  The memory for the new device path is allocated from EFI boot services memory.\r

   It is the responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r
   It is the responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r

-  \r
+\r

   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r
   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r


@@ -227,18 +227,18 @@ UefiDevicePathLibAppendDevicePath (
 /**\r
   Creates a new path by appending the device node to the device path.\r
 \r
 /**\r
   Creates a new path by appending the device node to the device path.\r
 \r

-  This function creates a new device path by appending a copy of the device node \r
-  specified by DevicePathNode to a copy of the device path specified by DevicePath \r
-  in an allocated buffer. The end-of-device-path device node is moved after the \r
+  This function creates a new device path by appending a copy of the device node\r
+  specified by DevicePathNode to a copy of the device path specified by DevicePath\r
+  in an allocated buffer. The end-of-device-path device node is moved after the\r

   end of the appended device node.\r
   If DevicePathNode is NULL then a copy of DevicePath is returned.\r
   end of the appended device node.\r
   If DevicePathNode is NULL then a copy of DevicePath is returned.\r

-  If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device \r
+  If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device\r

   path device node is returned.\r
   path device node is returned.\r

-  If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path \r
+  If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path\r

   device node is returned.\r
   device node is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r
   of the caller to free the memory allocated.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r


@@ -246,9 +246,9 @@ UefiDevicePathLibAppendDevicePath (
 \r
   @retval NULL      If there is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r
 \r
   @retval NULL      If there is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r

-                    A copy of DevicePathNode followed by an end-of-device-path node \r
+                    A copy of DevicePathNode followed by an end-of-device-path node\r

                     if both FirstDevicePath and SecondDevicePath are NULL.\r
                     if both FirstDevicePath and SecondDevicePath are NULL.\r

-                    A copy of an end-of-device-path node if both FirstDevicePath \r
+                    A copy of an end-of-device-path node if both FirstDevicePath\r

                     and SecondDevicePath are NULL.\r
 \r
 **/\r
                     and SecondDevicePath are NULL.\r
 \r
 **/\r


@@ -262,20 +262,20 @@ UefiDevicePathLibAppendDevicePathNode (
 /**\r
   Creates a new device path by appending the specified device path instance to the specified device\r
   path.\r
 /**\r
   Creates a new device path by appending the specified device path instance to the specified device\r
   path.\r

- \r
-  This function creates a new device path by appending a copy of the device path \r
-  instance specified by DevicePathInstance to a copy of the device path specified \r
+\r
+  This function creates a new device path by appending a copy of the device path\r
+  instance specified by DevicePathInstance to a copy of the device path specified\r

   by DevicePath in a allocated buffer.\r
   by DevicePath in a allocated buffer.\r

-  The end-of-device-path device node is moved after the end of the appended device \r
-  path instance and a new end-of-device-path-instance node is inserted between. \r
+  The end-of-device-path device node is moved after the end of the appended device\r
+  path instance and a new end-of-device-path-instance node is inserted between.\r

   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r
   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
   of the caller to free the memory allocated.\r

-  \r
+\r

   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r


@@ -293,25 +293,25 @@ UefiDevicePathLibAppendDevicePathInstance (
   Creates a copy of the current device path instance and returns a pointer to the next device path\r
   instance.\r
 \r
   Creates a copy of the current device path instance and returns a pointer to the next device path\r
   instance.\r
 \r

-  This function creates a copy of the current device path instance. It also updates \r
-  DevicePath to point to the next device path instance in the device path (or NULL \r
+  This function creates a copy of the current device path instance. It also updates\r
+  DevicePath to point to the next device path instance in the device path (or NULL\r

   if no more) and updates Size to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r
   If DevicePath points to a invalid device path, then NULL is returned.\r
   if no more) and updates Size to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r
   If DevicePath points to a invalid device path, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
   If Size is NULL, then ASSERT().\r
   of the caller to free the memory allocated.\r
   If Size is NULL, then ASSERT().\r

- \r
-  @param  DevicePath                 On input, this holds the pointer to the current \r
-                                     device path instance. On output, this holds \r
-                                     the pointer to the next device path instance \r
+\r
+  @param  DevicePath                 On input, this holds the pointer to the current\r
+                                     device path instance. On output, this holds\r
+                                     the pointer to the next device path instance\r

                                      or NULL if there are no more device path\r
                                      or NULL if there are no more device path\r

-                                     instances in the device path pointer to a \r
+                                     instances in the device path pointer to a\r

                                      device path data structure.\r
                                      device path data structure.\r

-  @param  Size                       On output, this holds the size of the device \r
-                                     path instance, in bytes or zero, if DevicePath \r
+  @param  Size                       On output, this holds the size of the device\r
+                                     path instance, in bytes or zero, if DevicePath\r

                                      is NULL.\r
 \r
   @return A pointer to the current device path instance.\r
                                      is NULL.\r
 \r
   @return A pointer to the current device path instance.\r


@@ -327,13 +327,13 @@ UefiDevicePathLibGetNextDevicePathInstance (
 /**\r
   Creates a device node.\r
 \r
 /**\r
   Creates a device node.\r
 \r

-  This function creates a new device node in a newly allocated buffer of size \r
-  NodeLength and initializes the device path node header with NodeType and NodeSubType.  \r
+  This function creates a new device node in a newly allocated buffer of size\r
+  NodeLength and initializes the device path node header with NodeType and NodeSubType.\r

   The new device path node is returned.\r
   The new device path node is returned.\r

-  If NodeLength is smaller than a device path header, then NULL is returned.  \r
-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If NodeLength is smaller than a device path header, then NULL is returned.\r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
 \r
   @param  NodeType                   The device node type for the new device node.\r
   of the caller to free the memory allocated.\r
 \r
   @param  NodeType                   The device node type for the new device node.\r


@@ -362,7 +362,7 @@ UefiDevicePathLibCreateDeviceNode (
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval  TRUE                      DevicePath is multi-instance.\r
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval  TRUE                      DevicePath is multi-instance.\r

-  @retval  FALSE                     DevicePath is not multi-instance, or DevicePath \r
+  @retval  FALSE                     DevicePath is not multi-instance, or DevicePath\r

                                      is NULL or invalid.\r
 \r
 **/\r
                                      is NULL or invalid.\r
 \r
 **/\r

diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c
index 9580e397ffbbbc01ee1775565a5c90f56947b31c..aca9e2854d10c6a1f613da347eb7a5bb6dd4e7b1 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c
+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c
@@ -8,14 +8,14 @@
   environment varibles. Multi-instance device paths should never be placed\r
   on a Handle.\r
 \r
   environment varibles. Multi-instance device paths should never be placed\r
   on a Handle.\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


@@ -29,14 +29,14 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *mDevicePathLib
 /**\r
   The constructor function caches the pointer to DevicePathUtilites protocol,\r
   DevicePathToText protocol and DevicePathFromText protocol.\r
 /**\r
   The constructor function caches the pointer to DevicePathUtilites protocol,\r
   DevicePathToText protocol and DevicePathFromText protocol.\r

-  \r
+\r

   The constructor function locates these three protocols from protocol database.\r
   It will caches the pointer to local protocol instance if that operation fails\r
   The constructor function locates these three protocols from protocol database.\r
   It will caches the pointer to local protocol instance if that operation fails\r

-  and it will always return EFI_SUCCESS. \r
+  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


@@ -62,7 +62,7 @@ UefiDevicePathLibOptionalDevicePathProtocolConstructor (
 /**\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
+  This function returns the size, in bytes, of the device path data structure\r

   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r
   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r


@@ -88,18 +88,18 @@ GetDevicePathSize (
 /**\r
   Creates a new copy of an existing device path.\r
 \r
 /**\r
   Creates a new copy of an existing device path.\r
 \r

-  This function allocates space for a new copy of the device path specified by DevicePath.  \r
-  If DevicePath is NULL, then NULL is returned.  If the memory is successfully \r
-  allocated, then the contents of DevicePath are copied to the newly allocated \r
-  buffer, and a pointer to that buffer is returned.  Otherwise, NULL is returned.  \r
-  The memory for the new device path is allocated from EFI boot services memory. \r
-  It is the responsibility of the caller to free the memory allocated. \r
-  \r
+  This function allocates space for a new copy of the device path specified by DevicePath.\r
+  If DevicePath is NULL, then NULL is returned.  If the memory is successfully\r
+  allocated, then the contents of DevicePath are copied to the newly allocated\r
+  buffer, and a pointer to that buffer is returned.  Otherwise, NULL is returned.\r
+  The memory for the new device path is allocated from EFI boot services memory.\r
+  It is the responsibility of the caller to free the memory allocated.\r
+\r

   @param  DevicePath    A pointer to a device path data structure.\r
 \r
   @retval NULL          DevicePath is NULL or invalid.\r
   @retval Others        A pointer to the duplicated device path.\r
   @param  DevicePath    A pointer to a device path data structure.\r
 \r
   @retval NULL          DevicePath is NULL or invalid.\r
   @retval Others        A pointer to the duplicated device path.\r

-  \r
+\r

 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r


@@ -117,21 +117,21 @@ DuplicateDevicePath (
 /**\r
   Creates a new device path by appending a second device path to a first device path.\r
 \r
 /**\r
   Creates a new device path by appending a second device path to a first device path.\r
 \r

-  This function creates a new device path by appending a copy of SecondDevicePath \r
-  to a copy of FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path \r
-  device node from SecondDevicePath is retained. The newly created device path is \r
-  returned. If FirstDevicePath is NULL, then it is ignored, and a duplicate of \r
-  SecondDevicePath is returned.  If SecondDevicePath is NULL, then it is ignored, \r
-  and a duplicate of FirstDevicePath is returned. If both FirstDevicePath and \r
-  SecondDevicePath are NULL, then a copy of an end-of-device-path is returned.  \r
-  \r
+  This function creates a new device path by appending a copy of SecondDevicePath\r
+  to a copy of FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path\r
+  device node from SecondDevicePath is retained. The newly created device path is\r
+  returned. If FirstDevicePath is NULL, then it is ignored, and a duplicate of\r
+  SecondDevicePath is returned.  If SecondDevicePath is NULL, then it is ignored,\r
+  and a duplicate of FirstDevicePath is returned. If both FirstDevicePath and\r
+  SecondDevicePath are NULL, then a copy of an end-of-device-path is returned.\r
+\r

   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r
   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r

-  The memory for the new device path is allocated from EFI boot services memory. \r
+  The memory for the new device path is allocated from EFI boot services memory.\r

   It is the responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r
   It is the responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r

-  \r
+\r

   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r
   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r


@@ -155,18 +155,18 @@ AppendDevicePath (
 /**\r
   Creates a new path by appending the device node to the device path.\r
 \r
 /**\r
   Creates a new path by appending the device node to the device path.\r
 \r

-  This function creates a new device path by appending a copy of the device node \r
-  specified by DevicePathNode to a copy of the device path specified by DevicePath \r
-  in an allocated buffer. The end-of-device-path device node is moved after the \r
+  This function creates a new device path by appending a copy of the device node\r
+  specified by DevicePathNode to a copy of the device path specified by DevicePath\r
+  in an allocated buffer. The end-of-device-path device node is moved after the\r

   end of the appended device node.\r
   If DevicePathNode is NULL then a copy of DevicePath is returned.\r
   end of the appended device node.\r
   If DevicePathNode is NULL then a copy of DevicePath is returned.\r

-  If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device \r
+  If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device\r

   path device node is returned.\r
   path device node is returned.\r

-  If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path \r
+  If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path\r

   device node is returned.\r
   device node is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r
   of the caller to free the memory allocated.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r


@@ -174,9 +174,9 @@ AppendDevicePath (
 \r
   @retval NULL      If there is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r
 \r
   @retval NULL      If there is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r

-                    A copy of DevicePathNode followed by an end-of-device-path node \r
+                    A copy of DevicePathNode followed by an end-of-device-path node\r

                     if both FirstDevicePath and SecondDevicePath are NULL.\r
                     if both FirstDevicePath and SecondDevicePath are NULL.\r

-                    A copy of an end-of-device-path node if both FirstDevicePath \r
+                    A copy of an end-of-device-path node if both FirstDevicePath\r

                     and SecondDevicePath are NULL.\r
 \r
 **/\r
                     and SecondDevicePath are NULL.\r
 \r
 **/\r


@@ -197,20 +197,20 @@ AppendDevicePathNode (
 /**\r
   Creates a new device path by appending the specified device path instance to the specified device\r
   path.\r
 /**\r
   Creates a new device path by appending the specified device path instance to the specified device\r
   path.\r

- \r
-  This function creates a new device path by appending a copy of the device path \r
-  instance specified by DevicePathInstance to a copy of the device path specified \r
+\r
+  This function creates a new device path by appending a copy of the device path\r
+  instance specified by DevicePathInstance to a copy of the device path specified\r

   by DevicePath in a allocated buffer.\r
   by DevicePath in a allocated buffer.\r

-  The end-of-device-path device node is moved after the end of the appended device \r
-  path instance and a new end-of-device-path-instance node is inserted between. \r
+  The end-of-device-path device node is moved after the end of the appended device\r
+  path instance and a new end-of-device-path-instance node is inserted between.\r

   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r
   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
   of the caller to free the memory allocated.\r

-  \r
+\r

   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r


@@ -235,25 +235,25 @@ AppendDevicePathInstance (
   Creates a copy of the current device path instance and returns a pointer to the next device path\r
   instance.\r
 \r
   Creates a copy of the current device path instance and returns a pointer to the next device path\r
   instance.\r
 \r

-  This function creates a copy of the current device path instance. It also updates \r
-  DevicePath to point to the next device path instance in the device path (or NULL \r
+  This function creates a copy of the current device path instance. It also updates\r
+  DevicePath to point to the next device path instance in the device path (or NULL\r

   if no more) and updates Size to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r
   If DevicePath points to a invalid device path, then NULL is returned.\r
   if no more) and updates Size to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r
   If DevicePath points to a invalid device path, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
   If Size is NULL, then ASSERT().\r
   of the caller to free the memory allocated.\r
   If Size is NULL, then ASSERT().\r

- \r
-  @param  DevicePath                 On input, this holds the pointer to the current \r
-                                     device path instance. On output, this holds \r
-                                     the pointer to the next device path instance \r
+\r
+  @param  DevicePath                 On input, this holds the pointer to the current\r
+                                     device path instance. On output, this holds\r
+                                     the pointer to the next device path instance\r

                                      or NULL if there are no more device path\r
                                      or NULL if there are no more device path\r

-                                     instances in the device path pointer to a \r
+                                     instances in the device path pointer to a\r

                                      device path data structure.\r
                                      device path data structure.\r

-  @param  Size                       On output, this holds the size of the device \r
-                                     path instance, in bytes or zero, if DevicePath \r
+  @param  Size                       On output, this holds the size of the device\r
+                                     path instance, in bytes or zero, if DevicePath\r

                                      is NULL.\r
 \r
   @return A pointer to the current device path instance.\r
                                      is NULL.\r
 \r
   @return A pointer to the current device path instance.\r


@@ -276,13 +276,13 @@ GetNextDevicePathInstance (
 /**\r
   Creates a device node.\r
 \r
 /**\r
   Creates a device node.\r
 \r

-  This function creates a new device node in a newly allocated buffer of size \r
-  NodeLength and initializes the device path node header with NodeType and NodeSubType.  \r
+  This function creates a new device node in a newly allocated buffer of size\r
+  NodeLength and initializes the device path node header with NodeType and NodeSubType.\r

   The new device path node is returned.\r
   The new device path node is returned.\r

-  If NodeLength is smaller than a device path header, then NULL is returned.  \r
-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If NodeLength is smaller than a device path header, then NULL is returned.\r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
 \r
   @param  NodeType                   The device node type for the new device node.\r
   of the caller to free the memory allocated.\r
 \r
   @param  NodeType                   The device node type for the new device node.\r


@@ -318,7 +318,7 @@ CreateDeviceNode (
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval  TRUE                      DevicePath is multi-instance.\r
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval  TRUE                      DevicePath is multi-instance.\r

-  @retval  FALSE                     DevicePath is not multi-instance, or DevicePath \r
+  @retval  FALSE                     DevicePath is not multi-instance, or DevicePath\r

                                      is NULL or invalid.\r
 \r
 **/\r
                                      is NULL or invalid.\r
 \r
 **/\r

diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf
index 9e3029cd1c3e0a308d5a8cb7efed30133df13af3..df6bfbe2df27b237cb59a3ac8caa191378d24e6b 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf
+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf
@@ -5,7 +5,7 @@
 #  If the DevicePathFromText/DevicePathToText protocol doesn't exist, the library\r
 #  uses its internal conversion logic.\r
 #\r
 #  If the DevicePathFromText/DevicePathToText protocol doesn't exist, the library\r
 #  uses its internal conversion logic.\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


@@ -86,4 +86,4 @@
 \r
 [Depex.common.DXE_DRIVER, Depex.common.DXE_RUNTIME_DRIVER, Depex.common.DXE_SAL_DRIVER, Depex.common.DXE_SMM_DRIVER]\r
   gEfiDevicePathUtilitiesProtocolGuid\r
 \r
 [Depex.common.DXE_DRIVER, Depex.common.DXE_RUNTIME_DRIVER, Depex.common.DXE_SAL_DRIVER, Depex.common.DXE_SMM_DRIVER]\r
   gEfiDevicePathUtilitiesProtocolGuid\r

-  
\ No newline at end of file
+\r

diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
index 2252d186cbf3215c2091254a5862800779cc20c4..9a0ee42fd16adcc188235cd7c9766b9f662b3068 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
+++ b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
@@ -2,7 +2,7 @@
   Library instance that implement UEFI Device Path Library class based on protocol\r
   gEfiDevicePathUtilitiesProtocolGuid.\r
 \r
   Library instance that implement UEFI Device Path Library class based on protocol\r
   gEfiDevicePathUtilitiesProtocolGuid.\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


@@ -46,13 +46,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_PROTOCOL  mUefiDevicePathLib
 \r
 /**\r
   The constructor function caches the pointer to DevicePathUtilites protocol.\r
 \r
 /**\r
   The constructor function caches the pointer to DevicePathUtilites protocol.\r

-  \r
+\r

   The constructor function locates DevicePathUtilities protocol from protocol database.\r
   The constructor function locates DevicePathUtilities 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


@@ -193,9 +193,9 @@ DevicePathSubType (
 /**\r
   Returns the 16-bit Length field of a device path node.\r
 \r
 /**\r
   Returns the 16-bit Length field of a device path node.\r
 \r

-  Returns the 16-bit Length field of the device path node specified by Node.  \r
+  Returns the 16-bit Length field of the device path node specified by Node.\r

   Node is not required to be aligned on a 16-bit boundary, so it is recommended\r
   Node is not required to be aligned on a 16-bit boundary, so it is recommended\r

-  that a function such as ReadUnaligned16() be used to extract the contents of \r
+  that a function such as ReadUnaligned16() be used to extract the contents of\r

   the Length field.\r
 \r
   If Node is NULL, then ASSERT().\r
   the Length field.\r
 \r
   If Node is NULL, then ASSERT().\r


@@ -218,14 +218,14 @@ DevicePathNodeLength (
 /**\r
   Returns a pointer to the next node in a device path.\r
 \r
 /**\r
   Returns a pointer to the next node in a device path.\r
 \r

-  Returns a pointer to the device path node that follows the device path node \r
+  Returns a pointer to the device path node that follows the device path node\r

   specified by Node.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r
   specified by Node.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r

-  @return a pointer to the device path node that follows the device path node \r
+  @return a pointer to the device path node that follows the device path node\r

   specified by Node.\r
 \r
 **/\r
   specified by Node.\r
 \r
 **/\r


@@ -241,12 +241,12 @@ NextDevicePathNode (
 \r
 /**\r
   Determines if a device path node is an end node of a device path.\r
 \r
 /**\r
   Determines if a device path node is an end node of a device path.\r

-  This includes nodes that are the end of a device path instance and nodes that \r
+  This includes nodes that are the end of a device path instance and nodes that\r

   are the end of an entire device path.\r
 \r
   are the end of an entire device path.\r
 \r

-  Determines if the device path node specified by Node is an end node of a device path.  \r
-  This includes nodes that are the end of a device path instance and nodes that are the \r
-  end of an entire device path.  If Node represents an end node of a device path, \r
+  Determines if the device path node specified by Node is an end node of a device path.\r
+  This includes nodes that are the end of a device path instance and nodes that are the\r
+  end of an entire device path.  If Node represents an end node of a device path,\r

   then TRUE is returned.  Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r
   then TRUE is returned.  Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r


@@ -254,9 +254,9 @@ NextDevicePathNode (
   @param  Node      A pointer to a device path node data structure.\r
 \r
   @retval TRUE      The device path node specified by Node is an end node of a device path.\r
   @param  Node      A pointer to a device path node data structure.\r
 \r
   @retval TRUE      The device path node specified by Node is an end node of a device path.\r

-  @retval FALSE     The device path node specified by Node is not an end node of \r
+  @retval FALSE     The device path node specified by Node is not an end node of\r

                     a device path.\r
                     a device path.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -271,9 +271,9 @@ IsDevicePathEndType (
 /**\r
   Determines if a device path node is an end node of an entire device path.\r
 \r
 /**\r
   Determines if a device path node is an end node of an entire device path.\r
 \r

-  Determines if a device path node specified by Node is an end node of an entire \r
+  Determines if a device path node specified by Node is an end node of an entire\r

   device path.\r
   device path.\r

-  If Node represents the end of an entire device path, then TRUE is returned.  \r
+  If Node represents the end of an entire device path, then TRUE is returned.\r

   Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r
   Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r


@@ -297,18 +297,18 @@ IsDevicePathEnd (
 /**\r
   Determines if a device path node is an end node of a device path instance.\r
 \r
 /**\r
   Determines if a device path node is an end node of a device path instance.\r
 \r

-  Determines if a device path node specified by Node is an end node of a device \r
+  Determines if a device path node specified by Node is an end node of a device\r

   path instance.\r
   path instance.\r

-  If Node represents the end of a device path instance, then TRUE is returned.  \r
+  If Node represents the end of a device path instance, then TRUE is returned.\r

   Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r
   Otherwise, FALSE is returned.\r
 \r
   If Node is NULL, then ASSERT().\r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r

-  @retval TRUE      The device path node specified by Node is the end of a device \r
+  @retval TRUE      The device path node specified by Node is the end of a device\r

   path instance.\r
   path instance.\r

-  @retval FALSE     The device path node specified by Node is not the end of a \r
+  @retval FALSE     The device path node specified by Node is not the end of a\r

   device path instance.\r
 \r
 **/\r
   device path instance.\r
 \r
 **/\r


@@ -325,8 +325,8 @@ IsDevicePathEndInstance (
 /**\r
   Sets the length, in bytes, of a device path node.\r
 \r
 /**\r
   Sets the length, in bytes, of a device path node.\r
 \r

-  Sets the length of the device path node specified by Node to the value specified \r
-  by NodeLength.  NodeLength is returned.  Node is not required to be aligned on \r
+  Sets the length of the device path node specified by Node to the value specified\r
+  by NodeLength.  NodeLength is returned.  Node is not required to be aligned on\r

   a 16-bit boundary, so it is recommended that a function such as WriteUnaligned16()\r
   be used to set the contents of the Length field.\r
 \r
   a 16-bit boundary, so it is recommended that a function such as WriteUnaligned16()\r
   be used to set the contents of the Length field.\r
 \r


@@ -355,15 +355,15 @@ SetDevicePathNodeLength (
 /**\r
   Fills in all the fields of a device path node that is the end of an entire device path.\r
 \r
 /**\r
   Fills in all the fields of a device path node that is the end of an entire device path.\r
 \r

-  Fills in all the fields of a device path node specified by Node so Node represents \r
-  the end of an entire device path.  The Type field of Node is set to \r
-  END_DEVICE_PATH_TYPE, the SubType field of Node is set to \r
-  END_ENTIRE_DEVICE_PATH_SUBTYPE, and the Length field of Node is set to \r
-  END_DEVICE_PATH_LENGTH.  Node is not required to be aligned on a 16-bit boundary, \r
-  so it is recommended that a function such as WriteUnaligned16() be used to set \r
-  the contents of the Length field. \r
+  Fills in all the fields of a device path node specified by Node so Node represents\r
+  the end of an entire device path.  The Type field of Node is set to\r
+  END_DEVICE_PATH_TYPE, the SubType field of Node is set to\r
+  END_ENTIRE_DEVICE_PATH_SUBTYPE, and the Length field of Node is set to\r
+  END_DEVICE_PATH_LENGTH.  Node is not required to be aligned on a 16-bit boundary,\r
+  so it is recommended that a function such as WriteUnaligned16() be used to set\r
+  the contents of the Length field.\r

 \r
 \r

-  If Node is NULL, then ASSERT(). \r
+  If Node is NULL, then ASSERT().\r

 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r
 \r
   @param  Node      A pointer to a device path node data structure.\r
 \r


@@ -381,7 +381,7 @@ SetDevicePathEndNode (
 /**\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
+  This function returns the size, in bytes, of the device path data structure\r

   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r
   specified by DevicePath including the end of device path node.\r
   If DevicePath is NULL or invalid, then 0 is returned.\r
 \r


@@ -403,19 +403,19 @@ GetDevicePathSize (
 /**\r
   Creates a new copy of an existing device path.\r
 \r
 /**\r
   Creates a new copy of an existing device path.\r
 \r

-  This function allocates space for a new copy of the device path specified by \r
-  DevicePath.  If DevicePath is NULL, then NULL is returned.  \r
+  This function allocates space for a new copy of the device path specified by\r
+  DevicePath.  If DevicePath is NULL, then NULL is returned.\r

   If the memory is successfully allocated, then the\r
   contents of DevicePath are copied to the newly allocated buffer, and a pointer to that buffer\r
   If the memory is successfully allocated, then the\r
   contents of DevicePath are copied to the newly allocated buffer, and a pointer to that buffer\r

-  is returned.  Otherwise, NULL is returned.  \r
-  The memory for the new device path is allocated from EFI boot services memory. \r
-  It is the responsibility of the caller to free the memory allocated. \r
-  \r
+  is returned.  Otherwise, NULL is returned.\r
+  The memory for the new device path is allocated from EFI boot services memory.\r
+  It is the responsibility of the caller to free the memory allocated.\r
+\r

   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval NULL    If DevicePath is NULL or invalid.\r
   @retval Others  A pointer to the duplicated device path.\r
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval NULL    If DevicePath is NULL or invalid.\r
   @retval Others  A pointer to the duplicated device path.\r

-  \r
+\r

 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r


@@ -431,22 +431,22 @@ DuplicateDevicePath (
 \r
   This function creates a new device path by appending a copy of SecondDevicePath to a copy of\r
   FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path device node from\r
 \r
   This function creates a new device path by appending a copy of SecondDevicePath to a copy of\r
   FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path device node from\r

-  SecondDevicePath is retained. The newly created device path is returned.  \r
-  If FirstDevicePath is NULL, then it is ignored, and a duplicate of SecondDevicePath is returned.  \r
-  If SecondDevicePath is NULL, then it is ignored, and a duplicate of FirstDevicePath is returned.  \r
+  SecondDevicePath is retained. The newly created device path is returned.\r
+  If FirstDevicePath is NULL, then it is ignored, and a duplicate of SecondDevicePath is returned.\r
+  If SecondDevicePath is NULL, then it is ignored, and a duplicate of FirstDevicePath is returned.\r

   If both FirstDevicePath and SecondDevicePath are NULL, then a copy of an end-of-device-path is\r
   If both FirstDevicePath and SecondDevicePath are NULL, then a copy of an end-of-device-path is\r

-  returned.  \r
+  returned.\r

   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r
   The memory for the new device path is allocated from EFI boot services memory. It is the\r
   responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r
   If there is not enough memory for the newly allocated buffer, then NULL is returned.\r
   The memory for the new device path is allocated from EFI boot services memory. It is the\r
   responsibility of the caller to free the memory allocated.\r
 \r
   @param  FirstDevicePath            A pointer to a device path data structure.\r
   @param  SecondDevicePath           A pointer to a device path data structure.\r

-  \r
+\r

   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r
   @retval NULL      If there is not enough memory for the newly allocated buffer.\r
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.\r
   @retval Others    A pointer to the new device path if success.\r

-                    Or a copy an end-of-device-path if both FirstDevicePath and \r
+                    Or a copy an end-of-device-path if both FirstDevicePath and\r

                     SecondDevicePath are NULL.\r
 \r
 **/\r
                     SecondDevicePath are NULL.\r
 \r
 **/\r


@@ -463,18 +463,18 @@ AppendDevicePath (
 /**\r
   Creates a new path by appending the device node to the device path.\r
 \r
 /**\r
   Creates a new path by appending the device node to the device path.\r
 \r

-  This function creates a new device path by appending a copy of the device node \r
-  specified by DevicePathNode to a copy of the device path specified by DevicePath \r
+  This function creates a new device path by appending a copy of the device node\r
+  specified by DevicePathNode to a copy of the device path specified by DevicePath\r

   in an allocated buffer.\r
   The end-of-device-path device node is moved after the end of the appended device node.\r
   If DevicePathNode is NULL then a copy of DevicePath is returned.\r
   in an allocated buffer.\r
   The end-of-device-path device node is moved after the end of the appended device node.\r
   If DevicePathNode is NULL then a copy of DevicePath is returned.\r

-  If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device \r
+  If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device\r

   path device node is returned.\r
   path device node is returned.\r

-  If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path \r
+  If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path\r

   device node is returned.\r
   device node is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r
   of the caller to free the memory allocated.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r


@@ -482,9 +482,9 @@ AppendDevicePath (
 \r
   @retval NULL      If there is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r
 \r
   @retval NULL      If there is not enough memory for the new device path.\r
   @retval Others    A pointer to the new device path if success.\r

-                    A copy of DevicePathNode followed by an end-of-device-path node \r
+                    A copy of DevicePathNode followed by an end-of-device-path node\r

                     if both FirstDevicePath and SecondDevicePath are NULL.\r
                     if both FirstDevicePath and SecondDevicePath are NULL.\r

-                    A copy of an end-of-device-path node if both FirstDevicePath \r
+                    A copy of an end-of-device-path node if both FirstDevicePath\r

                     and SecondDevicePath are NULL.\r
 \r
 **/\r
                     and SecondDevicePath are NULL.\r
 \r
 **/\r


@@ -499,22 +499,22 @@ AppendDevicePathNode (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Creates a new device path by appending the specified device path instance to \r
+  Creates a new device path by appending the specified device path instance to\r

   the specified device path.\r
   the specified device path.\r

- \r
-  This function creates a new device path by appending a copy of the device path \r
-  instance specified by DevicePathInstance to a copy of the device path specified \r
+\r
+  This function creates a new device path by appending a copy of the device path\r
+  instance specified by DevicePathInstance to a copy of the device path specified\r

   by DevicePath in a allocated buffer.\r
   by DevicePath in a allocated buffer.\r

-  The end-of-device-path device node is moved after the end of the appended device \r
-  path instance and a new end-of-device-path-instance node is inserted between. \r
+  The end-of-device-path device node is moved after the end of the appended device\r
+  path instance and a new end-of-device-path-instance node is inserted between.\r

   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r
   If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
   If DevicePathInstance is NULL, then NULL is returned.\r
   If DevicePath or DevicePathInstance is invalid, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.   \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
   of the caller to free the memory allocated.\r

-  \r
+\r

   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r
   @param  DevicePath                 A pointer to a device path data structure.\r
   @param  DevicePathInstance         A pointer to a device path instance.\r
 \r


@@ -532,27 +532,27 @@ AppendDevicePathInstance (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Creates a copy of the current device path instance and returns a pointer to the \r
+  Creates a copy of the current device path instance and returns a pointer to the\r

   next device path instance.\r
 \r
   next device path instance.\r
 \r

-  This function creates a copy of the current device path instance. It also updates \r
-  DevicePath to point to the next device path instance in the device path (or NULL \r
+  This function creates a copy of the current device path instance. It also updates\r
+  DevicePath to point to the next device path instance in the device path (or NULL\r

   if no more) and updates Size to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r
   if no more) and updates Size to hold the size of the device path instance copy.\r
   If DevicePath is NULL, then NULL is returned.\r

-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
   If Size is NULL, then ASSERT().\r
   of the caller to free the memory allocated.\r
   If Size is NULL, then ASSERT().\r

- \r
-  @param  DevicePath                 On input, this holds the pointer to the current \r
-                                     device path instance. On output, this holds \r
-                                     the pointer to the next device path instance \r
+\r
+  @param  DevicePath                 On input, this holds the pointer to the current\r
+                                     device path instance. On output, this holds\r
+                                     the pointer to the next device path instance\r

                                      or NULL if there are no more device path\r
                                      or NULL if there are no more device path\r

-                                     instances in the device path pointer to a \r
+                                     instances in the device path pointer to a\r

                                      device path data structure.\r
                                      device path data structure.\r

-  @param  Size                       On output, this holds the size of the device \r
-                                     path instance, in bytes or zero, if DevicePath \r
+  @param  Size                       On output, this holds the size of the device\r
+                                     path instance, in bytes or zero, if DevicePath\r

                                      is NULL.\r
 \r
   @return A pointer to the current device path instance.\r
                                      is NULL.\r
 \r
   @return A pointer to the current device path instance.\r


@@ -572,13 +572,13 @@ GetNextDevicePathInstance (
 /**\r
   Creates a device node.\r
 \r
 /**\r
   Creates a device node.\r
 \r

-  This function creates a new device node in a newly allocated buffer of size \r
-  NodeLength and initializes the device path node header with NodeType and NodeSubType.  \r
+  This function creates a new device node in a newly allocated buffer of size\r
+  NodeLength and initializes the device path node header with NodeType and NodeSubType.\r

   The new device path node is returned.\r
   The new device path node is returned.\r

-  If NodeLength is smaller than a device path header, then NULL is returned.  \r
-  If there is not enough memory to allocate space for the new device path, then \r
-  NULL is returned.  \r
-  The memory is allocated from EFI boot services memory. It is the responsibility \r
+  If NodeLength is smaller than a device path header, then NULL is returned.\r
+  If there is not enough memory to allocate space for the new device path, then\r
+  NULL is returned.\r
+  The memory is allocated from EFI boot services memory. It is the responsibility\r

   of the caller to free the memory allocated.\r
 \r
   @param  NodeType                   The device node type for the new device node.\r
   of the caller to free the memory allocated.\r
 \r
   @param  NodeType                   The device node type for the new device node.\r


@@ -610,7 +610,7 @@ CreateDeviceNode (
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval  TRUE                      DevicePath is multi-instance.\r
   @param  DevicePath                 A pointer to a device path data structure.\r
 \r
   @retval  TRUE                      DevicePath is multi-instance.\r

-  @retval  FALSE                     DevicePath is not multi-instance, or DevicePath \r
+  @retval  FALSE                     DevicePath is not multi-instance, or DevicePath\r

                                      is NULL or invalid.\r
 \r
 **/\r
                                      is NULL or invalid.\r
 \r
 **/\r


@@ -626,11 +626,11 @@ IsDevicePathMultiInstance (
 /**\r
   Retrieves the device path protocol from a handle.\r
 \r
 /**\r
   Retrieves the device path protocol from a handle.\r
 \r

-  This function returns the device path protocol from the handle specified by Handle.  \r
-  If Handle is NULL or Handle does not contain a device path protocol, then NULL \r
+  This function returns the device path protocol from the handle specified by Handle.\r
+  If Handle is NULL or Handle does not contain a device path protocol, then NULL\r

   is returned.\r
   is returned.\r

- \r
-  @param  Handle                     The handle from which to retrieve the device \r
+\r
+  @param  Handle                     The handle from which to retrieve the device\r

                                      path protocol.\r
 \r
   @return The device path protocol from the handle specified by Handle.\r
                                      path protocol.\r
 \r
   @return The device path protocol from the handle specified by Handle.\r


@@ -659,19 +659,19 @@ DevicePathFromHandle (
 /**\r
   Allocates a device path for a file and appends it to an existing device path.\r
 \r
 /**\r
   Allocates a device path for a file and appends it to an existing device path.\r
 \r

-  If Device is a valid device handle that contains a device path protocol, then \r
-  a device path for the file specified by FileName  is allocated and appended to \r
-  the device path associated with the handle Device.  The allocated device path \r
-  is returned.  If Device is NULL or Device is a handle that does not support the \r
-  device path protocol, then a device path containing a single device path node \r
+  If Device is a valid device handle that contains a device path protocol, then\r
+  a device path for the file specified by FileName  is allocated and appended to\r
+  the device path associated with the handle Device.  The allocated device path\r
+  is returned.  If Device is NULL or Device is a handle that does not support the\r
+  device path protocol, then a device path containing a single device path node\r

   for the file specified by FileName is allocated and returned.\r
   for the file specified by FileName is allocated and returned.\r

-  The memory for the new device path is allocated from EFI boot services memory. \r
+  The memory for the new device path is allocated from EFI boot services memory.\r

   It is the responsibility of the caller to free the memory allocated.\r
   It is the responsibility of the caller to free the memory allocated.\r

-  \r
+\r

   If FileName is NULL, then ASSERT().\r
   If FileName is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If FileName is NULL, then ASSERT().\r
   If FileName is not aligned on a 16-bit boundary, then ASSERT().\r
 \r

-  @param  Device                     A pointer to a device handle.  This parameter \r
+  @param  Device                     A pointer to a device handle.  This parameter\r

                                      is optional and may be NULL.\r
   @param  FileName                   A pointer to a Null-terminated Unicode string.\r
 \r
                                      is optional and may be NULL.\r
   @param  FileName                   A pointer to a Null-terminated Unicode string.\r
 \r

diff --git a/MdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c b/MdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
index f5da5ac4ad10609b79d6cb9e653093d777c4c69a..534f71f4b29bcd44a69bcd0d2f4122a642d29619 100644 (file)
--- a/MdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
+++ b/MdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
@@ -1,7 +1,7 @@
 /** @file\r
   Entry point to a EFI/DXE driver.\r
 \r
 /** @file\r
   Entry point to a EFI/DXE 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


@@ -27,7 +27,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Unloads an image from memory.\r
 \r
 /**\r
   Unloads an image from memory.\r
 \r

-  This function is a callback that a driver registers to do cleanup \r
+  This function is a callback that a driver registers to do cleanup\r

   when the UnloadImage boot service function is called.\r
 \r
   @param  ImageHandle The handle to the image to unload.\r
   when the UnloadImage boot service function is called.\r
 \r
   @param  ImageHandle The handle to the image to unload.\r


@@ -65,27 +65,27 @@ _DriverUnloadHandler (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  The entry point of PE/COFF Image for a DXE Driver, DXE Runtime Driver, DXE SMM \r
-  Driver, or UEFI Driver. \r
+  The entry point of PE/COFF Image for a DXE Driver, DXE Runtime Driver, DXE SMM\r
+  Driver, or UEFI Driver.\r

 \r
   This function is the entry point for a DXE Driver, DXE Runtime Driver, DXE SMM Driver,\r
   or UEFI Driver.  This function must call ProcessLibraryConstructorList() and\r
   ProcessModuleEntryPointList(). If the return status from ProcessModuleEntryPointList()\r
 \r
   This function is the entry point for a DXE Driver, DXE Runtime Driver, DXE SMM Driver,\r
   or UEFI Driver.  This function must call ProcessLibraryConstructorList() and\r
   ProcessModuleEntryPointList(). If the return status from ProcessModuleEntryPointList()\r

-  is an error status, then ProcessLibraryDestructorList() must be called. The return \r
-  value from ProcessModuleEntryPointList() is returned. If _gDriverUnloadImageCount \r
-  is greater than zero, then an unload handler must be registered for this image \r
+  is an error status, then ProcessLibraryDestructorList() must be called. The return\r
+  value from ProcessModuleEntryPointList() is returned. If _gDriverUnloadImageCount\r
+  is greater than zero, then an unload handler must be registered for this image\r

   and the unload handler must invoke ProcessModuleUnloadList().\r
   and the unload handler must invoke ProcessModuleUnloadList().\r

-  If _gUefiDriverRevision is not zero and SystemTable->Hdr.Revision is less than \r
+  If _gUefiDriverRevision is not zero and SystemTable->Hdr.Revision is less than\r

   _gUefiDriverRevison, then return EFI_INCOMPATIBLE_VERSION.\r
 \r
 \r
   _gUefiDriverRevison, then return EFI_INCOMPATIBLE_VERSION.\r
 \r
 \r

-  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver, \r
+  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver,\r

                        DXE SMM Driver, or UEFI Driver.\r
   @param  SystemTable  A pointer to the EFI System Table.\r
 \r
                        DXE SMM Driver, or UEFI Driver.\r
   @param  SystemTable  A pointer to the EFI System Table.\r
 \r

-  @retval  EFI_SUCCESS               The DXE Driver, DXE Runtime Driver, DXE SMM \r
+  @retval  EFI_SUCCESS               The DXE Driver, DXE Runtime Driver, DXE SMM\r

                                      Driver, or UEFI Driver exited normally.\r
                                      Driver, or UEFI Driver exited normally.\r

-  @retval  EFI_INCOMPATIBLE_VERSION  _gUefiDriverRevision is greater than \r
+  @retval  EFI_INCOMPATIBLE_VERSION  _gUefiDriverRevision is greater than\r

                                     SystemTable->Hdr.Revision.\r
   @retval  Other                     Return value from ProcessModuleEntryPointList().\r
 \r
                                     SystemTable->Hdr.Revision.\r
   @retval  Other                     Return value from ProcessModuleEntryPointList().\r
 \r


@@ -147,18 +147,18 @@ _ModuleEntryPoint (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Required by the EBC compiler and identical in functionality to _ModuleEntryPoint(). \r
+  Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().\r

 \r
   This function is required to call _ModuleEntryPoint() passing in ImageHandle,\r
   and SystemTable.\r
 \r
 \r
   This function is required to call _ModuleEntryPoint() passing in ImageHandle,\r
   and SystemTable.\r
 \r

-  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver, DXE \r
+  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver, DXE\r

                        SMM Driver, or UEFI Driver.\r
   @param  SystemTable  A pointer to the EFI System Table.\r
 \r
                        SMM Driver, or UEFI Driver.\r
   @param  SystemTable  A pointer to the EFI System Table.\r
 \r

-  @retval  EFI_SUCCESS               The DXE Driver, DXE Runtime Driver, DXE SMM \r
+  @retval  EFI_SUCCESS               The DXE Driver, DXE Runtime Driver, DXE SMM\r

                                      Driver, or UEFI Driver exited normally.\r
                                      Driver, or UEFI Driver exited normally.\r

-  @retval  EFI_INCOMPATIBLE_VERSION  _gUefiDriverRevision is greater than \r
+  @retval  EFI_INCOMPATIBLE_VERSION  _gUefiDriverRevision is greater than\r

                                      SystemTable->Hdr.Revision.\r
   @retval  Other                     Return value from ProcessModuleEntryPointList().\r
 **/\r
                                      SystemTable->Hdr.Revision.\r
   @retval  Other                     Return value from ProcessModuleEntryPointList().\r
 **/\r

diff --git a/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c b/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c
index 57aad77bc13542ce7828853a1500f75e79a43ab3..a768c3e23ae5090a72976d65d8244f35330bd665 100644 (file)
--- a/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c
+++ b/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Provides interface to EFI_FILE_HANDLE functionality.\r
 \r
 /** @file\r
   Provides interface to EFI_FILE_HANDLE functionality.\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


@@ -391,8 +391,8 @@ FileHandleFlush (
   @param[in] DirHandle          Handle to open file.\r
 \r
   @retval EFI_SUCCESS           DirHandle is a directory.\r
   @param[in] DirHandle          Handle to open file.\r
 \r
   @retval EFI_SUCCESS           DirHandle is a directory.\r

-  @retval EFI_INVALID_PARAMETER DirHandle is NULL. \r
-                                The file information returns from FileHandleGetInfo is NULL. \r
+  @retval EFI_INVALID_PARAMETER DirHandle is NULL.\r
+                                The file information returns from FileHandleGetInfo is NULL.\r

   @retval EFI_NOT_FOUND         DirHandle is not a directory.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_NOT_FOUND         DirHandle is not a directory.\r
 **/\r
 EFI_STATUS\r


@@ -769,8 +769,8 @@ StrnCatGrowLeft (
 \r
 /**\r
   Function to get a full filename given a EFI_FILE_HANDLE somewhere lower on the\r
 \r
 /**\r
   Function to get a full filename given a EFI_FILE_HANDLE somewhere lower on the\r

-  directory 'stack'. If the file is a directory, then append the '\' char at the \r
-  end of name string. If it's not a directory, then the last '\' should not be \r
+  directory 'stack'. If the file is a directory, then append the '\' char at the\r
+  end of name string. If it's not a directory, then the last '\' should not be\r

   added.\r
 \r
   if Handle is NULL, return EFI_INVALID_PARAMETER\r
   added.\r
 \r
   if Handle is NULL, return EFI_INVALID_PARAMETER\r


@@ -858,8 +858,8 @@ FileHandleGetFileName (
     *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"\\", 0);\r
   }\r
 \r
     *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"\\", 0);\r
   }\r
 \r

-  if (*FullFileName != NULL && \r
-      (*FullFileName)[StrLen(*FullFileName) - 1] == L'\\' && \r
+  if (*FullFileName != NULL &&\r
+      (*FullFileName)[StrLen(*FullFileName) - 1] == L'\\' &&\r

       StrLen(*FullFileName) > 1 &&\r
       FileHandleIsDirectory(Handle) == EFI_NOT_FOUND\r
      ) {\r
       StrLen(*FullFileName) > 1 &&\r
       FileHandleIsDirectory(Handle) == EFI_NOT_FOUND\r
      ) {\r


@@ -969,20 +969,20 @@ FileHandleReadLine(
     ||(Buffer==NULL&&*Size!=0)\r
    ){\r
     return (EFI_INVALID_PARAMETER);\r
     ||(Buffer==NULL&&*Size!=0)\r
    ){\r
     return (EFI_INVALID_PARAMETER);\r

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

   if (Buffer != NULL && *Size != 0) {\r
     *Buffer = CHAR_NULL;\r
   if (Buffer != NULL && *Size != 0) {\r
     *Buffer = CHAR_NULL;\r

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

   Status = FileHandleGetSize (Handle, &FileSize);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   } else if (FileSize == 0) {\r
     *Ascii = TRUE;\r
     return EFI_SUCCESS;\r
   Status = FileHandleGetSize (Handle, &FileSize);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   } else if (FileSize == 0) {\r
     *Ascii = TRUE;\r
     return EFI_SUCCESS;\r

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

   FileHandleGetPosition(Handle, &OriginalFilePosition);\r
   if (OriginalFilePosition == 0) {\r
     CharSize = sizeof(CHAR16);\r
   FileHandleGetPosition(Handle, &OriginalFilePosition);\r
   if (OriginalFilePosition == 0) {\r
     CharSize = sizeof(CHAR16);\r


@@ -1050,11 +1050,11 @@ FileHandleReadLine(
 \r
 /**\r
   Function to write a line of text to a file.\r
 \r
 /**\r
   Function to write a line of text to a file.\r

-  \r
-  If the file is a Unicode file (with UNICODE file tag) then write the unicode \r
+\r
+  If the file is a Unicode file (with UNICODE file tag) then write the unicode\r

   text.\r
   If the file is an ASCII file then write the ASCII text.\r
   text.\r
   If the file is an ASCII file then write the ASCII text.\r

-  If the size of file is zero (without file tag at the beginning) then write \r
+  If the size of file is zero (without file tag at the beginning) then write\r

   ASCII text as default.\r
 \r
   @param[in]     Handle         FileHandle to write to.\r
   ASCII text as default.\r
 \r
   @param[in]     Handle         FileHandle to write to.\r


@@ -1064,7 +1064,7 @@ FileHandleReadLine(
   @retval  EFI_SUCCESS            The data was written.\r
                                   Buffer is NULL.\r
   @retval  EFI_INVALID_PARAMETER  Handle is NULL.\r
   @retval  EFI_SUCCESS            The data was written.\r
                                   Buffer is NULL.\r
   @retval  EFI_INVALID_PARAMETER  Handle is NULL.\r

-  @retval  EFI_OUT_OF_RESOURCES   Unable to allocate temporary space for ASCII \r
+  @retval  EFI_OUT_OF_RESOURCES   Unable to allocate temporary space for ASCII\r

                                   string due to out of resources.\r
 \r
   @sa FileHandleWrite\r
                                   string due to out of resources.\r
 \r
   @sa FileHandleWrite\r


@@ -1093,25 +1093,25 @@ FileHandleWriteLine(
   if (Handle == NULL) {\r
     return (EFI_INVALID_PARAMETER);\r
   }\r
   if (Handle == NULL) {\r
     return (EFI_INVALID_PARAMETER);\r
   }\r

-  \r
+\r

   Ascii = FALSE;\r
   AsciiBuffer = NULL;\r
   Ascii = FALSE;\r
   AsciiBuffer = NULL;\r

-  \r
+\r

   Status = FileHandleGetPosition(Handle, &OriginalFilePosition);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r
   Status = FileHandleGetPosition(Handle, &OriginalFilePosition);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   Status = FileHandleSetPosition(Handle, 0);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r
   Status = FileHandleSetPosition(Handle, 0);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   Status = FileHandleGetSize(Handle, &FileSize);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r
   Status = FileHandleGetSize(Handle, &FileSize);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   if (FileSize == 0) {\r
     Ascii = TRUE;\r
   } else {\r
   if (FileSize == 0) {\r
     Ascii = TRUE;\r
   } else {\r


@@ -1124,12 +1124,12 @@ FileHandleWriteLine(
       Ascii = TRUE;\r
     }\r
   }\r
       Ascii = TRUE;\r
     }\r
   }\r

-  \r
+\r

   Status = FileHandleSetPosition(Handle, OriginalFilePosition);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r
   Status = FileHandleSetPosition(Handle, OriginalFilePosition);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   if (Ascii) {\r
     Size = ( StrSize(Buffer) / sizeof(CHAR16) ) * sizeof(CHAR8);\r
     AsciiBuffer = (CHAR8 *)AllocateZeroPool(Size);\r
   if (Ascii) {\r
     Size = ( StrSize(Buffer) / sizeof(CHAR16) ) * sizeof(CHAR8);\r
     AsciiBuffer = (CHAR8 *)AllocateZeroPool(Size);\r


@@ -1143,7 +1143,7 @@ FileHandleWriteLine(
         return EFI_INVALID_PARAMETER;\r
       }\r
     }\r
         return EFI_INVALID_PARAMETER;\r
       }\r
     }\r

-    \r
+\r

     Size = AsciiStrSize(AsciiBuffer) - sizeof(CHAR8);\r
     Status = FileHandleWrite(Handle, &Size, AsciiBuffer);\r
     if (EFI_ERROR(Status)) {\r
     Size = AsciiStrSize(AsciiBuffer) - sizeof(CHAR8);\r
     Status = FileHandleWrite(Handle, &Size, AsciiBuffer);\r
     if (EFI_ERROR(Status)) {\r


@@ -1167,7 +1167,7 @@ FileHandleWriteLine(
     Size = StrSize(L"\r\n") - sizeof(CHAR16);\r
     Status = FileHandleWrite(Handle, &Size, L"\r\n");\r
   }\r
     Size = StrSize(L"\r\n") - sizeof(CHAR16);\r
     Status = FileHandleWrite(Handle, &Size, L"\r\n");\r
   }\r

-  \r
+\r

   if (AsciiBuffer != NULL) {\r
     FreePool (AsciiBuffer);\r
   }\r
   if (AsciiBuffer != NULL) {\r
     FreePool (AsciiBuffer);\r
   }\r

diff --git a/MdePkg/Library/UefiLib/Console.c b/MdePkg/Library/UefiLib/Console.c
index ecaf425a0e937e08c8b16a3fbf185d7e654ec299..37fe84daa518ebe6698eecdc4f7e000b35311d65 100644 (file)
--- a/MdePkg/Library/UefiLib/Console.c
+++ b/MdePkg/Library/UefiLib/Console.c
@@ -1,14 +1,14 @@
 /** @file\r
   This module provide help function for displaying unicode string.\r
 \r
 /** @file\r
   This module provide help function for displaying unicode string.\r
 \r

-  Copyright (c) 2006 - 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) 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


@@ -31,7 +31,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UNICODE_WIDTH_ENTRY mUnicodeWidthTable[] = {
   //\r
   {(CHAR16)0x1FFF,  1},\r
   /*\r
   //\r
   {(CHAR16)0x1FFF,  1},\r
   /*\r

-   * Merge the blocks and replace them with the above entry as they fall to \r
+   * Merge the blocks and replace them with the above entry as they fall to\r

    * the same category and they are all narrow glyph. This will reduce search\r
    * time and table size. The merge will omit the reserved code.\r
    *\r
    * the same category and they are all narrow glyph. This will reduce search\r
    * time and table size. The merge will omit the reserved code.\r
    *\r


@@ -78,7 +78,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UNICODE_WIDTH_ENTRY mUnicodeWidthTable[] = {
   //\r
   {(CHAR16)0x2FFF,  1},\r
   /*\r
   //\r
   {(CHAR16)0x2FFF,  1},\r
   /*\r

-   * Merge the blocks and replace them with the above entry as they fall to \r
+   * Merge the blocks and replace them with the above entry as they fall to\r

    * the same category and they are all narrow glyph. This will reduce search\r
    * time and table size. The merge will omit the reserved code.\r
    *\r
    * the same category and they are all narrow glyph. This will reduce search\r
    * time and table size. The merge will omit the reserved code.\r
    *\r


@@ -110,7 +110,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UNICODE_WIDTH_ENTRY mUnicodeWidthTable[] = {
   //\r
   {(CHAR16)0x33FF,  2},\r
   /*\r
   //\r
   {(CHAR16)0x33FF,  2},\r
   /*\r

-   * Merge the blocks and replace them with the above entry as they fall to \r
+   * Merge the blocks and replace them with the above entry as they fall to\r

    * the same category and they are all wide glyph. This will reduce search\r
    * time and table size. The merge will omit the reserved code.\r
    *\r
    * the same category and they are all wide glyph. This will reduce search\r
    * time and table size. The merge will omit the reserved code.\r
    *\r


@@ -133,13 +133,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UNICODE_WIDTH_ENTRY mUnicodeWidthTable[] = {
   //\r
   {(CHAR16)0x9FFF,  2},\r
   /*\r
   //\r
   {(CHAR16)0x9FFF,  2},\r
   /*\r

-   * Merge the blocks and replace them with the above entry as they fall to \r
+   * Merge the blocks and replace them with the above entry as they fall to\r

    * the same category and they are all wide glyph. This will reduce search\r
    * time and table size. The merge will omit the reserved code.\r
    *\r
    * Remove the above item if below is un-commented.\r
    *\r
    * the same category and they are all wide glyph. This will reduce search\r
    * time and table size. The merge will omit the reserved code.\r
    *\r
    * Remove the above item if below is un-commented.\r
    *\r

-  {(CHAR16)0x4DFF,  0},       // Reserved. 0x3400-0x4DBF as CJK unified ideographs \r
+  {(CHAR16)0x4DFF,  0},       // Reserved. 0x3400-0x4DBF as CJK unified ideographs\r

                       // extension A in ver3.0. 0x3400-0x4DFF\r
   {(CHAR16)0x9FFF,  2},       // CJK unified ideographs. 0x4E00-0x9FFF\r
   *\r
                       // extension A in ver3.0. 0x3400-0x4DFF\r
   {(CHAR16)0x9FFF,  2},       // CJK unified ideographs. 0x4E00-0x9FFF\r
   *\r


@@ -155,7 +155,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UNICODE_WIDTH_ENTRY mUnicodeWidthTable[] = {
   //\r
   {(CHAR16)0xD7FF,  2},\r
   /*\r
   //\r
   {(CHAR16)0xD7FF,  2},\r
   /*\r

-   * Merge the blocks and replace them with the above entry as they fall to \r
+   * Merge the blocks and replace them with the above entry as they fall to\r

    * the same category and they are all wide glyph. This will reduce search\r
    * time and table size. The merge will omit the reserved code.\r
    *\r
    * the same category and they are all wide glyph. This will reduce search\r
    * time and table size. The merge will omit the reserved code.\r
    *\r


@@ -251,18 +251,18 @@ GetGlyphWidth (
 /**\r
   Computes the display length of a Null-terminated Unicode String.\r
 \r
 /**\r
   Computes the display length of a Null-terminated Unicode String.\r
 \r

-  This function computes and returns the display length of the Null-terminated \r
-  Unicode string specified by String.  If String is NULL then 0 is returned. If \r
-  any of the widths of the Unicode characters in String can not be determined, \r
-  then 0 is returned. The display width of String can be computed by summing the \r
-  display widths of each Unicode character in String.  Unicode characters that \r
-  are narrow glyphs have a width of 1, and Unicode characters that are width glyphs \r
+  This function computes and returns the display length of the Null-terminated\r
+  Unicode string specified by String.  If String is NULL then 0 is returned. If\r
+  any of the widths of the Unicode characters in String can not be determined,\r
+  then 0 is returned. The display width of String can be computed by summing the\r
+  display widths of each Unicode character in String.  Unicode characters that\r
+  are narrow glyphs have a width of 1, and Unicode characters that are width glyphs\r

   have a width of 2.  If String is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   @param  String      A pointer to a Null-terminated Unicode string.\r
 \r
   @return The display length of the Null-terminated Unicode string specified by String.\r
   have a width of 2.  If String is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   @param  String      A pointer to a Null-terminated Unicode string.\r
 \r
   @return The display length of the Null-terminated Unicode string specified by String.\r

-  \r
+\r

 **/\r
 UINTN\r
 EFIAPI\r
 **/\r
 UINTN\r
 EFIAPI\r


@@ -292,7 +292,7 @@ UnicodeStringDisplayLength (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Count the storage space of a Unicode string. \r
+  Count the storage space of a Unicode string.\r

 \r
   This function handles the Unicode string with NARROW_CHAR\r
   and WIDE_CHAR control characters. NARROW_HCAR and WIDE_CHAR\r
 \r
   This function handles the Unicode string with NARROW_CHAR\r
   and WIDE_CHAR control characters. NARROW_HCAR and WIDE_CHAR\r


@@ -303,7 +303,7 @@ UnicodeStringDisplayLength (
   @param String          The input string to be counted.\r
   @param LimitLen        Whether need to limit the string length.\r
   @param MaxWidth        The max length this function supported.\r
   @param String          The input string to be counted.\r
   @param LimitLen        Whether need to limit the string length.\r
   @param MaxWidth        The max length this function supported.\r

-  @param Offset          The max index of the string can be show out. \r
+  @param Offset          The max index of the string can be show out.\r

 \r
   @return Storage space for the input string.\r
 \r
 \r
   @return Storage space for the input string.\r
 \r


@@ -375,27 +375,27 @@ UefiLibGetStringWidth (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Draws a dialog box to the console output device specified by \r
+  Draws a dialog box to the console output device specified by\r

   ConOut defined in the EFI_SYSTEM_TABLE and waits for a keystroke\r
   ConOut defined in the EFI_SYSTEM_TABLE and waits for a keystroke\r

-  from the console input device specified by ConIn defined in the \r
+  from the console input device specified by ConIn defined in the\r

   EFI_SYSTEM_TABLE.\r
 \r
   If there are no strings in the variable argument list, then ASSERT().\r
   If all the strings in the variable argument list are empty, then ASSERT().\r
 \r
   @param[in]   Attribute  Specifies the foreground and background color of the popup.\r
   EFI_SYSTEM_TABLE.\r
 \r
   If there are no strings in the variable argument list, then ASSERT().\r
   If all the strings in the variable argument list are empty, then ASSERT().\r
 \r
   @param[in]   Attribute  Specifies the foreground and background color of the popup.\r

-  @param[out]  Key        A pointer to the EFI_KEY value of the key that was \r
+  @param[out]  Key        A pointer to the EFI_KEY value of the key that was\r

                           pressed.  This is an optional parameter that may be NULL.\r
                           If it is NULL then no wait for a keypress will be performed.\r
   @param[in]  ...         The variable argument list that contains pointers to Null-\r
                           pressed.  This is an optional parameter that may be NULL.\r
                           If it is NULL then no wait for a keypress will be performed.\r
   @param[in]  ...         The variable argument list that contains pointers to Null-\r

-                          terminated Unicode strings to display in the dialog box.  \r
+                          terminated Unicode strings to display in the dialog box.\r

                           The variable argument list is terminated by a NULL.\r
 \r
 **/\r
 VOID\r
 EFIAPI\r
 CreatePopUp (\r
                           The variable argument list is terminated by a NULL.\r
 \r
 **/\r
 VOID\r
 EFIAPI\r
 CreatePopUp (\r

-  IN  UINTN          Attribute,                \r
+  IN  UINTN          Attribute,\r

   OUT EFI_INPUT_KEY  *Key,      OPTIONAL\r
   ...\r
   )\r
   OUT EFI_INPUT_KEY  *Key,      OPTIONAL\r
   ...\r
   )\r


@@ -417,7 +417,7 @@ CreatePopUp (
   CHAR16                           *TmpString;\r
 \r
   //\r
   CHAR16                           *TmpString;\r
 \r
   //\r

-  // Determine the length of the longest line in the popup and the the total \r
+  // Determine the length of the longest line in the popup and the the total\r

   // number of lines in the popup\r
   //\r
   VA_START (Args, Key);\r
   // number of lines in the popup\r
   //\r
   VA_START (Args, Key);\r


@@ -443,7 +443,7 @@ CreatePopUp (
   // Cache a pointer to the Simple Text Output Protocol in the EFI System Table\r
   //\r
   ConOut = gST->ConOut;\r
   // Cache a pointer to the Simple Text Output Protocol in the EFI System Table\r
   //\r
   ConOut = gST->ConOut;\r

-  \r
+\r

   //\r
   // Save the current console cursor position and attributes\r
   //\r
   //\r
   // Save the current console cursor position and attributes\r
   //\r


@@ -483,7 +483,7 @@ CreatePopUp (
   ASSERT (Line != NULL);\r
 \r
   //\r
   ASSERT (Line != NULL);\r
 \r
   //\r

-  // Draw top of popup box   \r
+  // Draw top of popup box\r

   //\r
   SetMem16 (Line, (MaxLength + 2) * 2, BOXDRAW_HORIZONTAL);\r
   Line[0]             = BOXDRAW_DOWN_RIGHT;\r
   //\r
   SetMem16 (Line, (MaxLength + 2) * 2, BOXDRAW_HORIZONTAL);\r
   Line[0]             = BOXDRAW_DOWN_RIGHT;\r

diff --git a/MdePkg/Library/UefiLib/UefiDriverModel.c b/MdePkg/Library/UefiLib/UefiDriverModel.c
index fb6067eac2263e379affcf2a9532d4029d615df3..69581aeae83b96975b5edadaef6456d06def3768 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiDriverModel.c
+++ b/MdePkg/Library/UefiLib/UefiDriverModel.c
@@ -2,29 +2,29 @@
   Library functions that abstract driver model protocols\r
   installation.\r
 \r
   Library functions that abstract driver model protocols\r
   installation.\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 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
   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

-**/ \r
+**/\r

 \r
 \r
 #include "UefiLibInternal.h"\r
 \r
 /**\r
   Installs and completes the initialization of a Driver Binding Protocol instance.\r
 \r
 \r
 #include "UefiLibInternal.h"\r
 \r
 /**\r
   Installs and completes the initialization of a Driver Binding Protocol instance.\r

-  \r
+\r

   Installs the Driver Binding Protocol specified by DriverBinding onto the handle\r
   specified by DriverBindingHandle. If DriverBindingHandle is NULL, then DriverBinding\r
   is installed onto a newly created handle. DriverBindingHandle is typically the same\r
   as the driver's ImageHandle, but it can be different if the driver produces multiple\r
   Installs the Driver Binding Protocol specified by DriverBinding onto the handle\r
   specified by DriverBindingHandle. If DriverBindingHandle is NULL, then DriverBinding\r
   is installed onto a newly created handle. DriverBindingHandle is typically the same\r
   as the driver's ImageHandle, but it can be different if the driver produces multiple\r

-  Driver Binding Protocols. \r
-  If DriverBinding is NULL, then ASSERT(). \r
+  Driver Binding Protocols.\r
+  If DriverBinding is NULL, then ASSERT().\r

   If DriverBinding can not be installed onto a handle, then ASSERT().\r
 \r
   @param  ImageHandle          The image handle of the driver.\r
   If DriverBinding can not be installed onto a handle, then ASSERT().\r
 \r
   @param  ImageHandle          The image handle of the driver.\r


@@ -80,10 +80,10 @@ EfiLibInstallDriverBinding (
   Protocols onto the driver's DriverBindingHandle. If DriverBindingHandle is NULL,\r
   then the protocols are  installed onto a newly created handle. DriverBindingHandle\r
   is typically the same as the driver's ImageHandle, but it can be different if the\r
   Protocols onto the driver's DriverBindingHandle. If DriverBindingHandle is NULL,\r
   then the protocols are  installed onto a newly created handle. DriverBindingHandle\r
   is typically the same as the driver's ImageHandle, but it can be different if the\r

-  driver produces multiple Driver Binding Protocols. \r
-  If DriverBinding is NULL, then ASSERT(). \r
+  driver produces multiple Driver Binding Protocols.\r
+  If DriverBinding is NULL, then ASSERT().\r

   If the installation fails, then ASSERT().\r
   If the installation fails, then ASSERT().\r

-  \r
+\r

   @param  ImageHandle          The image handle of the driver.\r
   @param  SystemTable          The EFI System Table that was passed to the driver's entry point.\r
   @param  DriverBinding        A Driver Binding Protocol instance that this driver is producing.\r
   @param  ImageHandle          The image handle of the driver.\r
   @param  SystemTable          The EFI System Table that was passed to the driver's entry point.\r
   @param  DriverBinding        A Driver Binding Protocol instance that this driver is producing.\r


@@ -118,7 +118,7 @@ EfiLibInstallAllDriverProtocols (
   //\r
   DriverBinding->ImageHandle         = ImageHandle;\r
   DriverBinding->DriverBindingHandle = DriverBindingHandle;\r
   //\r
   DriverBinding->ImageHandle         = ImageHandle;\r
   DriverBinding->DriverBindingHandle = DriverBindingHandle;\r

-  \r
+\r

   if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {\r
     if (DriverConfiguration == NULL) {\r
       if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r
   if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {\r
     if (DriverConfiguration == NULL) {\r
       if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r


@@ -210,8 +210,8 @@ EfiLibInstallAllDriverProtocols (
   optional Component Name and optional Component Name 2 protocols onto the driver's\r
   DriverBindingHandle.  If DriverBindingHandle is NULL, then the protocols are installed\r
   onto a newly created handle.  DriverBindingHandle is typically the same as the driver's\r
   optional Component Name and optional Component Name 2 protocols onto the driver's\r
   DriverBindingHandle.  If DriverBindingHandle is NULL, then the protocols are installed\r
   onto a newly created handle.  DriverBindingHandle is typically the same as the driver's\r

-  ImageHandle, but it can be different if the driver produces multiple Driver Binding Protocols. \r
-  If DriverBinding is NULL, then ASSERT(). \r
+  ImageHandle, but it can be different if the driver produces multiple Driver Binding Protocols.\r
+  If DriverBinding is NULL, then ASSERT().\r

   If the installation fails, then ASSERT().\r
 \r
   @param  ImageHandle          The image handle of the driver.\r
   If the installation fails, then ASSERT().\r
 \r
   @param  ImageHandle          The image handle of the driver.\r


@@ -299,8 +299,8 @@ EfiLibInstallDriverBindingComponentName2 (
   Component Name, optional Component Name 2, optional Driver Configuration, optional Driver Configuration 2,\r
   optional Driver Diagnostic, and optional Driver Diagnostic 2 Protocols onto the driver's DriverBindingHandle.\r
   DriverBindingHandle is typically the same as the driver's ImageHandle, but it can be different if the driver\r
   Component Name, optional Component Name 2, optional Driver Configuration, optional Driver Configuration 2,\r
   optional Driver Diagnostic, and optional Driver Diagnostic 2 Protocols onto the driver's DriverBindingHandle.\r
   DriverBindingHandle is typically the same as the driver's ImageHandle, but it can be different if the driver\r

-  produces multiple Driver Binding Protocols. \r
-  If DriverBinding is NULL, then ASSERT(). \r
+  produces multiple Driver Binding Protocols.\r
+  If DriverBinding is NULL, then ASSERT().\r

   If the installation fails, then ASSERT().\r
 \r
 \r
   If the installation fails, then ASSERT().\r
 \r
 \r


@@ -337,14 +337,14 @@ EfiLibInstallAllDriverProtocols2 (
 {\r
   EFI_STATUS  Status;\r
 \r
 {\r
   EFI_STATUS  Status;\r
 \r

-  ASSERT (DriverBinding != NULL); \r
+  ASSERT (DriverBinding != NULL);\r

 \r
   //\r
   // Update the ImageHandle and DriverBindingHandle fields of the Driver Binding Protocol\r
   //\r
   DriverBinding->ImageHandle         = ImageHandle;\r
   DriverBinding->DriverBindingHandle = DriverBindingHandle;\r
 \r
   //\r
   // Update the ImageHandle and DriverBindingHandle fields of the Driver Binding Protocol\r
   //\r
   DriverBinding->ImageHandle         = ImageHandle;\r
   DriverBinding->DriverBindingHandle = DriverBindingHandle;\r

-  \r
+\r

   if (DriverConfiguration2 == NULL) {\r
     if (DriverConfiguration == NULL) {\r
       if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {\r
   if (DriverConfiguration2 == NULL) {\r
     if (DriverConfiguration == NULL) {\r
       if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {\r

diff --git a/MdePkg/Library/UefiLib/UefiLib.c b/MdePkg/Library/UefiLib/UefiLib.c
index 2260183cbaf9575840b268c15ae0628068171743..828a54ce7a978b6ee0b9361618ba834cfbf560b8 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiLib.c
+++ b/MdePkg/Library/UefiLib/UefiLib.c
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  The UEFI Library provides functions and macros that simplify the development of \r
-  UEFI Drivers and UEFI Applications.  These functions and macros help manage EFI \r
-  events, build simple locks utilizing EFI Task Priority Levels (TPLs), install \r
-  EFI Driver Model related protocols, manage Unicode string tables for UEFI Drivers, \r
+  The UEFI Library provides functions and macros that simplify the development of\r
+  UEFI Drivers and UEFI Applications.  These functions and macros help manage EFI\r
+  events, build simple locks utilizing EFI Task Priority Levels (TPLs), install\r
+  EFI Driver Model related protocols, manage Unicode string tables for UEFI Drivers,\r

   and print messages on the console output and standard error devices.\r
 \r
   Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
   and print messages on the console output and standard error devices.\r
 \r
   Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r


@@ -20,14 +20,14 @@
 #include "UefiLibInternal.h"\r
 \r
 /**\r
 #include "UefiLibInternal.h"\r
 \r
 /**\r

-  Empty constructor function that is required to resolve dependencies between \r
+  Empty constructor function that is required to resolve dependencies between\r

   libraries.\r
   libraries.\r

-  \r
+\r

     ** DO NOT REMOVE **\r
     ** DO NOT REMOVE **\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 executed correctly.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The constructor executed correctly.\r
 \r
 **/\r


@@ -69,7 +69,7 @@ CompareIso639LanguageCode (
 /**\r
   Retrieves a pointer to the system configuration table from the EFI System Table\r
   based on a specified GUID.\r
 /**\r
   Retrieves a pointer to the system configuration table from the EFI System Table\r
   based on a specified GUID.\r

-  \r
+\r

   This function searches the list of configuration tables stored in the EFI System Table\r
   for a table with a GUID that matches TableGuid.  If a match is found, then a pointer to\r
   the configuration table is returned in Table., and EFI_SUCCESS is returned. If a matching GUID\r
   This function searches the list of configuration tables stored in the EFI System Table\r
   for a table with a GUID that matches TableGuid.  If a match is found, then a pointer to\r
   the configuration table is returned in Table., and EFI_SUCCESS is returned. If a matching GUID\r


@@ -118,7 +118,7 @@ EfiGetSystemConfigurationTable (
   no instances of ProtocolGuid in the handle database at the time this function is invoked,\r
   then the notification function is still executed one time. In addition, every time a protocol\r
   of type ProtocolGuid instance is installed or reinstalled, the notification function is also\r
   no instances of ProtocolGuid in the handle database at the time this function is invoked,\r
   then the notification function is still executed one time. In addition, every time a protocol\r
   of type ProtocolGuid instance is installed or reinstalled, the notification function is also\r

-  executed. This function returns the notification event that was created. \r
+  executed. This function returns the notification event that was created.\r

   If ProtocolGuid is NULL, then ASSERT().\r
   If NotifyTpl is not a legal TPL value, then ASSERT().\r
   If NotifyFunction is NULL, then ASSERT().\r
   If ProtocolGuid is NULL, then ASSERT().\r
   If NotifyTpl is not a legal TPL value, then ASSERT().\r
   If NotifyFunction is NULL, then ASSERT().\r


@@ -131,7 +131,7 @@ EfiGetSystemConfigurationTable (
   @param  NotifyContext   The context parameter to pass to NotifyFunction.\r
   @param  Registration    A pointer to a memory location to receive the registration value.\r
                           This value is passed to LocateHandle() to obtain new handles that\r
   @param  NotifyContext   The context parameter to pass to NotifyFunction.\r
   @param  Registration    A pointer to a memory location to receive the registration value.\r
                           This value is passed to LocateHandle() to obtain new handles that\r

-                          have been added that support the ProtocolGuid-specified protocol. \r
+                          have been added that support the ProtocolGuid-specified protocol.\r

 \r
   @return The notification event that was created.\r
 \r
 \r
   @return The notification event that was created.\r
 \r


@@ -192,7 +192,7 @@ EfiCreateProtocolNotifyEvent(
 \r
   This function creates an event using NotifyTpl, NoifyFunction, and NotifyContext.\r
   This event is signaled with EfiNamedEventSignal(). This provides the ability for one or more\r
 \r
   This function creates an event using NotifyTpl, NoifyFunction, and NotifyContext.\r
   This event is signaled with EfiNamedEventSignal(). This provides the ability for one or more\r

-  listeners on the same event named by the GUID specified by Name. \r
+  listeners on the same event named by the GUID specified by Name.\r

   If Name is NULL, then ASSERT().\r
   If NotifyTpl is not a legal TPL value, then ASSERT().\r
   If NotifyFunction is NULL, then ASSERT().\r
   If Name is NULL, then ASSERT().\r
   If NotifyTpl is not a legal TPL value, then ASSERT().\r
   If NotifyFunction is NULL, then ASSERT().\r


@@ -200,7 +200,7 @@ EfiCreateProtocolNotifyEvent(
   @param  Name                  Supplies the GUID name of the event.\r
   @param  NotifyTpl             Supplies the task priority level of the event notifications.\r
   @param  NotifyFunction        Supplies the function to notify when the event is signaled.\r
   @param  Name                  Supplies the GUID name of the event.\r
   @param  NotifyTpl             Supplies the task priority level of the event notifications.\r
   @param  NotifyFunction        Supplies the function to notify when the event is signaled.\r

-  @param  NotifyContext         The context parameter to pass to NotifyFunction. \r
+  @param  NotifyContext         The context parameter to pass to NotifyFunction.\r

   @param  Registration          A pointer to a memory location to receive the registration value.\r
 \r
   @retval EFI_SUCCESS           A named event was created.\r
   @param  Registration          A pointer to a memory location to receive the registration value.\r
 \r
   @retval EFI_SUCCESS           A named event was created.\r


@@ -224,7 +224,7 @@ EfiNamedEventListen (
   ASSERT (Name != NULL);\r
   ASSERT (NotifyFunction != NULL);\r
   ASSERT (NotifyTpl <= TPL_HIGH_LEVEL);\r
   ASSERT (Name != NULL);\r
   ASSERT (NotifyFunction != NULL);\r
   ASSERT (NotifyTpl <= TPL_HIGH_LEVEL);\r

-  \r
+\r

   //\r
   // Create event\r
   //\r
   //\r
   // Create event\r
   //\r


@@ -365,13 +365,13 @@ EfiEventEmptyFunction (
 {\r
 }\r
 \r
 {\r
 }\r
 \r

-/** \r
+/**\r

   Returns the current TPL.\r
 \r
   Returns the current TPL.\r
 \r

-  This function returns the current TPL.  There is no EFI service to directly \r
-  retrieve the current TPL. Instead, the RaiseTPL() function is used to raise \r
-  the TPL to TPL_HIGH_LEVEL.  This will return the current TPL.  The TPL level \r
-  can then immediately be restored back to the current TPL level with a call \r
+  This function returns the current TPL.  There is no EFI service to directly\r
+  retrieve the current TPL. Instead, the RaiseTPL() function is used to raise\r
+  the TPL to TPL_HIGH_LEVEL.  This will return the current TPL.  The TPL level\r
+  can then immediately be restored back to the current TPL level with a call\r

   to RestoreTPL().\r
 \r
   @return The current TPL.\r
   to RestoreTPL().\r
 \r
   @return The current TPL.\r


@@ -395,8 +395,8 @@ EfiGetCurrentTpl (
 /**\r
   Initializes a basic mutual exclusion lock.\r
 \r
 /**\r
   Initializes a basic mutual exclusion lock.\r
 \r

-  This function initializes a basic mutual exclusion lock to the released state \r
-  and returns the lock.  Each lock provides mutual exclusion access at its task \r
+  This function initializes a basic mutual exclusion lock to the released state\r
+  and returns the lock.  Each lock provides mutual exclusion access at its task\r

   priority level.  Since there is no preemption or multiprocessor support in EFI,\r
   acquiring the lock only consists of raising to the locks TPL.\r
   If Lock is NULL, then ASSERT().\r
   priority level.  Since there is no preemption or multiprocessor support in EFI,\r
   acquiring the lock only consists of raising to the locks TPL.\r
   If Lock is NULL, then ASSERT().\r


@@ -427,8 +427,8 @@ EfiInitializeLock (
 /**\r
   Acquires ownership of a lock.\r
 \r
 /**\r
   Acquires ownership of a lock.\r
 \r

-  This function raises the system's current task priority level to the task \r
-  priority level of the mutual exclusion lock.  Then, it places the lock in the \r
+  This function raises the system's current task priority level to the task\r
+  priority level of the mutual exclusion lock.  Then, it places the lock in the\r

   acquired state.\r
   If Lock is NULL, then ASSERT().\r
   If Lock is not initialized, then ASSERT().\r
   acquired state.\r
   If Lock is NULL, then ASSERT().\r
   If Lock is not initialized, then ASSERT().\r


@@ -493,8 +493,8 @@ EfiAcquireLockOrFail (
 /**\r
   Releases ownership of a lock.\r
 \r
 /**\r
   Releases ownership of a lock.\r
 \r

-  This function transitions a mutual exclusion lock from the acquired state to \r
-  the released state, and restores the system's task priority level to its \r
+  This function transitions a mutual exclusion lock from the acquired state to\r
+  the released state, and restores the system's task priority level to its\r

   previous level.\r
   If Lock is NULL, then ASSERT().\r
   If Lock is not initialized, then ASSERT().\r
   previous level.\r
   If Lock is NULL, then ASSERT().\r
   If Lock is not initialized, then ASSERT().\r


@@ -528,7 +528,7 @@ EfiReleaseLock (
   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 with an\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 with an\r

-  attribute of EFI_OPEN_PROTOCOL_BY_DRIVER. \r
+  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


@@ -591,10 +591,10 @@ EfiTestManagedDevice (
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
   If ProtocolGuid is NULL, then ASSERT().\r
 \r
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
   If ProtocolGuid is NULL, then ASSERT().\r
 \r

-  @param  ControllerHandle     A handle for a (parent) controller to test. \r
+  @param  ControllerHandle     A handle for a (parent) controller to test.\r

   @param  ChildHandle          A child handle to test.\r
   @param  ProtocolGuid         Supplies the protocol that the child controller\r
   @param  ChildHandle          A child handle to test.\r
   @param  ProtocolGuid         Supplies the protocol that the child controller\r

-                               opens on its parent controller. \r
+                               opens on its parent controller.\r

 \r
   @retval EFI_SUCCESS          ChildHandle is a child of the ControllerHandle.\r
   @retval EFI_UNSUPPORTED      ChildHandle is not a child of the\r
 \r
   @retval EFI_SUCCESS          ChildHandle is a child of the ControllerHandle.\r
   @retval EFI_UNSUPPORTED      ChildHandle is not a child of the\r


@@ -653,26 +653,26 @@ EfiTestChildHandle (
   UnicodeStringTable that matches the language code specified by Language, then it\r
   is returned in UnicodeString.\r
 \r
   UnicodeStringTable that matches the language code specified by Language, then it\r
   is returned in UnicodeString.\r
 \r

-  @param  Language                A pointer to the ISO 639-2 language code for the \r
+  @param  Language                A pointer to the ISO 639-2 language code for the\r

                                   Unicode string to look up and return.\r
                                   Unicode string to look up and return.\r

-  @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes \r
-                                  that the Unicode string table supports.  Language \r
+  @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes\r
+                                  that the Unicode string table supports.  Language\r

                                   must be a member of this set.\r
   @param  UnicodeStringTable      A pointer to the table of Unicode strings.\r
   @param  UnicodeString           A pointer to the Unicode string from UnicodeStringTable\r
                                   that matches the language specified by Language.\r
 \r
                                   must be a member of this set.\r
   @param  UnicodeStringTable      A pointer to the table of Unicode strings.\r
   @param  UnicodeString           A pointer to the Unicode string from UnicodeStringTable\r
                                   that matches the language specified by Language.\r
 \r

-  @retval EFI_SUCCESS             The Unicode string that matches the language \r
+  @retval EFI_SUCCESS             The Unicode string that matches the language\r

                                   specified by Language was found\r
                                   specified by Language was found\r

-                                  in the table of Unicode strings UnicodeStringTable, \r
+                                  in the table of Unicode strings UnicodeStringTable,\r

                                   and it was returned in UnicodeString.\r
   @retval EFI_INVALID_PARAMETER   Language is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is NULL.\r
   @retval EFI_UNSUPPORTED         SupportedLanguages is NULL.\r
   @retval EFI_UNSUPPORTED         UnicodeStringTable is NULL.\r
                                   and it was returned in UnicodeString.\r
   @retval EFI_INVALID_PARAMETER   Language is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is NULL.\r
   @retval EFI_UNSUPPORTED         SupportedLanguages is NULL.\r
   @retval EFI_UNSUPPORTED         UnicodeStringTable is NULL.\r

-  @retval EFI_UNSUPPORTED         The language specified by Language is not a \r
+  @retval EFI_UNSUPPORTED         The language specified by Language is not a\r

                                   member of SupportedLanguages.\r
                                   member of SupportedLanguages.\r

-  @retval EFI_UNSUPPORTED         The language specified by Language is not \r
+  @retval EFI_UNSUPPORTED         The language specified by Language is not\r

                                   supported by UnicodeStringTable.\r
 \r
 **/\r
                                   supported by UnicodeStringTable.\r
 \r
 **/\r


@@ -745,7 +745,7 @@ LookupUnicodeString (
                                return. If Iso639Language is TRUE, then this ASCII string is\r
                                not assumed to be Null-terminated, and only the first three\r
                                characters are used. If Iso639Language is FALSE, then this ASCII\r
                                return. If Iso639Language is TRUE, then this ASCII string is\r
                                not assumed to be Null-terminated, and only the first three\r
                                characters are used. If Iso639Language is FALSE, then this ASCII\r

-                               string must be Null-terminated. \r
+                               string must be Null-terminated.\r

   @param  SupportedLanguages   A pointer to a Null-terminated ASCII string that contains a\r
                                set of ISO 639-2 or RFC 4646 language codes that the Unicode\r
                                string table supports.  Language must be a member of this set.\r
   @param  SupportedLanguages   A pointer to a Null-terminated ASCII string that contains a\r
                                set of ISO 639-2 or RFC 4646 language codes that the Unicode\r
                                string table supports.  Language must be a member of this set.\r


@@ -765,11 +765,11 @@ LookupUnicodeString (
   @retval  EFI_SUCCESS            The Unicode string that matches the language specified by Language\r
                                   was found in the table of Unicode strings UnicodeStringTable, and\r
                                   it was returned in UnicodeString.\r
   @retval  EFI_SUCCESS            The Unicode string that matches the language specified by Language\r
                                   was found in the table of Unicode strings UnicodeStringTable, and\r
                                   it was returned in UnicodeString.\r

-  @retval  EFI_INVALID_PARAMETER  Language is NULL.  \r
-  @retval  EFI_INVALID_PARAMETER  UnicodeString is NULL.  \r
-  @retval  EFI_UNSUPPORTED        SupportedLanguages is NULL.  \r
-  @retval  EFI_UNSUPPORTED        UnicodeStringTable is NULL.  \r
-  @retval  EFI_UNSUPPORTED        The language specified by Language is not a member of SupportedLanguages.  \r
+  @retval  EFI_INVALID_PARAMETER  Language is NULL.\r
+  @retval  EFI_INVALID_PARAMETER  UnicodeString is NULL.\r
+  @retval  EFI_UNSUPPORTED        SupportedLanguages is NULL.\r
+  @retval  EFI_UNSUPPORTED        UnicodeStringTable is NULL.\r
+  @retval  EFI_UNSUPPORTED        The language specified by Language is not a member of SupportedLanguages.\r

   @retval  EFI_UNSUPPORTED        The language specified by Language is not supported by UnicodeStringTable.\r
 \r
 **/\r
   @retval  EFI_UNSUPPORTED        The language specified by Language is not supported by UnicodeStringTable.\r
 \r
 **/\r


@@ -855,13 +855,13 @@ LookupUnicodeString2 (
 /**\r
   This function adds a Unicode string to UnicodeStringTable.\r
 \r
 /**\r
   This function adds a Unicode string to UnicodeStringTable.\r
 \r

-  If Language is a member of SupportedLanguages then UnicodeString is added to \r
-  UnicodeStringTable.  New buffers are allocated for both Language and \r
-  UnicodeString.  The contents of Language and UnicodeString are copied into \r
-  these new buffers.  These buffers are automatically freed when \r
+  If Language is a member of SupportedLanguages then UnicodeString is added to\r
+  UnicodeStringTable.  New buffers are allocated for both Language and\r
+  UnicodeString.  The contents of Language and UnicodeString are copied into\r
+  these new buffers.  These buffers are automatically freed when\r

   FreeUnicodeStringTable() is called.\r
 \r
   FreeUnicodeStringTable() is called.\r
 \r

-  @param  Language                A pointer to the ISO 639-2 language code for the Unicode \r
+  @param  Language                A pointer to the ISO 639-2 language code for the Unicode\r

                                   string to add.\r
   @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes\r
                                   that the Unicode string table supports.\r
                                   string to add.\r
   @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes\r
                                   that the Unicode string table supports.\r


@@ -869,19 +869,19 @@ LookupUnicodeString2 (
   @param  UnicodeStringTable      A pointer to the table of Unicode strings.\r
   @param  UnicodeString           A pointer to the Unicode string to add.\r
 \r
   @param  UnicodeStringTable      A pointer to the table of Unicode strings.\r
   @param  UnicodeString           A pointer to the Unicode string to add.\r
 \r

-  @retval EFI_SUCCESS             The Unicode string that matches the language \r
-                                  specified by Language was found in the table of \r
-                                  Unicode strings UnicodeStringTable, and it was \r
+  @retval EFI_SUCCESS             The Unicode string that matches the language\r
+                                  specified by Language was found in the table of\r
+                                  Unicode strings UnicodeStringTable, and it was\r

                                   returned in UnicodeString.\r
   @retval EFI_INVALID_PARAMETER   Language is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is an empty string.\r
   @retval EFI_UNSUPPORTED         SupportedLanguages is NULL.\r
                                   returned in UnicodeString.\r
   @retval EFI_INVALID_PARAMETER   Language is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is NULL.\r
   @retval EFI_INVALID_PARAMETER   UnicodeString is an empty string.\r
   @retval EFI_UNSUPPORTED         SupportedLanguages is NULL.\r

-  @retval EFI_ALREADY_STARTED     A Unicode string with language Language is \r
+  @retval EFI_ALREADY_STARTED     A Unicode string with language Language is\r

                                   already present in UnicodeStringTable.\r
                                   already present in UnicodeStringTable.\r

-  @retval EFI_OUT_OF_RESOURCES    There is not enough memory to add another \r
+  @retval EFI_OUT_OF_RESOURCES    There is not enough memory to add another\r

                                   Unicode string to UnicodeStringTable.\r
                                   Unicode string to UnicodeStringTable.\r

-  @retval EFI_UNSUPPORTED         The language specified by Language is not a \r
+  @retval EFI_UNSUPPORTED         The language specified by Language is not a\r

                                   member of SupportedLanguages.\r
 \r
 **/\r
                                   member of SupportedLanguages.\r
 \r
 **/\r


@@ -1044,21 +1044,21 @@ AddUnicodeString (
                               RFC 4646 language codes separated by ';'.\r
   @param  UnicodeStringTable  A pointer to the table of Unicode strings. Type EFI_UNICODE_STRING_TABLE\r
                               is defined in "Related Definitions".\r
                               RFC 4646 language codes separated by ';'.\r
   @param  UnicodeStringTable  A pointer to the table of Unicode strings. Type EFI_UNICODE_STRING_TABLE\r
                               is defined in "Related Definitions".\r

-  @param  UnicodeString       A pointer to the Unicode string to add.  \r
+  @param  UnicodeString       A pointer to the Unicode string to add.\r

   @param  Iso639Language      Specifies the supported language code format. If it is TRUE,\r
                               then Language and SupportedLanguages follow ISO 639-2 language code format.\r
                               Otherwise, they follow RFC 4646 language code format.\r
 \r
   @retval EFI_SUCCESS            The Unicode string that matches the language specified by\r
                                  Language was found in the table of Unicode strings UnicodeStringTable,\r
   @param  Iso639Language      Specifies the supported language code format. If it is TRUE,\r
                               then Language and SupportedLanguages follow ISO 639-2 language code format.\r
                               Otherwise, they follow RFC 4646 language code format.\r
 \r
   @retval EFI_SUCCESS            The Unicode string that matches the language specified by\r
                                  Language was found in the table of Unicode strings UnicodeStringTable,\r

-                                 and it was returned in UnicodeString.  \r
-  @retval EFI_INVALID_PARAMETER  Language is NULL.  \r
-  @retval EFI_INVALID_PARAMETER  UnicodeString is NULL.  \r
-  @retval EFI_INVALID_PARAMETER  UnicodeString is an empty string.  \r
-  @retval EFI_UNSUPPORTED        SupportedLanguages is NULL.  \r
+                                 and it was returned in UnicodeString.\r
+  @retval EFI_INVALID_PARAMETER  Language is NULL.\r
+  @retval EFI_INVALID_PARAMETER  UnicodeString is NULL.\r
+  @retval EFI_INVALID_PARAMETER  UnicodeString is an empty string.\r
+  @retval EFI_UNSUPPORTED        SupportedLanguages is NULL.\r

   @retval EFI_ALREADY_STARTED    A Unicode string with language Language is already present in\r
   @retval EFI_ALREADY_STARTED    A Unicode string with language Language is already present in\r

-                                 UnicodeStringTable.  \r
-  @retval EFI_OUT_OF_RESOURCES   There is not enough memory to add another Unicode string UnicodeStringTable.  \r
+                                 UnicodeStringTable.\r
+  @retval EFI_OUT_OF_RESOURCES   There is not enough memory to add another Unicode string UnicodeStringTable.\r

   @retval EFI_UNSUPPORTED        The language specified by Language is not a member of SupportedLanguages.\r
 \r
 **/\r
   @retval EFI_UNSUPPORTED        The language specified by Language is not a member of SupportedLanguages.\r
 \r
 **/\r


@@ -1142,7 +1142,7 @@ AddUnicodeString2 (
       while (*LanguageString != 0) {\r
         for (Index = 0; LanguageString[Index] != 0 && LanguageString[Index] != ';'; Index++);\r
 \r
       while (*LanguageString != 0) {\r
         for (Index = 0; LanguageString[Index] != 0 && LanguageString[Index] != ';'; Index++);\r
 \r

-        if (AsciiStrnCmp (Language, LanguageString, Index) == 0) { \r
+        if (AsciiStrnCmp (Language, LanguageString, Index) == 0) {\r

           return EFI_ALREADY_STARTED;\r
         }\r
         LanguageString += Index;\r
           return EFI_ALREADY_STARTED;\r
         }\r
         LanguageString += Index;\r


@@ -1224,7 +1224,7 @@ AddUnicodeString2 (
   This function frees the table of Unicode strings in UnicodeStringTable.\r
 \r
   If UnicodeStringTable is NULL, then EFI_SUCCESS is returned.\r
   This function frees the table of Unicode strings in UnicodeStringTable.\r
 \r
   If UnicodeStringTable is NULL, then EFI_SUCCESS is returned.\r

-  Otherwise, each language code, and each Unicode string in the Unicode string \r
+  Otherwise, each language code, and each Unicode string in the Unicode string\r

   table are freed, and EFI_SUCCESS is returned.\r
 \r
   @param  UnicodeStringTable  A pointer to the table of Unicode strings.\r
   table are freed, and EFI_SUCCESS is returned.\r
 \r
   @param  UnicodeStringTable  A pointer to the table of Unicode strings.\r


@@ -1278,8 +1278,8 @@ FreeUnicodeStringTable (
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r

-  Returns a pointer to an allocated buffer that contains the contents of a \r
-  variable retrieved through the UEFI Runtime Service GetVariable().  The \r
+  Returns a pointer to an allocated buffer that contains the contents of a\r
+  variable retrieved through the UEFI Runtime Service GetVariable().  The\r

   returned buffer is allocated using AllocatePool().  The caller is responsible\r
   for freeing this buffer with FreePool().\r
 \r
   returned buffer is allocated using AllocatePool().  The caller is responsible\r
   for freeing this buffer with FreePool().\r
 \r


@@ -1341,10 +1341,10 @@ GetVariable (
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r
 /**\r
   [ATTENTION] This function will be deprecated for security reason.\r
 \r

-  Returns a pointer to an allocated buffer that contains the contents of a \r
-  variable retrieved through the UEFI Runtime Service GetVariable().  This \r
+  Returns a pointer to an allocated buffer that contains the contents of a\r
+  variable retrieved through the UEFI Runtime Service GetVariable().  This\r

   function always uses the EFI_GLOBAL_VARIABLE GUID to retrieve variables.\r
   function always uses the EFI_GLOBAL_VARIABLE GUID to retrieve variables.\r

-  The returned buffer is allocated using AllocatePool().  The caller is \r
+  The returned buffer is allocated using AllocatePool().  The caller is\r

   responsible for freeing this buffer with FreePool().\r
 \r
   If Name is NULL, then ASSERT().\r
   responsible for freeing this buffer with FreePool().\r
 \r
   If Name is NULL, then ASSERT().\r


@@ -1367,8 +1367,8 @@ GetEfiGlobalVariable (
 #endif\r
 \r
 /**\r
 #endif\r
 \r
 /**\r

-  Returns the status whether get the variable success. The function retrieves \r
-  variable  through the UEFI Runtime Service GetVariable().  The \r
+  Returns the status whether get the variable success. The function retrieves\r
+  variable  through the UEFI Runtime Service GetVariable().  The\r

   returned buffer is allocated using AllocatePool().  The caller is responsible\r
   for freeing this buffer with FreePool().\r
 \r
   returned buffer is allocated using AllocatePool().  The caller is responsible\r
   for freeing this buffer with FreePool().\r
 \r


@@ -1408,7 +1408,7 @@ GetVariable2 (
   if (Size != NULL) {\r
     *Size  = 0;\r
   }\r
   if (Size != NULL) {\r
     *Size  = 0;\r
   }\r

-  \r
+\r

   Status = gRT->GetVariable ((CHAR16 *) Name, (EFI_GUID *) Guid, NULL, &BufferSize, *Value);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return Status;\r
   Status = gRT->GetVariable ((CHAR16 *) Name, (EFI_GUID *) Guid, NULL, &BufferSize, *Value);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return Status;\r


@@ -1440,10 +1440,10 @@ GetVariable2 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Returns a pointer to an allocated buffer that contains the contents of a \r
-  variable retrieved through the UEFI Runtime Service GetVariable().  This \r
+  Returns a pointer to an allocated buffer that contains the contents of a\r
+  variable retrieved through the UEFI Runtime Service GetVariable().  This\r

   function always uses the EFI_GLOBAL_VARIABLE GUID to retrieve variables.\r
   function always uses the EFI_GLOBAL_VARIABLE GUID to retrieve variables.\r

-  The returned buffer is allocated using AllocatePool().  The caller is \r
+  The returned buffer is allocated using AllocatePool().  The caller is\r

   responsible for freeing this buffer with FreePool().\r
 \r
   If Name is NULL, then ASSERT().\r
   responsible for freeing this buffer with FreePool().\r
 \r
   If Name is NULL, then ASSERT().\r


@@ -1470,50 +1470,50 @@ GetEfiGlobalVariable2 (
 }\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
-  code types may not be mixed in a single call to this function.  The language \r
-  code returned is allocated using AllocatePool().  The caller is responsible for \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.  The language\r
+  code returned is allocated using AllocatePool().  The caller is responsible for\r

   freeing the allocated buffer using FreePool().  This function supports a variable\r
   freeing the allocated buffer using FreePool().  This function supports a variable\r

-  argument list that allows the caller to pass in a prioritized list of language \r
-  codes to test against all the language codes in SupportedLanguages. \r
+  argument list that allows the caller to pass in a prioritized list of language\r
+  codes to test against all the language codes in SupportedLanguages.\r

 \r
   If SupportedLanguages is NULL, then ASSERT().\r
 \r
   @param[in]  SupportedLanguages  A pointer to a Null-terminated ASCII string that\r
 \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
 GetBestLanguage (\r
                  language in SupportedLanguages.\r
 \r
 **/\r
 CHAR8 *\r
 EFIAPI\r
 GetBestLanguage (\r

-  IN CONST CHAR8  *SupportedLanguages, \r
+  IN CONST CHAR8  *SupportedLanguages,\r

   IN UINTN        Iso639Language,\r
   ...\r
   )\r
   IN UINTN        Iso639Language,\r
   ...\r
   )\r


@@ -1592,7 +1592,7 @@ GetBestLanguage (
         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


@@ -1601,7 +1601,7 @@ GetBestLanguage (
   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

diff --git a/MdePkg/Library/UefiLib/UefiLib.inf b/MdePkg/Library/UefiLib/UefiLib.inf
index 8284dc58afc3cadd0609807e0babf940acc5b717..f69f0a43b576ee1a9f56b3d4b940d45c392d73e4 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiLib.inf
+++ b/MdePkg/Library/UefiLib/UefiLib.inf
@@ -1,13 +1,13 @@
 ## @file\r
 # Instance of UEFI Library.\r
 #\r
 ## @file\r
 # Instance of UEFI Library.\r
 #\r

-# The UEFI Library provides functions and macros that simplify the development of \r
-#  UEFI Drivers and UEFI Applications.  These functions and macros help manage EFI \r
-#  events, build simple locks utilizing EFI Task Priority Levels (TPLs), install \r
-#  EFI Driver Model related protocols, manage Unicode string tables for UEFI Drivers, \r
+# The UEFI Library provides functions and macros that simplify the development of\r
+#  UEFI Drivers and UEFI Applications.  These functions and macros help manage EFI\r
+#  events, build simple locks utilizing EFI Task Priority Levels (TPLs), install\r
+#  EFI Driver Model related protocols, manage Unicode string tables for UEFI Drivers,\r

 #  and print messages on the console output and standard error devices.\r
 #\r
 #  and print messages on the console output and standard error devices.\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


@@ -57,7 +57,7 @@
   UefiBootServicesTableLib\r
   DevicePathLib\r
   UefiRuntimeServicesTableLib\r
   UefiBootServicesTableLib\r
   DevicePathLib\r
   UefiRuntimeServicesTableLib\r

-  \r
+\r

 [Guids]\r
   gEfiEventReadyToBootGuid                      ## SOMETIMES_CONSUMES  ## Event\r
   gEfiEventLegacyBootGuid                       ## SOMETIMES_CONSUMES  ## Event\r
 [Guids]\r
   gEfiEventReadyToBootGuid                      ## SOMETIMES_CONSUMES  ## Event\r
   gEfiEventLegacyBootGuid                       ## SOMETIMES_CONSUMES  ## Event\r

diff --git a/MdePkg/Library/UefiLib/UefiLibPrint.c b/MdePkg/Library/UefiLib/UefiLibPrint.c
index 5527f8e7a8042c1ca682c92145142a9c101622a7..b7c546b215caab7180661166c0db2156066b3d7c 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiLibPrint.c
+++ b/MdePkg/Library/UefiLib/UefiLibPrint.c
@@ -2,7 +2,7 @@
   Mde UEFI library API implementation.\r
   Print to StdErr or ConOut defined in EFI_SYSTEM_TABLE\r
 \r
   Mde UEFI library API implementation.\r
   Print to StdErr or ConOut defined in EFI_SYSTEM_TABLE\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


@@ -90,23 +90,23 @@ InternalPrint (
   return Return;\r
 }\r
 \r
   return Return;\r
 }\r
 \r

-/** \r
-  Prints a formatted Unicode string to the console output device specified by \r
+/**\r
+  Prints a formatted Unicode string to the console output device specified by\r

   ConOut defined in the EFI_SYSTEM_TABLE.\r
 \r
   ConOut defined in the EFI_SYSTEM_TABLE.\r
 \r

-  This function prints a formatted Unicode string to the console output device \r
-  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of Unicode \r
-  characters that printed to ConOut.  If the length of the formatted Unicode \r
-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first \r
+  This function prints a formatted Unicode string to the console output device\r
+  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of Unicode\r
+  characters that printed to ConOut.  If the length of the formatted Unicode\r
+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first\r

   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r
   If gST->ConOut is NULL, then ASSERT().\r
 \r
   @param Format   A Null-terminated Unicode format string.\r
   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r
   If gST->ConOut is NULL, then ASSERT().\r
 \r
   @param Format   A Null-terminated Unicode format string.\r

-  @param ...      A Variable argument list whose contents are accessed based \r
+  @param ...      A Variable argument list whose contents are accessed based\r

                   on the format string specified by Format.\r
                   on the format string specified by Format.\r

-  \r
+\r

   @return The number of Unicode characters printed to ConOut.\r
 \r
 **/\r
   @return The number of Unicode characters printed to ConOut.\r
 \r
 **/\r


@@ -129,23 +129,23 @@ Print (
   return Return;\r
 }\r
 \r
   return Return;\r
 }\r
 \r

-/** \r
-  Prints a formatted Unicode string to the console output device specified by \r
+/**\r
+  Prints a formatted Unicode string to the console output device specified by\r

   StdErr defined in the EFI_SYSTEM_TABLE.\r
 \r
   StdErr defined in the EFI_SYSTEM_TABLE.\r
 \r

-  This function prints a formatted Unicode string to the console output device \r
-  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of Unicode \r
-  characters that printed to StdErr.  If the length of the formatted Unicode \r
-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first \r
+  This function prints a formatted Unicode string to the console output device\r
+  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of Unicode\r
+  characters that printed to StdErr.  If the length of the formatted Unicode\r
+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first\r

   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r
   If gST->StdErr is NULL, then ASSERT().\r
 \r
   @param Format   A Null-terminated Unicode format string.\r
   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r
   If gST->StdErr is NULL, then ASSERT().\r
 \r
   @param Format   A Null-terminated Unicode format string.\r

-  @param ...      Variable argument list whose contents are accessed based \r
+  @param ...      Variable argument list whose contents are accessed based\r

                   on the format string specified by Format.\r
                   on the format string specified by Format.\r

-  \r
+\r

   @return The number of Unicode characters printed to StdErr.\r
 \r
 **/\r
   @return The number of Unicode characters printed to StdErr.\r
 \r
 **/\r


@@ -225,22 +225,22 @@ AsciiInternalPrint (
   return Return;\r
 }\r
 \r
   return Return;\r
 }\r
 \r

-/** \r
-  Prints a formatted ASCII string to the console output device specified by \r
+/**\r
+  Prints a formatted ASCII string to the console output device specified by\r

   ConOut defined in the EFI_SYSTEM_TABLE.\r
 \r
   ConOut defined in the EFI_SYSTEM_TABLE.\r
 \r

-  This function prints a formatted ASCII string to the console output device \r
-  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of ASCII \r
-  characters that printed to ConOut.  If the length of the formatted ASCII \r
-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first \r
+  This function prints a formatted ASCII string to the console output device\r
+  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of ASCII\r
+  characters that printed to ConOut.  If the length of the formatted ASCII\r
+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first\r

   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.\r
   If Format is NULL, then ASSERT().\r
   If gST->ConOut is NULL, then ASSERT().\r
 \r
   @param Format   A Null-terminated ASCII format string.\r
   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.\r
   If Format is NULL, then ASSERT().\r
   If gST->ConOut is NULL, then ASSERT().\r
 \r
   @param Format   A Null-terminated ASCII format string.\r

-  @param ...      Variable argument list whose contents are accessed based \r
+  @param ...      Variable argument list whose contents are accessed based\r

                   on the format string specified by Format.\r
                   on the format string specified by Format.\r

-  \r
+\r

   @return The number of ASCII characters printed to ConOut.\r
 \r
 **/\r
   @return The number of ASCII characters printed to ConOut.\r
 \r
 **/\r


@@ -264,22 +264,22 @@ AsciiPrint (
   return Return;\r
 }\r
 \r
   return Return;\r
 }\r
 \r

-/** \r
-  Prints a formatted ASCII string to the console output device specified by \r
+/**\r
+  Prints a formatted ASCII string to the console output device specified by\r

   StdErr defined in the EFI_SYSTEM_TABLE.\r
 \r
   StdErr defined in the EFI_SYSTEM_TABLE.\r
 \r

-  This function prints a formatted ASCII string to the console output device \r
-  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of ASCII \r
-  characters that printed to StdErr.  If the length of the formatted ASCII \r
-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first \r
+  This function prints a formatted ASCII string to the console output device\r
+  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of ASCII\r
+  characters that printed to StdErr.  If the length of the formatted ASCII\r
+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first\r

   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.\r
   If Format is NULL, then ASSERT().\r
   If gST->StdErr is NULL, then ASSERT().\r
 \r
   @param Format   A Null-terminated ASCII format string.\r
   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.\r
   If Format is NULL, then ASSERT().\r
   If gST->StdErr is NULL, then ASSERT().\r
 \r
   @param Format   A Null-terminated ASCII format string.\r

-  @param ...      Variable argument list whose contents are accessed based \r
+  @param ...      Variable argument list whose contents are accessed based\r

                   on the format string specified by Format.\r
                   on the format string specified by Format.\r

-  \r
+\r

   @return The number of ASCII characters printed to ConErr.\r
 \r
 **/\r
   @return The number of ASCII characters printed to ConErr.\r
 \r
 **/\r


@@ -371,7 +371,7 @@ InternalPrintGraphic (
   RowInfoArray          = NULL;\r
 \r
   ConsoleHandle = gST->ConsoleOutHandle;\r
   RowInfoArray          = NULL;\r
 \r
   ConsoleHandle = gST->ConsoleOutHandle;\r

-  \r
+\r

   ASSERT( ConsoleHandle != NULL);\r
 \r
   Status = gBS->HandleProtocol (\r
   ASSERT( ConsoleHandle != NULL);\r
 \r
   Status = gBS->HandleProtocol (\r


@@ -560,24 +560,24 @@ Error:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Prints a formatted Unicode string to a graphics console device specified by \r
+  Prints a formatted Unicode string to a graphics console device specified by\r

   ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.\r
 \r
   ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.\r
 \r

-  This function prints a formatted Unicode string to the graphics console device \r
-  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of \r
-  Unicode characters displayed, not including partial characters that may be clipped \r
+  This function prints a formatted Unicode string to the graphics console device\r
+  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of\r
+  Unicode characters displayed, not including partial characters that may be clipped\r

   by the right edge of the display.  If the length of the formatted Unicode string is\r
   by the right edge of the display.  If the length of the formatted Unicode string is\r

-  greater than PcdUefiLibMaxPrintBufferSize, then at most the first \r
+  greater than PcdUefiLibMaxPrintBufferSize, then at most the first\r

   PcdUefiLibMaxPrintBufferSize characters are printed.The EFI_HII_FONT_PROTOCOL\r
   PcdUefiLibMaxPrintBufferSize characters are printed.The EFI_HII_FONT_PROTOCOL\r

-  StringToImage() service is used to convert the string to a bitmap using the glyphs \r
-  registered with the HII database. No wrapping is performed, so any portions of the \r
-  string the fall outside the active display region will not be displayed. Please see \r
+  StringToImage() service is used to convert the string to a bitmap using the glyphs\r
+  registered with the HII database. No wrapping is performed, so any portions of the\r
+  string the fall outside the active display region will not be displayed. Please see\r

   Section 27.2.6 of the UEFI Specification for a description of the supported string\r
   format including the set of control codes supported by the StringToImage() service.\r
 \r
   Section 27.2.6 of the UEFI Specification for a description of the supported string\r
   format including the set of control codes supported by the StringToImage() service.\r
 \r

-  If a graphics console device is not associated with the ConsoleOutputHandle \r
+  If a graphics console device is not associated with the ConsoleOutputHandle\r

   defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.\r
   defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.\r

-  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no \r
+  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no\r

   string is printed, and 0 is returned.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r
   string is printed, and 0 is returned.\r
   If Format is NULL, then ASSERT().\r
   If Format is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -590,13 +590,13 @@ Error:
                        then the foreground color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
   @param  BackGround   The background color of the string being printed.  This is\r
                        then the foreground color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
   @param  BackGround   The background color of the string being printed.  This is\r

-                       an optional parameter that may be NULL.  If it is NULL, \r
+                       an optional parameter that may be NULL.  If it is NULL,\r

                        then the background color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
                        then the background color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r

-  @param  Format       A Null-terminated Unicode format string.  See Print Library \r
+  @param  Format       A Null-terminated Unicode format string.  See Print Library\r

                        for the supported format string syntax.\r
                        for the supported format string syntax.\r

-  @param  ...          A Variable argument list whose contents are accessed based on \r
-                       the format string specified by Format.         \r
+  @param  ...          A Variable argument list whose contents are accessed based on\r
+                       the format string specified by Format.\r

 \r
   @return  The number of Unicode characters printed.\r
 \r
 \r
   @return  The number of Unicode characters printed.\r
 \r


@@ -640,24 +640,24 @@ PrintXY (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Prints a formatted ASCII string to a graphics console device specified by \r
+  Prints a formatted ASCII string to a graphics console device specified by\r

   ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.\r
 \r
   ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.\r
 \r

-  This function prints a formatted ASCII string to the graphics console device \r
-  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of \r
-  ASCII characters displayed, not including partial characters that may be clipped \r
+  This function prints a formatted ASCII string to the graphics console device\r
+  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of\r
+  ASCII characters displayed, not including partial characters that may be clipped\r

   by the right edge of the display.  If the length of the formatted ASCII string is\r
   by the right edge of the display.  If the length of the formatted ASCII string is\r

-  greater than PcdUefiLibMaxPrintBufferSize, then at most the first \r
+  greater than PcdUefiLibMaxPrintBufferSize, then at most the first\r

   PcdUefiLibMaxPrintBufferSize characters are printed.The EFI_HII_FONT_PROTOCOL\r
   PcdUefiLibMaxPrintBufferSize characters are printed.The EFI_HII_FONT_PROTOCOL\r

-  StringToImage() service is used to convert the string to a bitmap using the glyphs \r
-  registered with the HII database. No wrapping is performed, so any portions of the \r
-  string the fall outside the active display region will not be displayed. Please see \r
+  StringToImage() service is used to convert the string to a bitmap using the glyphs\r
+  registered with the HII database. No wrapping is performed, so any portions of the\r
+  string the fall outside the active display region will not be displayed. Please see\r

   Section 27.2.6 of the UEFI Specification for a description of the supported string\r
   format including the set of control codes supported by the StringToImage() service.\r
 \r
   Section 27.2.6 of the UEFI Specification for a description of the supported string\r
   format including the set of control codes supported by the StringToImage() service.\r
 \r

-  If a graphics console device is not associated with the ConsoleOutputHandle \r
+  If a graphics console device is not associated with the ConsoleOutputHandle\r

   defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.\r
   defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.\r

-  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no \r
+  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no\r

   string is printed, and 0 is returned.\r
   If Format is NULL, then ASSERT().\r
   If gST->ConsoleOutputHandle is NULL, then ASSERT().\r
   string is printed, and 0 is returned.\r
   If Format is NULL, then ASSERT().\r
   If gST->ConsoleOutputHandle is NULL, then ASSERT().\r


@@ -669,13 +669,13 @@ PrintXY (
                        then the foreground color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
   @param  BackGround   The background color of the string being printed.  This is\r
                        then the foreground color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
   @param  BackGround   The background color of the string being printed.  This is\r

-                       an optional parameter that may be NULL.  If it is NULL, \r
+                       an optional parameter that may be NULL.  If it is NULL,\r

                        then the background color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r
                        then the background color of the current ConOut device\r
                        in the EFI_SYSTEM_TABLE is used.\r

-  @param  Format       A Null-terminated ASCII format string.  See Print Library \r
+  @param  Format       A Null-terminated ASCII format string.  See Print Library\r

                        for the supported format string syntax.\r
                        for the supported format string syntax.\r

-  @param  ...          Variable argument list whose contents are accessed based on \r
-                       the format string specified by Format.         \r
+  @param  ...          Variable argument list whose contents are accessed based on\r
+                       the format string specified by Format.\r

 \r
   @return  The number of ASCII characters printed.\r
 \r
 \r
   @return  The number of ASCII characters printed.\r
 \r


@@ -717,25 +717,25 @@ AsciiPrintXY (
   return ReturnNum;\r
 }\r
 \r
   return ReturnNum;\r
 }\r
 \r

-/** \r
+/**\r

   Appends a formatted Unicode string to a Null-terminated Unicode string\r
   Appends a formatted Unicode string to a Null-terminated Unicode string\r

- \r
-  This function appends a formatted Unicode string to the Null-terminated \r
+\r
+  This function appends a formatted Unicode string to the Null-terminated\r

   Unicode string specified by String.   String is optional and may be NULL.\r
   Unicode string specified by String.   String is optional and may be NULL.\r

-  Storage for the formatted Unicode string returned is allocated using \r
+  Storage for the formatted Unicode string returned is allocated using\r

   AllocatePool().  The pointer to the appended string is returned.  The caller\r
   is responsible for freeing the returned string.\r
   AllocatePool().  The pointer to the appended string is returned.  The caller\r
   is responsible for freeing the returned string.\r

- \r
+\r

   If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().\r
   If FormatString is NULL, then ASSERT().\r
   If FormatString is not aligned on a 16-bit boundary, then ASSERT().\r
   If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().\r
   If FormatString is NULL, then ASSERT().\r
   If FormatString is not aligned on a 16-bit boundary, then ASSERT().\r

- \r
+\r

   @param[in] String         A Null-terminated Unicode string.\r
   @param[in] FormatString   A Null-terminated Unicode format string.\r
   @param[in]  Marker        VA_LIST marker for the variable argument list.\r
 \r
   @retval NULL    There was not enough available memory.\r
   @param[in] String         A Null-terminated Unicode string.\r
   @param[in] FormatString   A Null-terminated Unicode format string.\r
   @param[in]  Marker        VA_LIST marker for the variable argument list.\r
 \r
   @retval NULL    There was not enough available memory.\r

-  @return         Null-terminated Unicode string is that is the formatted \r
+  @return         Null-terminated Unicode string is that is the formatted\r

                   string appended to String.\r
 **/\r
 CHAR16*\r
                   string appended to String.\r
 **/\r
 CHAR16*\r


@@ -780,27 +780,27 @@ CatVSPrint (
   return (BufferToReturn);\r
 }\r
 \r
   return (BufferToReturn);\r
 }\r
 \r

-/** \r
+/**\r

   Appends a formatted Unicode string to a Null-terminated Unicode string\r
   Appends a formatted Unicode string to a Null-terminated Unicode string\r

- \r
-  This function appends a formatted Unicode string to the Null-terminated \r
+\r
+  This function appends a formatted Unicode string to the Null-terminated\r

   Unicode string specified by String.   String is optional and may be NULL.\r
   Unicode string specified by String.   String is optional and may be NULL.\r

-  Storage for the formatted Unicode string returned is allocated using \r
+  Storage for the formatted Unicode string returned is allocated using\r

   AllocatePool().  The pointer to the appended string is returned.  The caller\r
   is responsible for freeing the returned string.\r
   AllocatePool().  The pointer to the appended string is returned.  The caller\r
   is responsible for freeing the returned string.\r

- \r
+\r

   If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().\r
   If FormatString is NULL, then ASSERT().\r
   If FormatString is not aligned on a 16-bit boundary, then ASSERT().\r
   If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().\r
   If FormatString is NULL, then ASSERT().\r
   If FormatString is not aligned on a 16-bit boundary, then ASSERT().\r

- \r
+\r

   @param[in] String         A Null-terminated Unicode string.\r
   @param[in] FormatString   A Null-terminated Unicode format string.\r
   @param[in] String         A Null-terminated Unicode string.\r
   @param[in] FormatString   A Null-terminated Unicode format string.\r

-  @param[in] ...            The variable argument list whose contents are \r
-                            accessed based on the format string specified by \r
+  @param[in] ...            The variable argument list whose contents are\r
+                            accessed based on the format string specified by\r

                             FormatString.\r
 \r
   @retval NULL    There was not enough available memory.\r
                             FormatString.\r
 \r
   @retval NULL    There was not enough available memory.\r

-  @return         Null-terminated Unicode string is that is the formatted \r
+  @return         Null-terminated Unicode string is that is the formatted\r

                   string appended to String.\r
 **/\r
 CHAR16 *\r
                   string appended to String.\r
 **/\r
 CHAR16 *\r

diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c
index fc3a6ea74a0e44e6b5015b08e5e23391fac12894..6bbd7c137ff586baa4bd25945416918288f062f1 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/MdePkg/Library/UefiLib/UefiNotTiano.c
@@ -6,7 +6,7 @@
   (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way. This module is a DXE driver as\r
   it contains DXE enum extensions for EFI event services.\r
 \r
   (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way. This module is a DXE driver as\r
   it contains DXE enum extensions for EFI event 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


@@ -54,8 +54,8 @@ EfiCreateEventLegacyBoot (
 \r
 /**\r
   Create an EFI event in the Legacy Boot Event Group and allows\r
 \r
 /**\r
   Create an EFI event in the Legacy Boot Event Group and allows\r

-  the caller to specify a notification function.  \r
-  \r
+  the caller to specify a notification function.\r
+\r

   This function abstracts the creation of the Legacy Boot Event.\r
   The Framework moved from a proprietary to UEFI 2.0 based mechanism.\r
   This library abstracts the caller from how this event is created to prevent\r
   This function abstracts the creation of the Legacy Boot Event.\r
   The Framework moved from a proprietary to UEFI 2.0 based mechanism.\r
   This library abstracts the caller from how this event is created to prevent\r


@@ -120,10 +120,10 @@ EfiCreateEventLegacyBootEx (
   Create an EFI event in the Ready To Boot Event Group.\r
 \r
   Prior to UEFI 2.0 this was done via a non-standard UEFI extension, and this library\r
   Create an EFI event in the Ready To Boot Event Group.\r
 \r
   Prior to UEFI 2.0 this was done via a non-standard UEFI extension, and this library\r

-  abstracts the implementation mechanism of this event from the caller.   \r
-  This function abstracts the creation of the Ready to Boot Event.  The Framework \r
-  moved from a proprietary to UEFI 2.0-based mechanism.  This library abstracts \r
-  the caller from how this event is created to prevent the code form having to \r
+  abstracts the implementation mechanism of this event from the caller.\r
+  This function abstracts the creation of the Ready to Boot Event.  The Framework\r
+  moved from a proprietary to UEFI 2.0-based mechanism.  This library abstracts\r
+  the caller from how this event is created to prevent the code form having to\r

   change with the version of the specification supported.\r
   If ReadyToBootEvent is NULL, then ASSERT().\r
 \r
   change with the version of the specification supported.\r
   If ReadyToBootEvent is NULL, then ASSERT().\r
 \r


@@ -149,8 +149,8 @@ EfiCreateEventReadyToBoot (
 \r
 /**\r
   Create an EFI event in the Ready To Boot Event Group and allows\r
 \r
 /**\r
   Create an EFI event in the Ready To Boot Event Group and allows\r

-  the caller to specify a notification function.  \r
-  \r
+  the caller to specify a notification function.\r
+\r

   This function abstracts the creation of the Ready to Boot Event.\r
   The Framework moved from a proprietary to UEFI 2.0 based mechanism.\r
   This library abstracts the caller from how this event is created to prevent\r
   This function abstracts the creation of the Ready to Boot Event.\r
   The Framework moved from a proprietary to UEFI 2.0 based mechanism.\r
   This library abstracts the caller from how this event is created to prevent\r


@@ -214,7 +214,7 @@ EfiCreateEventReadyToBootEx (
 \r
 /**\r
   Create, Signal, and Close the Ready to Boot event using EfiSignalEventReadyToBoot().\r
 \r
 /**\r
   Create, Signal, and Close the Ready to Boot event using EfiSignalEventReadyToBoot().\r

-  \r
+\r

   This function abstracts the signaling of the Ready to Boot Event. The Framework moved\r
   from a proprietary to UEFI 2.0 based mechanism. This library abstracts the caller\r
   from how this event is created to prevent to code form having to change with the\r
   This function abstracts the signaling of the Ready to Boot Event. The Framework moved\r
   from a proprietary to UEFI 2.0 based mechanism. This library abstracts the caller\r
   from how this event is created to prevent to code form having to change with the\r


@@ -264,14 +264,14 @@ EfiSignalEventLegacyBoot (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Check to see if the Firmware Volume (FV) Media Device Path is valid \r
-  \r
-  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.  \r
+  Check to see if the Firmware Volume (FV) Media Device Path is valid\r
+\r
+  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.\r

   This library function abstracts validating a device path node.\r
   This library function abstracts validating a device path node.\r

-  Check the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure to see if it's valid.  \r
-  If it is valid, then return the GUID file name from the device path node.  Otherwise, \r
-  return NULL.  This device path changed in the DXE CIS version 0.92 in a non back ward \r
-  compatible way to not conflict with the UEFI 2.0 specification.  This function abstracts \r
+  Check the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure to see if it's valid.\r
+  If it is valid, then return the GUID file name from the device path node.  Otherwise,\r
+  return NULL.  This device path changed in the DXE CIS version 0.92 in a non back ward\r
+  compatible way to not conflict with the UEFI 2.0 specification.  This function abstracts\r

   the differences from the caller.\r
   If FvDevicePathNode is NULL, then ASSERT().\r
 \r
   the differences from the caller.\r
   If FvDevicePathNode is NULL, then ASSERT().\r
 \r


@@ -300,16 +300,16 @@ EfiGetNameGuidFromFwVolDevicePathNode (
 \r
 /**\r
   Initialize a Firmware Volume (FV) Media Device Path node.\r
 \r
 /**\r
   Initialize a Firmware Volume (FV) Media Device Path node.\r

-  \r
-  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.  \r
-  This library function abstracts initializing a device path node.  \r
-  Initialize the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure.  This device \r
-  path changed in the DXE CIS version 0.92 in a non back ward compatible way to \r
-  not conflict with the UEFI 2.0 specification.  This function abstracts the \r
+\r
+  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.\r
+  This library function abstracts initializing a device path node.\r
+  Initialize the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure.  This device\r
+  path changed in the DXE CIS version 0.92 in a non back ward compatible way to\r
+  not conflict with the UEFI 2.0 specification.  This function abstracts the\r

   differences from the caller.\r
   If FvDevicePathNode is NULL, then ASSERT().\r
   If NameGuid is NULL, then ASSERT().\r
   differences from the caller.\r
   If FvDevicePathNode is NULL, then ASSERT().\r
   If NameGuid is NULL, then ASSERT().\r

-  \r
+\r

   @param  FvDevicePathNode  The pointer to a FV device path node to initialize\r
   @param  NameGuid          FV file name to use in FvDevicePathNode\r
 \r
   @param  FvDevicePathNode  The pointer to a FV device path node to initialize\r
   @param  NameGuid          FV file name to use in FvDevicePathNode\r
 \r

diff --git a/MdePkg/Library/UefiMemoryAllocationLib/MemoryAllocationLib.c b/MdePkg/Library/UefiMemoryAllocationLib/MemoryAllocationLib.c
index 3bd3aefa216d459a80ef2cd44e6c6e24551464ea..dce13bbdf5e6be9af4aaca92520d9ca4b6fde181 100644 (file)
--- a/MdePkg/Library/UefiMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdePkg/Library/UefiMemoryAllocationLib/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.\r
 \r
   on boot services for Dxe phase drivers.\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


@@ -37,12 +37,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


@@ -129,11 +129,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


@@ -172,7 +172,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


@@ -188,7 +188,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


@@ -202,7 +202,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


@@ -245,7 +245,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


@@ -273,7 +273,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


@@ -301,7 +301,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


@@ -328,13 +328,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


@@ -368,7 +368,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


@@ -461,9 +461,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


@@ -548,7 +548,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


@@ -559,10 +559,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


@@ -574,7 +574,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


@@ -583,9 +583,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


@@ -610,9 +610,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


@@ -637,9 +637,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


@@ -661,19 +661,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


@@ -681,7 +681,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


@@ -701,18 +701,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


@@ -733,10 +733,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


@@ -744,7 +744,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


@@ -765,10 +765,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


@@ -776,7 +776,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


@@ -800,7 +800,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/MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c b/MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c
index 3e74647aa3eed8a1f249b0b66fddf695fae7176f..34e9b66a06f35d60748ed67d5a660593c79a2b00 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   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 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r


@@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @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

diff --git a/MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c b/MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c
index 21ea2d4ef47859ae0f6f7fdd108f10df9a66ba38..437253339f08c988052fcfcd885bbd25765b453e 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c
@@ -2,7 +2,7 @@
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   CopyMem() implementation.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -31,7 +31,7 @@
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r
   This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns\r
   DestinationBuffer.  The implementation must be reentrant, and it must handle the case\r
   where SourceBuffer overlaps DestinationBuffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/UefiMemoryLib/MemLibGuid.c b/MdePkg/Library/UefiMemoryLib/MemLibGuid.c
index cbb385fddfba8b4b7de2df526202264e8ce101f1..4cc95d3aab563392e6901f2ee5bf24d8cb5aadfd 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/UefiMemoryLib/MemLibGuid.c
@@ -2,7 +2,7 @@
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r
   Implementation of GUID functions.\r
 \r
   The following BaseMemoryLib instances contain the same copy of this file:\r

-  \r
+\r

     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r


@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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 @@
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r
 \r
   This function copies the contents of the 128-bit GUID specified by SourceGuid to\r
   DestinationGuid, and returns DestinationGuid.\r

-  \r
+\r

   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r
   If DestinationGuid is NULL, then ASSERT().\r
   If SourceGuid is NULL, then ASSERT().\r
 \r


@@ -63,7 +63,7 @@ CopyGuid (
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r
 \r
   This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.\r
   If there are any bit differences in the two GUIDs, then FALSE is returned.\r

-  \r
+\r

   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r
   If Guid1 is NULL, then ASSERT().\r
   If Guid2 is NULL, then ASSERT().\r
 \r


@@ -103,7 +103,7 @@ CompareGuid (
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r
   GUID value that matches Guid.  If a match is found, then a pointer to the matching\r
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.\r
   If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c
index 69a2ce97869b0eed08ad3f952c866e73bbf540cd..3eb0cbb2133e247a4431ec9105ce98a306fdb83c 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 16-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
   If Length is not aligned on a 16-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c
index 31f1d558a0d6255b0a1d8599920edabcc4487671..54bc4339e1656366a1a6da0dd82d79618115f9bd 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c
@@ -11,7 +11,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -32,7 +32,7 @@
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 32-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c
index 3819456b69d2ada1a9130ec2119091bbfbcc1edf..19f98fa1f95bfeadb99e1f8d81e60a5cc8737a27 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for a 64-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
   If Length is not aligned on a 64-bit boundary, then ASSERT().\r

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c
index 7fee8ae6d89d91299198cf0a0323e37c6dc9a1e7..ef63a54b7114b7bfa616d0410e3880ceae857d38 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -33,7 +33,7 @@
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   address to the highest address for an 8-bit value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r


@@ -57,19 +57,19 @@ ScanMem8 (
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
   }\r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r

- \r
+\r

   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r
   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);\r
 }\r
 \r
 /**\r

-  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching \r
+  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching\r

   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r
   UINTN sized value in the target buffer.\r
 \r
   This function searches the target buffer specified by Buffer and Length from the lowest\r
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,\r
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,\r
   then NULL is returned.  If Length is 0, then NULL is returned.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a UINTN boundary, then ASSERT().\r
   If Length is not aligned on a UINTN boundary, then ASSERT().\r

diff --git a/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c b/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
index 6efa407d3dfb079b94e61622fd088fbe6989a169..68a617e850b846e995a3b75d81ca6ee3e42faada 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
@@ -12,7 +12,7 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
 \r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r
   Fills a target buffer with a byte value, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with Value, and returns Buffer.\r

-  \r
+\r

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    Memory to set.\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   @param  Buffer    Memory to set.\r

diff --git a/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf b/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf
index 7382204f63d7dbde4fbcfae51a13f3838f2dbf7d..ce261b34318c2101e518074ae0c52ce68faaba4b 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf
+++ b/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf
@@ -4,7 +4,7 @@
 # Base Memory Library implementation that uses EFI Boot Services\r
 #  where possible for size reduction.\r
 #\r
 # Base Memory Library implementation that uses EFI Boot Services\r
 #  where possible for size reduction.\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 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                      = f1bbe03d-2f28-4dee-bec7-d98d7a30c36a\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = f1bbe03d-2f28-4dee-bec7-d98d7a30c36a\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = BaseMemoryLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = BaseMemoryLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

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

diff --git a/MdePkg/Library/UefiMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/UefiMemoryLib/ZeroMemWrapper.c
index a3aa7d10a689f53ec95fc196aec1faa721c1383d..9ab315b8cfe3758050375bc7980cc6cb8632c206 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/ZeroMemWrapper.c
@@ -11,8 +11,8 @@
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\r
     BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     UefiMemoryLib\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


@@ -29,7 +29,7 @@
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r
   Fills a target buffer with zeros, and returns the target buffer.\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r

-  \r
+\r

   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/UefiPalLib/UefiPalLib.c b/MdePkg/Library/UefiPalLib/UefiPalLib.c
index df52a9125f8576ae703ea406cf41e362f179919e..26f0be660b81de5f3806c5881361f7d3ee86397b 100644 (file)
--- a/MdePkg/Library/UefiPalLib/UefiPalLib.c
+++ b/MdePkg/Library/UefiPalLib/UefiPalLib.c
@@ -2,13 +2,13 @@
   PAL Library implementation retrieving the PAL Entry Point from the SAL System Table\r
   register in the EFI System Confguration Table.\r
 \r
   PAL Library implementation retrieving the PAL Entry Point from the SAL System Table\r
   register in the EFI System Confguration Table.\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 are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php.\r
   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   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/MdePkg/Library/UefiPciLibPciRootBridgeIo/PciLib.c b/MdePkg/Library/UefiPciLibPciRootBridgeIo/PciLib.c
index a14600040c8bed7c558dbd47f2f354365b354c78..575d9c1f91fe2e15ff51683e1b1da47b6443a69d 100644 (file)
--- a/MdePkg/Library/UefiPciLibPciRootBridgeIo/PciLib.c
+++ b/MdePkg/Library/UefiPciLibPciRootBridgeIo/PciLib.c
@@ -1,13 +1,13 @@
 /** @file\r
   PCI Library using PCI Root Bridge I/O Protocol.\r
 \r
 /** @file\r
   PCI Library using PCI Root Bridge I/O Protocol.\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 are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php.\r
   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   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


@@ -46,17 +46,17 @@
 //\r
 // Global varible to cache pointer to PCI Root Bridge I/O protocol.\r
 //\r
 //\r
 // Global varible to cache pointer to PCI Root Bridge I/O protocol.\r
 //\r

-EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL      *mPciRootBridgeIo = NULL; \r
+EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL      *mPciRootBridgeIo = NULL;\r

 \r
 /**\r
   The constructor function caches the pointer to PCI Root Bridge I/O protocol.\r
 \r
 /**\r
   The constructor function caches the pointer to PCI Root Bridge I/O protocol.\r

-  \r
+\r

   The constructor function locates PCI Root Bridge I/O protocol from protocol database.\r
   The constructor function locates PCI Root Bridge I/O 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


@@ -68,7 +68,7 @@ PciLibConstructor (
   )\r
 {\r
   EFI_STATUS  Status;\r
   )\r
 {\r
   EFI_STATUS  Status;\r

-  \r
+\r

   Status = gBS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**) &mPciRootBridgeIo);\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (mPciRootBridgeIo != NULL);\r
   Status = gBS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**) &mPciRootBridgeIo);\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (mPciRootBridgeIo != NULL);\r


@@ -143,19 +143,19 @@ DxePciLibPciRootBridgeIoWriteWorker (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Registers a PCI device so PCI configuration registers may be accessed after \r
+  Registers a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
-  Registers the PCI device specified by Address so all the PCI configuration registers \r
+\r
+  Registers the PCI device specified by Address so all the PCI configuration registers\r

   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r
   associated with that PCI device may be accessed after SetVirtualAddressMap() is called.\r

-  \r
+\r

   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If Address > 0x0FFFFFFF, then ASSERT().\r
 \r
   @param  Address The address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r

diff --git a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.c b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.c
index 7e57ec21f9695c305541a23e78e9d42733eb51b6..4661ed93868e6cc3a069af60799ac825718a1112 100644 (file)
--- a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.c
+++ b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.c
@@ -1,13 +1,13 @@
 /** @file\r
   PCI Segment Library implementation using PCI Root Bridge I/O Protocol.\r
 \r
 /** @file\r
   PCI Segment Library implementation using PCI Root Bridge I/O 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 are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php.\r
   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   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


@@ -23,14 +23,14 @@ UINTN                  mNumberOfPciRootBridges = 0;
 \r
 /**\r
   The constructor function caches data of PCI Root Bridge I/O Protocol instances.\r
 \r
 /**\r
   The constructor function caches data of PCI Root Bridge I/O Protocol instances.\r

-  \r
+\r

   The constructor function locates PCI Root Bridge I/O protocol instances,\r
   and caches the protocol instances, together with their segment numbers and bus ranges.\r
   The constructor function locates PCI Root Bridge I/O protocol instances,\r
   and caches the protocol instances, together with their segment numbers and bus ranges.\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


@@ -45,7 +45,7 @@ PciSegmentLibConstructor (
   UINTN                                Index;\r
   UINTN                                HandleCount;\r
   EFI_HANDLE                           *HandleBuffer;\r
   UINTN                                Index;\r
   UINTN                                HandleCount;\r
   EFI_HANDLE                           *HandleBuffer;\r

-  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL      *PciRootBridgeIo; \r
+  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL      *PciRootBridgeIo;\r

   EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR    *Descriptors;\r
 \r
   HandleCount     = 0;\r
   EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR    *Descriptors;\r
 \r
   HandleCount     = 0;\r


@@ -103,13 +103,13 @@ PciSegmentLibConstructor (
 \r
 /**\r
   The destructor function frees memory allocated by constructor.\r
 \r
 /**\r
   The destructor function frees memory allocated by constructor.\r

-  \r
+\r

   The destructor function frees memory for data of protocol instances allocated by constructor.\r
   The destructor function frees memory for data of protocol instances allocated by constructor.\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


@@ -159,7 +159,7 @@ PciSegmentLibSearchForRootBridge (
       if (BusNumber >= mPciRootBridgeData[Index].MinBusNumber && BusNumber <= mPciRootBridgeData[Index].MaxBusNumber) {\r
         return mPciRootBridgeData[Index].PciRootBridgeIo;\r
       }\r
       if (BusNumber >= mPciRootBridgeData[Index].MinBusNumber && BusNumber <= mPciRootBridgeData[Index].MaxBusNumber) {\r
         return mPciRootBridgeData[Index].PciRootBridgeIo;\r
       }\r

-    }    \r
+    }\r

   }\r
   return NULL;\r
 }\r
   }\r
   return NULL;\r
 }\r


@@ -185,7 +185,7 @@ DxePciSegmentLibPciRootBridgeIoReadWorker (
   )\r
 {\r
   UINT32                               Data;\r
   )\r
 {\r
   UINT32                               Data;\r

-  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL      *PciRootBridgeIo; \r
+  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL      *PciRootBridgeIo;\r

 \r
   PciRootBridgeIo = PciSegmentLibSearchForRootBridge (Address);\r
   ASSERT (PciRootBridgeIo != NULL);\r
 \r
   PciRootBridgeIo = PciSegmentLibSearchForRootBridge (Address);\r
   ASSERT (PciRootBridgeIo != NULL);\r


@@ -224,7 +224,7 @@ DxePciSegmentLibPciRootBridgeIoWriteWorker (
   IN  UINT32                                 Data\r
   )\r
 {\r
   IN  UINT32                                 Data\r
   )\r
 {\r

-  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL      *PciRootBridgeIo; \r
+  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL      *PciRootBridgeIo;\r

 \r
   PciRootBridgeIo = PciSegmentLibSearchForRootBridge (Address);\r
   ASSERT (PciRootBridgeIo != NULL);\r
 \r
   PciRootBridgeIo = PciSegmentLibSearchForRootBridge (Address);\r
   ASSERT (PciRootBridgeIo != NULL);\r


@@ -241,16 +241,16 @@ DxePciSegmentLibPciRootBridgeIoWriteWorker (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Register a PCI device so PCI configuration registers may be accessed after \r
+  Register a PCI device so PCI configuration registers may be accessed after\r

   SetVirtualAddressMap().\r
   SetVirtualAddressMap().\r

-  \r
+\r

   If any reserved bits in Address are set, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r
   If any reserved bits in Address are set, then ASSERT().\r
 \r
   @param  Address Address that encodes the PCI Bus, Device, Function and\r
                   Register.\r

-  \r
+\r

   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r
   @retval RETURN_SUCCESS           The PCI device was registered for runtime access.\r

-  @retval RETURN_UNSUPPORTED       An attempt was made to call this function \r
+  @retval RETURN_UNSUPPORTED       An attempt was made to call this function\r

                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r
                                    after ExitBootServices().\r
   @retval RETURN_UNSUPPORTED       The resources required to access the PCI device\r
                                    at runtime could not be mapped.\r

diff --git a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.h b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.h
index 7f130feea2413624146bd5e5accf38223240ec70..699a5b5341c3824e8496acd08367aef1e423c5d0 100644 (file)
--- a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.h
+++ b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.h
@@ -1,13 +1,13 @@
 /** @file\r
   Include file of PciSegmentPciRootBridgeIo Library.\r
 \r
 /** @file\r
   Include file of PciSegmentPciRootBridgeIo Library.\r
 \r

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

   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php.\r
   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   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/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
index ba8b8621fb811103980c186318084178a63e60d4..86c70276552d48900dc662bde0f4595c5c1b390a 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
@@ -3,10 +3,10 @@
 \r
   This library hides the global variable for the EFI Runtime Services so the\r
   caller does not need to deal with the possibility of being called from an\r
 \r
   This library hides the global variable for the EFI Runtime Services so the\r
   caller does not need to deal with the possibility of being called from an\r

-  OS virtual address space. All pointer values are different for a virtual \r
+  OS virtual address space. All pointer values are different for a virtual\r

   mapping than from the normal physical mapping at boot services time.\r
 \r
   mapping than from the normal physical mapping at boot services time.\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


@@ -125,7 +125,7 @@ RuntimeDriverLibConstruct (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  If a runtime driver exits with an error, it must call this routine \r
+  If a runtime driver exits with an error, it must call this routine\r

   to free the allocated resource before the exiting.\r
   It will ASSERT() if gBS is NULL.\r
   It will ASSERT() if that operation fails.\r
   to free the allocated resource before the exiting.\r
   It will ASSERT() if gBS is NULL.\r
   It will ASSERT() if that operation fails.\r


@@ -180,7 +180,7 @@ EfiAtRuntime (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function allows the caller to determine if UEFI SetVirtualAddressMap() has been called. \r
+  This function allows the caller to determine if UEFI SetVirtualAddressMap() has been called.\r

 \r
   This function returns TRUE after all the EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE functions have\r
   executed as a result of the OS calling SetVirtualAddressMap(). Prior to this time FALSE\r
 \r
   This function returns TRUE after all the EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE functions have\r
   executed as a result of the OS calling SetVirtualAddressMap(). Prior to this time FALSE\r


@@ -466,7 +466,7 @@ EfiGetNextVariableName (
   Variables are stored by the firmware and may maintain their values across power cycles. Each vendor\r
   may create and manage its own variables without the risk of name conflicts by using a unique VendorGuid.\r
 \r
   Variables are stored by the firmware and may maintain their values across power cycles. Each vendor\r
   may create and manage its own variables without the risk of name conflicts by using a unique VendorGuid.\r
 \r

-  @param  VariableName The name of the vendor's variable; it's a Null-Terminated \r
+  @param  VariableName The name of the vendor's variable; it's a Null-Terminated\r

                        Unicode String\r
   @param  VendorGuid   Unify identifier for vendor.\r
   @param  Attributes   Points to a memory location to return the attributes of variable. If the point\r
                        Unicode String\r
   @param  VendorGuid   Unify identifier for vendor.\r
   @param  Attributes   Points to a memory location to return the attributes of variable. If the point\r


@@ -530,7 +530,7 @@ EfiGetNextHighMonotonicCount (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  This service is a wrapper for the UEFI Runtime Service ConvertPointer().  \r
+  This service is a wrapper for the UEFI Runtime Service ConvertPointer().\r

 \r
   The ConvertPointer() function is used by an EFI component during the SetVirtualAddressMap() operation.\r
   ConvertPointer()must be called using physical address pointers during the execution of SetVirtualAddressMap().\r
 \r
   The ConvertPointer() function is used by an EFI component during the SetVirtualAddressMap() operation.\r
   ConvertPointer()must be called using physical address pointers during the execution of SetVirtualAddressMap().\r


@@ -562,7 +562,7 @@ EfiConvertPointer (
   Determines the new virtual address that is to be used on subsequent memory accesses.\r
 \r
   For IA32, x64, and EBC, this service is a wrapper for the UEFI Runtime Service\r
   Determines the new virtual address that is to be used on subsequent memory accesses.\r
 \r
   For IA32, x64, and EBC, this service is a wrapper for the UEFI Runtime Service\r

-  ConvertPointer().  See the UEFI Specification for details. \r
+  ConvertPointer().  See the UEFI Specification for details.\r

   For IPF, this function interprets Address as a pointer to an EFI_PLABEL structure\r
   and both the EntryPoint and GP fields of an EFI_PLABEL are converted from physical\r
   to virtiual addressing.  Since IPF allows the GP to point to an address outside\r
   For IPF, this function interprets Address as a pointer to an EFI_PLABEL structure\r
   and both the EntryPoint and GP fields of an EFI_PLABEL are converted from physical\r
   to virtiual addressing.  Since IPF allows the GP to point to an address outside\r


@@ -614,7 +614,7 @@ EfiConvertList (
 {\r
   LIST_ENTRY  *Link;\r
   LIST_ENTRY  *NextLink;\r
 {\r
   LIST_ENTRY  *Link;\r
   LIST_ENTRY  *NextLink;\r

-  \r
+\r

   //\r
   // For NULL List, return EFI_SUCCESS\r
   //\r
   //\r
   // For NULL List, return EFI_SUCCESS\r
   //\r

diff --git a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
index 8f46495fc5f8978cddd2a5ff7a184a4693daa9bd..98fb5abab031f69d0b6705408d49611ca165f521 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+++ b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
@@ -5,7 +5,7 @@
 #  EVT_SIGNAL_EXIT_BOOT_SERVICES event, to provide runtime services.\r
 # This instance also supports SAL drivers for better performance.\r
 #\r
 #  EVT_SIGNAL_EXIT_BOOT_SERVICES event, to provide runtime services.\r
 # This instance also supports SAL drivers for better performance.\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


@@ -44,7 +44,7 @@
   UefiBootServicesTableLib\r
   UefiRuntimeServicesTableLib\r
   DebugLib\r
   UefiBootServicesTableLib\r
   UefiRuntimeServicesTableLib\r
   DebugLib\r

- \r
+\r

 [Guids]\r
   gEfiEventExitBootServicesGuid             ## CONSUMES ## Event\r
   gEfiEventVirtualAddressChangeGuid         ## CONSUMES ## Event\r
 [Guids]\r
   gEfiEventExitBootServicesGuid             ## CONSUMES ## Event\r
   gEfiEventVirtualAddressChangeGuid         ## CONSUMES ## Event\r

diff --git a/MdePkg/Library/UefiSalLib/UefiSalLib.c b/MdePkg/Library/UefiSalLib/UefiSalLib.c
index e79c7ce8a936225013964fe2b5422d0dccb3641c..3cfc89fc5258e32deaeaf1a85cddf5659ffa6386 100644 (file)
--- a/MdePkg/Library/UefiSalLib/UefiSalLib.c
+++ b/MdePkg/Library/UefiSalLib/UefiSalLib.c
@@ -2,13 +2,13 @@
   SAL Library implementation retrieving the SAL Entry Point from the SAL System Table\r
   register in the EFI System Configuration Table.\r
 \r
   SAL Library implementation retrieving the SAL Entry Point from the SAL System Table\r
   register in the EFI System Configuration Table.\r
 \r

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

   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php.\r
   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   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,8 +28,8 @@ SAL_PROC         mSalProcEntry;
 \r
 /**\r
   Makes a SAL procedure call.\r
 \r
 /**\r
   Makes a SAL procedure call.\r

-  \r
-  This is a wrapper function to make a SAL procedure call.  \r
+\r
+  This is a wrapper function to make a SAL procedure call.\r

   No parameter checking is performed on the 8 input parameters,\r
   but there are some common rules that the caller should follow\r
   when making a SAL call.  Any address passed to SAL as buffers\r
   No parameter checking is performed on the 8 input parameters,\r
   but there are some common rules that the caller should follow\r
   when making a SAL call.  Any address passed to SAL as buffers\r

diff --git a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
index d399e2344fa6dd194edc50ba89f889601a78582c..62a73e27731cafe466804ed789f134d045590d6d 100644 (file)
--- a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
+++ b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
@@ -1,14 +1,14 @@
 /** @file\r
   UEFI SCSI Library implementation\r
 \r
 /** @file\r
   UEFI SCSI Library implementation\r
 \r

-  Copyright (c) 2006 - 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) 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


@@ -20,10 +20,10 @@
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r

-  \r
+\r

 #include <IndustryStandard/Scsi.h>\r
 #include <IndustryStandard/Scsi.h>\r

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

   //\r
   // Scsi Command Length\r
   //\r
   //\r
   // Scsi Command Length\r
   //\r


@@ -97,7 +97,7 @@ typedef struct {
                                     optional and may be NULL.\r
   @param[in, out] SenseDataLength   On input, a pointer to the length in bytes of\r
                                     the SenseData buffer. On output, a pointer to\r
                                     optional and may be NULL.\r
   @param[in, out] SenseDataLength   On input, a pointer to the length in bytes of\r
                                     the SenseData buffer. On output, a pointer to\r

-                                    the number of bytes written to the SenseData buffer. \r
+                                    the number of bytes written to the SenseData buffer.\r

   @param[out]     HostAdapterStatus The status of the SCSI Host Controller that produces\r
                                     the SCSI bus containing the SCSI target specified by\r
                                     ScsiIo when the SCSI Request Packet was executed.\r
   @param[out]     HostAdapterStatus The status of the SCSI Host Controller that produces\r
                                     the SCSI bus containing the SCSI target specified by\r
                                     ScsiIo when the SCSI Request Packet was executed.\r


@@ -107,7 +107,7 @@ typedef struct {
                                     by ScsiIo when the SCSI Request Packet was executed\r
                                     on the SCSI Host Controller. See the EFI SCSI I/O\r
                                     Protocol in the UEFI Specification for details on\r
                                     by ScsiIo when the SCSI Request Packet was executed\r
                                     on the SCSI Host Controller. See the EFI SCSI I/O\r
                                     Protocol in the UEFI Specification for details on\r

-                                    the possible return values. \r
+                                    the possible return values.\r

 \r
   @retval EFI_SUCCESS               The command was executed successfully.\r
                                     See HostAdapterStatus, TargetStatus, SenseDataLength,\r
 \r
   @retval EFI_SUCCESS               The command was executed successfully.\r
                                     See HostAdapterStatus, TargetStatus, SenseDataLength,\r


@@ -215,7 +215,7 @@ ScsiTestUnitReadyCommand (
                                          If SenseDataLength is 0, then this parameter\r
                                          is optional and may be NULL.\r
   @param[in, out] SenseDataLength        On input, the length in bytes of the SenseData buffer.\r
                                          If SenseDataLength is 0, then this parameter\r
                                          is optional and may be NULL.\r
   @param[in, out] SenseDataLength        On input, the length in bytes of the SenseData buffer.\r

-                                         On output, the number of bytes written to the SenseData buffer. \r
+                                         On output, the number of bytes written to the SenseData buffer.\r

   @param[out]     HostAdapterStatus      The status of the SCSI Host Controller that\r
                                          produces the SCSI bus containing the SCSI\r
                                          target specified by ScsiIo when the SCSI\r
   @param[out]     HostAdapterStatus      The status of the SCSI Host Controller that\r
                                          produces the SCSI bus containing the SCSI\r
                                          target specified by ScsiIo when the SCSI\r


@@ -227,12 +227,12 @@ ScsiTestUnitReadyCommand (
                                          executed on the SCSI Host Controller.\r
                                          See the EFI SCSI I/O Protocol in the UEFI\r
                                          Specification for details on the possible\r
                                          executed on the SCSI Host Controller.\r
                                          See the EFI SCSI I/O Protocol in the UEFI\r
                                          Specification for details on the possible\r

-                                         return values. \r
+                                         return values.\r

   @param[in, out] InquiryDataBuffer      A pointer to inquiry data that was generated\r
                                          by the execution of the SCSI Request Packet.\r
                                          This buffer must be allocated by the caller.\r
                                          If InquiryDataLength is 0, then this parameter\r
   @param[in, out] InquiryDataBuffer      A pointer to inquiry data that was generated\r
                                          by the execution of the SCSI Request Packet.\r
                                          This buffer must be allocated by the caller.\r
                                          If InquiryDataLength is 0, then this parameter\r

-                                         is optional and may be NULL. \r
+                                         is optional and may be NULL.\r

   @param[in, out] InquiryDataLength      On input, a pointer to the length in bytes\r
                                          of the InquiryDataBuffer buffer.\r
                                          On output, a pointer to the number of bytes\r
   @param[in, out] InquiryDataLength      On input, a pointer to the length in bytes\r
                                          of the InquiryDataBuffer buffer.\r
                                          On output, a pointer to the number of bytes\r


@@ -364,7 +364,7 @@ ScsiInquiryCommandEx (
                                          If SenseDataLength is 0, then this parameter\r
                                          is optional and may be NULL.\r
   @param[in, out] SenseDataLength        On input, the length in bytes of the SenseData buffer.\r
                                          If SenseDataLength is 0, then this parameter\r
                                          is optional and may be NULL.\r
   @param[in, out] SenseDataLength        On input, the length in bytes of the SenseData buffer.\r

-                                         On output, the number of bytes written to the SenseData buffer. \r
+                                         On output, the number of bytes written to the SenseData buffer.\r

   @param[out]     HostAdapterStatus      The status of the SCSI Host Controller that\r
                                          produces the SCSI bus containing the SCSI\r
                                          target specified by ScsiIo when the SCSI\r
   @param[out]     HostAdapterStatus      The status of the SCSI Host Controller that\r
                                          produces the SCSI bus containing the SCSI\r
                                          target specified by ScsiIo when the SCSI\r


@@ -376,12 +376,12 @@ ScsiInquiryCommandEx (
                                          executed on the SCSI Host Controller.\r
                                          See the EFI SCSI I/O Protocol in the UEFI\r
                                          Specification for details on the possible\r
                                          executed on the SCSI Host Controller.\r
                                          See the EFI SCSI I/O Protocol in the UEFI\r
                                          Specification for details on the possible\r

-                                         return values. \r
+                                         return values.\r

   @param[in, out] InquiryDataBuffer      A pointer to inquiry data that was generated\r
                                          by the execution of the SCSI Request Packet.\r
                                          This buffer must be allocated by the caller.\r
                                          If InquiryDataLength is 0, then this parameter\r
   @param[in, out] InquiryDataBuffer      A pointer to inquiry data that was generated\r
                                          by the execution of the SCSI Request Packet.\r
                                          This buffer must be allocated by the caller.\r
                                          If InquiryDataLength is 0, then this parameter\r

-                                         is optional and may be NULL. \r
+                                         is optional and may be NULL.\r

   @param[in, out] InquiryDataLength      On input, a pointer to the length in bytes\r
                                          of the InquiryDataBuffer buffer.\r
                                          On output, a pointer to the number of bytes\r
   @param[in, out] InquiryDataLength      On input, a pointer to the length in bytes\r
                                          of the InquiryDataBuffer buffer.\r
                                          On output, a pointer to the number of bytes\r


@@ -389,7 +389,7 @@ ScsiInquiryCommandEx (
   @param[in]      EnableVitalProductData If TRUE, then the supported vital product\r
                                          data is returned in InquiryDataBuffer.\r
                                          If FALSE, then the standard inquiry data is\r
   @param[in]      EnableVitalProductData If TRUE, then the supported vital product\r
                                          data is returned in InquiryDataBuffer.\r
                                          If FALSE, then the standard inquiry data is\r

-                                         returned in InquiryDataBuffer. \r
+                                         returned in InquiryDataBuffer.\r

 \r
   @retval EFI_SUCCESS                    The command was executed successfully. See HostAdapterStatus,\r
                                          TargetStatus, SenseDataLength, and SenseData in that order\r
 \r
   @retval EFI_SUCCESS                    The command was executed successfully. See HostAdapterStatus,\r
                                          TargetStatus, SenseDataLength, and SenseData in that order\r


@@ -481,7 +481,7 @@ ScsiInquiryCommand (
                                      If SenseDataLength is 0, then this parameter\r
                                      is optional and may be NULL.\r
   @param[in, out]  SenseDataLength   On input, the length in bytes of the SenseData buffer.\r
                                      If SenseDataLength is 0, then this parameter\r
                                      is optional and may be NULL.\r
   @param[in, out]  SenseDataLength   On input, the length in bytes of the SenseData buffer.\r

-                                     On output, the number of bytes written to the SenseData buffer. \r
+                                     On output, the number of bytes written to the SenseData buffer.\r

   @param[out]     HostAdapterStatus  The status of the SCSI Host Controller that\r
                                      produces the SCSI bus containing the SCSI target\r
                                      specified by ScsiIo when the SCSI Request Packet\r
   @param[out]     HostAdapterStatus  The status of the SCSI Host Controller that\r
                                      produces the SCSI bus containing the SCSI target\r
                                      specified by ScsiIo when the SCSI Request Packet\r


@@ -497,14 +497,14 @@ ScsiInquiryCommand (
                                      execution of the SCSI Request Packet.  This\r
                                      buffer must be allocated by the caller. If\r
                                      DataLength is 0, then this parameter is optional\r
                                      execution of the SCSI Request Packet.  This\r
                                      buffer must be allocated by the caller. If\r
                                      DataLength is 0, then this parameter is optional\r

-                                     and may be NULL. \r
+                                     and may be NULL.\r

   @param[in, out]  DataLength        On input, a pointer to the length in bytes of\r
                                      the DataBuffer buffer.  On output, a pointer\r
                                      to the number of bytes written to the DataBuffer\r
   @param[in, out]  DataLength        On input, a pointer to the length in bytes of\r
                                      the DataBuffer buffer.  On output, a pointer\r
                                      to the number of bytes written to the DataBuffer\r

-                                     buffer. \r
+                                     buffer.\r

   @param[in]      DBDField           Specifies the DBD field of the CDB for this SCSI Command.\r
   @param[in]      DBDField           Specifies the DBD field of the CDB for this SCSI Command.\r

-  @param[in]      PageControl        Specifies the PC field of the CDB for this SCSI Command. \r
-  @param[in]      PageCode           Specifies the Page Control field of the CDB for this SCSI Command. \r
+  @param[in]      PageControl        Specifies the PC field of the CDB for this SCSI Command.\r
+  @param[in]      PageCode           Specifies the Page Control field of the CDB for this SCSI Command.\r

 \r
   @retval EFI_SUCCESS                The command was executed successfully.\r
                                      See HostAdapterStatus, TargetStatus, SenseDataLength,\r
 \r
   @retval EFI_SUCCESS                The command was executed successfully.\r
                                      See HostAdapterStatus, TargetStatus, SenseDataLength,\r

diff --git a/MdePkg/Library/UefiScsiLib/UefiScsiLib.inf b/MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
index cd0c5c1ec80333c3ee5cbb5f730421d91a58be08..b66c5378905f3db31b0a492023014bfb9c80ef44 100644 (file)
--- a/MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
+++ b/MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
@@ -4,7 +4,7 @@
 # This libarary provides the functions to submit Scsi commands defined\r
 # in SCSI-2 specification for scsi device.\r
 #\r
 # This libarary provides the functions to submit Scsi commands defined\r
 # in SCSI-2 specification for scsi device.\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
 #\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                      = 280E42C3-826E-4573-9772-B74EF1086D95\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 280E42C3-826E-4573-9772-B74EF1086D95\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = UefiScsiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = UefiScsiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

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

diff --git a/MdePkg/Library/UefiUsbLib/Hid.c b/MdePkg/Library/UefiUsbLib/Hid.c
index 29d4e9dcf76698ac23639485c5c99ce716787944..fca02838f112704fda63e228819e49274cf859d5 100644 (file)
--- a/MdePkg/Library/UefiUsbLib/Hid.c
+++ b/MdePkg/Library/UefiUsbLib/Hid.c
@@ -2,13 +2,13 @@
 \r
   The library provides USB HID Class standard and specific requests defined\r
   in USB HID Firmware Specification 7 section : Requests.\r
 \r
   The library provides USB HID Class standard and specific requests defined\r
   in USB HID Firmware Specification 7 section : Requests.\r

-  \r
-  Copyright (c) 2004 - 2010, 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
   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


@@ -16,7 +16,7 @@
 \r
 #include "UefiUsbLibInternal.h"\r
 \r
 \r
 #include "UefiUsbLibInternal.h"\r
 \r

-//  \r
+//\r

 //  Hid RequestType Bits specifying characteristics of request.\r
 //  Valid values are 10100001b (0xa1) or 00100001b (0x21).\r
 //  The following description:\r
 //  Hid RequestType Bits specifying characteristics of request.\r
 //  Valid values are 10100001b (0xa1) or 00100001b (0x21).\r
 //  The following description:\r


@@ -228,7 +228,7 @@ UsbSetProtocolRequest (
   EFI_USB_DEVICE_REQUEST  Request;\r
 \r
   ASSERT (UsbIo != NULL);\r
   EFI_USB_DEVICE_REQUEST  Request;\r
 \r
   ASSERT (UsbIo != NULL);\r

-  \r
+\r

   //\r
   // Fill Device request packet\r
   //\r
   //\r
   // Fill Device request packet\r
   //\r


@@ -334,7 +334,7 @@ UsbGetIdleRequest (
   UINT32                  Status;\r
   EFI_STATUS              Result;\r
   EFI_USB_DEVICE_REQUEST  Request;\r
   UINT32                  Status;\r
   EFI_STATUS              Result;\r
   EFI_USB_DEVICE_REQUEST  Request;\r

-  \r
+\r

   ASSERT (UsbIo != NULL);\r
   ASSERT (Duration != NULL);\r
   //\r
   ASSERT (UsbIo != NULL);\r
   ASSERT (Duration != NULL);\r
   //\r

diff --git a/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h b/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
index cbd296e3249b6b8a965275cd98d1a46d7728c3a3..be785ae5b15e0f82d4bfed7a541397b1ec39f64d 100644 (file)
--- a/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
+++ b/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
@@ -1,10 +1,10 @@
 /** @file\r
 /** @file\r

-  \r
+\r

   Common header file shared by all source files.\r
 \r
   This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
 \r
   Common header file shared by all source files.\r
 \r
   This file includes package header files, library classes and protocol, PPI & GUID definitions.\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

diff --git a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
index b1fcbc50970fc5e9bd27cd5cefc624f8395a64ff..aba5091a279538dd03c05e22090ed4ee7b0ae16b 100644 (file)
--- a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
+++ b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
@@ -1,15 +1,15 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  The library provides the USB Standard Device Requests defined \r
+  The library provides the USB Standard Device Requests defined\r

   in Usb specification 9.4 section.\r
   in Usb specification 9.4 section.\r

-  \r
-  Copyright (c) 2004 - 2008, 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 are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php.\r
   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   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/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 432de804c5dda6f80b11b482eca06833b73ec400..94ad814dc9d62eae14dd20e78de728bf21523c81 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -1754,7 +1754,7 @@
 \r
   ## Include/Protocol/Tls.h\r
   gEfiTlsProtocolGuid                 = { 0xca959f, 0x6cfa, 0x4db1, {0x95, 0xbc, 0xe4, 0x6c, 0x47, 0x51, 0x43, 0x90 }}\r
 \r
   ## Include/Protocol/Tls.h\r
   gEfiTlsProtocolGuid                 = { 0xca959f, 0x6cfa, 0x4db1, {0x95, 0xbc, 0xe4, 0x6c, 0x47, 0x51, 0x43, 0x90 }}\r

-  \r
+\r

   ## Include/Protocol/TlsConfig.h\r
   gEfiTlsConfigurationProtocolGuid    = { 0x1682fe44, 0xbd7a, 0x4407, { 0xb7, 0xc7, 0xdc, 0xa3, 0x7c, 0xa3, 0x92, 0x2d }}\r
 \r
   ## Include/Protocol/TlsConfig.h\r
   gEfiTlsConfigurationProtocolGuid    = { 0x1682fe44, 0xbd7a, 0x4407, { 0xb7, 0xc7, 0xdc, 0xa3, 0x7c, 0xa3, 0x92, 0x2d }}\r
 \r

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index cf20bc3a1fcf559d85ee99122b9e88f0852e4054..c7b93d4c8c44eb6a28eca8842d5be6875566965c 100644 (file)
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -179,8 +179,8 @@
   MdePkg/Library/DxePciSegmentLibEsal/DxePciSegmentLibEsal.inf\r
   MdePkg/Library/DxeRuntimeExtendedSalLib/DxeRuntimeExtendedSalLib.inf\r
   MdePkg/Library/DxeSalLibEsal/DxeSalLibEsal.inf\r
   MdePkg/Library/DxePciSegmentLibEsal/DxePciSegmentLibEsal.inf\r
   MdePkg/Library/DxeRuntimeExtendedSalLib/DxeRuntimeExtendedSalLib.inf\r
   MdePkg/Library/DxeSalLibEsal/DxeSalLibEsal.inf\r

-  MdePkg/Library/DxeTimerLibEsal/DxeTimerLibEsal.inf  \r
-  \r
+  MdePkg/Library/DxeTimerLibEsal/DxeTimerLibEsal.inf\r
+\r

 [Components.EBC]\r
   MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
   MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
 [Components.EBC]\r
   MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
   MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r

diff --git a/MdePkg/MdePkg.uni b/MdePkg/MdePkg.uni
index 18bb01f2199b43491c75af8af245706d89c4eb1b..85d46e05a604ed7b1e18e1826cc52890867fde05 100644 (file)
--- a/MdePkg/MdePkg.uni
+++ b/MdePkg/MdePkg.uni
@@ -4,14 +4,14 @@
 // It also provides the definitions(including PPIs/PROTOCOLs/GUIDs) of\r
 // EFI1.10/UEFI2.4/PI1.3 and some Industry Standards.\r
 //\r
 // It also provides the definitions(including PPIs/PROTOCOLs/GUIDs) of\r
 // EFI1.10/UEFI2.4/PI1.3 and some Industry Standards.\r
 //\r

-// Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2007 - 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 are licensed and made available under\r
 // the terms and conditions of the BSD License which accompanies this distribution.\r
 // The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 // Portions copyright (c) 2008 - 2009, Apple Inc. 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 which 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/MdePkg/MdePkgExtra.uni b/MdePkg/MdePkgExtra.uni
index 1e23fe9c43397986866b1c0db95797515e34a555..3db1a764eb5e5adf2667d3080694131b70c30681 100644 (file)
--- a/MdePkg/MdePkgExtra.uni
+++ b/MdePkg/MdePkgExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // Mde Package Localized Strings and Content.\r
 //\r
 // /** @file\r
 // Mde 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
 // Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 //\r
 //\r
 // Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 //\r


@@ -15,6 +15,6 @@
 //\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

 "Mde package"\r
 "Mde package"\r