git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intelfb: the pseudo_palette is only 16 elements long
[safe/jmp/linux-2.6]
/
drivers
/
video
/
hecubafb.c
diff --git
a/drivers/video/hecubafb.c
b/drivers/video/hecubafb.c
index
dc12e2d
..
abfcb50
100644
(file)
--- a/
drivers/video/hecubafb.c
+++ b/
drivers/video/hecubafb.c
@@
-238,7
+238,7
@@
static void hecubafb_fillrect(struct fb_info *info,
{
struct hecubafb_par *par = info->par;
{
struct hecubafb_par *par = info->par;
-
cfb
_fillrect(info, rect);
+
sys
_fillrect(info, rect);
hecubafb_dpy_update(par);
}
hecubafb_dpy_update(par);
}
@@
-248,7
+248,7
@@
static void hecubafb_copyarea(struct fb_info *info,
{
struct hecubafb_par *par = info->par;
{
struct hecubafb_par *par = info->par;
-
cfb
_copyarea(info, area);
+
sys
_copyarea(info, area);
hecubafb_dpy_update(par);
}
hecubafb_dpy_update(par);
}
@@
-258,7
+258,7
@@
static void hecubafb_imageblit(struct fb_info *info,
{
struct hecubafb_par *par = info->par;
{
struct hecubafb_par *par = info->par;
-
cfb
_imageblit(info, image);
+
sys
_imageblit(info, image);
hecubafb_dpy_update(par);
}
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
*/
* 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 f
ile *file
, const char __user *buf,
+static ssize_t hecubafb_write(struct f
b_info *info
, const char __user *buf,
size_t count, loff_t *ppos)
{
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;
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;
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;
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,
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,
.fb_write = hecubafb_write,
.fb_fillrect = hecubafb_fillrect,
.fb_copyarea = hecubafb_copyarea,