diff options
| author | Julius Werner <jwerner@chromium.org> | 2014-06-02 20:13:51 -0700 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2015-01-09 07:04:58 +0100 |
| commit | 43e10301c0ae481e97cfc84080bb0989a13174f4 (patch) | |
| tree | dec6dfbca7557750bb1cb1170b680ed915c4a33f | |
| parent | 8c8c377584742755ca7a2f490e77d0cd8da36bee (diff) | |
libpayload: Add ability to unregister output driver
This patch adds a console_kill_output_driver() function, which can
remove a previously registered output driver. This is mostly useful when
you overlay some output channel over another, such as when the GDB stub
takes direct control of the UART (and thus has to get rid of the
existing serial output driver).
BUG=chrome-os-partner:18390
TEST=None
Original-Change-Id: I6fce95c22fd15cd321ca6b2d6fbc4e3902b1eac3
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/202561
Original-Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
(cherry picked from commit 87680a246429d24e99b7b477b743c357f73b752c)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Change-Id: I50001cee4582c962ceedc215d59238867a6ae95a
Reviewed-on: http://review.coreboot.org/8116
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | payloads/libpayload/include/libpayload.h | 1 | ||||
| -rw-r--r-- | payloads/libpayload/libc/console.c | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index 9781c9eab5..40a85cfd62 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -282,6 +282,7 @@ struct console_output_driver { void console_add_output_driver(struct console_output_driver *out); void console_add_input_driver(struct console_input_driver *in); +int console_remove_output_driver(void *function); #define havechar havekey /** @} */ diff --git a/payloads/libpayload/libc/console.c b/payloads/libpayload/libc/console.c index 8c0664d125..827da792b9 100644 --- a/payloads/libpayload/libc/console.c +++ b/payloads/libpayload/libc/console.c @@ -48,6 +48,23 @@ void console_add_input_driver(struct console_input_driver *in) console_in = in; } +/* + * For when you really need to silence an output driver (e.g. to avoid ugly + * recursions). Takes the pointer of either of the two output functions, since + * the struct console_output_driver itself is often static and inaccessible. + */ +int console_remove_output_driver(void *function) +{ + struct console_output_driver **out; + for (out = &console_out; *out; out = &(*out)->next) + if ((*out)->putchar == function || (*out)->write == function) { + *out = (*out)->next; + return 1; + } + + return 0; +} + void console_init(void) { #ifdef CONFIG_LP_VIDEO_CONSOLE |