DebugLib:

	Fix a bug in PeiDxeDebugLibReportStatusCode: it should use gReportStatusCodeDebugType so that report status code infrastructure can correctly extract debug info.
	Fix functional and coding style issues in the three instances in EdkModulePkg, namely: EdkDxeDebugLibReportStatusCode, EdkUefiDebugLibStderr, EdkUefiDebugLibConout.
	DevicePathLib:
	Sync with MWG 0.57 and add new interface of CreateDevicePathNode(). All the function headers have been updated.
	PeiServicesLib:
	Adjust coding style and fix a minor comment error.
	PciLib:
	Adjust assert() condition to sync with MWG 0.57
	BaseMemoryLib:
	Adjust assert() for ScanMemXX (), ScanGuid()
	Rename UefiMemoryLib to DxeMemoryLib
	PrintLib:
	Change the return value of all print services to exclude the NULL-terminator.
	Misc:
	Slightly adjust the coding style in hob.c in PeiCore module.


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

14 files changed, 32 insertions, 38 deletions

diff --git a/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c b/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
index e3b0fe3fd6..4c0d3eaadb 100644
--- a/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

diff --git a/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c b/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
index 1fd00acabd..9e620e2200 100644
--- a/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

diff --git a/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c b/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
index 3fecfc9ff0..759377483c 100644
--- a/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
+++ b/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
@@ -16,7 +16,7 @@
 

     BaseMemoryLib

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

diff --git a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c b/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
index 351e370c2c..8932af7083 100644
--- a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

@@ -95,7 +95,8 @@ CompareGuid (
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.

   If Length is 0, then NULL is returned.

   If Length > 0 and Buffer is NULL, then ASSERT().

-  If Buffer is not aligned on a 64-bit boundary, then ASSERT().

+  If Buffer is not aligned on a 32-bit boundary, then ASSERT().

+  If Length is not aligned on a 128-bit boundary, then ASSERT().

   If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

 

   @param  Buffer  Pointer to the target buffer to scan.

@@ -115,16 +116,12 @@ ScanGuid (
 {

   CONST GUID                        *GuidPtr;

 

-  ASSERT (Buffer != NULL);

-  //

-  // Make sure Buffer is aligned on a 64-bit boundary.

-  //

-  ASSERT (((UINTN) Buffer & 7) == 0);

-

+  ASSERT (((UINTN)Buffer & (sizeof (Guid->Data1) - 1)) == 0);

   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));

+  ASSERT ((Length & (sizeof (*GuidPtr) - 1)) == 0);

 

   GuidPtr = (GUID*)Buffer;

-  Buffer = GuidPtr + Length / sizeof (*GuidPtr);

+  Buffer  = GuidPtr + Length / sizeof (*GuidPtr);

   while (GuidPtr < (CONST GUID*)Buffer) {

     if (CompareGuid (GuidPtr, Guid)) {

       return (VOID*)GuidPtr;

diff --git a/MdePkg/Library/PeiMemoryLib/MemLibInternals.h b/MdePkg/Library/PeiMemoryLib/MemLibInternals.h
index ca7311a407..8646b24e79 100644
--- a/MdePkg/Library/PeiMemoryLib/MemLibInternals.h
+++ b/MdePkg/Library/PeiMemoryLib/MemLibInternals.h
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
index 9ffc2cf159..29170594d3 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

@@ -35,6 +35,7 @@
   then NULL is returned.  If Length is 0, then NULL is returned.

   If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 16-bit boundary, then ASSERT().

+  If Length is not aligned on a 16-bit boundary, then ASSERT().

   If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

 

   @param  Buffer      Pointer to the target buffer to scan.

@@ -52,16 +53,14 @@ ScanMem16 (
   IN UINT16      Value

   )

 {

-  UINTN     Stride;

-  

-  Stride = Length / sizeof (Value);

-  if (Stride == 0) {

+  if (Length == 0) {

     return NULL;

   }

 

   ASSERT (Buffer != NULL);

   ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

-  return (VOID*)InternalMemScanMem16 (Buffer, Stride, Value);

+  return (VOID*)InternalMemScanMem16 (Buffer, Length / sizeof (Value), Value);

 }

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
index 6b0beee632..b54d5da07c 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

@@ -35,6 +35,7 @@
   then NULL is returned.  If Length is 0, then NULL is returned.

   If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 32-bit boundary, then ASSERT().

+  If Length is not aligned on a 32-bit boundary, then ASSERT().

   If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

 

   @param  Buffer      Pointer to the target buffer to scan.

@@ -52,16 +53,14 @@ ScanMem32 (
   IN UINT32      Value

   )

 {

-  UINTN     Stride;

-  

-  Stride = Length / sizeof (Value);

-  if (Stride == 0) {

+  if (Length == 0) {

     return NULL;

   }

 

   ASSERT (Buffer != NULL);

   ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

-  return (VOID*)InternalMemScanMem32 (Buffer, Stride, Value);

+  return (VOID*)InternalMemScanMem32 (Buffer, Length / sizeof (Value), Value);

 }

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
index 589d45c1a1..7bfc7d721e 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

@@ -35,6 +35,7 @@
   then NULL is returned.  If Length is 0, then NULL is returned.

   If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 64-bit boundary, then ASSERT().

+  If Length is not aligned on a 64-bit boundary, then ASSERT().

   If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

 

   @param  Buffer      Pointer to the target buffer to scan.

@@ -52,16 +53,14 @@ ScanMem64 (
   IN UINT64      Value

   )

 {

-  UINTN     Stride;

-  

-  Stride = Length / sizeof (Value);

-  if (Stride == 0) {

+  if (Length == 0) {

     return NULL;

   }

 

   ASSERT (Buffer != NULL);

   ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

-  return (VOID*)InternalMemScanMem64 (Buffer, Stride, Value);

+  return (VOID*)InternalMemScanMem64 (Buffer, Length / sizeof (Value), Value);

 }

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
index 4dc8bac073..0f7289d3df 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
index 41467a9cb0..889339c953 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
index 425840682d..15f8205ebc 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
index 4a1eda80e8..981a7d4731 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

diff --git a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
index 3965be759a..c73168841b 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/

 

@@ -32,7 +32,7 @@
   If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

 

   @param  Buffer    Memory to set.

-  @param  Length    Number of bytes to set

+  @param  Length    Number of bytes to set.

   @param  Value     Value of the set operation.

 

   @return Buffer.

diff --git a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
index 56dbe5d8be..08247681c5 100644
--- a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2

     BaseMemoryLibRepStr

     PeiMemoryLib

-    UefiMemoryLib

+    DxeMemoryLib

 

 **/