aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2018-12-21 09:48:17 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2018-12-21 09:48:17 +0000
commit485cee0e136763febc859b8eddd5c54520987725 (patch)
treec578ab7cb2a16dd3f7687c98d5ce62ad8732a9ae /include
parentba7695b39bb82d5ceba093b0c18dd38cc9af61c3 (diff)
parentdfa5ed9fc80f7aad9a0b284a1844aae3251fe75e (diff)
downloadtf-a-tests-485cee0e136763febc859b8eddd5c54520987725.tar.gz
Merge changes from topic "sb/terse-output"
* changes: Remove redundant error message in tftf_initialise_timer() Remove prints from VExpress NOR flash driver Remove prints in get_overall_test_result() Remove SHELL_COLOR build flag Do not print CPU MPID in mp_printf() Use vprintf() inside mp_printf() Add vprintf() in standard C library
Diffstat (limited to 'include')
-rw-r--r--include/common/debug.h23
-rw-r--r--include/lib/stdlib/stdio.h2
2 files changed, 4 insertions, 21 deletions
diff --git a/include/common/debug.h b/include/common/debug.h
index bfbff093d..216c53d9b 100644
--- a/include/common/debug.h
+++ b/include/common/debug.h
@@ -9,34 +9,15 @@
#include <stdio.h>
-/* TODO: Deal with per-image printf functions in a cleaner way. */
-
-#if defined(IMAGE_CACTUS) || defined(IMAGE_IVY)
-/*
- * The register MPIDR_EL1 can't be read from EL0, which means that mp_printf()
- * can't be used.
- */
-#define mp_printf printf
-#else
/*
* Print a formatted string on the UART.
*
* Does the same thing as the standard libc's printf() function but in a MP-safe
* manner, i.e. it can be called from several CPUs simultaneously without
* getting interleaved messages.
- *
- * The messages printed using mp_printf() won't be saved in the test results
- * (use tftf_testcase_output() instead for that). mp_printf() is meant to be
- * used for debug traces only. Unlike messages stored in the tests output which
- * appear only at the end of the test session in the test report, messages
- * printed using mp_printf() will be displayed straight away.
- *
- * Messaged will be prefixed by the CPU MPID issuing the call, like that:
- * [cpu 0x0002] Sending SGI #1 to cpu 0
*/
__attribute__((format(printf, 1, 2)))
void mp_printf(const char *fmt, ...);
-#endif
/*
* The log output macros print output to the console. These macros produce
@@ -44,8 +25,8 @@ void mp_printf(const char *fmt, ...);
* make command line) is greater or equal than the level required for that
* type of log output.
* The format expected is similar to printf(). For example:
- * INFO("Info %s.\n", "message") -> [cpu 0xxx] INFO: Info message.
- * WARN("Warning %s.\n", "message") -> [cpu 0xxx] WARNING: Warning message.
+ * INFO("Info %s.\n", "message") -> INFO: Info message.
+ * WARN("Warning %s.\n", "message") -> WARNING: Warning message.
*/
#define LOG_LEVEL_NONE 0
#define LOG_LEVEL_ERROR 10
diff --git a/include/lib/stdlib/stdio.h b/include/lib/stdlib/stdio.h
index 80110a8b4..55d8fe2c1 100644
--- a/include/lib/stdlib/stdio.h
+++ b/include/lib/stdlib/stdio.h
@@ -59,6 +59,8 @@ typedef __ssize_t ssize_t;
#define EOF (-1)
int printf(const char * __restrict, ...) __printflike(1, 2);
+int vprintf(const char * __restrict, __va_list);
+
int putchar(int);
int puts(const char *);
int sprintf(char * __restrict, const char * __restrict, ...)