patch-2.4.0-test5 linux/drivers/video/virgefb.c

• Lines: 87
• Date: Wed Jul 26 11:08:41 2000
• Orig file: v2.4.0-test4/linux/drivers/video/virgefb.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/video/virgefb.c linux/drivers/video/virgefb.c
@@ -308,10 +308,6 @@
 			    struct fb_info *info);
 static int virgefb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			    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);
 
 
 /*
@@ -1072,30 +1068,6 @@
 }
 
 
-/*
- *    Pan or Wrap the Display
- *
- *    This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
- */
-
-static int virgefb_pan_display(struct fb_var_screeninfo *var, int con,
-			       struct fb_info *info)
-{
-	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 = {
 	owner:		THIS_MODULE,
 	fb_get_fix:	virgefb_get_fix,
@@ -1103,8 +1075,6 @@
 	fb_set_var:	virgefb_set_var,
 	fb_get_cmap:	virgefb_get_cmap,
 	fb_set_cmap:	virgefb_set_cmap,
-	fb_pan_display:	virgefb_pan_display,
-	fb_ioctl:	virgefb_ioctl,
 };
 
 
@@ -1348,9 +1318,14 @@
 }
 
 static struct display_switch fbcon_virge8 = {
-   fbcon_cfb8_setup, fbcon_virge8_bmove, fbcon_virge8_clear, fbcon_virge8_putc,
-   fbcon_virge8_putcs, fbcon_virge8_revc, NULL, NULL, fbcon_virge8_clear_margins,
-   FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+   setup:		fbcon_cfb8_setup,
+   bmove:		fbcon_virge8_bmove,
+   clear:		fbcon_virge8_clear,
+   putc:		fbcon_virge8_putc,
+   putcs:		fbcon_virge8_putcs,
+   revc:		fbcon_virge8_revc,
+   clear_margins:	fbcon_virge8_clear_margins,
+   fontwidthmask:	FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
 };
 #endif
 
@@ -1408,9 +1383,14 @@
 }
 
 static struct display_switch fbcon_virge16 = {
-   fbcon_cfb16_setup, fbcon_virge16_bmove, fbcon_virge16_clear, fbcon_virge16_putc,
-   fbcon_virge16_putcs, fbcon_virge16_revc, NULL, NULL, fbcon_virge16_clear_margins,
-   FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+   setup:		fbcon_cfb16_setup,
+   bmove:		fbcon_virge16_bmove,
+   clear:		fbcon_virge16_clear,
+   putc:		fbcon_virge16_putc,
+   putcs:		fbcon_virge16_putcs,
+   revc:		fbcon_virge16_revc,
+   clear_margins:	fbcon_virge16_clear_margins,
+   fontwidthmask:	FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
 };
 #endif