linuxconsole-commit

[Franz S. <fs...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv27651

Modified Files:
	aty128fb.c fbcon.c macmodes.c 
Log Message:
Delete vmode/cmode handling in aty128fb. Some minor fixes.

Index: aty128fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/aty128fb.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- aty128fb.c	2001/11/22 13:11:51	1.18
+++ aty128fb.c	2001/11/22 18:00:42	1.19
@@ -211,11 +211,6 @@
 
 static const char *mode_option __initdata = NULL;
 
-#ifdef CONFIG_PPC
-static int default_vmode __initdata = VMODE_1024_768_60;
-static int default_cmode __initdata = CMODE_8;
-#endif
-
 #ifdef CONFIG_MTRR
 static int mtrr = 1;
 #endif
@@ -1118,30 +1113,6 @@
             mtrr = 0;
         }
 #endif
-#ifdef CONFIG_PPC
-        /* vmode and cmode depreciated */
-	else if (!strncmp(this_opt, "vmode:", 6)) {
-            unsigned int vmode = simple_strtoul(this_opt+6, NULL, 0);
-            if (vmode > 0 && vmode <= VMODE_MAX)
-                default_vmode = vmode;
-        } else if (!strncmp(this_opt, "cmode:", 6)) {
-            unsigned int cmode = simple_strtoul(this_opt+6, NULL, 0);
-            switch (cmode) {
-	    case 0:
-	    case 8:
-		default_cmode = CMODE_8;
-		break;
-	    case 15:
-	    case 16:
-		default_cmode = CMODE_16;
-		break;
-	    case 24:
-	    case 32:
-		default_cmode = CMODE_32;
-		break;
-            }
-        }
-#endif /* CONFIG_PPC */
         else
             mode_option = this_opt;
     }
@@ -1191,15 +1162,6 @@
     if (_machine == _MACH_Pmac) {
         if (mode_option) {
             if (!mac_find_mode(&var, info, mode_option, 8))
-                var = default_var;
-        } else {
-            if (default_vmode <= 0 || default_vmode > VMODE_MAX)
-                default_vmode = VMODE_1024_768_60;
-
-            if (default_cmode < CMODE_8 || default_cmode > CMODE_32)
-                default_cmode = CMODE_8;
-
-            if (mac_vmode_to_var(default_vmode, default_cmode, &var))
                 var = default_var;
         }
     } else

Index: fbcon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbcon.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- fbcon.c	2001/11/07 10:19:20	1.57
+++ fbcon.c	2001/11/22 18:00:42	1.58
@@ -170,7 +170,7 @@
     if (!options || !*options)
             return 0;
 
-    while (this_opt = strsep(&options, ",")) {	
+    while ((this_opt = strsep(&options, ","))) {	
     	if (!strncmp(this_opt, "font:", 5))
         	strcpy(fontname, this_opt+5);
     }

Index: macmodes.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/macmodes.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- macmodes.c	2001/11/22 12:56:49	1.2
+++ macmodes.c	2001/11/22 18:00:42	1.3
@@ -380,6 +380,7 @@
     unsigned int dbsize = 0;
 
     if (mode_option && !strncmp(mode_option, "mac", 3)) {
+	mode_option += 3;
 	db = mac_modedb;
 	dbsize = sizeof(mac_modedb)/sizeof(*mac_modedb);
     }