Menu
▾
▴
[Linuxconsole-commit]CVS: ruby/linux/drivers/video Config.in,1.55,1.56 aty128fb.c,1.21,1.22 fbcon.c,1.60,1.61 fbgen.c,1.25,1.26 fm2fb.c,1.7,1.8 macfb.c,1.8,1.9 pvr2fb.c,1.1,1.2 sa1100fb.c,1.18,1.19 sgivwfb.c,1.11,1.12 vesafb.c,1.18,1.19 vfb.c,1.31,1.32
|
From: James S. <jsi...@us...> - 2001-12-26 17:28:16
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv5113/drivers/video
Modified Files:
Config.in aty128fb.c fbcon.c fbgen.c fm2fb.c macfb.c pvr2fb.c
sa1100fb.c sgivwfb.c vesafb.c vfb.c
Log Message:
Synced to 2.5.0. Don't use. The default 2.5.0 has a nasty bug in it.
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Config.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Config.in 2001/11/23 04:10:15 1.55
+++ Config.in 2001/12/26 17:28:11 1.56
@@ -80,10 +80,10 @@
fi
fi
if [ "$CONFIG_PPC" = "y" ]; then
- bool ' Open Firmware frame buffer device support' CONFIG_FB_OF
- bool ' Apple "control" display support' CONFIG_FB_CONTROL
- bool ' Apple "platinum" display support' CONFIG_FB_PLATINUM
- bool ' Apple "valkyrie" display support' CONFIG_FB_VALKYRIE
+ dep_bool ' Open Firmware frame buffer device support' CONFIG_FB_OF $CONFIG_ALL_PPC
+ dep_bool ' Apple "control" display support' CONFIG_FB_CONTROL $CONFIG_ALL_PPC
+ dep_bool ' Apple "platinum" display support' CONFIG_FB_PLATINUM $CONFIG_ALL_PPC
+ dep_bool ' Apple "valkyrie" display support' CONFIG_FB_VALKYRIE $CONFIG_ALL_PPC
bool ' IMS Twin Turbo display support' CONFIG_FB_IMSTT
bool ' Chips 65550 display support' CONFIG_FB_CT65550
bool ' S3 Trio display support' CONFIG_FB_S3TRIO
Index: aty128fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/aty128fb.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- aty128fb.c 2001/12/02 07:02:03 1.21
+++ aty128fb.c 2001/12/26 17:28:11 1.22
@@ -207,7 +207,7 @@
static char *mode __initdata = NULL;
static int nomtrr __initdata = 0;
-static const char *mode_option __initdata = NULL;
+static char *mode_option __initdata = NULL;
/* PLL constants */
struct aty128_constants {
@@ -711,7 +711,7 @@
crtc->pitch = var->xres_virtual >> 3;
crtc->offset = 0;
- crtc->offset_cntl = 0;
+ crtc->offset_cntl = 0x00010000;
crtc->bpp = var->bits_per_pixel;
return 0;
}
@@ -1086,7 +1086,7 @@
if (!options || !*options)
return 0;
- while ((this_opt = strsep(&options, ","))) {
+ while ((this_opt = strsep(&options, ",")) != NULL) {
if (!strncmp(this_opt, "font:", 5)) {
char *p;
int i;
@@ -1711,6 +1711,7 @@
#ifdef MODULE
MODULE_AUTHOR("(c)1999-2000 Brad Douglas <br...@ne...>");
MODULE_DESCRIPTION("FBDev driver for ATI Rage128 / Pro cards");
+MODULE_LICENSE("GPL");
MODULE_PARM(noaccel, "i");
MODULE_PARM_DESC(noaccel, "Disable hardware acceleration (0 or 1=disabled) (default=0)");
MODULE_PARM(mode, "s");
Index: fbcon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbcon.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- fbcon.c 2001/12/23 00:04:18 1.60
+++ fbcon.c 2001/12/26 17:28:11 1.61
@@ -170,7 +170,7 @@
if (!options || !*options)
return 0;
- while ((this_opt = strsep(&options, ","))) {
+ while ((this_opt = strsep(&options, ",")) != NULL) {
if (!strncmp(this_opt, "font:", 5))
strcpy(fontname, this_opt+5);
}
Index: fbgen.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbgen.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- fbgen.c 2001/11/14 17:25:07 1.25
+++ fbgen.c 2001/12/26 17:28:11 1.26
@@ -134,7 +134,7 @@
return 0;
}
- while ((this_opt = strsep(&options, ","))) {
+ while ((this_opt = strsep(&options, ",")) != NULL) {
if (!*this_opt) {
continue;
}
Index: fm2fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fm2fb.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fm2fb.c 2001/10/29 00:11:00 1.7
+++ fm2fb.c 2001/12/26 17:28:11 1.8
@@ -315,7 +315,7 @@
if (!options || !*options)
return 0;
- while (this_opt = strsep(&options, ",")) {
+ while ((this_opt = strsep(&options, ",")) != NULL) {
if (!strncmp(this_opt, "pal", 3))
fm2fb_mode = FM2FB_MODE_PAL;
else if (!strncmp(this_opt, "ntsc", 4))
Index: macfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/macfb.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- macfb.c 2001/10/29 00:11:00 1.8
+++ macfb.c 2001/12/26 17:28:11 1.9
@@ -848,7 +848,7 @@
if (!options || !*options)
return;
- while (this_opt = strsep(&options, ",")) {
+ while ((this_opt = strsep(&options, ",")) != NULL) {
if (!*this_opt) continue;
if (! strcmp(this_opt, "inverse"))
Index: pvr2fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/pvr2fb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pvr2fb.c 2001/11/02 17:34:53 1.1
+++ pvr2fb.c 2001/12/26 17:28:11 1.2
@@ -1046,7 +1046,7 @@
if (!options || !*options)
return 0;
- while ((this_opt = strsep(&options, ","))) {
+ while ((this_opt = strsep(&options, ",")) != NULL) {
if (!*this_opt)
continue;
if (!strcmp(this_opt, "inverse")) {
Index: sa1100fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/sa1100fb.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sa1100fb.c 2001/11/06 21:56:05 1.18
+++ sa1100fb.c 2001/12/26 17:28:11 1.19
@@ -2370,7 +2370,7 @@
if (!options || !*options)
return 0;
- while (this_opt = strsep(&options, ",")) {
+ while ((this_opt = strsep(&options, ",")) != NULL) {
if (!strncmp(this_opt, "bpp:", 4))
current_par.max_bpp =
Index: sgivwfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/sgivwfb.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sgivwfb.c 2001/10/29 22:58:43 1.11
+++ sgivwfb.c 2001/12/26 17:28:11 1.12
@@ -611,7 +611,7 @@
if (!options || !*options)
return 0;
- while (this_opt = strsep(&options, ",")) {
+ while ((this_opt = strsep(&options, ",")) != NULL) {
}
return 0;
}
Index: vesafb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vesafb.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- vesafb.c 2001/11/23 01:25:45 1.18
+++ vesafb.c 2001/12/26 17:28:11 1.19
@@ -187,8 +187,8 @@
if (!options || !*options)
return 0;
-
- while ((this_opt = strsep(&options, ","))) {
+
+ while ((this_opt = strsep(&options, ",")) != NULL) {
if (!*this_opt) continue;
if (! strcmp(this_opt, "inverse"))
@@ -232,10 +232,11 @@
FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
if (!request_mem_region(video_base, video_size, "vesafb")) {
- printk(KERN_ERR
+ printk(KERN_WARNING
"vesafb: abort, cannot reserve video memory at 0x%lx\n",
video_base);
- return -EBUSY;
+ /* We cannot make this fatal. Sometimes this comes from magic
+ spaces our resource handlers simply don't know about */
}
printk("Got requested region (framebuffer)\n");
@@ -369,3 +370,5 @@
* c-basic-offset: 8
* End:
*/
+
+MODULE_LICENSE("GPL");
Index: vfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vfb.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- vfb.c 2001/11/14 22:01:52 1.31
+++ vfb.c 2001/12/26 17:28:12 1.32
@@ -365,7 +365,7 @@
if (!options || !*options)
return 1;
- while (this_opt = strsep(&options, ",")) {
+ while ((this_opt = strsep(&options, ",")) != NULL) {
if (!*this_opt)
continue;
if (!strncmp(this_opt, "disable", 7))
|
