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
This commit is contained in:
Stefan Reinauer
Stefan Reinauer
parent
42fa7fe28b
commit
bbd2f21184
|
|
@ -7,7 +7,7 @@ ramstage-y += pci_ops_auto.c
|
|||
ramstage-y += exception.c
|
||||
ramstage-$(CONFIG_IOAPIC) += ioapic.c
|
||||
|
||||
romstage-y += printk_init.c
|
||||
romstage-y += romstage_console.c
|
||||
romstage-y += cbfs_and_run.c
|
||||
|
||||
$(obj)/arch/x86/lib/console.ramstage.o :: $(obj)/build.h
|
||||
|
|
|
|||
|
|
@ -0,0 +1,135 @@
|
|||
/*
|
||||
* This file is part of the coreboot project.
|
||||
*
|
||||
* Copyright (C) 2003 Eric Biederman
|
||||
*
|
||||
* 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 <stdint.h>
|
||||
#include <console/loglevel.h>
|
||||
#include <console/post_codes.h>
|
||||
|
||||
/* __PRE_RAM__ */
|
||||
/* Using a global varible can cause problems when we reset the stack
|
||||
* from cache as ram to ram. If we make this a define USE_SHARED_STACK
|
||||
* we could use the same code on all architectures.
|
||||
*/
|
||||
#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL
|
||||
#if CONFIG_CONSOLE_SERIAL8250
|
||||
#include <uart8250.h>
|
||||
#endif
|
||||
|
||||
#if CONFIG_CONSOLE_SERIAL8250
|
||||
#include "lib/uart8250.c"
|
||||
#endif
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
#include "lib/ne2k.c"
|
||||
#endif
|
||||
|
||||
static void __console_tx_byte(unsigned char byte)
|
||||
{
|
||||
#if CONFIG_CONSOLE_SERIAL8250
|
||||
uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);
|
||||
#endif
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void __console_tx_nibble(unsigned nibble)
|
||||
{
|
||||
unsigned char digit;
|
||||
digit = nibble + '0';
|
||||
if (digit > '9') {
|
||||
digit += 39;
|
||||
}
|
||||
__console_tx_byte(digit);
|
||||
}
|
||||
|
||||
static void __console_tx_char(int loglevel, unsigned char byte)
|
||||
{
|
||||
if (console_loglevel >= loglevel) {
|
||||
#if CONFIG_CONSOLE_SERIAL8250
|
||||
uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);
|
||||
#endif
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
static void __console_tx_hex8(int loglevel, unsigned char value)
|
||||
{
|
||||
if (console_loglevel >= loglevel) {
|
||||
__console_tx_nibble((value >> 4U) & 0x0fU);
|
||||
__console_tx_nibble(value & 0x0fU);
|
||||
}
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void __console_tx_hex16(int loglevel, unsigned short value)
|
||||
{
|
||||
if (console_loglevel >= loglevel) {
|
||||
__console_tx_nibble((value >> 12U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 8U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 4U) & 0x0fU);
|
||||
__console_tx_nibble(value & 0x0fU);
|
||||
}
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void __console_tx_hex32(int loglevel, unsigned int value)
|
||||
{
|
||||
if (console_loglevel >= loglevel) {
|
||||
__console_tx_nibble((value >> 28U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 24U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 20U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 16U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 12U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 8U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 4U) & 0x0fU);
|
||||
__console_tx_nibble(value & 0x0fU);
|
||||
}
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void __console_tx_string(int loglevel, const char *str)
|
||||
{
|
||||
if (console_loglevel >= loglevel) {
|
||||
unsigned char ch;
|
||||
while((ch = *str++) != '\0') {
|
||||
if (ch == '\n')
|
||||
__console_tx_byte('\r');
|
||||
__console_tx_byte(ch);
|
||||
}
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
/* if included by romcc, include the sources, too. romcc can't use prototypes */
|
||||
#include <console/console.c>
|
||||
#include <console/post.c>
|
||||
#include <console/die.c>
|
||||
|
||||
|
||||
|
|
@ -155,159 +155,6 @@ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf,
|
|||
|
||||
/* __ROMCC__ */
|
||||
|
||||
#if CONFIG_CONSOLE_SERIAL8250
|
||||
#include "lib/uart8250.c"
|
||||
#endif
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
#include "lib/ne2k.c"
|
||||
#endif
|
||||
|
||||
static void __console_tx_byte(unsigned char byte)
|
||||
{
|
||||
#if CONFIG_CONSOLE_SERIAL8250
|
||||
uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);
|
||||
#endif
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void __console_tx_nibble(unsigned nibble)
|
||||
{
|
||||
unsigned char digit;
|
||||
digit = nibble + '0';
|
||||
if (digit > '9') {
|
||||
digit += 39;
|
||||
}
|
||||
__console_tx_byte(digit);
|
||||
}
|
||||
|
||||
static void __console_tx_char(int loglevel, unsigned char byte)
|
||||
{
|
||||
if (console_loglevel >= loglevel) {
|
||||
#if CONFIG_CONSOLE_SERIAL8250
|
||||
uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);
|
||||
#endif
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
static void __console_tx_hex8(int loglevel, unsigned char value)
|
||||
{
|
||||
if (console_loglevel >= loglevel) {
|
||||
__console_tx_nibble((value >> 4U) & 0x0fU);
|
||||
__console_tx_nibble(value & 0x0fU);
|
||||
}
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void __console_tx_hex16(int loglevel, unsigned short value)
|
||||
{
|
||||
if (console_loglevel >= loglevel) {
|
||||
__console_tx_nibble((value >> 12U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 8U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 4U) & 0x0fU);
|
||||
__console_tx_nibble(value & 0x0fU);
|
||||
}
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void __console_tx_hex32(int loglevel, unsigned int value)
|
||||
{
|
||||
if (console_loglevel >= loglevel) {
|
||||
__console_tx_nibble((value >> 28U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 24U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 20U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 16U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 12U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 8U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 4U) & 0x0fU);
|
||||
__console_tx_nibble(value & 0x0fU);
|
||||
}
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void __console_tx_string(int loglevel, const char *str)
|
||||
{
|
||||
if (console_loglevel >= loglevel) {
|
||||
unsigned char ch;
|
||||
while((ch = *str++) != '\0') {
|
||||
if (ch == '\n')
|
||||
__console_tx_byte('\r');
|
||||
__console_tx_byte(ch);
|
||||
}
|
||||
#if CONFIG_CONSOLE_NE2K
|
||||
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#define FUNCTIONS_FOR_PRINT
|
||||
#ifdef FUNCTIONS_FOR_PRINT
|
||||
static void print_emerg_char(unsigned char byte) { __console_tx_char(BIOS_EMERG, byte); }
|
||||
static void print_emerg_hex8(unsigned char value){ __console_tx_hex8(BIOS_EMERG, value); }
|
||||
static void print_emerg_hex16(unsigned short value){ __console_tx_hex16(BIOS_EMERG, value); }
|
||||
static void print_emerg_hex32(unsigned int value) { __console_tx_hex32(BIOS_EMERG, value); }
|
||||
static void print_emerg(const char *str) { __console_tx_string(BIOS_EMERG, str); }
|
||||
|
||||
static void print_alert_char(unsigned char byte) { __console_tx_char(BIOS_ALERT, byte); }
|
||||
static void print_alert_hex8(unsigned char value) { __console_tx_hex8(BIOS_ALERT, value); }
|
||||
static void print_alert_hex16(unsigned short value){ __console_tx_hex16(BIOS_ALERT, value); }
|
||||
static void print_alert_hex32(unsigned int value) { __console_tx_hex32(BIOS_ALERT, value); }
|
||||
static void print_alert(const char *str) { __console_tx_string(BIOS_ALERT, str); }
|
||||
|
||||
static void print_crit_char(unsigned char byte) { __console_tx_char(BIOS_CRIT, byte); }
|
||||
static void print_crit_hex8(unsigned char value) { __console_tx_hex8(BIOS_CRIT, value); }
|
||||
static void print_crit_hex16(unsigned short value){ __console_tx_hex16(BIOS_CRIT, value); }
|
||||
static void print_crit_hex32(unsigned int value) { __console_tx_hex32(BIOS_CRIT, value); }
|
||||
static void print_crit(const char *str) { __console_tx_string(BIOS_CRIT, str); }
|
||||
|
||||
static void print_err_char(unsigned char byte) { __console_tx_char(BIOS_ERR, byte); }
|
||||
static void print_err_hex8(unsigned char value) { __console_tx_hex8(BIOS_ERR, value); }
|
||||
static void print_err_hex16(unsigned short value){ __console_tx_hex16(BIOS_ERR, value); }
|
||||
static void print_err_hex32(unsigned int value) { __console_tx_hex32(BIOS_ERR, value); }
|
||||
static void print_err(const char *str) { __console_tx_string(BIOS_ERR, str); }
|
||||
|
||||
static void print_warning_char(unsigned char byte) { __console_tx_char(BIOS_WARNING, byte); }
|
||||
static void print_warning_hex8(unsigned char value) { __console_tx_hex8(BIOS_WARNING, value); }
|
||||
static void print_warning_hex16(unsigned short value){ __console_tx_hex16(BIOS_WARNING, value); }
|
||||
static void print_warning_hex32(unsigned int value) { __console_tx_hex32(BIOS_WARNING, value); }
|
||||
static void print_warning(const char *str) { __console_tx_string(BIOS_WARNING, str); }
|
||||
|
||||
static void print_notice_char(unsigned char byte) { __console_tx_char(BIOS_NOTICE, byte); }
|
||||
static void print_notice_hex8(unsigned char value) { __console_tx_hex8(BIOS_NOTICE, value); }
|
||||
static void print_notice_hex16(unsigned short value){ __console_tx_hex16(BIOS_NOTICE, value); }
|
||||
static void print_notice_hex32(unsigned int value) { __console_tx_hex32(BIOS_NOTICE, value); }
|
||||
static void print_notice(const char *str) { __console_tx_string(BIOS_NOTICE, str); }
|
||||
|
||||
static void print_info_char(unsigned char byte) { __console_tx_char(BIOS_INFO, byte); }
|
||||
static void print_info_hex8(unsigned char value) { __console_tx_hex8(BIOS_INFO, value); }
|
||||
static void print_info_hex16(unsigned short value){ __console_tx_hex16(BIOS_INFO, value); }
|
||||
static void print_info_hex32(unsigned int value) { __console_tx_hex32(BIOS_INFO, value); }
|
||||
static void print_info(const char *str) { __console_tx_string(BIOS_INFO, str); }
|
||||
|
||||
static void print_debug_char(unsigned char byte) { __console_tx_char(BIOS_DEBUG, byte); }
|
||||
static void print_debug_hex8(unsigned char value) { __console_tx_hex8(BIOS_DEBUG, value); }
|
||||
static void print_debug_hex16(unsigned short value){ __console_tx_hex16(BIOS_DEBUG, value); }
|
||||
static void print_debug_hex32(unsigned int value) { __console_tx_hex32(BIOS_DEBUG, value); }
|
||||
static void print_debug(const char *str) { __console_tx_string(BIOS_DEBUG, str); }
|
||||
|
||||
static void print_spew_char(unsigned char byte) { __console_tx_char(BIOS_SPEW, byte); }
|
||||
static void print_spew_hex8(unsigned char value) { __console_tx_hex8(BIOS_SPEW, value); }
|
||||
static void print_spew_hex16(unsigned short value){ __console_tx_hex16(BIOS_SPEW, value); }
|
||||
static void print_spew_hex32(unsigned int value) { __console_tx_hex32(BIOS_SPEW, value); }
|
||||
static void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); }
|
||||
|
||||
#else
|
||||
#define print_emerg(STR) __console_tx_string(BIOS_EMERG, STR)
|
||||
#define print_alert(STR) __console_tx_string(BIOS_ALERT, STR)
|
||||
#define print_crit(STR) __console_tx_string(BIOS_CRIT, STR)
|
||||
|
|
@ -357,12 +204,9 @@ static void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); }
|
|||
#define print_info_hex32(HEX) __console_tx_hex32(BIOS_INFO, HEX)
|
||||
#define print_debug_hex32(HEX) __console_tx_hex32(BIOS_DEBUG, HEX)
|
||||
#define print_spew_hex32(HEX) __console_tx_hex32(BIOS_SPEW, HEX)
|
||||
#endif
|
||||
|
||||
/* if included by romcc, include the sources, too. romcc can't use prototypes */
|
||||
#include <console/console.c>
|
||||
#include <console/post.c>
|
||||
#include <console/die.c>
|
||||
#endif
|
||||
#include "arch/x86/lib/romcc_console.c"
|
||||
|
||||
#endif /* __ROMCC__ */
|
||||
|
||||
#endif /* CONSOLE_CONSOLE_H_ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue