Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-18 18:44:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Introduce tf_vprintf() and tf_string_print()

Browse source 
This patch introduces tf_vprintf() and tf_string_print() APIs
which is needed by the logging framework introduced in a later
patch.

Change-Id: Ie4240443d0e04e070502b51e371e546dd469fd33
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
This commit is contained in:
Soby Mathew 2017-09-04 11:45:52 +01:00
parent 8b6385deb3
commit 2d7e82823d
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
common/tf_printf.c
View file

@ -23,8 +23,10 @@
(((lcount) > 1) ? va_arg(args, unsigned long long int) : \
((lcount) ? va_arg(args, unsigned long int) : va_arg(args, unsigned int)))
static void string_print(const char *str)
void tf_string_print(const char *str)
{
assert(str);
while (*str)
putchar(*str++);
}
@ -64,15 +66,13 @@ static void unsigned_num_print(unsigned long long int unum, unsigned int radix)
* The print exits on all other formats specifiers other than valid
* combinations of the above specifiers.
*******************************************************************/
void tf_printf(const char *fmt, ...)
void tf_vprintf(const char *fmt, va_list args)
{
va_list args;
int l_count;
long long int num;
unsigned long long int unum;
char *str;
va_start(args, fmt);
while (*fmt) {
l_count = 0;
@ -94,12 +94,12 @@ loop:
break;
case 's':
str = va_arg(args, char *);
string_print(str);
tf_string_print(str);
break;
case 'p':
unum = (uintptr_t)va_arg(args, void *);
if (unum)
string_print("0x");
tf_string_print("0x");
unsigned_num_print(unum, 16);
break;
@ -123,13 +123,20 @@ loop:
break;
default:
/* Exit on any other format specifier */
goto exit;
return;
}
fmt++;
continue;
}
putchar(*fmt++);
}
exit:
va_end(args);
}
void tf_printf(const char *fmt, ...)
{
va_list va;
va_start(va, fmt);
tf_vprintf(fmt, va);
va_end(va);
}

3
include/common/debug.h
View file

@ -24,6 +24,7 @@
#define LOG_LEVEL_VERBOSE 50
#ifndef __ASSEMBLY__
#include <stdarg.h>
#include <stdio.h>
#if LOG_LEVEL >= LOG_LEVEL_NOTICE
@ -65,6 +66,8 @@ void __dead2 __stack_chk_fail(void);
void tf_printf(const char *fmt, ...) __printflike(1, 2);
int tf_snprintf(char *s, size_t n, const char *fmt, ...) __printflike(3, 4);
void tf_vprintf(const char *fmt, va_list args);
void tf_string_print(const char *str);
#endif /* __ASSEMBLY__ */
#endif /* __DEBUG_H__ */