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@758 6f19259b-4bc3-4df7-8a09-765794883524

18 files changed, 0 insertions, 1495 deletions

diff --git a/MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c b/MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c
deleted file mode 100644
index e3b0fe3fd6..0000000000
--- a/MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/** @file

-  CompareMem() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  CompareMemWrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Compares the contents of two buffers.

-

-  This function compares Length bytes of SourceBuffer to Length bytes of DestinationBuffer.

-  If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the

-  value returned is the first mismatched byte in SourceBuffer subtracted from the first

-  mismatched byte in DestinationBuffer.

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

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

-  If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). 

-  If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). 

-

-

-  @param  DestinationBuffer Pointer to the destination buffer to compare.

-  @param  SourceBuffer      Pointer to the source buffer to compare.

-  @param  Length            Number of bytes to compare.

-

-  @return 0                 All Length bytes of the two buffers are identical.

-  @retval Non-zero          The first mismatched byte in SourceBuffer subtracted from the first

-                            mismatched byte in DestinationBuffer.

-

-**/

-INTN

-EFIAPI

-CompareMem (

-  IN CONST VOID  *DestinationBuffer,

-  IN CONST VOID  *SourceBuffer,

-  IN UINTN       Length

-  )

-{

-  if (Length == 0) {

-    return 0;

-  }

-  ASSERT (DestinationBuffer != NULL);

-  ASSERT (SourceBuffer != NULL);

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

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

-

-  return InternalMemCompareMem (DestinationBuffer, SourceBuffer, Length);

-}

diff --git a/MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c b/MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c
deleted file mode 100644
index 1fd00acabd..0000000000
--- a/MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/** @file

-  CopyMem() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  CopyMemWrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Copies a source buffer to a destination buffer, and returns the destination buffer.

-

-  This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns

-  DestinationBuffer.  The implementation must be reentrant, and it must handle the case

-  where SourceBuffer overlaps DestinationBuffer.

-  If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). 

-  If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). 

-

-  @param  DestinationBuffer   Pointer to the destination buffer of the memory copy.

-  @param  SourceBuffer        Pointer to the source buffer of the memory copy.

-  @param  Length              Number of bytes to copy from SourceBuffer to DestinationBuffer.

-

-  @return DestinationBuffer.

-

-**/

-VOID *

-EFIAPI

-CopyMem (

-  OUT VOID       *DestinationBuffer,

-  IN CONST VOID  *SourceBuffer,

-  IN UINTN       Length

-  )

-{

-  if (Length == 0) {

-    return DestinationBuffer;

-  }

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

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

-

-  if (DestinationBuffer == SourceBuffer) {

-    return DestinationBuffer;

-  }

-  return InternalMemCopyMem (DestinationBuffer, SourceBuffer, Length);

-}

diff --git a/MdePkg/Library/UefiMemoryLib/MemLib.c b/MdePkg/Library/UefiMemoryLib/MemLib.c
deleted file mode 100644
index f8f8e30d0a..0000000000
--- a/MdePkg/Library/UefiMemoryLib/MemLib.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/** @file

-  Base Memory Library.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  MemLib.c

-

-**/

-

-VOID *

-EFIAPI

-InternalMemCopyMem (

-  OUT     VOID                      *Destination,

-  IN      CONST VOID                *Source,

-  IN      UINTN                     Length

-  )

-{

-  gBS->CopyMem (Destination, (VOID*)Source, Length);

-  return Destination;

-}

-

-VOID *

-EFIAPI

-InternalMemSetMem (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Size,

-  IN      UINT8                     Value

-  )

-{

-  gBS->SetMem (Buffer, Size, Value);

-  return Buffer;

-}

diff --git a/MdePkg/Library/UefiMemoryLib/MemLibGeneric.c b/MdePkg/Library/UefiMemoryLib/MemLibGeneric.c
deleted file mode 100644
index 3fecfc9ff0..0000000000
--- a/MdePkg/Library/UefiMemoryLib/MemLibGeneric.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/** @file

-  Architecture Independent Base Memory Library Implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  MemLibGeneric.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with a 16-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem16 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

-  )

-{

-  do {

-    ((UINT16*)Buffer)[--Length] = Value;

-  } while (Length != 0);

-  return Buffer;

-}

-

-/**

-  Fills a target buffer with a 32-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem32 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

-  )

-{

-  do {

-    ((UINT32*)Buffer)[--Length] = Value;

-  } while (Length != 0);

-  return Buffer;

-}

-

-/**

-  Fills a target buffer with a 64-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem64 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

-  )

-{

-  do {

-    ((UINT64*)Buffer)[--Length] = Value;

-  } while (Length != 0);

-  return Buffer;

-}

-

-/**

-  Set Buffer to 0 for Size bytes.

-

-  @param  Buffer Memory to set.

-  @param  Size Number of bytes to set

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemZeroMem (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length

-  )

-{

-  return InternalMemSetMem (Buffer, Length, 0);

-}

-

-/**

-  Compares two memory buffers of a given length.

-

-  @param  DestinationBuffer First memory buffer

-  @param  SourceBuffer      Second memory buffer

-  @param  Length            Length of DestinationBuffer and SourceBuffer memory

-                            regions to compare. Must be non-zero.

-

-  @retval 0     if MemOne == MemTwo

-

-**/

-INTN

-EFIAPI

-InternalMemCompareMem (

-  IN      CONST VOID                *DestinationBuffer,

-  IN      CONST VOID                *SourceBuffer,

-  IN      UINTN                     Length

-  )

-{

-  while ((--Length != 0) &&

-         (*(INT8*)DestinationBuffer == *(INT8*)SourceBuffer)) {

-    DestinationBuffer = (INT8*)DestinationBuffer + 1;

-    SourceBuffer = (INT8*)SourceBuffer + 1;

-  }

-  return (INTN)*(UINT8*)DestinationBuffer - (INTN)*(UINT8*)SourceBuffer;

-}

-

-/**

-  Scans a target buffer for an 8-bit value, and returns a pointer to the

-  matching 8-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem8 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT8                     Value

-  )

-{

-  CONST UINT8                       *Pointer;

-

-  Pointer = (CONST UINT8*)Buffer;

-  do {

-    if (*(Pointer++) == Value) {

-      return Pointer;

-    }

-  } while (--Length != 0);

-  return NULL;

-}

-

-/**

-  Scans a target buffer for a 16-bit value, and returns a pointer to the

-  matching 16-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem16 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

-  )

-{

-  CONST UINT16                      *Pointer;

-

-  Pointer = (CONST UINT16*)Buffer;

-  do {

-    if (*(Pointer++) == Value) {

-      return Pointer;

-    }

-  } while (--Length != 0);

-  return NULL;

-}

-

-/**

-  Scans a target buffer for a 32-bit value, and returns a pointer to the

-  matching 32-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem32 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

-  )

-{

-  CONST UINT32                      *Pointer;

-

-  Pointer = (CONST UINT32*)Buffer;

-  do {

-    if (*(Pointer++) == Value) {

-      return Pointer;

-    }

-  } while (--Length != 0);

-  return NULL;

-}

-

-/**

-  Scans a target buffer for a 64-bit value, and returns a pointer to the

-  matching 64-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem64 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

-  )

-{

-  CONST UINT64                      *Pointer;

-

-  Pointer = (CONST UINT64*)Buffer;

-  do {

-    if (*(Pointer++) == Value) {

-      return Pointer;

-    }

-  } while (--Length != 0);

-  return NULL;

-}

diff --git a/MdePkg/Library/UefiMemoryLib/MemLibGuid.c b/MdePkg/Library/UefiMemoryLib/MemLibGuid.c
deleted file mode 100644
index 351e370c2c..0000000000
--- a/MdePkg/Library/UefiMemoryLib/MemLibGuid.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/** @file

-  Implementation of GUID functions.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  MemLibGuid.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-/**

-  Copies a source GUID to a destination GUID.

-

-  This function copies the contents of the 128-bit GUID specified by SourceGuid to

-  DestinationGuid, and returns DestinationGuid.

-  If DestinationGuid is NULL, then ASSERT().

-  If SourceGuid is NULL, then ASSERT().

-

-  @param  DestinationGuid   Pointer to the destination GUID.

-  @param  SourceGuid        Pointer to the source GUID.

-

-  @return DestinationGuid.

-

-**/

-GUID *

-EFIAPI

-CopyGuid (

-  OUT GUID       *DestinationGuid,

-  IN CONST GUID  *SourceGuid

-  )

-{

-  WriteUnaligned64 (

-    (UINT64*)DestinationGuid,

-    ReadUnaligned64 ((CONST UINT64*)SourceGuid)

-    );

-  WriteUnaligned64 (

-    (UINT64*)DestinationGuid + 1,

-    ReadUnaligned64 ((CONST UINT64*)SourceGuid + 1)

-    );

-  return DestinationGuid;

-}

-

-/**

-  Compares two GUIDs.

-

-  This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.

-  If there are any bit differences in the two GUIDs, then FALSE is returned.

-  If Guid1 is NULL, then ASSERT().

-  If Guid2 is NULL, then ASSERT().

-

-  @param  Guid1       A pointer to a 128 bit GUID.

-  @param  Guid2       A pointer to a 128 bit GUID.

-

-  @retval TRUE        Guid1 and Guid2 are identical.

-  @retval FALSE       Guid1 and Guid2 are not identical.

-

-**/

-BOOLEAN

-EFIAPI

-CompareGuid (

-  IN CONST GUID  *Guid1,

-  IN CONST GUID  *Guid2

-  )

-{

-  return (BOOLEAN)(

-           ReadUnaligned64 ((CONST UINT64*)Guid1)

-             == ReadUnaligned64 ((CONST UINT64*)Guid2) &&

-           ReadUnaligned64 ((CONST UINT64*)Guid1 + 1)

-             == ReadUnaligned64 ((CONST UINT64*)Guid2 + 1)

-           );

-}

-

-/**

-  Scans a target buffer for a GUID, and returns a pointer to the matching GUID

-  in the target buffer.

-

-  This function searches target the buffer specified by Buffer and Length from

-  the lowest address to the highest address at 128-bit increments for the 128-bit

-  GUID value that matches Guid.  If a match is found, then a pointer to the matching

-  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 Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan.

-  @param  Guid    Value to search for in the target buffer.

-

-  @return A pointer to the matching Guid in the target buffer or NULL otherwise.

-

-**/

-VOID *

-EFIAPI

-ScanGuid (

-  IN CONST VOID  *Buffer,

-  IN UINTN       Length,

-  IN CONST GUID  *Guid

-  )

-{

-  CONST GUID                        *GuidPtr;

-

-  ASSERT (Buffer != NULL);

-  //

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

-  //

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

-

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

-

-  GuidPtr = (GUID*)Buffer;

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

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

-    if (CompareGuid (GuidPtr, Guid)) {

-      return (VOID*)GuidPtr;

-    }

-    GuidPtr++;

-  }

-  return NULL;

-}

diff --git a/MdePkg/Library/UefiMemoryLib/MemLibInternals.h b/MdePkg/Library/UefiMemoryLib/MemLibInternals.h
deleted file mode 100644
index ca7311a407..0000000000
--- a/MdePkg/Library/UefiMemoryLib/MemLibInternals.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/** @file

-  Declaration of internal functions for Base Memory Library.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  MemLibInternals.h

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#ifndef __MEM_LIB_INTERNALS__

-#define __MEM_LIB_INTERNALS__

-

-/**

-  Copy Length bytes from Source to Destination.

-

-  @param  Destination Target of copy

-  @param  Source Place to copy from

-  @param  Length Number of bytes to copy

-

-  @return Destination

-

-**/

-VOID *

-EFIAPI

-InternalMemCopyMem (

-  OUT     VOID                      *DestinationBuffer,

-  IN      CONST VOID                *SourceBuffer,

-  IN      UINTN                     Length

-  );

-

-/**

-  Set Buffer to Value for Size bytes.

-

-  @param  Buffer Memory to set.

-  @param  Size Number of bytes to set

-  @param  Value Value of the set operation.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT8                     Value

-  );

-

-/**

-  Fills a target buffer with a 16-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem16 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

-  );

-

-/**

-  Fills a target buffer with a 32-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem32 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

-  );

-

-/**

-  Fills a target buffer with a 64-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem64 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

-  );

-

-/**

-  Set Buffer to 0 for Size bytes.

-

-  @param  Buffer Memory to set.

-  @param  Size Number of bytes to set

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemZeroMem (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length

-  );

-

-/**

-  Compares two memory buffers of a given length.

-

-  @param  DestinationBuffer First memory buffer

-  @param  SourceBuffer      Second memory buffer

-  @param  Length            Length of DestinationBuffer and SourceBuffer memory

-                            regions to compare. Must be non-zero.

-

-  @retval 0     if MemOne == MemTwo

-

-**/

-INTN

-EFIAPI

-InternalMemCompareMem (

-  IN      CONST VOID                *DestinationBuffer,

-  IN      CONST VOID                *SourceBuffer,

-  IN      UINTN                     Length

-  );

-

-/**

-  Scans a target buffer for an 8-bit value, and returns a pointer to the

-  matching 8-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem8 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT8                     Value

-  );

-

-/**

-  Scans a target buffer for a 16-bit value, and returns a pointer to the

-  matching 16-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem16 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

-  );

-

-/**

-  Scans a target buffer for a 32-bit value, and returns a pointer to the

-  matching 32-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem32 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

-  );

-

-/**

-  Scans a target buffer for a 64-bit value, and returns a pointer to the

-  matching 64-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem64 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

-  );

-

-#endif

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c
deleted file mode 100644
index 9ffc2cf159..0000000000
--- a/MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/** @file

-  ScanMem16() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  ScanMem16Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value

-  in the target buffer.

-

-  This function searches target the buffer specified by Buffer and Length from the lowest

-  address to the highest address for a 16-bit value that matches Value.  If a match is found,

-  then a pointer to the matching byte 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 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.

-  @param  Length      Number of bytes in Buffer to scan.

-  @param  Value       Value to search for in the target buffer.

-

-  @return A pointer to the matching byte in the target buffer or NULL otherwise.

-

-**/

-VOID *

-EFIAPI

-ScanMem16 (

-  IN CONST VOID  *Buffer,

-  IN UINTN       Length,

-  IN UINT16      Value

-  )

-{

-  UINTN     Stride;

-  

-  Stride = Length / sizeof (Value);

-  if (Stride == 0) {

-    return NULL;

-  }

-

-  ASSERT (Buffer != NULL);

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

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

-

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

-}

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c
deleted file mode 100644
index 6b0beee632..0000000000
--- a/MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/** @file

-  ScanMem32() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  ScanMem32Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Scans a target buffer for a 32-bit value, and returns a pointer to the matching 32-bit value

-  in the target buffer.

-

-  This function searches target the buffer specified by Buffer and Length from the lowest

-  address to the highest address for a 32-bit value that matches Value.  If a match is found,

-  then a pointer to the matching byte 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 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.

-  @param  Length      Number of bytes in Buffer to scan.

-  @param  Value       Value to search for in the target buffer.

-

-  @return A pointer to the matching byte in the target buffer or NULL otherwise.

-

-**/

-VOID *

-EFIAPI

-ScanMem32 (

-  IN CONST VOID  *Buffer,

-  IN UINTN       Length,

-  IN UINT32      Value

-  )

-{

-  UINTN     Stride;

-  

-  Stride = Length / sizeof (Value);

-  if (Stride == 0) {

-    return NULL;

-  }

-

-  ASSERT (Buffer != NULL);

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

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

-

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

-}

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c
deleted file mode 100644
index 589d45c1a1..0000000000
--- a/MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/** @file

-  ScanMem64() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  ScanMem64Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value

-  in the target buffer.

-

-  This function searches target the buffer specified by Buffer and Length from the lowest

-  address to the highest address for a 64-bit value that matches Value.  If a match is found,

-  then a pointer to the matching byte 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 Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

-

-  @param  Buffer      Pointer to the target buffer to scan.

-  @param  Length      Number of bytes in Buffer to scan.

-  @param  Value       Value to search for in the target buffer.

-

-  @return A pointer to the matching byte in the target buffer or NULL otherwise.

-

-**/

-VOID *

-EFIAPI

-ScanMem64 (

-  IN CONST VOID  *Buffer,

-  IN UINTN       Length,

-  IN UINT64      Value

-  )

-{

-  UINTN     Stride;

-  

-  Stride = Length / sizeof (Value);

-  if (Stride == 0) {

-    return NULL;

-  }

-

-  ASSERT (Buffer != NULL);

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

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

-

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

-}

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c
deleted file mode 100644
index 4dc8bac073..0000000000
--- a/MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/** @file

-  ScanMem8() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  ScanMem8Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Scans a target buffer for an 8-bit value, and returns a pointer to the matching 8-bit value

-  in the target buffer.

-

-  This function searches target the buffer specified by Buffer and Length from the lowest

-  address to the highest address for an 8-bit value that matches Value.  If a match is found,

-  then a pointer to the matching byte 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 Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

-

-  @param  Buffer      Pointer to the target buffer to scan.

-  @param  Length      Number of bytes in Buffer to scan.

-  @param  Value       Value to search for in the target buffer.

-

-  @return A pointer to the matching byte in the target buffer or NULL otherwise.

-

-**/

-VOID *

-EFIAPI

-ScanMem8 (

-  IN CONST VOID  *Buffer,

-  IN UINTN       Length,

-  IN UINT8       Value

-  )

-{

-  if (Length == 0) {

-    return NULL;

-  }

-  ASSERT (Buffer != NULL);

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

- 

-  return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);

-}

diff --git a/MdePkg/Library/UefiMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/UefiMemoryLib/SetMem16Wrapper.c
deleted file mode 100644
index 41467a9cb0..0000000000
--- a/MdePkg/Library/UefiMemoryLib/SetMem16Wrapper.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/** @file

-  SetMem16() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  SetMem16Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with a 16-bit value, and returns the target buffer.

-

-  This function fills Length bytes of Buffer with the 16-bit value specified by

-  Value, and returns Buffer. Value is repeated every 16-bits in for Length

-  bytes of Buffer.

-

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

-  If Length is greater than (MAX_ADDRESS - Buffer + 1), 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().

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer.

-

-**/

-VOID *

-EFIAPI

-SetMem16 (

-  OUT VOID   *Buffer,

-  IN UINTN   Length,

-  IN UINT16  Value

-  )

-{

-  if (Length == 0) {

-    return Buffer;

-  }

-

-  ASSERT (Buffer != NULL);

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

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

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

-

-  return InternalMemSetMem16 (Buffer, Length / sizeof (Value), Value);

-}

diff --git a/MdePkg/Library/UefiMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/UefiMemoryLib/SetMem32Wrapper.c
deleted file mode 100644
index 425840682d..0000000000
--- a/MdePkg/Library/UefiMemoryLib/SetMem32Wrapper.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/** @file

-  SetMem32() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  SetMem32Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with a 32-bit value, and returns the target buffer.

-

-  This function fills Length bytes of Buffer with the 32-bit value specified by

-  Value, and returns Buffer. Value is repeated every 32-bits in for Length

-  bytes of Buffer.

-

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

-  If Length is greater than (MAX_ADDRESS - Buffer + 1), 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().

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer.

-

-**/

-VOID *

-EFIAPI

-SetMem32 (

-  OUT VOID   *Buffer,

-  IN UINTN   Length,

-  IN UINT32  Value

-  )

-{

-  if (Length == 0) {

-    return Buffer;

-  }

-

-  ASSERT (Buffer != NULL);

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

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

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

-

-  return InternalMemSetMem32 (Buffer, Length / sizeof (Value), Value);

-}

diff --git a/MdePkg/Library/UefiMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/UefiMemoryLib/SetMem64Wrapper.c
deleted file mode 100644
index 4a1eda80e8..0000000000
--- a/MdePkg/Library/UefiMemoryLib/SetMem64Wrapper.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/** @file

-  SetMem64() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  SetMem64Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with a 64-bit value, and returns the target buffer.

-

-  This function fills Length bytes of Buffer with the 64-bit value specified by

-  Value, and returns Buffer. Value is repeated every 64-bits in for Length

-  bytes of Buffer.

-

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

-  If Length is greater than (MAX_ADDRESS - Buffer + 1), 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().

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer.

-

-**/

-VOID *

-EFIAPI

-SetMem64 (

-  OUT VOID   *Buffer,

-  IN UINTN   Length,

-  IN UINT64  Value

-  )

-{

-  if (Length == 0) {

-    return Buffer;

-  }

-

-  ASSERT (Buffer != NULL);

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

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

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

-

-  return InternalMemSetMem64 (Buffer, Length / sizeof (Value), Value);

-}

diff --git a/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c b/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
deleted file mode 100644
index 3965be759a..0000000000
--- a/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/** @file

-  SetMem() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  SetMemWrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with a byte value, and returns the target buffer.

-

-  This function fills Length bytes of Buffer with Value, and returns Buffer.

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

-

-  @param  Buffer    Memory to set.

-  @param  Length    Number of bytes to set

-  @param  Value     Value of the set operation.

-

-  @return Buffer.

-

-**/

-VOID *

-EFIAPI

-SetMem (

-  OUT VOID  *Buffer,

-  IN UINTN  Length,

-  IN UINT8  Value

-  )

-{

-  if (Length == 0) {

-    return Buffer;

-  }

-

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

-

-  return InternalMemSetMem (Buffer, Length, Value);

-}

diff --git a/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.mbd b/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.mbd
deleted file mode 100644
index 70fd110e1e..0000000000
--- a/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.mbd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-Copyright (c) 2006, Intel Corporation

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

--->

-<LibraryModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">

-  <MbdLibHeader>

-    <BaseName>UefiMemoryLib</BaseName>

-    <Guid>f1bbe03d-2f28-4dee-bec7-d98d7a30c36a</Guid>

-    <Version>EDK_RELEASE_VERSION        0x00090000</Version>

-    <Description>FIX ME!</Description>

-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>

-    <License>

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

-    </License>

-    <Created>2006-04-12 13:39</Created>

-  </MbdLibHeader>

-</LibraryModuleBuildDescription>

diff --git a/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.msa b/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.msa
deleted file mode 100644
index cadeec581d..0000000000
--- a/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.msa
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

-  <MsaHeader>

-    <ModuleName>UefiMemoryLib</ModuleName>

-    <ModuleType>UEFI_DRIVER</ModuleType>

-    <GuidValue>f1bbe03d-2f28-4dee-bec7-d98d7a30c36a</GuidValue>

-    <Version>1.0</Version>

-    <Abstract>Memory-only library functions with no library constructor/destructor</Abstract>

-    <Description>FIX ME!</Description>

-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>

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

-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

-  </MsaHeader>

-  <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

-    <BinaryModule>false</BinaryModule>

-    <OutputFileBasename>UefiMemoryLib</OutputFileBasename>

-  </ModuleDefinitions>

-  <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_PRODUCED">

-      <Keyword>BaseMemoryLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>DebugLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiBootServicesTableLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-  </LibraryClassDefinitions>

-  <SourceFiles>

-    <Filename>MemLib.c</Filename>

-    <Filename>MemLibGuid.c</Filename>

-    <Filename>MemLibGeneric.c</Filename>

-    <Filename>CopyMemWrapper.c</Filename>

-    <Filename>SetMemWrapper.c</Filename>

-    <Filename>SetMem16Wrapper.c</Filename>

-    <Filename>SetMem32Wrapper.c</Filename>

-    <Filename>SetMem64Wrapper.c</Filename>

-    <Filename>CompareMemWrapper.c</Filename>

-    <Filename>ZeroMemWrapper.c</Filename>

-    <Filename>ScanMem8Wrapper.c</Filename>

-    <Filename>ScanMem16Wrapper.c</Filename>

-    <Filename>ScanMem32Wrapper.c</Filename>

-    <Filename>ScanMem64Wrapper.c</Filename>

-  </SourceFiles>

-  <PackageDependencies>

-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-  </PackageDependencies>

-  <Externs>

-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

-    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>

-  </Externs>

-</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/MdePkg/Library/UefiMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/UefiMemoryLib/ZeroMemWrapper.c
deleted file mode 100644
index 56dbe5d8be..0000000000
--- a/MdePkg/Library/UefiMemoryLib/ZeroMemWrapper.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/** @file

-  ZeroMem() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  ZeroMemWrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    UefiMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with zeros, and returns the target buffer.

-

-  This function fills Length bytes of Buffer with zeros, and returns Buffer.

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

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

-

-  @param  Buffer      Pointer to the target buffer to fill with zeros.

-  @param  Length      Number of bytes in Buffer to fill with zeros.

-

-  @return Buffer.

-

-**/

-VOID *

-EFIAPI

-ZeroMem (

-  OUT VOID  *Buffer,

-  IN UINTN  Length

-  )

-{

-  ASSERT (!(Buffer == NULL && Length > 0));

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

-  return InternalMemSetMem (Buffer, Length, 0);

-}

diff --git a/MdePkg/Library/UefiMemoryLib/build.xml b/MdePkg/Library/UefiMemoryLib/build.xml
deleted file mode 100644
index 3c5ba2519d..0000000000
--- a/MdePkg/Library/UefiMemoryLib/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 

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

-<project basedir="." default="UefiMemoryLib"><!--Apply external ANT tasks-->

-   <taskdef resource="GenBuild.tasks"/>

-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>

-   <property environment="env"/>

-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Library/UefiMemoryLib"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

-   <target name="UefiMemoryLib">

-      <GenBuild baseName="UefiMemoryLib" mbdFilename="${MODULE_DIR}/UefiMemoryLib.mbd" msaFilename="${MODULE_DIR}/UefiMemoryLib.msa"/>

-   </target>

-   <target depends="UefiMemoryLib_clean" name="clean"/>

-   <target depends="UefiMemoryLib_cleanall" name="cleanall"/>

-   <target name="UefiMemoryLib_clean">

-      <OutputDirSetup baseName="UefiMemoryLib" mbdFilename="${MODULE_DIR}/UefiMemoryLib.mbd" msaFilename="${MODULE_DIR}/UefiMemoryLib.msa"/>

-      <if>

-         <available file="${DEST_DIR_OUTPUT}/UefiMemoryLib_build.xml"/>

-         <then>

-            <ant antfile="${DEST_DIR_OUTPUT}/UefiMemoryLib_build.xml" target="clean"/>

-         </then>

-      </if>

-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

-   </target>

-   <target name="UefiMemoryLib_cleanall">

-      <OutputDirSetup baseName="UefiMemoryLib" mbdFilename="${MODULE_DIR}/UefiMemoryLib.mbd" msaFilename="${MODULE_DIR}/UefiMemoryLib.msa"/>

-      <if>

-         <available file="${DEST_DIR_OUTPUT}/UefiMemoryLib_build.xml"/>

-         <then>

-            <ant antfile="${DEST_DIR_OUTPUT}/UefiMemoryLib_build.xml" target="cleanall"/>

-         </then>

-      </if>

-      <delete dir="${DEST_DIR_OUTPUT}"/>

-      <delete dir="${DEST_DIR_DEBUG}"/>

-      <delete>

-         <fileset dir="${BIN_DIR}" includes="**UefiMemoryLib*"/>

-      </delete>

-   </target>

-</project>
\ No newline at end of file