diff options
| author | James Simmons <jsimmons@kozmo.(none)> | 2003-03-30 21:53:23 -0800 |
|---|---|---|
| committer | James Simmons <jsimmons@kozmo.(none)> | 2003-03-30 21:53:23 -0800 |
| commit | 3104f53bd3acbfd2c8e90c68cd2b9a24022ca417 (patch) | |
| tree | e5e7155a9815a6abfeda595573f4e10c6eacf8f7 /include/linux/fb.h | |
| parent | eadeb50d7cd9ec4be5ce68cad3a6ed9fd3679050 (diff) | |
[FBDEV] Massive cleanups of the cursor api.
Diffstat (limited to 'include/linux/fb.h')
| -rw-r--r-- | include/linux/fb.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index fa77d12eb5b8..61dc9788e8b8 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -311,7 +311,6 @@ struct fb_image { #define FB_CUR_SETCMAP 0x08 #define FB_CUR_SETSHAPE 0x10 #define FB_CUR_SETSIZE 0x20 -#define FB_CUR_SETDEST 0x40 #define FB_CUR_SETALL 0xFF struct fbcurpos { @@ -323,7 +322,6 @@ struct fb_cursor { __u16 enable; /* cursor on/off */ __u16 rop; /* bitop operation */ char *mask; /* cursor mask bits */ - char *dest; /* destination */ struct fbcurpos hot; /* cursor hot spot */ struct fb_image image; /* Cursor image */ }; @@ -471,9 +469,9 @@ struct fb_info { * `Generic' versions of the frame buffer device operations */ -extern int fb_set_var(struct fb_var_screeninfo *var, struct fb_info *info); -extern int fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info); -extern int fb_blank(int blank, struct fb_info *info); +extern int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var); +extern int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var); +extern int fb_blank(struct fb_info *info, int blank); extern int soft_cursor(struct fb_info *info, struct fb_cursor *cursor); extern void cfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect); extern void cfb_copyarea(struct fb_info *info, const struct fb_copyarea *area); @@ -511,8 +509,8 @@ extern int fb_validate_mode(struct fb_var_screeninfo *var, /* drivers/video/fbcmap.c */ extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp); extern void fb_dealloc_cmap(struct fb_cmap *cmap); -extern void fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to, - int fsfromto); +extern int fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to, + int fsfromto); extern int fb_set_cmap(struct fb_cmap *cmap, int kspc, struct fb_info *fb_info); extern struct fb_cmap *fb_default_cmap(int len); extern void fb_invert_cmaps(void); |