Fixed build issues for DxeCoreHobLib and BaseUefiDecompressLib.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2752 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Library/BaseMemoryLib.h b/MdePkg/Include/Library/BaseMemoryLib.h
index 66051525ec513459f213239a7b7c1a5149818e2e..18a6b8dfbbbef87b2b1f8e31983f52e2597b324c 100644 (file)
--- a/MdePkg/Include/Library/BaseMemoryLib.h
+++ b/MdePkg/Include/Library/BaseMemoryLib.h
@@ -23,8 +23,8 @@
   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

-  If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). \r
-  If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). \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
   @param  DestinationBuffer   Pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        Pointer to the source buffer of the memory copy.\r
 \r
   @param  DestinationBuffer   Pointer to the destination buffer of the memory copy.\r
   @param  SourceBuffer        Pointer to the source buffer of the memory copy.\r


@@ -45,7 +45,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

-  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    Memory to set.\r
   @param  Length    Number of bytes to set.\r
 \r
   @param  Buffer    Memory to set.\r
   @param  Length    Number of bytes to set.\r


@@ -148,7 +148,7 @@ SetMem64 (
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r
 \r
   This function fills Length bytes of Buffer with zeros, and returns Buffer.\r
   If Length > 0 and Buffer is NULL, then ASSERT().\r

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().\r

 \r
   @param  Buffer      Pointer to the target buffer to fill with zeros.\r
   @param  Length      Number of bytes in Buffer to fill with zeros.\r
 \r
   @param  Buffer      Pointer to the target buffer to fill with zeros.\r
   @param  Length      Number of bytes in Buffer to fill with zeros.\r


@@ -172,8 +172,8 @@ ZeroMem (
   mismatched byte in DestinationBuffer.\r
   If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().\r
   mismatched byte in DestinationBuffer.\r
   If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().\r
   If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().\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
+  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
   @param  DestinationBuffer Pointer to the destination buffer to compare.\r
   @param  SourceBuffer      Pointer to the source buffer to compare.\r
 \r
   @param  DestinationBuffer Pointer to the destination buffer to compare.\r
   @param  SourceBuffer      Pointer to the source buffer to compare.\r


@@ -201,7 +201,7 @@ CompareMem (
   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
   If Length > 0 and Buffer is NULL, then ASSERT().\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
   If Length > 0 and Buffer is NULL, then ASSERT().\r

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().\r

 \r
   @param  Buffer      Pointer to the target buffer to scan.\r
   @param  Length      Number of bytes in Buffer to scan.\r
 \r
   @param  Buffer      Pointer to the target buffer to scan.\r
   @param  Length      Number of bytes in Buffer to scan.\r


@@ -229,7 +229,7 @@ ScanMem8 (
   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

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().\r

 \r
   @param  Buffer      Pointer to the target buffer to scan.\r
   @param  Length      Number of bytes in Buffer to scan.\r
 \r
   @param  Buffer      Pointer to the target buffer to scan.\r
   @param  Length      Number of bytes in Buffer to scan.\r


@@ -257,7 +257,7 @@ ScanMem16 (
   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

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().\r

 \r
   @param  Buffer      Pointer to the target buffer to scan.\r
   @param  Length      Number of bytes in Buffer to scan.\r
 \r
   @param  Buffer      Pointer to the target buffer to scan.\r
   @param  Length      Number of bytes in Buffer to scan.\r


@@ -285,7 +285,7 @@ ScanMem32 (
   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

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().\r

 \r
   @param  Buffer      Pointer to the target buffer to scan.\r
   @param  Length      Number of bytes in Buffer to scan.\r
 \r
   @param  Buffer      Pointer to the target buffer to scan.\r
   @param  Length      Number of bytes in Buffer to scan.\r


@@ -357,7 +357,7 @@ CompareGuid (
   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

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().\r

 \r
   @param  Buffer  Pointer to the target buffer to scan.\r
   @param  Length  Number of bytes in Buffer to scan.\r
 \r
   @param  Buffer  Pointer to the target buffer to scan.\r
   @param  Length  Number of bytes in Buffer to scan.\r

diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h
index f11df343eb88a249fa298b7890e338fae3cef73b..135f79a5616874e8d7f1a6e815dbf0671a905891 100644 (file)
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h
+++ b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h
@@ -17,11 +17,6 @@
 #ifndef __BASE_UEFI_DECOMPRESS_LIB_INTERNALS_H__\r
 #define __BASE_UEFI_DECOMPRESS_LIB_INTERNALS_H__\r
 \r
 #ifndef __BASE_UEFI_DECOMPRESS_LIB_INTERNALS_H__\r
 #define __BASE_UEFI_DECOMPRESS_LIB_INTERNALS_H__\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 //\r
 // Decompression algorithm begins here\r
 //\r
 //\r
 // Decompression algorithm begins here\r
 //\r


@@ -94,8 +89,8 @@ FillBuf (
 /**\r
   Get NumOfBits of bits out from mBitBuf\r
 \r
 /**\r
   Get NumOfBits of bits out from mBitBuf\r
 \r

-  Get NumOfBits of bits out from mBitBuf. Fill mBitBuf with subsequent \r
-  NumOfBits of bits from source. Returns NumOfBits of bits that are \r
+  Get NumOfBits of bits out from mBitBuf. Fill mBitBuf with subsequent\r
+  NumOfBits of bits from source. Returns NumOfBits of bits that are\r

   popped out.\r
 \r
   @param  Sd        The global scratch data.\r
   popped out.\r
 \r
   @param  Sd        The global scratch data.\r


@@ -113,7 +108,7 @@ GetBits (
 /**\r
   Creates Huffman Code mapping table according to code length array.\r
 \r
 /**\r
   Creates Huffman Code mapping table according to code length array.\r
 \r

-  Creates Huffman Code mapping table for Extra Set, Char&Len Set \r
+  Creates Huffman Code mapping table for Extra Set, Char&Len Set\r

   and Position Set according to code length array.\r
 \r
   @param  Sd        The global scratch data\r
   and Position Set according to code length array.\r
 \r
   @param  Sd        The global scratch data\r


@@ -139,7 +134,7 @@ MakeTable (
   Decodes a position value.\r
 \r
   Get a position value according to Position Huffman Table.\r
   Decodes a position value.\r
 \r
   Get a position value according to Position Huffman Table.\r

-  \r
+\r

   @param  Sd the global scratch data\r
 \r
   @return The position value decoded.\r
   @param  Sd the global scratch data\r
 \r
   @return The position value decoded.\r


@@ -175,7 +170,7 @@ ReadPTLen (
 \r
 /**\r
   Reads code lengths for Char&Len Set.\r
 \r
 /**\r
   Reads code lengths for Char&Len Set.\r

-  \r
+\r

   Read in and decode the Char&Len Set Code Length Array, then\r
   generate the Huffman Code mapping table for the Char&Len Set.\r
 \r
   Read in and decode the Char&Len Set Code Length Array, then\r
   generate the Huffman Code mapping table for the Char&Len Set.\r
 \r


@@ -189,7 +184,7 @@ ReadCLen (
 \r
 /**\r
   Decode a character/length value.\r
 \r
 /**\r
   Decode a character/length value.\r

-  \r
+\r

   Read one value from mBitBuf, Get one code from mBitBuf. If it is at block boundary, generates\r
   Huffman code mapping table for Extra Set, Code&Len Set and\r
   Position Set.\r
   Read one value from mBitBuf, Get one code from mBitBuf. If it is at block boundary, generates\r
   Huffman code mapping table for Extra Set, Code&Len Set and\r
   Position Set.\r


@@ -208,7 +203,7 @@ DecodeC (
   Decode the source data and put the resulting data into the destination buffer.\r
 \r
   Decode the source data and put the resulting data into the destination buffer.\r
   Decode the source data and put the resulting data into the destination buffer.\r
 \r
   Decode the source data and put the resulting data into the destination buffer.\r

-  \r
+\r

   @param  Sd The global scratch data\r
 \r
 **/\r
   @param  Sd The global scratch data\r
 \r
 **/\r

diff --git a/MdePkg/Library/DxeCoreHobLib/HobLib.c b/MdePkg/Library/DxeCoreHobLib/HobLib.c
index 751d7cfeff5a4bc3a887e6bd1a18bdeaae9dbadc..d94225e0a4037861ebfd85287203fb27607b6ecf 100644 (file)
--- a/MdePkg/Library/DxeCoreHobLib/HobLib.c
+++ b/MdePkg/Library/DxeCoreHobLib/HobLib.c
@@ -29,7 +29,7 @@
 #include <Library/DebugLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 \r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 \r

-#include "InternalHobLib.h""\r
+#include "InternalHobLib.h"\r

 \r
 /**\r
   Returns the pointer to the HOB list.\r
 \r
 /**\r
   Returns the pointer to the HOB list.\r


@@ -51,7 +51,7 @@ 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
   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


@@ -74,7 +74,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


@@ -91,8 +91,8 @@ 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
+  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
   @param  Type          The HOB type to return.\r
 \r
 \r
   @param  Type          The HOB type to return.\r
 \r


@@ -112,10 +112,10 @@ GetFirstHob (
 }\r
 \r
 /**\r
 }\r
 \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
+  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 info respectively.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\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 info respectively.\r
   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer\r


@@ -150,7 +150,7 @@ GetNextGuidHob (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function searches the first instance of a HOB among the whole HOB list. \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
   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


@@ -178,7 +178,7 @@ GetFirstGuidHob (
 /**\r
   Get the Boot Mode from the HOB list.\r
 \r
 /**\r
   Get the 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
   @param  VOID\r
   PHIT HOB in HOB list.\r
 \r
   @param  VOID\r


@@ -260,8 +260,8 @@ BuildResourceDescriptorHob (
 /**\r
   Builds a GUID HOB with a certain data length.\r
 \r
 /**\r
   Builds a GUID HOB with a certain data length.\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

diff --git a/MdePkg/Library/DxeCoreHobLib/InternalHobLib.h b/MdePkg/Library/DxeCoreHobLib/InternalHobLib.h
index 8f0347639cfdb0778e7ce480e91815d2e9782554..0c458c0b14ba6fadd85e265408c51e09dbe3448c 100644 (file)
--- a/MdePkg/Library/DxeCoreHobLib/InternalHobLib.h
+++ b/MdePkg/Library/DxeCoreHobLib/InternalHobLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal include file of DXE Entry Point HOB Library.\r
 \r
 /** @file\r
   Internal include file of DXE Entry Point HOB Library.\r
 \r

-  Copyright (c) 2006, Intel Corporation\r
+  Copyright (c) 2006 - 2007, Intel Corporation\r

   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under 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

-  Module Name:  HobLib.h\r
+  Module Name:  InternalHobLib.h\r

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