summaryrefslogtreecommitdiff
path: root/src/console
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2009-10-24 13:06:04 +0000
committerStefan Reinauer <stepan@openbios.org>2009-10-24 13:06:04 +0000
commit52fc6b12cb458a93ba1eeac4082f4e7f574cdafc (patch)
treeb776758d0d9deb8947f46a248a31b33f9f9d1a5b /src/console
parentb53bed15677e8bd97f58f7f5d847f1029ddaa41b (diff)
downloadcoreboot-52fc6b12cb458a93ba1eeac4082f4e7f574cdafc.tar.xz
re-order console output functions, add proper prototypes,
drop claim that our files were blatantly copied, because they have been rewritten a very long time ago. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4837 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/console')
-rw-r--r--src/console/Makefile.inc1
-rw-r--r--src/console/printk.c4
-rw-r--r--src/console/vsprintf.c58
-rw-r--r--src/console/vtxprintf.c39
4 files changed, 39 insertions, 63 deletions
diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index 4545ce5a37..d721fb4e33 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -4,7 +4,6 @@ obj-y += vtxprintf.o
obj-y += vsprintf.o
initobj-y += vtxprintf.o
-initobj-y += vsprintf.o
driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.o
driver-$(CONFIG_USBDEBUG_DIRECT) += usbdebug_direct_console.o
diff --git a/src/console/printk.c b/src/console/printk.c
index f4157a7b00..3b1ae24ec1 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -7,6 +7,7 @@
#include <stdarg.h>
#include <smp/spinlock.h>
+#include <console/vtxprintf.h>
#include <console/console.h>
/* printk's without a loglevel use this.. */
@@ -22,9 +23,6 @@ int default_message_loglevel = DEFAULT_MESSAGE_LOGLEVEL;
int minimum_console_loglevel = MINIMUM_CONSOLE_LOGLEVEL;
int default_console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
-void display(char*);
-extern int vtxprintf(void (*)(unsigned char), const char *, va_list);
-
static spinlock_t console_lock = SPIN_LOCK_UNLOCKED;
int do_printk(int msg_level, const char *fmt, ...)
diff --git a/src/console/vsprintf.c b/src/console/vsprintf.c
index bfa6ffebab..9507e8ea54 100644
--- a/src/console/vsprintf.c
+++ b/src/console/vsprintf.c
@@ -1,45 +1,61 @@
/*
- * linux/lib/vsprintf.c
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2009 coresystems GmbH
*
- * Copyright (C) 1991, 1992 Linus Torvalds
+ * 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
*/
-/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */
-/*
- * Wirzenius wrote this portably, Torvalds fucked it up :-)
- */
#include <stdarg.h>
-#include <string.h>
+#include <smp/spinlock.h>
+#include <console/vtxprintf.h>
-int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args);
+static spinlock_t vsprintf_lock = SPIN_LOCK_UNLOCKED;
-int vsprintf(char * buf, const char *fmt, va_list args)
-{
- char *str_buf;
+static char *str_buf;
- /* this function is only used by vsprintf.
- To keep str_buf local (for reentrancy
- and to avoid .bss use, nest it */
- void str_tx_byte(unsigned char byte)
- {
- *str_buf = byte;
- str_buf++;
- }
+static void str_tx_byte(unsigned char byte)
+{
+ *str_buf = byte;
+ str_buf++;
+}
+static int vsprintf(char *buf, const char *fmt, va_list args)
+{
int i;
+
+ spin_lock(&vsprintf_lock);
+
str_buf = buf;
i = vtxprintf(str_tx_byte, fmt, args);
*str_buf = '\0';
+
+ spin_unlock(&vsprintf_lock);
+
return i;
}
-int sprintf(char * buf, const char *fmt, ...)
+int sprintf(char *buf, const char *fmt, ...)
{
va_list args;
int i;
va_start(args, fmt);
- i=vsprintf(buf,fmt,args);
+ i = vsprintf(buf, fmt, args);
va_end(args);
+
return i;
}
diff --git a/src/console/vtxprintf.c b/src/console/vtxprintf.c
index 72bbac5fb0..b1b53b6a39 100644
--- a/src/console/vtxprintf.c
+++ b/src/console/vtxprintf.c
@@ -7,50 +7,13 @@
#include <stdarg.h>
#include <string.h>
#include <div64.h>
+#include <console/vtxprintf.h>
/* haha, don't need ctype.c */
#define isdigit(c) ((c) >= '0' && (c) <= '9')
#define is_digit isdigit
#define isxdigit(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
-#if 0
-/* We are using number() instead. So this code is obsoleted and should
- * probably go away.
- */
-
-static unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base)
-{
- unsigned long result = 0,value;
-
- if (!base) {
- base = 10;
- if (*cp == '0') {
- base = 8;
- cp++;
- if ((*cp == 'x') && isxdigit(cp[1])) {
- cp++;
- base = 16;
- }
- }
- }
- while (isxdigit(*cp) && (value = isdigit(*cp) ? *cp-'0' : (islower(*cp)
- ? toupper(*cp) : *cp)-'A'+10) < base) {
- result = result*base + value;
- cp++;
- }
- if (endp)
- *endp = (char *)cp;
- return result;
-}
-
-static long simple_strtol(const char *cp,char **endp,unsigned int base)
-{
- if(*cp=='-')
- return -simple_strtoul(cp+1,endp,base);
- return simple_strtoul(cp,endp,base);
-}
-#endif
-
static int skip_atoi(const char **s)
{
int i=0;