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

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

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/video/dn_cfb4.c linux/drivers/video/dn_cfb4.c
@@ -121,10 +121,6 @@
 			  struct fb_info *info);
 static int dn_fb_set_cmap(struct fb_cmap *cmap,int kspc,int con,
 			  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);
@@ -141,8 +137,6 @@
 	fb_set_var:	dn_fb_set_var,
 	fb_get_cmap:	dn_fb_get_cmap,
 	fb_set_cmap:	dn_fb_set_cmap,
-	fb_pan_display:	dn_fb_pan_display,
-	fb_ioctl:	dn_fb_ioctl,
 };
 
 static int currcon=0;
@@ -266,24 +260,6 @@
 
 }
 
-static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con,
-			     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;
-
-}
-
 static void dn_fb_set_disp(int con, struct fb_info *info) {
 
   struct fb_fix_screeninfo fix;
@@ -529,6 +505,11 @@
 }
 
 static struct display_switch dispsw_apollofb = {
-    fbcon_mfb_setup, bmove_apollofb, clear_apollofb,
-    putc_apollofb, putcs_apollofb, rev_char_apollofb
+    setup:		fbcon_mfb_setup,
+    bmove:		bmove_apollofb,
+    clear:		clear_apollofb,
+    putc:		putc_apollofb,
+    putcs:		putcs_apollofb,
+    revc:		rev_char_apollofb,
+    fontwidthmask:	FONTWIDTH(8)
 };