X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fvideo%2Fhecubafb.c;h=94e0df8a6f60bc9b80d05586b1337fad1006cc47;hb=fcb1fec7fece6b9889deaedf5b7d21f4f5a26381;hp=dc12e2d5489e35450ef7a73827739c1b7c21ea4e;hpb=28cdf76bf0bce757428f84161e3aa510028d47b4;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c
index dc12e2d..94e0df8 100644
--- a/drivers/video/hecubafb.c
+++ b/drivers/video/hecubafb.c
@@ -45,7 +45,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/list.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 /* Apollo controller specific defines */
 #define APOLLO_START_NEW_IMG	0xA0
@@ -238,7 +238,7 @@ static void hecubafb_fillrect(struct fb_info *info,
 {
 	struct hecubafb_par *par = info->par;
 
-	cfb_fillrect(info, rect);
+	sys_fillrect(info, rect);
 
 	hecubafb_dpy_update(par);
 }
@@ -248,7 +248,7 @@ static void hecubafb_copyarea(struct fb_info *info,
 {
 	struct hecubafb_par *par = info->par;
 
-	cfb_copyarea(info, area);
+	sys_copyarea(info, area);
 
 	hecubafb_dpy_update(par);
 }
@@ -258,7 +258,7 @@ static void hecubafb_imageblit(struct fb_info *info,
 {
 	struct hecubafb_par *par = info->par;
 
-	cfb_imageblit(info, image);
+	sys_imageblit(info, image);
 
 	hecubafb_dpy_update(par);
 }
@@ -267,12 +267,9 @@ static void hecubafb_imageblit(struct fb_info *info,
  * this is the slow path from userspace. they can seek and write to
  * the fb. it's inefficient to do anything less than a full screen draw
  */
-static ssize_t hecubafb_write(struct file *file, const char __user *buf,
+static ssize_t hecubafb_write(struct fb_info *info, const char __user *buf,
 				size_t count, loff_t *ppos)
 {
-	struct inode *inode;
-	int fbidx;
-	struct fb_info *info;
 	unsigned long p;
 	int err=-EINVAL;
 	struct hecubafb_par *par;
@@ -280,13 +277,6 @@ static ssize_t hecubafb_write(struct file *file, const char __user *buf,
 	unsigned int fbmemlength;
 
 	p = *ppos;
-	inode = file->f_dentry->d_inode;
-	fbidx = iminor(inode);
-	info = registered_fb[fbidx];
-
-	if (!info || !info->screen_base)
-		return -ENODEV;
-
 	par = info->par;
 	xres = info->var.xres;
 	fbmemlength = (xres * info->var.yres)/8;
@@ -319,6 +309,7 @@ static ssize_t hecubafb_write(struct file *file, const char __user *buf,
 
 static struct fb_ops hecubafb_ops = {
 	.owner		= THIS_MODULE,
+	.fb_read        = fb_sys_read,
 	.fb_write	= hecubafb_write,
 	.fb_fillrect	= hecubafb_fillrect,
 	.fb_copyarea	= hecubafb_copyarea,