diff options
author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-05-23 05:25:44 +0000 |
---|---|---|
committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-05-23 05:25:44 +0000 |
commit | d9e5c1fffb22d39dd52ef23febe40cd4e2ee0965 (patch) | |
tree | 23b9c355ca02dbee8566b71685c63c319e9ee08d /MdePkg/Library/IfrSupportLib | |
parent | 254ba2477fd0b101228da33db03efed95c6489ae (diff) | |
download | edk2-platforms-d9e5c1fffb22d39dd52ef23febe40cd4e2ee0965.tar.xz |
1) Add BufToHexString, HexStringToBuf and IsHexDigit to BaseLib.
2) Remove the duplicated functions implementation from the modules that reference these APIs
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5282 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg/Library/IfrSupportLib')
-rw-r--r-- | MdePkg/Library/IfrSupportLib/IfrSupportLib.inf | 3 | ||||
-rw-r--r-- | MdePkg/Library/IfrSupportLib/UefiIfrForm.c | 63 | ||||
-rw-r--r-- | MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h | 4 |
3 files changed, 7 insertions, 63 deletions
diff --git a/MdePkg/Library/IfrSupportLib/IfrSupportLib.inf b/MdePkg/Library/IfrSupportLib/IfrSupportLib.inf index a8d5df4c95..98ac18c07c 100644 --- a/MdePkg/Library/IfrSupportLib/IfrSupportLib.inf +++ b/MdePkg/Library/IfrSupportLib/IfrSupportLib.inf @@ -38,8 +38,6 @@ UefiIfrForm.c
UefiIfrLibraryInternal.h
UefiIfrOpCodeCreation.c
- R8Lib.h
- R8Lib.c
[Packages]
@@ -71,4 +69,3 @@ [Pcd]
gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang
-
\ No newline at end of file diff --git a/MdePkg/Library/IfrSupportLib/UefiIfrForm.c b/MdePkg/Library/IfrSupportLib/UefiIfrForm.c index e630e3e39d..8963789423 100644 --- a/MdePkg/Library/IfrSupportLib/UefiIfrForm.c +++ b/MdePkg/Library/IfrSupportLib/UefiIfrForm.c @@ -27,55 +27,6 @@ Abstract: // UINT16 mFakeConfigHdr[] = L"GUID=00000000000000000000000000000000&NAME=0000&PATH=0"; -#if 0 -STATIC -EFI_STATUS -GetPackageDataFromPackageList ( - IN EFI_HII_PACKAGE_LIST_HEADER *HiiPackageList, - IN UINT32 PackageIndex, - OUT UINT32 *BufferLen, - OUT EFI_HII_PACKAGE_HEADER **Buffer - ) -{ - UINT32 Index; - EFI_HII_PACKAGE_HEADER *Package; - UINT32 Offset; - UINT32 PackageListLength; - EFI_HII_PACKAGE_HEADER PackageHeader = {0, 0}; - - ASSERT(HiiPackageList != NULL); - - if ((BufferLen == NULL) || (Buffer == NULL)) { - return EFI_INVALID_PARAMETER; - } - - Package = NULL; - Index = 0; - Offset = sizeof (EFI_HII_PACKAGE_LIST_HEADER); - CopyMem (&PackageListLength, &HiiPackageList->PackageLength, sizeof (UINT32)); - while (Offset < PackageListLength) { - Package = (EFI_HII_PACKAGE_HEADER *) (((UINT8 *) HiiPackageList) + Offset); - CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER)); - if (Index == PackageIndex) { - break; - } - Offset += PackageHeader.Length; - Index++; - } - if (Offset >= PackageListLength) { - // - // no package found in this Package List - // - return EFI_NOT_FOUND; - } - - *BufferLen = PackageHeader.Length; - *Buffer = Package; - return EFI_SUCCESS; -} -#endif - - /** Draw a dialog and return the selected key. @@ -301,7 +252,7 @@ SwapBuffer ( /** - Converts binary buffer to Unicode string in reversed byte order from R8_BufToHexString(). + Converts binary buffer to Unicode string in reversed byte order from BufToHexString(). @param Str String for output @param Buffer Binary buffer. @@ -326,7 +277,7 @@ BufferToHexString ( SwapBuffer (NewBuffer, BufferSize); StrBufferLen = (BufferSize + 1) * sizeof (CHAR16); - Status = R8_BufToHexString (Str, &StrBufferLen, NewBuffer, BufferSize); + Status = BufToHexString (Str, &StrBufferLen, NewBuffer, BufferSize); gBS->FreePool (NewBuffer); @@ -335,7 +286,7 @@ BufferToHexString ( /** - Converts Hex String to binary buffer in reversed byte order from R8_HexStringToBuf(). + Converts Hex String to binary buffer in reversed byte order from HexStringToBuf(). @param Buffer Pointer to buffer that receives the data. @param BufferSize Length in bytes of the buffer to hold converted @@ -360,7 +311,7 @@ HexStringToBuffer ( UINTN ConvertedStrLen; ConvertedStrLen = 0; - Status = R8_HexStringToBuf (Buffer, BufferSize, Str, &ConvertedStrLen); + Status = HexStringToBuf (Buffer, BufferSize, Str, &ConvertedStrLen); if (!EFI_ERROR (Status)) { SwapBuffer (Buffer, ConvertedStrLen); } @@ -496,7 +447,7 @@ FindBlockName ( Data = 0; BufferSize = sizeof (UINTN); - Status = R8_HexStringToBuf ((UINT8 *) &Data, &BufferSize, String, &ConvertedStrLen); + Status = HexStringToBuf ((UINT8 *) &Data, &BufferSize, String, &ConvertedStrLen); if (EFI_ERROR (Status)) { return FALSE; } @@ -513,7 +464,7 @@ FindBlockName ( Data = 0; BufferSize = sizeof (UINTN); - Status = R8_HexStringToBuf ((UINT8 *) &Data, &BufferSize, String, &ConvertedStrLen); + Status = HexStringToBuf ((UINT8 *) &Data, &BufferSize, String, &ConvertedStrLen); if (EFI_ERROR (Status)) { return FALSE; } @@ -710,7 +661,7 @@ SetBrowserData ( // StringPtr = BlockName + 16; BufferLen = sizeof (BlockName) - (16 * sizeof (CHAR16)); - R8_BufToHexString (StringPtr, &BufferLen, (UINT8 *) &BufferSize, sizeof (UINTN)); + BufToHexString (StringPtr, &BufferLen, (UINT8 *) &BufferSize, sizeof (UINTN)); Request = BlockName; } else { diff --git a/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h b/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h index dd41c7aea3..dade8592f5 100644 --- a/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h +++ b/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h @@ -40,8 +40,4 @@ Abstract: #include <Library/HiiLib.h> #include <Library/PcdLib.h> -//#include <MdeModuleHii.h> - -#include "R8Lib.h" - #endif |