From f0aa09b51b1874b8d52574d18a497162eda9cdf5 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 23 Mar 2010 13:23:40 +0000 Subject: fix newly introduced printk_foo warnings.. Interesting enough, console_printk was only used in a single place and duplicated a large part of console.h which is included in the same place. Thus, just drop console_printk.c and we're one down with console complexity Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5274 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/lib/console.c | 1 - src/arch/i386/lib/console_printk.c | 99 -------------------------------------- 2 files changed, 100 deletions(-) delete mode 100644 src/arch/i386/lib/console_printk.c (limited to 'src/arch') diff --git a/src/arch/i386/lib/console.c b/src/arch/i386/lib/console.c index 6d07e1670b..15d65a31c7 100644 --- a/src/arch/i386/lib/console.c +++ b/src/arch/i386/lib/console.c @@ -5,7 +5,6 @@ #include "console_print.c" #else /* CONFIG_USE_PRINTK_IN_CAR == 1 */ #include -#include "console_printk.c" #endif /* CONFIG_USE_PRINTK_IN_CAR */ void console_init(void) diff --git a/src/arch/i386/lib/console_printk.c b/src/arch/i386/lib/console_printk.c deleted file mode 100644 index 191a4b7fe0..0000000000 --- a/src/arch/i386/lib/console_printk.c +++ /dev/null @@ -1,99 +0,0 @@ - -#define printk(BIOS_EMERG, fmt, arg...) do_printk(BIOS_EMERG ,fmt, ##arg) -#define printk(BIOS_ALERT, fmt, arg...) do_printk(BIOS_ALERT ,fmt, ##arg) -#define printk_crit(fmt, arg...) do_printk(BIOS_CRIT ,fmt, ##arg) -#define printk(BIOS_ERR, fmt, arg...) do_printk(BIOS_ERR ,fmt, ##arg) -#define printk(BIOS_WARNING, fmt, arg...) do_printk(BIOS_WARNING ,fmt, ##arg) -#define printk_notice(fmt, arg...) do_printk(BIOS_NOTICE ,fmt, ##arg) -#define printk(BIOS_INFO, fmt, arg...) do_printk(BIOS_INFO ,fmt, ##arg) -#define printk(BIOS_DEBUG, fmt, arg...) do_printk(BIOS_DEBUG ,fmt, ##arg) -#define printk(BIOS_SPEW, fmt, arg...) do_printk(BIOS_SPEW ,fmt, ##arg) - -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_EMERG -#undef printk_emerg -#define printk(BIOS_EMERG, fmt, arg...) do_printk(BIOS_EMERG , "", ##arg) -#endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_ALERT -#undef printk_alert -#define printk(BIOS_ALERT, fmt, arg...) do_printk(BIOS_EMERG , "", ##arg) -#endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_CRIT -#undef printk_crit -#define printk_crit(fmt, arg...) do_printk(BIOS_EMERG , "", ##arg) -#endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_ERR -#undef printk_err -#define printk(BIOS_ERR, fmt, arg...) do_printk(BIOS_EMERG , "", ##arg) -#endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_WARNING -#undef printk_warning -#define printk(BIOS_WARNING, fmt, arg...) do_printk(BIOS_EMERG , "", ##arg) -#endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_NOTICE -#undef printk_notice -#define printk_notice(fmt, arg...) do_printk(BIOS_EMERG , "", ##arg) -#endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_INFO -#undef printk_info -#define printk(BIOS_INFO, fmt, arg...) do_printk(BIOS_EMERG , "", ##arg) -#endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_DEBUG -#undef printk_debug -#define printk(BIOS_DEBUG, fmt, arg...) do_printk(BIOS_EMERG , "", ##arg) -#endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_SPEW -#undef printk_spew -#define printk(BIOS_SPEW, fmt, arg...) do_printk(BIOS_EMERG , "", ##arg) -#endif - -#define print_emerg(STR) printk_emerg ("%s", (STR)) -#define print_alert(STR) printk_alert ("%s", (STR)) -#define print_crit(STR) printk_crit ("%s", (STR)) -#define print_err(STR) printk_err ("%s", (STR)) -#define print_warning(STR) printk(BIOS_WARNING, "%s", (STR)) -#define print_notice(STR) printk_notice ("%s", (STR)) -#define print_info(STR) printk_info ("%s", (STR)) -#define print_debug(STR) printk_debug ("%s", (STR)) -#define print_spew(STR) printk_spew ("%s", (STR)) - -#define print_emerg_char(CH) printk_emerg ("%c", (CH)) -#define print_alert_char(CH) printk_alert ("%c", (CH)) -#define print_crit_char(CH) printk_crit ("%c", (CH)) -#define print_err_char(CH) printk_err ("%c", (CH)) -#define print_warning_char(CH) printk(BIOS_WARNING, "%c", (CH)) -#define print_notice_char(CH) printk_notice ("%c", (CH)) -#define print_info_char(CH) printk_info ("%c", (CH)) -#define print_debug_char(CH) printk_debug ("%c", (CH)) -#define print_spew_char(CH) printk_spew ("%c", (CH)) - -#define print_emerg_hex8(HEX) printk_emerg ("%02x", (HEX)) -#define print_alert_hex8(HEX) printk_alert ("%02x", (HEX)) -#define print_crit_hex8(HEX) printk_crit ("%02x", (HEX)) -#define print_err_hex8(HEX) printk_err ("%02x", (HEX)) -#define print_warning_hex8(HEX) printk(BIOS_WARNING, "%02x", (HEX)) -#define print_notice_hex8(HEX) printk_notice ("%02x", (HEX)) -#define print_info_hex8(HEX) printk_info ("%02x", (HEX)) -#define print_debug_hex8(HEX) printk_debug ("%02x", (HEX)) -#define print_spew_hex8(HEX) printk_spew ("%02x", (HEX)) - -#define print_emerg_hex16(HEX) printk_emerg ("%04x", (HEX)) -#define print_alert_hex16(HEX) printk_alert ("%04x", (HEX)) -#define print_crit_hex16(HEX) printk_crit ("%04x", (HEX)) -#define print_err_hex16(HEX) printk_err ("%04x", (HEX)) -#define print_warning_hex16(HEX) printk(BIOS_WARNING, "%04x", (HEX)) -#define print_notice_hex16(HEX) printk_notice ("%04x", (HEX)) -#define print_info_hex16(HEX) printk_info ("%04x", (HEX)) -#define print_debug_hex16(HEX) printk_debug ("%04x", (HEX)) -#define print_spew_hex16(HEX) printk_spew ("%04x", (HEX)) - -#define print_emerg_hex32(HEX) printk_emerg ("%08x", (HEX)) -#define print_alert_hex32(HEX) printk_alert ("%08x", (HEX)) -#define print_crit_hex32(HEX) printk_crit ("%08x", (HEX)) -#define print_err_hex32(HEX) printk_err ("%08x", (HEX)) -#define print_warning_hex32(HEX) printk(BIOS_WARNING, "%08x", (HEX)) -#define print_notice_hex32(HEX) printk_notice ("%08x", (HEX)) -#define print_info_hex32(HEX) printk_info ("%08x", (HEX)) -#define print_debug_hex32(HEX) printk_debug ("%08x", (HEX)) -#define print_spew_hex32(HEX) printk_spew ("%08x", (HEX)) - - -- cgit v1.2.3