re-order console output functions, add proper prototypes,

[coreboot.git] / src / arch / i386 / lib / printk_init.c

diff --git a/src/arch/i386/lib/printk_init.c b/src/arch/i386/lib/printk_init.c
index 7c03664a4ff8edc302481c546c34a50b057ee117..7e5dfa03dc3df27b1f998a57dc8c0b3e4e298d81 100644 (file)
--- a/src/arch/i386/lib/printk_init.c
+++ b/src/arch/i386/lib/printk_init.c
@@ -1,32 +1,43 @@
 /*
- *  blantantly copied from linux/kernel/printk.c
+ * 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.
  *
- *  Copyright (C) 1991, 1992  Linus Torvalds
+ * 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.
  *
- *  by yhlu moved from arch/ppc/lib/printk_init.c, removed the global variable console_loglevel
+ * 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 <stdarg.h>
+#include <console/vtxprintf.h>
 #include <console/loglevel.h>
+#include <uart8250.h>
 
-/* printk's without a loglevel use this.. */
-#define DEFAULT_MESSAGE_LOGLEVEL 4 /* BIOS_WARNING */
-
-/* Keep together for sysctl support */
-/* Using an global varible can cause problem when we reset the stack from cache as ram to 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.
+ */
 #if 0
-int console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
+int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
 #else
-#define console_loglevel ASM_CONSOLE_LOGLEVEL
+#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 #endif
 
-extern int vtxprintf(void (*)(unsigned char), const char *, va_list);
-extern void uart8250_tx_byte(unsigned, unsigned char);
-
 void console_tx_byte(unsigned char byte)
 {
        if (byte == '\n')
-               uart8250_tx_byte(TTYS0_BASE, '\r');
-       uart8250_tx_byte(TTYS0_BASE, byte);
+               uart8250_tx_byte(CONFIG_TTYS0_BASE, '\r');
+
+       uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);
 }
 
 int do_printk(int msg_level, const char *fmt, ...)
@@ -34,7 +45,7 @@ int do_printk(int msg_level, const char *fmt, ...)
        va_list args;
        int i;
 
-       if (msg_level >= console_loglevel) {
+       if (msg_level > console_loglevel) {
                return 0;
        }