diff options
author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2011-04-20 21:11:22 +0000 |
---|---|---|
committer | Stefan Reinauer <stepan@openbios.org> | 2011-04-20 21:11:22 +0000 |
commit | bbd2f21184fdede46f7b6136bf0be47582236376 (patch) | |
tree | beb18e1733d2d01fc3151ff94685be85179555dd /src/arch/x86/lib/romstage_console.c | |
parent | 42fa7fe28b60b448f501e99ee285a0af12c86d34 (diff) |
Simplify coreboot's console/console.h
- shift most (romcc) code out of console.h into arch/x86/lib/romcc_console.c
- rename arch/x86/lib/printk_init.c to .../romstage_console.c
- drop FUNCTIONS_FOR_PRINT since __console_tx_* are already functions, so there
should not be any side effects to eliminating another indirection.
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Acked-by: Patrick Georgi <patrick@georgi-clan.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6532 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/x86/lib/romstage_console.c')
-rw-r--r-- | src/arch/x86/lib/romstage_console.c | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c new file mode 100644 index 0000000000..e8a926356e --- /dev/null +++ b/src/arch/x86/lib/romstage_console.c @@ -0,0 +1,64 @@ +/* + * This file is part of the coreboot project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include <console/console.h> +#include <console/vtxprintf.h> +#if CONFIG_CONSOLE_SERIAL8250 +#include <uart8250.h> +#endif +#if CONFIG_USBDEBUG +#include <usbdebug.h> +#endif +#if CONFIG_CONSOLE_NE2K +#include <console/ne2k.h> +#endif + +static void console_tx_byte(unsigned char byte) +{ + if (byte == '\n') + console_tx_byte('\r'); + +#if CONFIG_CONSOLE_SERIAL8250 + uart8250_tx_byte(CONFIG_TTYS0_BASE, byte); +#endif +#if CONFIG_USBDEBUG + usbdebug_tx_byte(byte); +#endif +#if CONFIG_CONSOLE_NE2K + ne2k_append_data(&byte, 1, CONFIG_CONSOLE_NE2K_IO_PORT); +#endif +} + +int do_printk(int msg_level, const char *fmt, ...) +{ + va_list args; + int i; + + if (msg_level > console_loglevel) { + return 0; + } + + va_start(args, fmt); + i = vtxprintf(console_tx_byte, fmt, args); + va_end(args); +#if CONFIG_CONSOLE_NE2K + ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT); +#endif + return i; +} |