[commit] r1156 - in trunk/openbios-devel: arch/sparc32 drivers

[repository service]

Author: mcayland
Date: Sun Jun  9 14:25:46 2013
New Revision: 1156
URL: http://tracker.coreboot.org/trac/openbios/changeset/1156

Log:
video: switch VGA and TCX drivers over to Forth console using is-install.

Here we install the Forth terminal console instead of the C console for
the VGA and TCX drivers.

Note that this patch also disables video output for SPARC32 when
CONFIG_DEBUG_CONSOLE_VIDEO is enabled, since these routines write directly
to the screen instead of using the Forth bindings causing some display
issues.

Signed-off-by: Mark Cave-Ayland

Modified:
   trunk/openbios-devel/arch/sparc32/console.c
   trunk/openbios-devel/drivers/pci.c
   trunk/openbios-devel/drivers/sbus.c

Modified: trunk/openbios-devel/arch/sparc32/console.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/console.c	Sun Jun  9 14:25:43 2013	(r1155)
+++ trunk/openbios-devel/arch/sparc32/console.c	Sun Jun  9 14:25:46 2013	(r1156)
@@ -30,15 +30,6 @@
 unsigned char *vmem;
 volatile uint32_t *dac;

-static void video_putchar(int c)
-{
-    char buf;
-
-    buf = c & 0xff;
-
-    console_draw_fstr(&buf, 1);
-}
-
 static void video_cls(void)
 {
     memset((void *)vmem, 0, VMEM_SIZE);
@@ -63,9 +54,6 @@
 #ifdef CONFIG_DEBUG_CONSOLE_SERIAL
    serial_putchar(c);
 #endif
-#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
-	video_putchar(c);
-#endif
    return c;
 }

Modified: trunk/openbios-devel/drivers/pci.c
==============================================================================
--- trunk/openbios-devel/drivers/pci.c	Sun Jun  9 14:25:43 2013	(r1155)
+++ trunk/openbios-devel/drivers/pci.c	Sun Jun  9 14:25:46 2013	(r1156)
@@ -764,12 +764,16 @@

int vga_config_cb (const pci_config_t *config)
 {
-	if (config->assigned[0] != 0x00000000)
+	if (config->assigned[0] != 0x00000000) {
             vga_vbe_init(config->path,
                          pci_bus_addr_to_host_addr(config->assigned[0] & ~0x0000000F),
                          config->sizes[0],
                          pci_bus_addr_to_host_addr(config->assigned[1] & ~0x0000000F),
                          config->sizes[1]);
+
+            feval("['] qemu-vga-driver-init is-install");
+        }
+
    return 0;
 }

Modified: trunk/openbios-devel/drivers/sbus.c
==============================================================================
--- trunk/openbios-devel/drivers/sbus.c	Sun Jun  9 14:25:43 2013	(r1155)
+++ trunk/openbios-devel/drivers/sbus.c	Sun Jun  9 14:25:46 2013	(r1156)
@@ -329,6 +329,8 @@
         fword("property");
     }

+    feval("['] qemu-tcx-driver-init is-install");
+
     chosen = find_dev("/chosen");
     push_str(path);
     fword("open-dev");