More porting to new api.

drivers/video/Makefile

@@ -45,7 +45,7 @@ obj-$(CONFIG_FB_ACORN)            += acornfb.o
 obj-$(CONFIG_FB_AMIGA)            += amifb.o
 obj-$(CONFIG_FB_PM2)              += pm2fb.o
 obj-$(CONFIG_FB_APOLLO)           += dnfb.o
-obj-$(CONFIG_FB_Q40)              += q40fb.o
+obj-$(CONFIG_FB_Q40)              += q40fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_ATARI)            += atafb.o
 obj-$(CONFIG_FB_ATY128)           += aty128fb.o
 obj-$(CONFIG_FB_RADEON)		  += radeonfb.o
@@ -73,7 +73,7 @@ obj-$(CONFIG_FB_VESA)             += vesafb.o cfbfillrect.o cfbcopyarea.o cfbimg
 obj-$(CONFIG_FB_VGA16)            += vga16fb.o fbcon-vga-planes.o
 obj-$(CONFIG_FB_VIRGE)            += virgefb.o
 obj-$(CONFIG_FB_G364)             += g364fb.o
-obj-$(CONFIG_FB_FM2)              += fm2fb.o
+obj-$(CONFIG_FB_FM2)              += fm2fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_CREATOR)          += creatorfb.o sbusfb.o
 obj-$(CONFIG_FB_CGSIX)            += cgsixfb.o sbusfb.o
 obj-$(CONFIG_FB_BWTWO)            += bwtwofb.o sbusfb.o
@@ -114,7 +114,7 @@ obj-$(CONFIG_FB_BWTWO)            += bwtwofb.o
 obj-$(CONFIG_FB_HGA)              += hgafb.o  
 obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
 obj-$(CONFIG_FB_VIRTUAL)          += vfb.o  
-obj-$(CONFIG_FB_HIT)              += hitfb.o
+obj-$(CONFIG_FB_HIT)              += hitfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_E1355)            += epson1355fb.o
 obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
 obj-$(CONFIG_FB_VOODOO1)          += sstfb.o

drivers/video/cfbimgblt.c

@@ -70,40 +70,43 @@ void cfb_imageblit(struct fb_info *p, struct fb_image *image)
 
 	src = image->data;	
 
-	if (p->fix.visual == FB_VISUAL_TRUECOLOR) {
-		fgx = fgcolor = ((u32 *)(p->pseudo_palette))[image->fg_color];
-		bgx = bgcolor = ((u32 *)(p->pseudo_palette))[image->bg_color];
-	} else {
-		fgx = fgcolor = image->fg_color;
-		bgx = bgcolor = image->bg_color;
-	}	
+	if (image->depth == 1) {
+
+		if (p->fix.visual == FB_VISUAL_TRUECOLOR) {
+			fgx = fgcolor = ((u32 *)(p->pseudo_palette))[image->fg_color];
+			bgx = bgcolor = ((u32 *)(p->pseudo_palette))[image->bg_color];
+		} else {
+			fgx = fgcolor = image->fg_color;
+			bgx = bgcolor = image->bg_color;
+		}	
  
-	for (i = 0; i < ppw-1; i++) {
-		fgx <<= p->var.bits_per_pixel;
-		bgx <<= p->var.bits_per_pixel;
-		fgx |= fgcolor;
-		bgx |= bgcolor;
-	}
-	eorx = fgx ^ bgx;
-	n = ((image->width + 7) >> 3);
-	pad = (n << 3) - image->width;
+		for (i = 0; i < ppw-1; i++) {
+			fgx <<= p->var.bits_per_pixel;
+			bgx <<= p->var.bits_per_pixel;
+			fgx |= fgcolor;
+			bgx |= bgcolor;
+		}
+		eorx = fgx ^ bgx;
+		n = ((image->width + 7) >> 3);
+		pad = (n << 3) - image->width;
 
-	for (i = 0; i < image->height; i++) {
-		dst = (unsigned long *) dst1;
+		for (i = 0; i < image->height; i++) {
+			dst = (unsigned long *) dst1;
 		
-		for (j = image->width/ppw; j > 0; j--) {
-			mask = 0;
+			for (j = image->width/ppw; j > 0; j--) {
+				mask = 0;
 		
-			for (k = ppw; k > 0; k--) {	
-				if (test_bit(l, src))
-					mask |= (tmp >> (p->var.bits_per_pixel*(k-1)));
-				l--;
-				if (l < 0) { l = 7; src++; }
+				for (k = ppw; k > 0; k--) {	
+					if (test_bit(l, src))
+						mask |= (tmp >> (p->var.bits_per_pixel*(k-1)));
+					l--;
+					if (l < 0) { l = 7; src++; }
+				}
+				fb_writel((mask & eorx)^bgx, dst);
+				dst++;
 			}
-			fb_writel((mask & eorx)^bgx, dst);
-			dst++;
-		}
-		l =- pad;		
-		dst1 += p->fix.line_length;	
-	}	
+			l =- pad;		
+			dst1 += p->fix.line_length;	
+		}	
+	}
 }

drivers/video/hgafb.c

@@ -386,44 +386,6 @@ static int __init hga_card_detect(void)
  *
  * ------------------------------------------------------------------------- */
 
-/**
- *	hga_get_fix - get the fixed part of the display
- *	@fix:struct fb_fix_screeninfo to fill in
- *	@con:unused
- *	@info:pointer to fb_info object containing info for current hga board
- *
- *	This wrapper function copies @info->fix to @fix.
- *	A zero is returned on success and %-EINVAL for failure.
- */
-
-int hga_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info)
-{
-	CHKINFO(-EINVAL);
-	DPRINTK("hga_get_fix: con:%d, info:%x, fb_info:%x\n", con, (unsigned)info, (unsigned)&fb_info);
-
-	*fix = info->fix;
-	return 0;
-}
-
-/**
- *	hga_get_var - get the user defined part of the display
- *	@var:struct fb_var_screeninfo to fill in
- *	@con:unused
- *	@info:pointer to fb_info object containing info for current hga board
- *
- *	This wrapper function copies @info->var to @var.
- *	A zero is returned on success and %-EINVAL for failure.
- */
-
-int hga_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
-{
-	CHKINFO(-EINVAL);
-	DPRINTK("hga_get_var: con:%d, info:%x, fb_info:%x\n", con, (unsigned)info, (unsigned)&fb_info);
-
-	*var = info->var;
-	return 0;
-}
-
 /**
  *	hga_set_var - set the user defined part of the display
  *	@var:new video mode
@@ -596,8 +558,8 @@ static int hgafb_blank(int blank_mode, struct fb_info *info)
 
 static struct fb_ops hgafb_ops = {
 	owner:		THIS_MODULE,
-	fb_get_fix:	hga_get_fix,
-	fb_get_var:	hga_get_var,
+	fb_get_fix:	gen_get_fix,
+	fb_get_var:	gen_get_var,
 	fb_set_var:	hga_set_var,
 	fb_get_cmap:	hga_get_cmap,
 	fb_set_cmap:	gen_set_cmap,