summaryrefslogtreecommitdiffstats
path: root/firmware/drivers/lcd-16bit-vert.c
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2011-12-03 22:39:08 +0000
committerRafaël Carré <rafael.carre@gmail.com>2011-12-03 22:39:08 +0000
commit6b5dff4c7be02d159b7c267372f63155cc31dbb8 (patch)
treed38d1f11c4b79c5ac83f885e1aae5fa4073eb837 /firmware/drivers/lcd-16bit-vert.c
parent26851eaaa984ceecd9f9b50b082c0835f990c726 (diff)
downloadrockbox-6b5dff4c7be02d159b7c267372f63155cc31dbb8.tar.gz
rockbox-6b5dff4c7be02d159b7c267372f63155cc31dbb8.tar.bz2
rockbox-6b5dff4c7be02d159b7c267372f63155cc31dbb8.zip
lcd-16bit: move lcd_bitmap and lcd_bitmap_transparent to common code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31131 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/lcd-16bit-vert.c')
-rw-r--r--firmware/drivers/lcd-16bit-vert.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/firmware/drivers/lcd-16bit-vert.c b/firmware/drivers/lcd-16bit-vert.c
index 1d9e207bd9..f020d74757 100644
--- a/firmware/drivers/lcd-16bit-vert.c
+++ b/firmware/drivers/lcd-16bit-vert.c
@@ -369,7 +369,7 @@ void ICODE_ATTR lcd_bitmap_part(const fb_data *src, int src_x, int src_y,
int stride, int x, int y, int width,
int height)
{
- fb_data *dst, *dst_end;
+ fb_data *dst;
/******************** Image in viewport clipping **********************/
/* nothing to draw? */
@@ -427,7 +427,7 @@ void ICODE_ATTR lcd_bitmap_part(const fb_data *src, int src_x, int src_y,
src += stride * src_x + src_y; /* move starting point */
dst = LCDADDR(x, y);
- dst_end = dst + width * LCD_HEIGHT;
+ fb_data *dst_end = dst + width * LCD_HEIGHT;
do
{
@@ -438,12 +438,6 @@ void ICODE_ATTR lcd_bitmap_part(const fb_data *src, int src_x, int src_y,
while (dst < dst_end);
}
-/* Draw a full native bitmap */
-void lcd_bitmap(const fb_data *src, int x, int y, int width, int height)
-{
- lcd_bitmap_part(src, 0, 0, STRIDE(SCREEN_MAIN, width, height), x, y, width, height);
-}
-
/* Draw a partial native bitmap */
void ICODE_ATTR lcd_bitmap_transparent_part(const fb_data *src, int src_x,
int src_y, int stride, int x,
@@ -524,11 +518,3 @@ void ICODE_ATTR lcd_bitmap_transparent_part(const fb_data *src, int src_x,
}
while (dst < dst_end);
}
-
-/* Draw a full native bitmap with a transparent color */
-void lcd_bitmap_transparent(const fb_data *src, int x, int y,
- int width, int height)
-{
- lcd_bitmap_transparent_part(src, 0, 0,
- STRIDE(SCREEN_MAIN, width, height), x, y, width, height);
-}