diff options
| author | Dave Chapman <dave@dchapman.com> | 2005-11-14 21:54:23 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2005-11-14 21:54:23 +0000 |
| commit | f5aebf78487e94cc39277bc5a7f5277d5ce3303e (patch) | |
| tree | 3a9c9e42aea1dd41d61fec8ec7c7fd34aed49eb2 | |
| parent | ae7c55c12c27b2e94a43db180188070a9ec42a21 (diff) | |
| download | rockbox-f5aebf78487e94cc39277bc5a7f5277d5ce3303e.zip rockbox-f5aebf78487e94cc39277bc5a7f5277d5ce3303e.tar.gz rockbox-f5aebf78487e94cc39277bc5a7f5277d5ce3303e.tar.bz2 rockbox-f5aebf78487e94cc39277bc5a7f5277d5ce3303e.tar.xz | |
Fixes for new 16-bit framebuffer type
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7883 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | bootloader/ipod.c | 4 | ||||
| -rw-r--r-- | firmware/drivers/lcd-ipod.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bootloader/ipod.c b/bootloader/ipod.c index 591b760..03a814f 100644 --- a/bootloader/ipod.c +++ b/bootloader/ipod.c @@ -346,10 +346,10 @@ void* main(void) /* Notes: iPod Color/Photo LCD is 220x176, Nano is 176x138 */ /* Display the 42x47 pixel iPodLinux logo */ - lcd_bitmap((unsigned char*)ipllogo, 20,6, 42,47); + lcd_bitmap(ipllogo, 20,6, 42,47); /* Display the 100x31 pixel Rockbox logo */ - lcd_bitmap((unsigned char*)rockboxlogo, 74,16, 100,31); + lcd_bitmap(rockboxlogo, 74,16, 100,31); line=7; diff --git a/firmware/drivers/lcd-ipod.c b/firmware/drivers/lcd-ipod.c index ebb5d3c..30cd455 100644 --- a/firmware/drivers/lcd-ipod.c +++ b/firmware/drivers/lcd-ipod.c @@ -204,7 +204,7 @@ void lcd_init_device(void) /* Performance function that works with an external buffer note that by and bheight are in 4-pixel units! */ -void lcd_blit(const unsigned char* data, int x, int by, int width, +void lcd_blit(const fb_data* data, int x, int by, int width, int bheight, int stride) { /* TODO: Implement lcd_blit() */ |