erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libpayload: Add ability to unregister output driver

Browse source 
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 87680a2464)
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>
This commit is contained in:
Julius Werner 2014-06-02 20:13:51 -07:00 • committed by Marc Jones
commit 43e10301c0
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
payloads/libpayload/include/libpayload.h
View file

@ -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
/** @} */

17
payloads/libpayload/libc/console.c
View file

@ -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