I updated the patch to the current developement kernel. Please test it and
let me know if it works. If you have patches to fix any bugs please
send them my way. I like to send it soon to linus. Thank you.
Q: Why did they deprecate a.out support in linux?
A: Because a nasty coff is bad for your elf.
James Simmons [jsimmons@linux-fbdev.org] ____/|
fbdev/gfx developer \ o.O|
http://www.linux-fbdev.org =(_)=
http://linuxgfx.sourceforge.net U
diff -urN linux-2.3.99-pre9-2/drivers/video/S3triofb.c linux/drivers/video/S3triofb.c
--- linux-2.3.99-pre9-2/drivers/video/S3triofb.c Wed Nov 10 15:09:56 1999
+++ linux/drivers/video/S3triofb.c Wed May 17 09:27:48 2000
@@ -91,9 +91,6 @@
struct fb_info *info);
static int s3trio_pan_display(struct fb_var_screeninfo *var, int con,
struct fb_info *info);
-static int s3trio_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
-
/*
* Interface to the low level console driver
@@ -142,7 +139,7 @@
static struct fb_ops s3trio_ops = {
s3trio_open, s3trio_release, s3trio_get_fix, s3trio_get_var, s3trio_set_var,
- s3trio_get_cmap, s3trio_set_cmap, s3trio_pan_display, s3trio_ioctl
+ s3trio_get_cmap, s3trio_set_cmap, s3trio_pan_display, NULL
};
@@ -279,13 +276,6 @@
else
fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
return 0;
-}
-
-
-static int s3trio_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
}
int __init s3triofb_init(void)
diff -urN linux-2.3.99-pre9-2/drivers/video/acornfb.c linux/drivers/video/acornfb.c
--- linux-2.3.99-pre9-2/drivers/video/acornfb.c Sat May 13 08:31:42 2000
+++ linux/drivers/video/acornfb.c Wed May 17 09:28:12 2000
@@ -1125,13 +1125,6 @@
return 0;
}
-static int
-acornfb_ioctl(struct inode *ino, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info)
-{
- return -ENOIOCTLCMD;
-}
-
static struct fb_ops acornfb_ops = {
acornfb_open,
acornfb_release,
@@ -1141,7 +1134,7 @@
acornfb_get_cmap,
acornfb_set_cmap,
acornfb_pan_display,
- acornfb_ioctl
+ NULL
};
static int
diff -urN linux-2.3.99-pre9-2/drivers/video/aty128fb.c linux/drivers/video/aty128fb.c
--- linux-2.3.99-pre9-2/drivers/video/aty128fb.c Fri May 12 11:25:25 2000
+++ linux/drivers/video/aty128fb.c Wed May 17 09:29:38 2000
@@ -301,11 +301,8 @@
struct fb_info *info);
static int aty128fb_pan_display(struct fb_var_screeninfo *var, int con,
struct fb_info *fb);
-static int aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
static int aty128fb_rasterimg(struct fb_info *info, int start);
-
/*
* Interface to the low level console driver
*/
@@ -388,7 +385,7 @@
static struct fb_ops aty128fb_ops = {
aty128fb_open, aty128fb_release, aty128fb_get_fix,
aty128fb_get_var, aty128fb_set_var, aty128fb_get_cmap,
- aty128fb_set_cmap, aty128fb_pan_display, aty128fb_ioctl,
+ aty128fb_set_cmap, aty128fb_pan_display, NULL,
NULL, aty128fb_rasterimg
};
@@ -1572,18 +1569,6 @@
return 0;
}
-
- /*
- * Frame Buffer Specific ioctls
- */
-
-static int
-aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
-}
-
static int
aty128fb_rasterimg(struct fb_info *info, int start)
diff -urN linux-2.3.99-pre9-2/drivers/video/chipsfb.c linux/drivers/video/chipsfb.c
--- linux-2.3.99-pre9-2/drivers/video/chipsfb.c Fri Feb 11 21:39:25 2000
+++ linux/drivers/video/chipsfb.c Wed May 17 09:30:10 2000
@@ -129,8 +129,6 @@
struct fb_info *info);
static int chips_set_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info);
-static int chips_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
static struct fb_ops chipsfb_ops = {
chips_open,
@@ -141,7 +139,7 @@
chips_get_cmap,
chips_set_cmap,
chips_pan_display,
- chips_ioctl
+ NULL
};
static int chipsfb_getcolreg(u_int regno, u_int *red, u_int *green,
@@ -240,12 +238,6 @@
else
fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
return 0;
-}
-
-static int chips_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
}
static int chipsfbcon_switch(int con, struct fb_info *info)
diff -urN linux-2.3.99-pre9-2/drivers/video/clgenfb.c linux/drivers/video/clgenfb.c
--- linux-2.3.99-pre9-2/drivers/video/clgenfb.c Fri May 12 11:25:25 2000
+++ linux/drivers/video/clgenfb.c Wed May 17 09:31:00 2000
@@ -473,9 +473,6 @@
static int clgenfb_open (struct fb_info *info, int user);
static int clgenfb_release (struct fb_info *info, int user);
-static int clgenfb_ioctl (struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg, int con,
- struct fb_info *info);
#if defined(CONFIG_FB_OF)
int clgen_of_init (struct device_node *dp);
#endif
@@ -491,7 +488,7 @@
fbgen_get_cmap,
fbgen_set_cmap,
fbgen_pan_display,
- clgenfb_ioctl,
+ NULL,
NULL
};
@@ -665,16 +662,6 @@
return 0;
}
-/*--- handle /dev/fbx ioctl calls ------------------------------------------*/
-static int clgenfb_ioctl (struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg, int con,
- struct fb_info *info)
-{
- DPRINTK ("ENTER\n");
- /* Nothing exciting here... */
- DPRINTK ("EXIT\n");
- return -EINVAL;
-}
/**** END Interface used by the World *************************************/
/****************************************************************************/
/**** BEGIN Hardware specific Routines **************************************/
diff -urN linux-2.3.99-pre9-2/drivers/video/controlfb.c linux/drivers/video/controlfb.c
--- linux-2.3.99-pre9-2/drivers/video/controlfb.c Fri Feb 11 21:39:25 2000
+++ linux/drivers/video/controlfb.c Wed May 17 09:31:36 2000
@@ -124,8 +124,6 @@
struct fb_info *info);
static int control_set_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info);
-static int control_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
static int controlfb_getcolreg(u_int regno, u_int *red, u_int *green,
@@ -178,7 +176,7 @@
control_get_cmap,
control_set_cmap,
control_pan_display,
- control_ioctl
+ NULL
};
@@ -346,12 +344,6 @@
return fb_set_cmap(cmap, kspc, controlfb_setcolreg, info);
fb_copy_cmap(cmap, &disp->cmap, kspc ? 0 : 1);
return 0;
-}
-
-static int control_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
}
/******************** End of controlfb_ops implementation ********************/
diff -urN linux-2.3.99-pre9-2/drivers/video/cyber2000fb.c linux/drivers/video/cyber2000fb.c
--- linux-2.3.99-pre9-2/drivers/video/cyber2000fb.c Wed May 17 09:20:17 2000
+++ linux/drivers/video/cyber2000fb.c Wed May 17 09:32:17 2000
@@ -1059,15 +1059,6 @@
return 0;
}
-
-static int
-cyber2000fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
-}
-
-
/*
* Update the `var' structure (called by fbcon.c)
*
@@ -1187,7 +1178,6 @@
fb_set_var: cyber2000fb_set_var,
fb_set_cmap: cyber2000fb_set_cmap,
fb_pan_display: cyber2000fb_pan_display,
- fb_ioctl: cyber2000fb_ioctl,
fb_get_fix: gen_get_fix,
fb_get_var: gen_get_var,
fb_get_cmap: gen_get_cmap,
diff -urN linux-2.3.99-pre9-2/drivers/video/cyberfb.c linux/drivers/video/cyberfb.c
--- linux-2.3.99-pre9-2/drivers/video/cyberfb.c Fri Jan 28 21:22:32 2000
+++ linux/drivers/video/cyberfb.c Wed May 17 09:32:51 2000
@@ -255,8 +255,6 @@
struct fb_info *info);
static int cyberfb_pan_display(struct fb_var_screeninfo *var, int con,
struct fb_info *info);
-static int cyberfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
/*
* Interface to the low level console driver
@@ -1043,22 +1041,10 @@
return -EINVAL;
}
-
-/*
- * Cybervision Frame Buffer Specific ioctls
- */
-
-static int cyberfb_ioctl(struct inode *inode, struct file *file,
- u_int cmd, u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
-}
-
-
static struct fb_ops cyberfb_ops = {
cyberfb_open, cyberfb_release, cyberfb_get_fix, cyberfb_get_var,
cyberfb_set_var, cyberfb_get_cmap, cyberfb_set_cmap,
- cyberfb_pan_display, cyberfb_ioctl
+ cyberfb_pan_display, NULL
};
diff -urN linux-2.3.99-pre9-2/drivers/video/dn_cfb4.c linux/drivers/video/dn_cfb4.c
--- linux-2.3.99-pre9-2/drivers/video/dn_cfb4.c Thu Feb 3 20:20:51 2000
+++ linux/drivers/video/dn_cfb4.c Wed May 17 09:33:26 2000
@@ -125,8 +125,6 @@
struct fb_info *info);
static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con,
struct fb_info *info);
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info);
static int dnfbcon_switch(int con,struct fb_info *info);
static int dnfbcon_updatevar(int con,struct fb_info *info);
@@ -138,7 +136,7 @@
static struct fb_info fb_info;
static struct fb_ops dn_fb_ops = {
dn_fb_open,dn_fb_release, dn_fb_get_fix, dn_fb_get_var, dn_fb_set_var,
- dn_fb_get_cmap, dn_fb_set_cmap, dn_fb_pan_display, dn_fb_ioctl
+ dn_fb_get_cmap, dn_fb_set_cmap, dn_fb_pan_display, NULL
};
static int currcon=0;
@@ -282,15 +280,6 @@
struct fb_info *info) {
printk("panning not supported\n");
-
- return -EINVAL;
-
-}
-
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info) {
-
- printk("no IOCTLs as of yet.\n");
return -EINVAL;
diff -urN linux-2.3.99-pre9-2/drivers/video/dn_cfb8.c linux/drivers/video/dn_cfb8.c
--- linux-2.3.99-pre9-2/drivers/video/dn_cfb8.c Thu Feb 3 20:20:51 2000
+++ linux/drivers/video/dn_cfb8.c Wed May 17 09:34:01 2000
@@ -126,8 +126,6 @@
struct fb_info *info);
static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con,
struct fb_info *info);
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info);
static int dnfbcon_switch(int con,struct fb_info *info);
static int dnfbcon_updatevar(int con,struct fb_info *info);
@@ -139,7 +137,7 @@
static struct fb_info fb_info;
static struct fb_ops dn_fb_ops = {
dn_fb_open,dn_fb_release, dn_fb_get_fix, dn_fb_get_var, dn_fb_set_var,
- dn_fb_get_cmap, dn_fb_set_cmap, dn_fb_pan_display, dn_fb_ioctl
+ dn_fb_get_cmap, dn_fb_set_cmap, dn_fb_pan_display, NULL
};
static int currcon=0;
@@ -283,15 +281,6 @@
struct fb_info *info) {
printk("panning not supported\n");
-
- return -EINVAL;
-
-}
-
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info) {
-
- printk("no IOCTLs as of yet.\n");
return -EINVAL;
diff -urN linux-2.3.99-pre9-2/drivers/video/dnfb.c linux/drivers/video/dnfb.c
--- linux-2.3.99-pre9-2/drivers/video/dnfb.c Thu Feb 3 20:20:51 2000
+++ linux/drivers/video/dnfb.c Wed May 17 09:34:54 2000
@@ -131,8 +131,6 @@
struct fb_info *info);
static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con,
struct fb_info *info);
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info);
static int dnfbcon_switch(int con,struct fb_info *info);
static int dnfbcon_updatevar(int con,struct fb_info *info);
@@ -144,7 +142,7 @@
static struct fb_info fb_info;
static struct fb_ops dn_fb_ops = {
dn_fb_open,dn_fb_release, dn_fb_get_fix, dn_fb_get_var, dn_fb_set_var,
- dn_fb_get_cmap, dn_fb_set_cmap, dn_fb_pan_display, dn_fb_ioctl
+ dn_fb_get_cmap, dn_fb_set_cmap, dn_fb_pan_display, NULL
};
static int currcon=0;
@@ -288,15 +286,6 @@
struct fb_info *info) {
printk("panning not supported\n");
-
- return -EINVAL;
-
-}
-
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info) {
-
- printk("no IOCTLs as of yet.\n");
return -EINVAL;
diff -urN linux-2.3.99-pre9-2/drivers/video/fbgen.c linux/drivers/video/fbgen.c
--- linux-2.3.99-pre9-2/drivers/video/fbgen.c Fri Jan 28 21:22:32 2000
+++ linux/drivers/video/fbgen.c Wed May 17 09:45:32 2000
@@ -189,18 +189,6 @@
return 0;
}
-
- /*
- * Frame Buffer Specific ioctls
- */
-
-int fbgen_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
-}
-
-
/* ---- Helper functions --------------------------------------------------- */
diff -urN linux-2.3.99-pre9-2/drivers/video/fbmem.c linux/drivers/video/fbmem.c
--- linux-2.3.99-pre9-2/drivers/video/fbmem.c Thu Apr 27 17:54:51 2000
+++ linux/drivers/video/fbmem.c Wed May 17 09:54:52 2000
@@ -418,8 +418,10 @@
(*info->blank)(arg, info);
return 0;
default:
- return fb->fb_ioctl(inode, file, cmd, arg, PROC_CONSOLE(info),
- info);
+ if (fb->fb_ioctl)
+ return fb->fb_ioctl(inode, file, cmd, arg,
+ PROC_CONSOLE(info), info);
+ return -EINVAL;
}
}
diff -urN linux-2.3.99-pre9-2/drivers/video/fm2fb.c linux/drivers/video/fm2fb.c
--- linux-2.3.99-pre9-2/drivers/video/fm2fb.c Fri Jan 28 21:22:32 2000
+++ linux/drivers/video/fm2fb.c Wed May 17 09:35:39 2000
@@ -197,9 +197,6 @@
struct fb_info *info);
static int fm2fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info);
-static int fm2fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
-
/*
* Interface to the low level console driver
@@ -224,7 +221,7 @@
static struct fb_ops fm2fb_ops = {
fm2fb_open, fm2fb_release, fm2fb_get_fix, fm2fb_get_var, fm2fb_set_var,
- fm2fb_get_cmap, fm2fb_set_cmap, fm2fb_pan_display, fm2fb_ioctl
+ fm2fb_get_cmap, fm2fb_set_cmap, fm2fb_pan_display, NULL
};
@@ -361,14 +358,6 @@
fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
return 0;
}
-
-
-static int fm2fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
-}
-
/*
* Initialisation
diff -urN linux-2.3.99-pre9-2/drivers/video/g364fb.c linux/drivers/video/g364fb.c
--- linux-2.3.99-pre9-2/drivers/video/g364fb.c Wed Nov 10 15:09:56 1999
+++ linux/drivers/video/g364fb.c Wed May 17 09:36:22 2000
@@ -105,9 +105,6 @@
struct fb_info *info);
static int g364fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info);
-static int g364fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
-
/*
* Interface to the low level console driver
@@ -130,7 +127,7 @@
static struct fb_ops g364fb_ops = {
g364fb_open, g364fb_release, g364fb_get_fix, g364fb_get_var, g364fb_set_var,
- g364fb_get_cmap, g364fb_set_cmap, g364fb_pan_display, g364fb_ioctl
+ g364fb_get_cmap, g364fb_set_cmap, g364fb_pan_display, NULL
};
@@ -285,14 +282,6 @@
fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
return 0;
}
-
-
-static int g364fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
-}
-
/*
* Initialisation
diff -urN linux-2.3.99-pre9-2/drivers/video/hgafb.c linux/drivers/video/hgafb.c
--- linux-2.3.99-pre9-2/drivers/video/hgafb.c Thu Mar 16 15:18:23 2000
+++ linux/drivers/video/hgafb.c Wed May 17 09:37:00 2000
@@ -531,26 +531,10 @@
info->var.vmode &= ~FB_VMODE_YWRAP;
return 0;
}
-
-
- /*
- * Frame Buffer Specific ioctls
- */
-
-int hga_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info)
-{
- CHKINFO(-EINVAL);
- DPRINTK("hga_ioctl: con:%d\n", con);
- return -EINVAL;
-}
-
-
-
static struct fb_ops hgafb_ops = {
hgafb_open, hgafb_release, hga_get_fix, hga_get_var, hga_set_var,
- hga_get_cmap, hga_set_cmap, hga_pan_display, hga_ioctl
+ hga_get_cmap, hga_set_cmap, hga_pan_display, NULL
};
diff -urN linux-2.3.99-pre9-2/drivers/video/hpfb.c linux/drivers/video/hpfb.c
--- linux-2.3.99-pre9-2/drivers/video/hpfb.c Tue Dec 7 19:35:33 1999
+++ linux/drivers/video/hpfb.c Wed May 17 09:37:26 2000
@@ -225,13 +225,6 @@
writeb(fb_bitmask, fb_regs + WMOVE);
}
-static int hpfb_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg, int con,
- struct fb_info *info)
-{
- return -EINVAL;
-}
-
static int hpfb_switch(int con, struct fb_info *info)
{
do_fb_set_var(&fb_display[con].var,1);
@@ -296,7 +289,7 @@
hpfb_get_cmap,
hpfb_set_cmap,
NULL,
- hpfb_ioctl
+ NULL
};
#define TOPCAT_FBOMSB 0x5d
diff -urN linux-2.3.99-pre9-2/drivers/video/igafb.c linux/drivers/video/igafb.c
--- linux-2.3.99-pre9-2/drivers/video/igafb.c Mon Feb 14 20:57:57 2000
+++ linux/drivers/video/igafb.c Wed May 17 09:38:08 2000
@@ -454,12 +454,6 @@
return -EINVAL;
}
-static int igafb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
-}
-
/*
* Framebuffer option structure
*/
@@ -472,7 +466,7 @@
igafb_get_cmap,
igafb_set_cmap,
igafb_pan_display,
- igafb_ioctl,
+ NULL,
#ifdef __sparc__
igafb_mmap
#else
diff -urN linux-2.3.99-pre9-2/drivers/video/offb.c linux/drivers/video/offb.c
--- linux-2.3.99-pre9-2/drivers/video/offb.c Sat Mar 25 10:06:11 2000
+++ linux/drivers/video/offb.c Wed May 17 09:38:41 2000
@@ -91,8 +91,6 @@
struct fb_info *info);
static int offb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info);
-static int offb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
extern boot_infos_t *boot_infos;
@@ -124,7 +122,7 @@
static struct fb_ops offb_ops = {
offb_open, offb_release, offb_get_fix, offb_get_var, offb_set_var,
- offb_get_cmap, offb_set_cmap, offb_pan_display, offb_ioctl
+ offb_get_cmap, offb_set_cmap, offb_pan_display, NULL
};
@@ -275,14 +273,6 @@
fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
return 0;
}
-
-
-static int offb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
-}
-
#ifdef CONFIG_FB_S3TRIO
extern void s3triofb_init_of(struct device_node *dp);
diff -urN linux-2.3.99-pre9-2/drivers/video/platinumfb.c linux/drivers/video/platinumfb.c
--- linux-2.3.99-pre9-2/drivers/video/platinumfb.c Wed Nov 10 15:09:56 1999
+++ linux/drivers/video/platinumfb.c Wed May 17 09:39:26 2000
@@ -115,9 +115,6 @@
struct fb_info *info);
static int platinum_set_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info);
-static int platinum_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
-
/*
* Interface to the low level console driver
@@ -174,7 +171,7 @@
platinum_get_cmap,
platinum_set_cmap,
platinum_pan_display,
- platinum_ioctl
+ NULL
};
static int platinum_open(struct fb_info *info, int user)
@@ -365,13 +362,6 @@
else
fb_copy_cmap(cmap, &disp->cmap, kspc ? 0 : 1);
return 0;
-}
-
-static int platinum_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- printk(KERN_ERR "platinum_ioctl not yet implemented\n");
- return -EINVAL;
}
static int platinum_switch(int con, struct fb_info *fb)
diff -urN linux-2.3.99-pre9-2/drivers/video/q40fb.c linux/drivers/video/q40fb.c
--- linux-2.3.99-pre9-2/drivers/video/q40fb.c Wed Nov 10 15:09:56 1999
+++ linux/drivers/video/q40fb.c Wed May 17 09:40:08 2000
@@ -43,9 +43,6 @@
struct fb_info *info);
static int q40fb_pan_display(struct fb_var_screeninfo *var, int con,
struct fb_info *info);
-static int q40fb_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg, int con,
- struct fb_info *info);
static int q40con_switch(int con, struct fb_info *info);
static int q40con_updatevar(int con, struct fb_info *info);
@@ -57,7 +54,7 @@
static struct fb_info fb_info;
static struct fb_ops q40fb_ops = {
q40fb_open,q40fb_release, q40fb_get_fix, q40fb_get_var, q40fb_set_var,
- q40fb_get_cmap, q40fb_set_cmap, q40fb_pan_display, q40fb_ioctl
+ q40fb_get_cmap, q40fb_set_cmap, q40fb_pan_display, NULL
};
static int currcon=0;
@@ -273,34 +270,6 @@
return -EINVAL;
-}
-
-static int q40fb_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg, int con,
- struct fb_info *info)
-{
-#if 0
- unsigned long i;
- struct display *display;
-
- if (con>=0)
- display = &fb_display[con];
- else
- display = &disp[0];
-
- if (cmd == FBIOSETSCROLLMODE)
- {
- i = verify_area(VERIFY_READ, (void *)arg, sizeof(unsigned long));
- if (!i)
- {
- copy_from_user(&i, (void *)arg, sizeof(unsigned long));
- display->scrollmode = i;
- }
- q40_updatescrollmode(display);
- return i;
- }
-#endif
- return -EINVAL;
}
static void q40fb_set_disp(int con, struct fb_info *info)
diff -urN linux-2.3.99-pre9-2/drivers/video/retz3fb.c linux/drivers/video/retz3fb.c
--- linux-2.3.99-pre9-2/drivers/video/retz3fb.c Fri Jan 28 21:22:32 2000
+++ linux/drivers/video/retz3fb.c Wed May 17 09:40:44 2000
@@ -281,10 +281,6 @@
struct fb_info *info);
static int retz3fb_pan_display(struct fb_var_screeninfo *var, int con,
struct fb_info *info);
-static int retz3fb_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg, int con,
- struct fb_info *info);
-
/*
* Interface to the low level console driver
@@ -1374,23 +1370,10 @@
return -EINVAL;
}
-
-/*
- * RetinaZ3 Frame Buffer Specific ioctls
- */
-
-static int retz3fb_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg, int con,
- struct fb_info *info)
-{
- return -EINVAL;
-}
-
-
static struct fb_ops retz3fb_ops = {
retz3fb_open, retz3fb_release, retz3fb_get_fix, retz3fb_get_var,
retz3fb_set_var, retz3fb_get_cmap, retz3fb_set_cmap,
- retz3fb_pan_display, retz3fb_ioctl
+ retz3fb_pan_display, NULL
};
diff -urN linux-2.3.99-pre9-2/drivers/video/riva/fbdev.c linux/drivers/video/riva/fbdev.c
--- linux-2.3.99-pre9-2/drivers/video/riva/fbdev.c Wed May 17 09:20:17 2000
+++ linux/drivers/video/riva/fbdev.c Wed May 17 09:41:33 2000
@@ -239,8 +239,7 @@
struct fb_info *info);
static int rivafb_pan_display (struct fb_var_screeninfo *var, int con,
struct fb_info *info);
-static int rivafb_ioctl (struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info);
+
static int rivafb_switch (int con, struct fb_info *info);
static int rivafb_updatevar (int con, struct fb_info *info);
static void rivafb_blank (int blank, struct fb_info *info);
@@ -279,7 +278,7 @@
rivafb_get_cmap,
rivafb_set_cmap,
rivafb_pan_display,
- rivafb_ioctl
+ NULL
};
@@ -1141,24 +1140,6 @@
return 0;
}
-
-
-static int rivafb_ioctl (struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info)
-{
- struct rivafb_info *rivainfo = (struct rivafb_info *) info;
-
- DPRINTK ("ENTER\n");
-
- assert (rivainfo != NULL);
-
- /* no rivafb-specific ioctls */
-
- DPRINTK ("EXIT, returning -EINVAL\n");
-
- return -EINVAL;
-}
-
static int rivafb_switch (int con, struct fb_info *info)
{
diff -urN linux-2.3.99-pre9-2/drivers/video/sa1100fb.c linux/drivers/video/sa1100fb.c
--- linux-2.3.99-pre9-2/drivers/video/sa1100fb.c Tue Apr 11 20:13:32 2000
+++ linux/drivers/video/sa1100fb.c Wed May 17 09:42:11 2000
@@ -187,8 +187,6 @@
static int sa1100fb_open(struct fb_info *info, int user);
static int sa1100fb_release(struct fb_info *info, int user);
static int sa1100fb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info);
-static int sa1100fb_ioctl(struct inode *ino, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info);
static int sa1100fb_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info);
static int sa1100fb_set_var(struct fb_var_screeninfo *var, int con, struct fb_info *info);
static int sa1100fb_get_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info);
@@ -211,7 +209,7 @@
sa1100fb_get_cmap,
sa1100fb_set_cmap,
sa1100fb_pan_display,
- sa1100fb_ioctl
+ NULL
};
@@ -1134,14 +1132,3 @@
return;
}
-
-
-
-static int
-sa1100fb_ioctl(struct inode *ino, struct file *file, unsigned int cmd,
- unsigned long arg, int con, struct fb_info *info)
-{
- return -ENOIOCTLCMD;
-}
-
-
diff -urN linux-2.3.99-pre9-2/drivers/video/sgivwfb.c linux/drivers/video/sgivwfb.c
--- linux-2.3.99-pre9-2/drivers/video/sgivwfb.c Wed Nov 10 15:15:26 1999
+++ linux/drivers/video/sgivwfb.c Wed May 17 09:42:52 2000
@@ -105,8 +105,6 @@
struct fb_info *info);
static int sgivwfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info);
-static int sgivwfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
static int sgivwfb_mmap(struct fb_info *info, struct file *file,
struct vm_area_struct *vma);
@@ -119,7 +117,7 @@
sgivwfb_get_cmap,
sgivwfb_set_cmap,
sgivwfb_pan_display,
- sgivwfb_ioctl,
+ NULL,
sgivwfb_mmap
};
@@ -892,15 +890,6 @@
else
fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
return 0;
-}
-
-/*
- * Virtual Frame Buffer Specific ioctls
- */
-static int sgivwfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
}
static int sgivwfb_mmap(struct fb_info *info, struct file *file,
diff -urN linux-2.3.99-pre9-2/drivers/video/skeletonfb.c linux/drivers/video/skeletonfb.c
--- linux-2.3.99-pre9-2/drivers/video/skeletonfb.c Fri Jan 28 21:22:32 2000
+++ linux/drivers/video/skeletonfb.c Wed May 17 09:45:19 2000
@@ -383,7 +383,7 @@
static struct fb_ops xxxfb_ops = {
xxxfb_open, xxxfb_release, fbgen_get_fix, fbgen_get_var, fbgen_set_var,
- fbgen_get_cmap, fbgen_set_cmap, fbgen_pan_display, fbgen_ioctl
+ fbgen_get_cmap, fbgen_set_cmap, fbgen_pan_display, NULL
};
diff -urN linux-2.3.99-pre9-2/drivers/video/sun3fb.c linux/drivers/video/sun3fb.c
--- linux-2.3.99-pre9-2/drivers/video/sun3fb.c Mon Feb 14 20:57:58 2000
+++ linux/drivers/video/sun3fb.c Wed May 17 09:44:35 2000
@@ -84,12 +84,10 @@
struct fb_info *info);
static int sun3fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info);
-static int sun3fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
+
static void sun3fb_cursor(struct display *p, int mode, int x, int y);
static void sun3fb_clear_margin(struct display *p, int s);
-
/*
* Interface to the low level console driver
*/
@@ -110,8 +108,9 @@
static void do_install_cmap(int con, struct fb_info *info);
static struct fb_ops sun3fb_ops = {
- sun3fb_open, sun3fb_release, sun3fb_get_fix, sun3fb_get_var, sun3fb_set_var,
- sun3fb_get_cmap, sun3fb_set_cmap, sun3fb_pan_display, sun3fb_ioctl
+ sun3fb_open, sun3fb_release, sun3fb_get_fix, sun3fb_get_var,
+ sun3fb_set_var, sun3fb_get_cmap, sun3fb_set_cmap, sun3fb_pan_display,
+ NULL
};
@@ -362,12 +361,6 @@
} else
fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
return 0;
-}
-
-static int sun3fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
}
/*
diff -urN linux-2.3.99-pre9-2/drivers/video/tdfxfb.c linux/drivers/video/tdfxfb.c
--- linux-2.3.99-pre9-2/drivers/video/tdfxfb.c Fri May 12 11:25:25 2000
+++ linux/drivers/video/tdfxfb.c Wed May 17 09:46:21 2000
@@ -397,12 +397,6 @@
int kspc,
int con,
struct fb_info* info);
-static int tdfxfb_ioctl(struct inode* inode,
- struct file* file,
- u_int cmd,
- u_long arg,
- int con,
- struct fb_info* info);
/*
* Interface to the low level console driver
@@ -491,7 +485,7 @@
tdfxfb_get_cmap,
tdfxfb_set_cmap,
tdfxfb_pan_display,
- tdfxfb_ioctl,
+ NULL, // fb_ioctl
NULL, // fb_mmap
NULL // fb_rasterimg
};
@@ -1937,24 +1931,6 @@
fb_copy_cmap(cmap, &d->cmap, kspc ? 0 : 1);
}
return 0;
-}
-
-static int tdfxfb_ioctl(struct inode *inode,
- struct file *file,
- u_int cmd,
- u_long arg,
- int con,
- struct fb_info *fb) {
-/* These IOCTLs ar just for testing only...
- switch (cmd) {
- case 0x4680:
- nowrap=nopan=0;
- return 0;
- case 0x4681:
- nowrap=nopan=1;
- return 0;
- }*/
- return -EINVAL;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)
diff -urN linux-2.3.99-pre9-2/drivers/video/valkyriefb.c linux/drivers/video/valkyriefb.c
--- linux-2.3.99-pre9-2/drivers/video/valkyriefb.c Wed Nov 10 15:09:56 1999
+++ linux/drivers/video/valkyriefb.c Wed May 17 09:46:55 2000
@@ -131,8 +131,6 @@
struct fb_info *info);
static int valkyrie_set_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info);
-static int valkyrie_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
static int read_valkyrie_sense(struct fb_info_valkyrie *p);
static inline int valkyrie_vram_reqd(int video_mode, int color_mode);
@@ -159,7 +157,7 @@
valkyrie_get_cmap,
valkyrie_set_cmap,
valkyrie_pan_display,
- valkyrie_ioctl
+ NULL
};
static int valkyriefb_getcolreg(u_int regno, u_int *red, u_int *green,
@@ -298,12 +296,6 @@
}
fb_copy_cmap(cmap, &disp->cmap, kspc ? 0 : 1);
return 0;
-}
-
-static int valkyrie_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
}
static int valkyriefb_switch(int con, struct fb_info *fb)
diff -urN linux-2.3.99-pre9-2/drivers/video/vesafb.c linux/drivers/video/vesafb.c
--- linux-2.3.99-pre9-2/drivers/video/vesafb.c Fri May 12 11:25:25 2000
+++ linux/drivers/video/vesafb.c Wed May 17 09:47:14 2000
@@ -451,13 +451,6 @@
return 0;
}
-static int vesafb_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg, int con,
- struct fb_info *info)
-{
- return -EINVAL;
-}
-
static struct fb_ops vesafb_ops = {
vesafb_open,
vesafb_release,
@@ -467,7 +460,7 @@
vesafb_get_cmap,
vesafb_set_cmap,
vesafb_pan_display,
- vesafb_ioctl
+ NULL
};
int vesafb_setup(char *options)
diff -urN linux-2.3.99-pre9-2/drivers/video/vfb.c linux/drivers/video/vfb.c
--- linux-2.3.99-pre9-2/drivers/video/vfb.c Wed Nov 10 15:09:56 1999
+++ linux/drivers/video/vfb.c Wed May 17 09:47:51 2000
@@ -94,9 +94,6 @@
struct fb_info *info);
static int vfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info);
-static int vfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
-
/*
* Interface to the low level console driver
@@ -125,7 +122,7 @@
static struct fb_ops vfb_ops = {
vfb_open, vfb_release, vfb_get_fix, vfb_get_var, vfb_set_var, vfb_get_cmap,
- vfb_set_cmap, vfb_pan_display, vfb_ioctl
+ vfb_set_cmap, vfb_pan_display, NULL
};
@@ -393,18 +390,6 @@
fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
return 0;
}
-
-
- /*
- * Virtual Frame Buffer Specific ioctls
- */
-
-static int vfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info)
-{
- return -EINVAL;
-}
-
int __init vfb_setup(char *options)
{
diff -urN linux-2.3.99-pre9-2/drivers/video/vga16fb.c linux/drivers/video/vga16fb.c
--- linux-2.3.99-pre9-2/drivers/video/vga16fb.c Fri May 12 11:25:25 2000
+++ linux/drivers/video/vga16fb.c Wed May 17 09:48:33 2000
@@ -692,13 +692,6 @@
return 0;
}
-static int vga16fb_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg, int con,
- struct fb_info *info)
-{
- return -EINVAL;
-}
-
static struct fb_ops vga16fb_ops = {
vga16fb_open,
vga16fb_release,
@@ -708,7 +701,7 @@
vga16fb_get_cmap,
vga16fb_set_cmap,
vga16fb_pan_display,
- vga16fb_ioctl
+ NULL
};
int vga16fb_setup(char *options)
diff -urN linux-2.3.99-pre9-2/drivers/video/virgefb.c linux/drivers/video/virgefb.c
--- linux-2.3.99-pre9-2/drivers/video/virgefb.c Fri Jan 28 21:22:32 2000
+++ linux/drivers/video/virgefb.c Wed May 17 09:49:03 2000
@@ -312,9 +312,6 @@
struct fb_info *info);
static int virgefb_pan_display(struct fb_var_screeninfo *var, int con,
struct fb_info *info);
-static int virgefb_ioctl(struct inode *inode, struct file *file, u_int cmd,
- u_long arg, int con, struct fb_info *info);
-
/*
* Interface to the low level console driver
@@ -1108,22 +1105,10 @@
return(-EINVAL);
}
-
-/*
- * Cybervision Frame Buffer Specific ioctls
- */
-
-static int virgefb_ioctl(struct inode *inode, struct file *file,
- u_int cmd, u_long arg, int con, struct fb_info *info)
-{
- return(-EINVAL);
-}
-
-
static struct fb_ops virgefb_ops = {
virgefb_open, virgefb_release, virgefb_get_fix, virgefb_get_var,
virgefb_set_var, virgefb_get_cmap, virgefb_set_cmap,
- virgefb_pan_display, virgefb_ioctl
+ virgefb_pan_display, NULL
};
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Tue May 23 2000 - 21:00:13 EST