summaryrefslogtreecommitdiff
path: root/src/console
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-04-27 06:56:47 +0000
committerStefan Reinauer <stepan@openbios.org>2010-04-27 06:56:47 +0000
commit14e22779625de673569c7b950ecc2753fb915b31 (patch)
tree14a6ed759e116e9e6e9bbd7f499b74b96d6cc072 /src/console
parent0e1e8065e303030c39c3f2c27e5d32ee58a16c66 (diff)
downloadcoreboot-14e22779625de673569c7b950ecc2753fb915b31.tar.xz
Since some people disapprove of white space cleanups mixed in regular commits
while others dislike them being extra commits, let's clean them up once and for all for the existing code. If it's ugly, let it only be ugly once :-) Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5507 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/console')
-rw-r--r--src/console/Kconfig2
-rw-r--r--src/console/btext_console.c12
-rw-r--r--src/console/console.c8
-rw-r--r--src/console/logbuf_console.c2
-rw-r--r--src/console/uart8250_console.c6
-rw-r--r--src/console/vsprintf.c2
-rw-r--r--src/console/vtxprintf.c10
7 files changed, 21 insertions, 21 deletions
diff --git a/src/console/Kconfig b/src/console/Kconfig
index 86d75754cd..b9d6f69253 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -98,7 +98,7 @@ config USBDEBUG_DIRECT
It also requires a USB2 controller which supports the EHCI
Debug Port capability. Controllers which are known to work:
-
+
* 10b9:5239 ALi Corporation USB 2.0 (USB PCI card)
* 8086:24cd Intel ICH4/ICH4-M
* 8086:24dd Intel ICH5
diff --git a/src/console/btext_console.c b/src/console/btext_console.c
index b1b10e63cb..56d893e36e 100644
--- a/src/console/btext_console.c
+++ b/src/console/btext_console.c
@@ -62,8 +62,8 @@ u32 boot_text_mapped;
boot_infos_t disp_bi;
-#define BTEXT
-#define BTDATA
+#define BTEXT
+#define BTDATA
/* This function will enable the early boot text when doing OF booting. This
@@ -100,7 +100,7 @@ btext_setup_display(u32 width, u32 height, u32 depth, u32 pitch,
* changes.
*/
-void
+void
map_boot_text(void)
{
#if 0
@@ -111,9 +111,9 @@ map_boot_text(void)
return;
base = ((unsigned long) bi->dispDeviceBase) & 0xFFFFF000UL;
offset = ((unsigned long) bi->dispDeviceBase) - base;
- size = bi->dispDeviceRowBytes * bi->dispDeviceRect[3] + offset
+ size = bi->dispDeviceRowBytes * bi->dispDeviceRect[3] + offset
+ bi->dispDeviceRect[0];
- bi->logicalDisplayBase = ioremap(base,0x800000 );
+ bi->logicalDisplayBase = ioremap(base,0x800000 );
if (bi->logicalDisplayBase == 0)
return;
// bi->logicalDisplayBase += offset;
@@ -360,7 +360,7 @@ static u32 expand_bits_8[16] BTDATA = {
0x0000ffff,0xff00ffff,0x00ffffff,0xffffffff
#else
#error FIXME: No endianness??
-#endif
+#endif
};
#if 0
static const u32 expand_bits_16[4] BTDATA = {
diff --git a/src/console/console.c b/src/console/console.c
index 327ad19017..016c3b9664 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -1,5 +1,5 @@
/*
- * Bootstrap code for the INTEL
+ * Bootstrap code for the INTEL
*/
#include <console/console.h>
@@ -18,7 +18,7 @@ void console_init(void)
struct console_driver *driver;
if(get_option(&console_loglevel, "debug_level"))
console_loglevel=CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
-
+
for(driver = console_drivers; driver < econsole_drivers; driver++) {
if (!driver->init)
continue;
@@ -38,7 +38,7 @@ void console_tx_flush(void)
{
struct console_driver *driver;
for(driver = console_drivers; driver < econsole_drivers; driver++) {
- if (!driver->tx_flush)
+ if (!driver->tx_flush)
continue;
driver->tx_flush();
}
@@ -99,7 +99,7 @@ void __attribute__((noreturn)) die(const char *msg)
void console_init(void)
{
- static const char console_test[] =
+ static const char console_test[] =
"\n\ncoreboot-"
COREBOOT_VERSION
COREBOOT_EXTRA_VERSION
diff --git a/src/console/logbuf_console.c b/src/console/logbuf_console.c
index 3b6c744503..a76791d542 100644
--- a/src/console/logbuf_console.c
+++ b/src/console/logbuf_console.c
@@ -2,7 +2,7 @@
#define LOGBUF_SIZE 1024
-// KEEP THIS GLOBAL.
+// KEEP THIS GLOBAL.
// I need the address so I can watch it with the ARIUM hardware. RGM.
char logbuf[LOGBUF_SIZE];
int logbuf_offset = 0;
diff --git a/src/console/uart8250_console.c b/src/console/uart8250_console.c
index fd71ff7dc2..20deaa72e3 100644
--- a/src/console/uart8250_console.c
+++ b/src/console/uart8250_console.c
@@ -38,17 +38,17 @@ static void ttyS0_init(void)
uart8250_init(CONFIG_TTYS0_BASE, divisor, CONFIG_TTYS0_LCS);
}
-static void ttyS0_tx_byte(unsigned char data)
+static void ttyS0_tx_byte(unsigned char data)
{
uart8250_tx_byte(CONFIG_TTYS0_BASE, data);
}
-static unsigned char ttyS0_rx_byte(void)
+static unsigned char ttyS0_rx_byte(void)
{
return uart8250_rx_byte(CONFIG_TTYS0_BASE);
}
-static int ttyS0_tst_byte(void)
+static int ttyS0_tst_byte(void)
{
return uart8250_can_rx_byte(CONFIG_TTYS0_BASE);
}
diff --git a/src/console/vsprintf.c b/src/console/vsprintf.c
index 7407c420ab..4a745233b9 100644
--- a/src/console/vsprintf.c
+++ b/src/console/vsprintf.c
@@ -1,6 +1,6 @@
/*
* This file is part of the coreboot project.
- *
+ *
* Copyright (C) 2009 coresystems GmbH
*
* This program is free software; you can redistribute it and/or
diff --git a/src/console/vtxprintf.c b/src/console/vtxprintf.c
index 3c75e3d704..944fd5b96f 100644
--- a/src/console/vtxprintf.c
+++ b/src/console/vtxprintf.c
@@ -30,7 +30,7 @@ static int skip_atoi(const char **s)
#define SPECIAL 32 /* 0x */
#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */
-static int number(void (*tx_byte)(unsigned char byte),
+static int number(void (*tx_byte)(unsigned char byte),
unsigned long long num, int base, int size, int precision, int type)
{
char c,sign,tmp[66];
@@ -112,7 +112,7 @@ int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args
int precision; /* min. # of digits for integers; max
number of chars for from string */
int qualifier; /* 'h', 'l', or 'L' for integer fields */
-
+
int count;
for (count=0; *fmt ; ++fmt) {
@@ -120,7 +120,7 @@ int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args
tx_byte(*fmt), count++;
continue;
}
-
+
/* process flags */
flags = 0;
repeat:
@@ -132,7 +132,7 @@ int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args
case '#': flags |= SPECIAL; goto repeat;
case '0': flags |= ZEROPAD; goto repeat;
}
-
+
/* get field width */
field_width = -1;
if (is_digit(*fmt))
@@ -150,7 +150,7 @@ int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args
/* get the precision */
precision = -1;
if (*fmt == '.') {
- ++fmt;
+ ++fmt;
if (is_digit(*fmt))
precision = skip_atoi(&fmt);
else if (*fmt == '*') {