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

• Lines: 119
• Date: Wed Jul 26 11:08:40 2000
• Orig file: v2.4.0-test4/linux/drivers/video/clgenfb.c
• Orig date: Mon Jul 10 16:47:25 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/video/clgenfb.c linux/drivers/video/clgenfb.c
@@ -472,9 +472,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
@@ -490,7 +487,6 @@
 	fb_get_cmap:	fbgen_get_cmap,
 	fb_set_cmap:	fbgen_set_cmap,
 	fb_pan_display:	fbgen_pan_display,
-	fb_ioctl:	clgenfb_ioctl,
 };
 
 /*--- Hardware Specific Routines -------------------------------------------*/
@@ -540,18 +536,15 @@
 static void fbcon_clgen8_clear (struct vc_data *conp, struct display *p,
 				int sy, int sx, int height, int width);
 
-static struct display_switch fbcon_clgen_8 =
-{
-	fbcon_cfb8_setup,
-	fbcon_clgen8_bmove,
-	fbcon_clgen8_clear,
-	fbcon_cfb8_putc,
-	fbcon_cfb8_putcs,
-	fbcon_cfb8_revc,
-	NULL,
-	NULL,
-	fbcon_cfb8_clear_margins,
-	FONTWIDTH (4) | FONTWIDTH (8) | FONTWIDTH (12) | FONTWIDTH (16)
+static struct display_switch fbcon_clgen_8 = {
+	setup:		fbcon_cfb8_setup,
+	bmove:		fbcon_clgen8_bmove,
+	clear:		fbcon_clgen8_clear,
+	putc:		fbcon_cfb8_putc,
+	putcs:		fbcon_cfb8_putcs,
+	revc:		fbcon_cfb8_revc,
+	clear_margins:	fbcon_cfb8_clear_margins,
+	fontwidthmask:	FONTWIDTH (4) | FONTWIDTH (8) | FONTWIDTH (12) | FONTWIDTH (16)
 };
 #endif
 #ifdef FBCON_HAS_CFB16
@@ -559,18 +552,15 @@
 				 int dy, int dx, int height, int width);
 static void fbcon_clgen16_clear (struct vc_data *conp, struct display *p,
 				 int sy, int sx, int height, int width);
-static struct display_switch fbcon_clgen_16 =
-{
-	fbcon_cfb16_setup,
-	fbcon_clgen16_bmove,
-	fbcon_clgen16_clear,
-	fbcon_cfb16_putc,
-	fbcon_cfb16_putcs,
-	fbcon_cfb16_revc,
-	NULL,
-	NULL,
-	fbcon_cfb16_clear_margins,
-	FONTWIDTH (4) | FONTWIDTH (8) | FONTWIDTH (12) | FONTWIDTH (16)
+static struct display_switch fbcon_clgen_16 = {
+	setup:		fbcon_cfb16_setup,
+	bmove:		fbcon_clgen16_bmove,
+	clear:		fbcon_clgen16_clear,
+	putc:		fbcon_cfb16_putc,
+	putcs:		fbcon_cfb16_putcs,
+	revc:		fbcon_cfb16_revc,
+	clear_margins:	fbcon_cfb16_clear_margins,
+	fontwidthmask:	FONTWIDTH (4) | FONTWIDTH (8) | FONTWIDTH (12) | FONTWIDTH (16)
 };
 #endif
 #ifdef FBCON_HAS_CFB32
@@ -578,18 +568,15 @@
 				 int dy, int dx, int height, int width);
 static void fbcon_clgen32_clear (struct vc_data *conp, struct display *p,
 				 int sy, int sx, int height, int width);
-static struct display_switch fbcon_clgen_32 =
-{
-	fbcon_cfb32_setup,
-	fbcon_clgen32_bmove,
-	fbcon_clgen32_clear,
-	fbcon_cfb32_putc,
-	fbcon_cfb32_putcs,
-	fbcon_cfb32_revc,
-	NULL,
-	NULL,
-	fbcon_cfb32_clear_margins,
-	FONTWIDTH (4) | FONTWIDTH (8) | FONTWIDTH (12) | FONTWIDTH (16)
+static struct display_switch fbcon_clgen_32 = {
+	setup:		fbcon_cfb32_setup,
+	bmove:		fbcon_clgen32_bmove,
+	clear:		fbcon_clgen32_clear,
+	putc:		fbcon_cfb32_putc,
+	putcs:		fbcon_cfb32_putcs,
+	revc:		fbcon_cfb32_revc,
+	clear_margins:	fbcon_cfb32_clear_margins,
+	fontwidthmask:	FONTWIDTH (4) | FONTWIDTH (8) | FONTWIDTH (12) | FONTWIDTH (16)
 };
 #endif
 
@@ -655,16 +642,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 **************************************/