[OpenBIOS] r282 - in openbios-devel: drivers modules

[svn at openbios.org]

Author: blueswirl
Date: 2008-12-05 19:32:39 +0100 (Fri, 05 Dec 2008)
New Revision: 282

Modified:
   openbios-devel/drivers/build.xml
   openbios-devel/drivers/pci.c
   openbios-devel/modules/video.c
Log:
Misc VGA fixes (Laurent Vivier)

Modified: openbios-devel/drivers/build.xml
===================================================================
--- openbios-devel/drivers/build.xml	2008-12-05 18:31:27 UTC (rev 281)
+++ openbios-devel/drivers/build.xml	2008-12-05 18:32:39 UTC (rev 282)
@@ -14,6 +14,7 @@
   <object source="obio.c"   condition="DRIVER_OBIO"/>
   <object source="vga_load_regs.c" condition="DRIVER_VGA"/>
   <object source="vga_set_mode.c" condition="DRIVER_VGA"/>
+  <object source="vga_vbe.c" condition="DRIVER_VGA"/>
  </library>
 
  <dictionary name="openbios" target="forth">

Modified: openbios-devel/drivers/pci.c
===================================================================
--- openbios-devel/drivers/pci.c	2008-12-05 18:31:27 UTC (rev 281)
+++ openbios-devel/drivers/pci.c	2008-12-05 18:32:39 UTC (rev 282)
@@ -305,11 +305,9 @@
 
 static int vga_config_cb (const pci_config_t *config)
 {
-#if 0
 	if (config->regions[0] != 0x00000000)
 		vga_vbe_init(config->path, config->regions[0], config->sizes[0],
 			     config->regions[1], config->sizes[1]);
-#endif
 	return 0;
 }
 

Modified: openbios-devel/modules/video.c
===================================================================
--- openbios-devel/modules/video.c	2008-12-05 18:31:27 UTC (rev 281)
+++ openbios-devel/modules/video.c	2008-12-05 18:32:39 UTC (rev 282)
@@ -148,7 +148,7 @@
 			while( ww-- )
 				*p++ = col;
 		} else {
-			char *p = (char*)pp + x;
+			char *p = (ushort*)pp + x;
 			while( ww-- )
 				*p++ = col;
 		}
@@ -181,6 +181,10 @@
             dac[1] = ((color >> 8) & 0xff) << 24; // Green
             dac[1] = (color & 0xff) << 24; // Blue
         }
+#else
+	vga_set_color(ind, ((color >> 16) & 0xff),
+			   ((color >> 8) & 0xff),
+			   (color & 0xff));
 #endif
 }
 
@@ -278,14 +282,7 @@
     PUSH(len);
 }
 
-static void
-video_open(void)
-{
-    RET(-1);
-}
-
 NODE_METHODS( video ) = {
-	{"open",		video_open		},
 	{"dimensions",		video_dimensions	},
 	{"set-colors",		video_set_colors	},
 	{"fill-rectangle",	video_fill_rect		},