From 68a21689aef3a81335456476d4d10860ef5bc6b3 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 24 Mar 2008 00:35:53 +0000 Subject: Consistent naming scheme the various blit functions. * Removed lcd_blit_mono() for colour targets. Plugin API became incompatible, so sort, clean up & bump. * Implemented lcd_blit_mono() for M3. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16775 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/ipod/lcd-color_nano.c | 16 +--------------- firmware/target/arm/ipod/lcd-gray.c | 6 +++--- firmware/target/arm/ipod/video/lcd-video.c | 16 +--------------- 3 files changed, 5 insertions(+), 33 deletions(-) (limited to 'firmware/target/arm/ipod') diff --git a/firmware/target/arm/ipod/lcd-color_nano.c b/firmware/target/arm/ipod/lcd-color_nano.c index b18b7ee712..482622bf57 100644 --- a/firmware/target/arm/ipod/lcd-color_nano.c +++ b/firmware/target/arm/ipod/lcd-color_nano.c @@ -109,20 +109,6 @@ void lcd_init_device(void) /*** update functions ***/ -/* Performance function that works with an external buffer - note that by and bheight are in 4-pixel units! */ -void lcd_blit(const fb_data* data, int x, int by, int width, - int bheight, int stride) -{ - /* TODO: Implement lcd_blit() */ - (void)data; - (void)x; - (void)by; - (void)width; - (void)bheight; - (void)stride; -} - #define CSUB_X 2 #define CSUB_Y 2 @@ -155,7 +141,7 @@ void lcd_blit(const fb_data* data, int x, int by, int width, #define MAX_6BIT 0x3f /* Performance function to blit a YUV bitmap directly to the LCD */ -void lcd_yuv_blit(unsigned char * const src[3], +void lcd_blit_yuv(unsigned char * const src[3], int src_x, int src_y, int stride, int x, int y, int width, int height) { diff --git a/firmware/target/arm/ipod/lcd-gray.c b/firmware/target/arm/ipod/lcd-gray.c index b77d3eb7f6..e36a7efc1d 100644 --- a/firmware/target/arm/ipod/lcd-gray.c +++ b/firmware/target/arm/ipod/lcd-gray.c @@ -277,8 +277,8 @@ void lcd_mono_data(const unsigned char *data, int count); /* Performance function that works with an external buffer note that x, bwidtht and stride are in 8-pixel units! */ -void lcd_blit(const unsigned char* data, int bx, int y, int bwidth, - int height, int stride) +void lcd_blit_mono(const unsigned char *data, int bx, int y, int bwidth, + int height, int stride) { while (height--) { @@ -295,7 +295,7 @@ void lcd_grey_data(unsigned char *values, unsigned char *phases, int count); /* Performance function that works with an external buffer note that bx and bwidth are in 8-pixel units! */ -void lcd_grey_phase_blit(unsigned char *values, unsigned char *phases, +void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases, int bx, int y, int bwidth, int height, int stride) { while (height--) diff --git a/firmware/target/arm/ipod/video/lcd-video.c b/firmware/target/arm/ipod/video/lcd-video.c index 0829114289..d0c82e905c 100644 --- a/firmware/target/arm/ipod/video/lcd-video.c +++ b/firmware/target/arm/ipod/video/lcd-video.c @@ -247,20 +247,6 @@ void lcd_init_device(void) /*** update functions ***/ -/* Performance function that works with an external buffer - note that by and bheight are in 4-pixel units! */ -void lcd_blit(const fb_data* data, int x, int by, int width, - int bheight, int stride) -{ - /* TODO: Implement lcd_blit() */ - (void)data; - (void)x; - (void)by; - (void)width; - (void)bheight; - (void)stride; -} - /* Update a fraction of the display. */ void lcd_update_rect(int x, int y, int width, int height) { @@ -319,7 +305,7 @@ extern void lcd_write_yuv420_lines(unsigned char const * const src[3], int stride); /* Performance function to blit a YUV bitmap directly to the LCD */ -void lcd_yuv_blit(unsigned char * const src[3], +void lcd_blit_yuv(unsigned char * const src[3], int src_x, int src_y, int stride, int x, int y, int width, int height) { -- cgit v1.2.3