From be870d264cad24389cd408058a20c39b95134aa0 Mon Sep 17 00:00:00 2001 From: jljusten Date: Mon, 17 Mar 2008 21:29:07 +0000 Subject: Renamed to match filename naming recommendations. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4879 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Foundation/Library/Dxe/Print/Ascii/SPrint.c | 144 +++++++++++++++++++++ .../Foundation/Library/Dxe/Print/Ascii/Sprint.c | 144 --------------------- 2 files changed, 144 insertions(+), 144 deletions(-) create mode 100644 EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Ascii/SPrint.c delete mode 100644 EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Ascii/Sprint.c (limited to 'EdkCompatibilityPkg/Foundation/Library/Dxe') diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Ascii/SPrint.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Ascii/SPrint.c new file mode 100644 index 0000000000..7c44ad57ce --- /dev/null +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Ascii/SPrint.c @@ -0,0 +1,144 @@ +/*++ + +Copyright (c) 2004, 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. + +Module Name: + + Sprint.c + +Abstract: + + Basic Ascii AvSPrintf() function named VSPrint(). VSPrint() enables very + simple implemenation of SPrint() and Print() to support debug. + + You can not Print more than EFI_DRIVER_LIB_MAX_PRINT_BUFFER characters at a + time. This makes the implementation very simple. + + VSPrint, Print, SPrint format specification has the follwoing form + + %[flags][width]type + + flags: + '-' - Left justify + '+' - Prefix a sign + ' ' - Prefix a blank + ',' - Place commas in numberss + '0' - Prefix for width with zeros + 'l' - UINT64 + 'L' - UINT64 + + width: + '*' - Get width from a UINTN argumnet from the argument list + Decimal number that represents width of print + + type: + 'X' - argument is a UINTN hex number, prefix '0' + 'x' - argument is a hex number + 'd' - argument is a decimal number + 'a' - argument is an ascii string + 'S','s' - argument is an Unicode string + 'g' - argument is a pointer to an EFI_GUID + 't' - argument is a pointer to an EFI_TIME structure + 'c' - argument is an ascii character + 'r' - argument is EFI_STATUS + '%' - Print a % + +--*/ + +#include "TianoCommon.h" +#include "PrintWidth.h" +#include "EfiPrintLib.h" +#include "Print.h" + + +UINTN +USPrint ( + OUT CHAR16 *Buffer, + IN UINTN BufferSize, + IN CONST CHAR16 *Format, + ... + ) +/*++ + +Routine Description: + + Process format and place the results in Buffer for wide chars. + +Arguments: + + Buffer - Wide char buffer to print the results of the parsing of Format into. + BufferSize - Maximum number of characters to put into buffer. + Format - Format string + ... - Vararg list consumed by processing Format. + +Returns: + + Number of characters printed. + +--*/ +{ + UINTN Return; + VA_LIST Marker; + + VA_START (Marker, Format); + Return = UnicodeVSPrint (Buffer, BufferSize, Format, Marker); + VA_END (Marker); + + return Return; +} + + +UINTN +UvSPrint ( + OUT CHAR16 *Buffer, + IN UINTN BufferSize, + IN CONST CHAR16 *FormatString, + IN VA_LIST Marker + ) +/*++ + +Routine Description: + + Internal implementation of USPrint. + Process format and place the results in Buffer for wide chars. + +Arguments: + + Buffer - Wide char buffer to print the results of the parsing of Format into. + BufferSize - Maximum number of characters to put into buffer. + FormatString - Format string + Marker - Vararg list consumed by processing Format. + +Returns: + + Number of characters printed. + +--*/ +{ + UINTN Index; + CHAR8 AsciiFormat[EFI_DRIVER_LIB_MAX_PRINT_BUFFER]; + CHAR8 AsciiResult[EFI_DRIVER_LIB_MAX_PRINT_BUFFER]; + + for (Index = 0; Index < EFI_DRIVER_LIB_MAX_PRINT_BUFFER && FormatString[Index] != '\0'; Index++) { + AsciiFormat[Index] = (CHAR8) FormatString[Index]; + } + + AsciiFormat[Index] = '\0'; + + Index = VSPrint (AsciiResult, EFI_DRIVER_LIB_MAX_PRINT_BUFFER, AsciiFormat, Marker); + + for (Index = 0; (Index < (BufferSize - 1)) && AsciiResult[Index] != '\0'; Index++) { + Buffer[Index] = (CHAR16) AsciiResult[Index]; + } + + Buffer[Index] = '\0'; + + return Index++; +} diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Ascii/Sprint.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Ascii/Sprint.c deleted file mode 100644 index 7c44ad57ce..0000000000 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Ascii/Sprint.c +++ /dev/null @@ -1,144 +0,0 @@ -/*++ - -Copyright (c) 2004, 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. - -Module Name: - - Sprint.c - -Abstract: - - Basic Ascii AvSPrintf() function named VSPrint(). VSPrint() enables very - simple implemenation of SPrint() and Print() to support debug. - - You can not Print more than EFI_DRIVER_LIB_MAX_PRINT_BUFFER characters at a - time. This makes the implementation very simple. - - VSPrint, Print, SPrint format specification has the follwoing form - - %[flags][width]type - - flags: - '-' - Left justify - '+' - Prefix a sign - ' ' - Prefix a blank - ',' - Place commas in numberss - '0' - Prefix for width with zeros - 'l' - UINT64 - 'L' - UINT64 - - width: - '*' - Get width from a UINTN argumnet from the argument list - Decimal number that represents width of print - - type: - 'X' - argument is a UINTN hex number, prefix '0' - 'x' - argument is a hex number - 'd' - argument is a decimal number - 'a' - argument is an ascii string - 'S','s' - argument is an Unicode string - 'g' - argument is a pointer to an EFI_GUID - 't' - argument is a pointer to an EFI_TIME structure - 'c' - argument is an ascii character - 'r' - argument is EFI_STATUS - '%' - Print a % - ---*/ - -#include "TianoCommon.h" -#include "PrintWidth.h" -#include "EfiPrintLib.h" -#include "Print.h" - - -UINTN -USPrint ( - OUT CHAR16 *Buffer, - IN UINTN BufferSize, - IN CONST CHAR16 *Format, - ... - ) -/*++ - -Routine Description: - - Process format and place the results in Buffer for wide chars. - -Arguments: - - Buffer - Wide char buffer to print the results of the parsing of Format into. - BufferSize - Maximum number of characters to put into buffer. - Format - Format string - ... - Vararg list consumed by processing Format. - -Returns: - - Number of characters printed. - ---*/ -{ - UINTN Return; - VA_LIST Marker; - - VA_START (Marker, Format); - Return = UnicodeVSPrint (Buffer, BufferSize, Format, Marker); - VA_END (Marker); - - return Return; -} - - -UINTN -UvSPrint ( - OUT CHAR16 *Buffer, - IN UINTN BufferSize, - IN CONST CHAR16 *FormatString, - IN VA_LIST Marker - ) -/*++ - -Routine Description: - - Internal implementation of USPrint. - Process format and place the results in Buffer for wide chars. - -Arguments: - - Buffer - Wide char buffer to print the results of the parsing of Format into. - BufferSize - Maximum number of characters to put into buffer. - FormatString - Format string - Marker - Vararg list consumed by processing Format. - -Returns: - - Number of characters printed. - ---*/ -{ - UINTN Index; - CHAR8 AsciiFormat[EFI_DRIVER_LIB_MAX_PRINT_BUFFER]; - CHAR8 AsciiResult[EFI_DRIVER_LIB_MAX_PRINT_BUFFER]; - - for (Index = 0; Index < EFI_DRIVER_LIB_MAX_PRINT_BUFFER && FormatString[Index] != '\0'; Index++) { - AsciiFormat[Index] = (CHAR8) FormatString[Index]; - } - - AsciiFormat[Index] = '\0'; - - Index = VSPrint (AsciiResult, EFI_DRIVER_LIB_MAX_PRINT_BUFFER, AsciiFormat, Marker); - - for (Index = 0; (Index < (BufferSize - 1)) && AsciiResult[Index] != '\0'; Index++) { - Buffer[Index] = (CHAR16) AsciiResult[Index]; - } - - Buffer[Index] = '\0'; - - return Index++; -} -- cgit v1.2.3