aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Dykes <mardyk01@review.trustedfirmware.org>2020-10-14 18:59:27 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-10-14 18:59:27 +0000
commitdfe577a817d8384c313f0a184be75efeb3cd8445 (patch)
tree70b809f525b66182abb50f8fa77a9a5202bf0a5f /include
parent5dfe680fa8041d2a4a983fee9517a6bf451a1767 (diff)
parent831b0e9824e6c7cb07308830c12977acb79156c7 (diff)
downloadtrusted-firmware-a-dfe577a817d8384c313f0a184be75efeb3cd8445.tar.gz
Merge "Don't return error information from console_flush" into integration
Diffstat (limited to 'include')
-rw-r--r--include/common/debug.h2
-rw-r--r--include/drivers/console.h6
-rw-r--r--include/plat/common/platform.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/common/debug.h b/include/common/debug.h
index 9aef15b514..ed0e8bf97c 100644
--- a/include/common/debug.h
+++ b/include/common/debug.h
@@ -101,7 +101,7 @@ void __dead2 do_panic(void);
#define panic() \
do { \
backtrace(__func__); \
- (void)console_flush(); \
+ console_flush(); \
do_panic(); \
} while (false)
diff --git a/include/drivers/console.h b/include/drivers/console.h
index 761816ac74..99bf960418 100644
--- a/include/drivers/console.h
+++ b/include/drivers/console.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -43,7 +43,7 @@ typedef struct console {
u_register_t flags;
int (*const putc)(int character, struct console *console);
int (*const getc)(struct console *console);
- int (*const flush)(struct console *console);
+ void (*const flush)(struct console *console);
uintptr_t base;
/* Additional private driver data may follow here. */
} console_t;
@@ -76,7 +76,7 @@ int console_putc(int c);
/* Read a character (blocking) from any console registered for current state. */
int console_getc(void);
/* Flush all consoles registered for the current state. */
-int console_flush(void);
+void console_flush(void);
#endif /* __ASSEMBLER__ */
diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h
index 2c1a180c83..ebcc855774 100644
--- a/include/plat/common/platform.h
+++ b/include/plat/common/platform.h
@@ -111,7 +111,7 @@ uintptr_t plat_get_my_stack(void);
void plat_report_exception(unsigned int exception_type);
int plat_crash_console_init(void);
int plat_crash_console_putc(int c);
-int plat_crash_console_flush(void);
+void plat_crash_console_flush(void);
void plat_error_handler(int err) __dead2;
void plat_panic_handler(void) __dead2;
const char *plat_log_get_prefix(unsigned int log_level);