r38 - in openbios-devel: arch/x86 modules

Author: stepan
Date: 2006-06-05 12:51:31 +0200 (Mon, 05 Jun 2006)
New Revision: 38

Modified:
   openbios-devel/arch/x86/console.c
   openbios-devel/modules/console.c
   openbios-devel/modules/video.c
Log:
sparc32 merge 20 part 1

Modified: openbios-devel/arch/x86/console.c
===================================================================
--- openbios-devel/arch/x86/console.c	2006-05-31 20:20:10 UTC (rev 37)
+++ openbios-devel/arch/x86/console.c	2006-06-05 10:51:31 UTC (rev 38)
@@ -251,7 +251,7 @@
  *  keyboard driver
  */

-static char normal[] = {
+static const char normal[] = {
    0x0, 0x1b, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-',
    '=', '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o',
    'p', '[', ']', 0xa, 0x0, 'a', 's', 'd', 'f', 'g', 'h', 'j',
@@ -261,7 +261,7 @@
    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, '0', 0x7f
 };

-static char shifted[] = {
+static const char shifted[] = {
    0x0, 0x1b, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_',
    '+', '\b', '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O',
    'P', '{', '}', 0xa, 0x0, 'A', 'S', 'D', 'F', 'G', 'H', 'J',

Modified: openbios-devel/modules/console.c
===================================================================
--- openbios-devel/modules/console.c	2006-05-31 20:20:10 UTC (rev 37)
+++ openbios-devel/modules/console.c	2006-06-05 10:51:31 UTC (rev 38)
@@ -165,7 +165,7 @@
 int
 console_draw_str( const char *str )
 {
-	static char *ignore[] = { "[1;37m", "[2;40m", NULL };
+	static const char *ignore[] = { "[1;37m", "[2;40m", NULL };
    int ch, y, x, i;

if( !cons.inited && console_init() )

Modified: openbios-devel/modules/video.c
===================================================================
--- openbios-devel/modules/video.c	2006-05-31 20:20:10 UTC (rev 37)
+++ openbios-devel/modules/video.c	2006-06-05 10:51:31 UTC (rev 38)
@@ -172,6 +172,13 @@
 #ifdef CONFIG_MOL
    if( video.fb.depth == 8 )
    	OSI_SetColor( ind, color );
+#elif CONFIG_SPARC32
+	if( video.fb.depth == 8 ) {
+            dac[0] = ind << 24;
+            dac[1] = ((color >> 16) & 0xff) << 24; // Red
+            dac[1] = ((color >> 8) & 0xff) << 24; // Green
+            dac[1] = (color & 0xff) << 24; // Blue
+        }
 #endif
 }