archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2025-12-08 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

OcStringLib: Convert to BASE instance.

Browse Source
This commit is contained in:
Download-Fritz 2018-11-09 18:49:30 +01:00
parent 37b0e363d9
commit d924a62b4e
4 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Include/Library/OcStringLib.h
View File

@ -172,12 +172,12 @@ OcAsciiStrnCmp (
@param[in] StringGuid A pointer to a buffer containing the ascii string.
@param[in] Guid A pointer to location to store the converted GUID.
@retval EFI_SUCCESS The conversion completed successfully.
@retval RETURN_SUCCESS The conversion completed successfully.
**/
EFI_STATUS
RETURN_STATUS
OcAsciiStrToGuid (
IN CONST CHAR8 *StringGuid,
IN OUT EFI_GUID *Guid
IN OUT GUID *Guid
);
// OcAsciiStrToUnicode
@ -326,12 +326,12 @@ ToUpperChar (
@param[in] StringGuid A pointer to a buffer containing the unicode string.
@param[in] Guid A pointer to location to store the converted GUID.
@retval EFI_SUCCESS The conversion completed successfully.
@retval RETURN_SUCCESS The conversion completed successfully.
**/
EFI_STATUS
RETURN_STATUS
OcStrToGuid (
IN CONST CHAR16 *StringGuid,
IN OUT EFI_GUID *Guid
IN OUT GUID *Guid
);
// OcStrToAscii

20
Library/OcStringLib/OcAsciiLib.c
View File

@ -12,17 +12,11 @@
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <Uefi.h>
#include <Base.h>
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/OcStringLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiLib.h>
#include <Macros.h>
// IsAsciiPrint
/** Check if character is printable
@ -220,17 +214,17 @@ AsciiToUpperChar (
@param[in] StringGuid A pointer to a buffer containing the ascii string.
@param[in] Guid A pointer to location to store the converted GUID.
@retval EFI_SUCCESS The conversion completed successfully.
@retval RETURN_SUCCESS The conversion completed successfully.
**/
EFI_STATUS
RETURN_STATUS
OcAsciiStrToGuid (
IN CONST CHAR8 *StringGuid,
IN OUT EFI_GUID *Guid
IN OUT GUID *Guid
)
{
EFI_STATUS Status;
RETURN_STATUS Status;
Status = EFI_INVALID_PARAMETER;
Status = RETURN_INVALID_PARAMETER;
if ((StringGuid != NULL) && (Guid != NULL)) {
ZeroMem (Guid, sizeof (*Guid));
@ -252,7 +246,7 @@ OcAsciiStrToGuid (
Guid->Data4[6] = (UINT8)(AsciiHexCharToUintn (StringGuid[32]) * 16 + AsciiHexCharToUintn (StringGuid[33]));
Guid->Data4[7] = (UINT8)(AsciiHexCharToUintn (StringGuid[34]) * 16 + AsciiHexCharToUintn (StringGuid[35]));
Status = EFI_SUCCESS;
Status = RETURN_SUCCESS;
}
}

4
Library/OcStringLib/OcStringLib.inf
View File

@ -22,7 +22,7 @@
FILE_GUID = 1E0810F7-9E40-43D0-A036-185407D0231D
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = OcStringLib|PEIM DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_DRIVER UEFI_APPLICATION DXE_SMM_DRIVER
LIBRARY_CLASS = OcStringLib
#
@ -45,4 +45,6 @@
[LibraryClasses]
BaseLib
BaseMemoryLib
MemoryAllocationLib

19
Library/OcStringLib/OcUnicodeLib.c
View File

@ -12,17 +12,12 @@
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <Uefi.h>
#include <Base.h>
#include <Library/DebugLib.h>
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/OcStringLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiLib.h>
#include <Macros.h>
// IsPrint
/** Check if character is printable
@ -219,17 +214,17 @@ ToUpperChar (
@param[in] StringGuid A pointer to a buffer containing the unicode string.
@param[in] Guid A pointer to location to store the converted GUID.
@retval EFI_SUCCESS The conversion completed successfully.
@retval RETURN_UCCESS The conversion completed successfully.
**/
EFI_STATUS
RETURN_STATUS
OcStrToGuid (
IN CONST CHAR16 *StringGuid,
IN OUT EFI_GUID *Guid
IN OUT GUID *Guid
)
{
EFI_STATUS Status;
RETURN_STATUS Status;
Status = EFI_INVALID_PARAMETER;
Status = RETURN_INVALID_PARAMETER;
if ((StringGuid != NULL) && (Guid != NULL)) {
ZeroMem (Guid, sizeof (*Guid));
@ -251,7 +246,7 @@ OcStrToGuid (
Guid->Data4[6] = (UINT8)(HexCharToUintn (StringGuid[32]) * 16 + HexCharToUintn (StringGuid[33]));
Guid->Data4[7] = (UINT8)(HexCharToUintn (StringGuid[34]) * 16 + HexCharToUintn (StringGuid[35]));
Status = EFI_SUCCESS;
Status = RETURN_SUCCESS;
}
}