mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-19 02:54:24 +00:00

Enforce full include path for includes. Deprecate old paths. The following folders inside include/lib have been left unchanged: - include/lib/cpus/${ARCH} - include/lib/el3_runtime/${ARCH} The reason for this change is that having a global namespace for includes isn't a good idea. It defeats one of the advantages of having folders and it introduces problems that are sometimes subtle (because you may not know the header you are actually including if there are two of them). For example, this patch had to be created because two headers were called the same way:e0ea0928d5
("Fix gpio includes of mt8173 platform to avoid collision."). More recently, this patch has had similar problems:46f9b2c3a2
("drivers: add tzc380 support"). This problem was introduced in commit4ecca33988
("Move include and source files to logical locations"). At that time, there weren't too many headers so it wasn't a real issue. However, time has shown that this creates problems. Platforms that want to preserve the way they include headers may add the removed paths to PLAT_INCLUDES, but this is discouraged. Change-Id: I39dc53ed98f9e297a5966e723d1936d6ccf2fc8f Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
197 lines
4.1 KiB
C
197 lines
4.1 KiB
C
/*
|
|
* Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <assert.h>
|
|
#include <stdarg.h>
|
|
#include <stdbool.h>
|
|
#include <stdint.h>
|
|
|
|
#include <common/debug.h>
|
|
|
|
#define get_num_va_args(_args, _lcount) \
|
|
(((_lcount) > 1) ? va_arg(_args, long long int) : \
|
|
(((_lcount) == 1) ? va_arg(_args, long int) : \
|
|
va_arg(_args, int)))
|
|
|
|
#define get_unum_va_args(_args, _lcount) \
|
|
(((_lcount) > 1) ? va_arg(_args, unsigned long long int) : \
|
|
(((_lcount) == 1) ? va_arg(_args, unsigned long int) : \
|
|
va_arg(_args, unsigned int)))
|
|
|
|
static int string_print(const char *str)
|
|
{
|
|
int count = 0;
|
|
|
|
assert(str != NULL);
|
|
|
|
for ( ; *str != '\0'; str++) {
|
|
(void)putchar(*str);
|
|
count++;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
static int unsigned_num_print(unsigned long long int unum, unsigned int radix,
|
|
char padc, int padn)
|
|
{
|
|
/* Just need enough space to store 64 bit decimal integer */
|
|
char num_buf[20];
|
|
int i = 0, count = 0;
|
|
unsigned int rem;
|
|
|
|
do {
|
|
rem = unum % radix;
|
|
if (rem < 0xa)
|
|
num_buf[i] = '0' + rem;
|
|
else
|
|
num_buf[i] = 'a' + (rem - 0xa);
|
|
i++;
|
|
unum /= radix;
|
|
} while (unum > 0U);
|
|
|
|
if (padn > 0) {
|
|
while (i < padn) {
|
|
(void)putchar(padc);
|
|
count++;
|
|
padn--;
|
|
}
|
|
}
|
|
|
|
while (--i >= 0) {
|
|
(void)putchar(num_buf[i]);
|
|
count++;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
/*******************************************************************
|
|
* Reduced format print for Trusted firmware.
|
|
* The following type specifiers are supported by this print
|
|
* %x - hexadecimal format
|
|
* %s - string format
|
|
* %d or %i - signed decimal format
|
|
* %u - unsigned decimal format
|
|
* %p - pointer format
|
|
*
|
|
* The following length specifiers are supported by this print
|
|
* %l - long int (64-bit on AArch64)
|
|
* %ll - long long int (64-bit on AArch64)
|
|
* %z - size_t sized integer formats (64 bit on AArch64)
|
|
*
|
|
* The following padding specifiers are supported by this print
|
|
* %0NN - Left-pad the number with 0s (NN is a decimal number)
|
|
*
|
|
* The print exits on all other formats specifiers other than valid
|
|
* combinations of the above specifiers.
|
|
*******************************************************************/
|
|
int vprintf(const char *fmt, va_list args)
|
|
{
|
|
int l_count;
|
|
long long int num;
|
|
unsigned long long int unum;
|
|
char *str;
|
|
char padc = '\0'; /* Padding character */
|
|
int padn; /* Number of characters to pad */
|
|
int count = 0; /* Number of printed characters */
|
|
|
|
while (*fmt != '\0') {
|
|
l_count = 0;
|
|
padn = 0;
|
|
|
|
if (*fmt == '%') {
|
|
fmt++;
|
|
/* Check the format specifier */
|
|
loop:
|
|
switch (*fmt) {
|
|
case 'i': /* Fall through to next one */
|
|
case 'd':
|
|
num = get_num_va_args(args, l_count);
|
|
if (num < 0) {
|
|
(void)putchar('-');
|
|
unum = (unsigned long long int)-num;
|
|
padn--;
|
|
} else
|
|
unum = (unsigned long long int)num;
|
|
|
|
count += unsigned_num_print(unum, 10,
|
|
padc, padn);
|
|
break;
|
|
case 's':
|
|
str = va_arg(args, char *);
|
|
count += string_print(str);
|
|
break;
|
|
case 'p':
|
|
unum = (uintptr_t)va_arg(args, void *);
|
|
if (unum > 0U) {
|
|
count += string_print("0x");
|
|
padn -= 2;
|
|
}
|
|
|
|
count += unsigned_num_print(unum, 16,
|
|
padc, padn);
|
|
break;
|
|
case 'x':
|
|
unum = get_unum_va_args(args, l_count);
|
|
count += unsigned_num_print(unum, 16,
|
|
padc, padn);
|
|
break;
|
|
case 'z':
|
|
if (sizeof(size_t) == 8U)
|
|
l_count = 2;
|
|
|
|
fmt++;
|
|
goto loop;
|
|
case 'l':
|
|
l_count++;
|
|
fmt++;
|
|
goto loop;
|
|
case 'u':
|
|
unum = get_unum_va_args(args, l_count);
|
|
count += unsigned_num_print(unum, 10,
|
|
padc, padn);
|
|
break;
|
|
case '0':
|
|
padc = '0';
|
|
padn = 0;
|
|
fmt++;
|
|
|
|
for (;;) {
|
|
char ch = *fmt;
|
|
if ((ch < '0') || (ch > '9')) {
|
|
goto loop;
|
|
}
|
|
padn = (padn * 10) + (ch - '0');
|
|
fmt++;
|
|
}
|
|
assert(0); /* Unreachable */
|
|
default:
|
|
/* Exit on any other format specifier */
|
|
return -1;
|
|
}
|
|
fmt++;
|
|
continue;
|
|
}
|
|
(void)putchar(*fmt);
|
|
fmt++;
|
|
count++;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
int printf(const char *fmt, ...)
|
|
{
|
|
int count;
|
|
va_list va;
|
|
|
|
va_start(va, fmt);
|
|
count = vprintf(fmt, va);
|
|
va_end(va);
|
|
|
|
return count;
|
|
}
|