diff options
author | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
---|---|---|
committer | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
commit | 590501cfe404b5463adecc70628e5bc7c8f142a2 (patch) | |
tree | 3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /firmware/drivers/lcd-16bit.c | |
parent | a26110c52dff9bc15d20146462d52d07f61bd238 (diff) | |
download | rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.gz rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.zip |
Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/lcd-16bit.c')
-rw-r--r-- | firmware/drivers/lcd-16bit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c index bd5d09368c..96a9e1a4d7 100644 --- a/firmware/drivers/lcd-16bit.c +++ b/firmware/drivers/lcd-16bit.c | |||
@@ -668,7 +668,8 @@ void lcd_bitmap(const fb_data *src, int x, int y, int width, int height) | |||
668 | lcd_bitmap_part(src, 0, 0, width, x, y, width, height); | 668 | lcd_bitmap_part(src, 0, 0, width, x, y, width, height); |
669 | } | 669 | } |
670 | 670 | ||
671 | #if !defined(TOSHIBA_GIGABEAT_F) || defined(SIMULATOR) | 671 | #if !defined(TOSHIBA_GIGABEAT_F) && !defined(TOSHIBA_GIGABEAT_S) \ |
672 | || defined(SIMULATOR) | ||
672 | /* Draw a partial native bitmap */ | 673 | /* Draw a partial native bitmap */ |
673 | void lcd_bitmap_transparent_part(const fb_data *src, int src_x, int src_y, | 674 | void lcd_bitmap_transparent_part(const fb_data *src, int src_x, int src_y, |
674 | int stride, int x, int y, int width, | 675 | int stride, int x, int y, int width, |