THE PROGRAM IS 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: ScanMem16Wrapper.c\r
-\r
- The following BaseMemoryLib instances share the same version of this file:\r
+ The following BaseMemoryLib instances contain the same copy of this file:\r
\r
BaseMemoryLib\r
BaseMemoryLibMmx\r
BaseMemoryLibSse2\r
BaseMemoryLibRepStr\r
+ BaseMemoryLibOptDxe\r
+ BaseMemoryLibOptPei\r
PeiMemoryLib\r
- UefiMemoryLib\r
+ DxeMemoryLib\r
\r
**/\r
\r
+\r
#include "MemLibInternals.h"\r
\r
/**\r
- Scans a target buffer for a 16-bit value, and returns a pointer to the\r
- matching 16-bit value in the target buffer.\r
+ Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value\r
+ in the target buffer.\r
\r
- This function searches target the buffer specified by Buffer and Length from\r
- the lowest address to the highest address at 16-bit increments for a 16-bit\r
- value that matches Value. If a match is found, then a pointer to the matching\r
- value in the target buffer is returned. If no match is found, then NULL is\r
- returned. If Length is 0, then NULL is returned.\r
-\r
- If Buffer is NULL, then ASSERT().\r
+ This function searches target the buffer specified by Buffer and Length from the lowest\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
+ 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 greater than (MAX_ADDRESS - Buffer + 1), 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
\r
- @param Buffer Pointer to the target buffer to scan.\r
- @param Length Number of bytes in Buffer to scan.\r
- @param Value Value to search for in the target buffer.\r
+ @param Buffer Pointer to the target buffer to scan.\r
+ @param Length Number of bytes in Buffer to scan.\r
+ @param Value Value to search for in the target buffer.\r
\r
- @return Pointer to the first occurrence.\r
- @retval NULL if Length == 0 or Value was not found.\r
+ @return A pointer to the matching byte in the target buffer or NULL otherwise.\r
\r
**/\r
VOID *\r
EFIAPI\r
ScanMem16 (\r
- IN CONST VOID *Buffer,\r
- IN UINTN Length,\r
- IN UINT16 Value\r
+ IN CONST VOID *Buffer,\r
+ IN UINTN Length,\r
+ IN UINT16 Value\r
)\r
{\r
+ if (Length == 0) {\r
+ return NULL;\r
+ }\r
+\r
ASSERT (Buffer != NULL);\r
ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);\r
- ASSERT (Length <= MAX_ADDRESS + (UINTN)Buffer + 1);\r
+ ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
+ ASSERT ((Length & (sizeof (Value) - 1)) == 0);\r
\r
- if ((Length /= sizeof (Value)) == 0) {\r
- return NULL;\r
- }\r
- return (VOID*)InternalMemScanMem16 (Buffer, Length, Value);\r
+ return (VOID*)InternalMemScanMem16 (Buffer, Length / sizeof (Value), Value);\r
}\r