Menu
▾
▴
[linuxsh-cvs] CVS: linux/drivers/video/voyager voyager_alphafb.c, 1.3, 1.4 voyager_crtcsrfb.c, 1.3, 1.4 voyager_crtfb.c, 1.3, 1.4 voyager_gxfb.c, 1.5, 1.6 voyager_panelcsrfb.c, 1.3, 1.4 voyager_valphafb.c, 1.3, 1.4 voyager_videofb.c, 1.3, 1.4
Update of /cvsroot/linuxsh/linux/drivers/video/voyager In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14374/drivers/video/voyager Modified Files: voyager_alphafb.c voyager_crtcsrfb.c voyager_crtfb.c voyager_gxfb.c voyager_panelcsrfb.c voyager_valphafb.c voyager_videofb.c Log Message: fix voyager_*fb ioctl prototypes, patch from Manuel Lauss. Index: voyager_alphafb.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/video/voyager/voyager_alphafb.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- voyager_alphafb.c 18 Jul 2006 13:30:29 -0000 1.3 +++ voyager_alphafb.c 3 Aug 2006 08:21:31 -0000 1.4 @@ -42,8 +42,7 @@ static int voyafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info); static int voyafb_blank(int blank, struct fb_info *info); -static int voyafb_ioctl(struct inode*, struct file*, - unsigned int, unsigned long, struct fb_info*); +static int voyafb_ioctl(struct fb_info *, unsigned int, unsigned long); static int change_mode(struct fb_var_screeninfo *var); static unsigned int pseudo_palette[16]; @@ -134,9 +133,8 @@ return 0; } -static int voyafb_ioctl(struct inode* inode, struct file* file, - unsigned int cmd, unsigned long arg, - struct fb_info* info) +static int voyafb_ioctl(struct fb_info *info, unsigned int cmd, + unsigned long arg) { if(cmd == VOYAGER_IOCTL_ENABLE) { if(arg == 0) { Index: voyager_crtcsrfb.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/video/voyager/voyager_crtcsrfb.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- voyager_crtcsrfb.c 18 Jul 2006 13:30:29 -0000 1.3 +++ voyager_crtcsrfb.c 3 Aug 2006 08:21:31 -0000 1.4 @@ -42,8 +42,7 @@ static int voyafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info); static int voyafb_blank(int blank, struct fb_info *info); -static int voyafb_ioctl(struct inode*, struct file*, - unsigned int, unsigned long, struct fb_info*); +static int voyafb_ioctl(struct fb_info *, unsigned int, unsigned long); static int change_mode(struct fb_var_screeninfo *var); static unsigned int pseudo_palette[16]; @@ -133,9 +132,8 @@ return 0; } -static int voyafb_ioctl(struct inode* inode, struct file* file, - unsigned int cmd, unsigned long arg, - struct fb_info* info) +static int voyafb_ioctl(struct fb_info *info, unsigned int cmd, + unsigned long arg) { if(cmd == VOYAGER_IOCTL_ENABLE) { if(arg == 0) { Index: voyager_crtfb.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/video/voyager/voyager_crtfb.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- voyager_crtfb.c 18 Jul 2006 13:30:29 -0000 1.3 +++ voyager_crtfb.c 3 Aug 2006 08:21:31 -0000 1.4 @@ -42,8 +42,7 @@ static int voyafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info); static int voyafb_blank(int blank, struct fb_info *info); -static int voyafb_ioctl(struct inode*, struct file*, - unsigned int, unsigned long, struct fb_info*); +static int voyafb_ioctl(struct fb_info *, unsigned int, unsigned long); static unsigned int pseudo_palette[16]; @@ -129,9 +128,8 @@ return 0; } -static int voyafb_ioctl(struct inode* inode, struct file* file, - unsigned int cmd, unsigned long arg, - struct fb_info* info) +static int voyafb_ioctl(struct fb_info *info, unsigned int cmd, + unsigned long arg) { if(cmd == VOYAGER_IOCTL_ENABLE) { if(arg == 0) { Index: voyager_gxfb.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/video/voyager/voyager_gxfb.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- voyager_gxfb.c 18 Jul 2006 13:30:29 -0000 1.5 +++ voyager_gxfb.c 3 Aug 2006 08:21:31 -0000 1.6 @@ -58,8 +58,7 @@ static int voyafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info); static int voyafb_blank(int blank, struct fb_info *info); -static int voyafb_ioctl(struct inode*, struct file*, - unsigned int, unsigned long, struct fb_info*); +static int voyafb_ioctl(struct fb_info*, unsigned int, unsigned long); static int voyafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info); static void vsyncwait(int delay); @@ -241,9 +240,8 @@ return 0; } -static int voyafb_ioctl(struct inode* inode, struct file* file, - unsigned int cmd, unsigned long arg, - struct fb_info* info) +static int voyafb_ioctl(struct fb_info *info, unsigned int cmd, + unsigned long arg) { static long *po; int *wk; Index: voyager_panelcsrfb.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/video/voyager/voyager_panelcsrfb.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- voyager_panelcsrfb.c 18 Jul 2006 13:30:29 -0000 1.3 +++ voyager_panelcsrfb.c 3 Aug 2006 08:21:31 -0000 1.4 @@ -42,8 +42,7 @@ static int voyafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info); static int voyafb_blank(int blank, struct fb_info *info); -static int voyafb_ioctl(struct inode*, struct file*, - unsigned int, unsigned long, struct fb_info*); +static int voyafb_ioctl(struct fb_info *, unsigned int, unsigned long); static int change_mode(struct fb_var_screeninfo *var); static unsigned int pseudo_palette[16]; @@ -133,9 +132,8 @@ return 0; } -static int voyafb_ioctl(struct inode* inode, struct file* file, - unsigned int cmd, unsigned long arg, - struct fb_info* info) +static int voyafb_ioctl(struct fb_info *info, unsigned int cmd, + unsigned long arg) { if(cmd == VOYAGER_IOCTL_ENABLE) { if(arg == 0) { Index: voyager_valphafb.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/video/voyager/voyager_valphafb.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- voyager_valphafb.c 18 Jul 2006 13:30:29 -0000 1.3 +++ voyager_valphafb.c 3 Aug 2006 08:21:32 -0000 1.4 @@ -42,8 +42,7 @@ static int voyafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info); static int voyafb_blank(int blank, struct fb_info *info); -static int voyafb_ioctl(struct inode*, struct file*, - unsigned int, unsigned long, struct fb_info*); +static int voyafb_ioctl(struct fb_info *, unsigned int, unsigned long); static int change_mode(struct fb_var_screeninfo *var); static unsigned int pseudo_palette[16]; @@ -134,9 +133,8 @@ return 0; } -static int voyafb_ioctl(struct inode* inode, struct file* file, - unsigned int cmd, unsigned long arg, - struct fb_info* info) +static int voyafb_ioctl(struct fb_info *info, unsigned int cmd, + unsigned long arg) { if(cmd == VOYAGER_IOCTL_ENABLE) { if(arg == 0) { Index: voyager_videofb.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/video/voyager/voyager_videofb.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- voyager_videofb.c 18 Jul 2006 13:30:29 -0000 1.3 +++ voyager_videofb.c 3 Aug 2006 08:21:32 -0000 1.4 @@ -42,8 +42,7 @@ static int voyafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info); static int voyafb_blank(int blank, struct fb_info *info); -static int voyafb_ioctl(struct inode*, struct file*, - unsigned int, unsigned long, struct fb_info*); +static int voyafb_ioctl(struct fb_info *, unsigned int, unsigned long); static int change_mode(struct fb_var_screeninfo *var); static unsigned int pseudo_palette[16]; @@ -134,9 +133,8 @@ return 0; } -static int voyafb_ioctl(struct inode* inode, struct file* file, - unsigned int cmd, unsigned long arg, - struct fb_info* info) +static int voyafb_ioctl(struct fb_info *info, unsigned int cmd, + unsigned long arg) { if(cmd == VOYAGER_IOCTL_ENABLE) { if(arg == 0) { |
