Remove warnings from USB debug console code.

[coreboot.git] / src / include / console / console.h

diff --git a/src/include/console/console.h b/src/include/console/console.h
index fe7ea0b1e6b1342e3e7eb8691257f583d22216e9..5501edf62903fa70ed5964d75a6e483550dbec1d 100644 (file)
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -5,16 +5,16 @@
 #include <console/loglevel.h>
 
 #ifndef __PRE_RAM__
-void console_init(void);
 void console_tx_byte(unsigned char byte);
 void console_tx_flush(void);
 unsigned char console_rx_byte(void);
 int console_tst_byte(void);
-void post_code(uint8_t value);
-void __attribute__ ((noreturn)) die(const char *msg);
 #if CONFIG_CONSOLE_VGA == 1
 void vga_console_init(void);
 #endif
+#if CONFIG_USBDEBUG
+#include <usbdebug.h>
+#endif
 
 struct console_driver {
        void (*init)(void);
@@ -31,9 +31,19 @@ extern struct console_driver console_drivers[];
 extern struct console_driver econsole_drivers[];
 
 extern int console_loglevel;
-#endif /* !__PRE_RAM__ */
+#else
+/* __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
+#endif
 
 #ifndef __ROMCC__
+void console_init(void);
+void post_code(u8 value);
+void __attribute__ ((noreturn)) die(const char *msg);
 int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 
 #undef WE_CLEANED_UP_ALL_SIDE_EFFECTS
@@ -121,10 +131,20 @@ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf,
 #define print_debug_hex32(HEX)   printk(BIOS_DEBUG,  "%08x", (HEX))
 #define print_spew_hex32(HEX)    printk(BIOS_SPEW,   "%08x", (HEX))
 #else
+
+#include <pc80/serial.c>
+
+#if CONFIG_CONSOLE_NE2K
+#include "lib/ne2k.c"
+#endif
+
 /* __ROMCC__ */
 static void __console_tx_byte(unsigned char byte)
 {
        uart_tx_byte(byte);
+#if CONFIG_CONSOLE_NE2K
+       ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);
+#endif
 }
 
 static void __console_tx_nibble(unsigned nibble)
@@ -139,32 +159,42 @@ static void __console_tx_nibble(unsigned nibble)
 
 static void __console_tx_char(int loglevel, unsigned char byte)
 {
-       if (ASM_CONSOLE_LOGLEVEL >= loglevel) {
+       if (console_loglevel >= loglevel) {
                uart_tx_byte(byte);
+#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 (ASM_CONSOLE_LOGLEVEL >= loglevel) {
+       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 (ASM_CONSOLE_LOGLEVEL >= loglevel) {
+       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 (ASM_CONSOLE_LOGLEVEL >= loglevel) {
+       if (console_loglevel >= loglevel) {
                __console_tx_nibble((value >> 28U) & 0x0fU);
                __console_tx_nibble((value >> 24U) & 0x0fU);
                __console_tx_nibble((value >> 20U) & 0x0fU);
@@ -174,17 +204,23 @@ static void __console_tx_hex32(int loglevel, unsigned int value)
                __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 (ASM_CONSOLE_LOGLEVEL >= loglevel) {
+       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
        }
 }
 
@@ -298,4 +334,9 @@ static void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); }
 
 #endif
 
+#ifdef __ROMCC__
+/* if included by romcc, include the sources, too. romcc can't use prototypes */
+#include <console/console.c>
+#endif
+
 #endif /* CONSOLE_CONSOLE_H_ */