Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / src / console / btext_console.c

diff --git a/src/console/btext_console.c b/src/console/btext_console.c
index fc6b6deea5f689f8799946e33b86b12f347edaf3..56d893e36ebfb97ce8c451596936922bc546ccf3 100644 (file)
--- a/src/console/btext_console.c
+++ b/src/console/btext_console.c
@@ -3,7 +3,7 @@
  *
  * Benjamin Herrenschmidt <benh@kernel.crashing.org>
  *
- *   move to LinuxBIOS by LYH yhlu@tyan.com
+ *   move to coreboot by LYH yhlu@tyan.com
  */
 
 #if 0
@@ -56,14 +56,14 @@ static u32 g_max_loc_Y;
 #define cmapsz        (16*96)
 #endif
 
-static unsigned char vga_font[cmapsz];
+extern unsigned char vga_font[cmapsz];
 
 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 = {
@@ -445,7 +445,7 @@ void btext_tx_byte(unsigned char data)
         btext_drawchar(data);
 }
 
-static struct console_driver btext_console __console = {
+static const struct console_driver btext_console __console = {
         .init    = btext_init,
         .tx_byte = btext_tx_byte,
         .rx_byte = 0,