Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fbdev: c2p - Rename c2p to c2p_planar

Browse Source 
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven 2008-12-21 15:48:13 +01:00
parent 96f47d6105
commit 2eab7ff843
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/Makefile
View File

@ -28,7 +28,7 @@ obj-$(CONFIG_FB_DDC) += fb_ddc.o
obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
# Hardware specific drivers go first
obj-$(CONFIG_FB_AMIGA) += amifb.o c2p.o
obj-$(CONFIG_FB_AMIGA) += amifb.o c2p_planar.o
obj-$(CONFIG_FB_ARC) += arcfb.o
obj-$(CONFIG_FB_CLPS711X) += clps711xfb.o
obj-$(CONFIG_FB_CYBER2000) += cyber2000fb.o

6
drivers/video/amifb.c
View File

@ -2159,9 +2159,9 @@ static void amifb_imageblit(struct fb_info *info, const struct fb_image *image)
src += pitch;
}
} else {
c2p(info->screen_base, image->data, dx, dy, width, height,
par->next_line, par->next_plane, image->width,
info->var.bits_per_pixel);
c2p_planar(info->screen_base, image->data, dx, dy, width,
height, par->next_line, par->next_plane,
image->width, info->var.bits_per_pixel);
}
}

2
drivers/video/c2p.h
View File

@ -10,7 +10,7 @@
#include <linux/types.h>
extern void c2p(void *dst, const void *src, u32 dx, u32 dy, u32 width,
extern void c2p_planar(void *dst, const void *src, u32 dx, u32 dy, u32 width,
u32 height, u32 dst_nextline, u32 dst_nextplane,
u32 src_nextline, u32 bpp);

9
drivers/video/c2p.c → drivers/video/c2p_planar.c
View File

@ -71,7 +71,7 @@ static inline void store_planar_masked(void *dst, u32 dst_inc, u32 bpp,
/*
* c2p - Copy 8-bit chunky image data to a planar frame buffer
* c2p_planar - Copy 8-bit chunky image data to a planar frame buffer
* @dst: Starting address of the planar frame buffer
* @dx: Horizontal destination offset (in pixels)
* @dy: Vertical destination offset (in pixels)
@ -83,8 +83,9 @@ static inline void store_planar_masked(void *dst, u32 dst_inc, u32 bpp,
* @bpp: Bits per pixel of the planar frame buffer (1-8)
*/
void c2p(void *dst, const void *src, u32 dx, u32 dy, u32 width, u32 height,
u32 dst_nextline, u32 dst_nextplane, u32 src_nextline, u32 bpp)
void c2p_planar(void *dst, const void *src, u32 dx, u32 dy, u32 width,
u32 height, u32 dst_nextline, u32 dst_nextplane,
u32 src_nextline, u32 bpp)
{
union {
u8 pixels[32];
@ -150,6 +151,6 @@ void c2p(void *dst, const void *src, u32 dx, u32 dy, u32 width, u32 height,
dst += dst_nextline;
}
}
EXPORT_SYMBOL_GPL(c2p);
EXPORT_SYMBOL_GPL(c2p_planar);
MODULE_LICENSE("GPL");