From 0f951b1de817eaf311a6d2bc949865cc80c61201 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Mon, 5 Apr 2010 07:10:01 +0000 Subject: Fuzev2: use RGB565SWAPPED (pointed out by amiconn) => 91fps git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25478 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config/sansafuzev2.h | 2 +- firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c | 6 +++--- tools/bmp2rb.c | 2 +- tools/configure | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index 88d7650ca3..5db6bb9ec4 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h @@ -86,7 +86,7 @@ #define LCD_WIDTH 220 #define LCD_HEIGHT 176 #define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ +#define LCD_PIXELFORMAT RGB565SWAPPED /* rgb565 swapped */ /* AS3514 or newer */ diff --git a/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c index b337a14eac..618d242c4a 100644 --- a/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c +++ b/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c @@ -133,7 +133,7 @@ static void dbop_write_data(const int16_t* p_bytes, int count) { /* need to do a single 16bit write beforehand if the address is * not word aligned or count is 1, switch to 16bit mode if needed */ dbop_set_mode(16); - DBOP_DOUT16 = swap16(*p_bytes++); + DBOP_DOUT16 = *p_bytes++; if (!(--count)) return; } @@ -146,7 +146,7 @@ static void dbop_write_data(const int16_t* p_bytes, int count) while (count > 1) { - DBOP_DOUT32 = swap_odd_even32(*data++); + DBOP_DOUT32 = *data++; count -= 2; /* Wait if push fifo is full */ @@ -179,7 +179,7 @@ static void lcd_write_cmd(unsigned short cmd) static void lcd_write_reg(int reg, int value) { - int16_t data = value; + int16_t data = swap16(value); lcd_write_cmd(reg); dbop_write_data(&data, 1); } diff --git a/tools/bmp2rb.c b/tools/bmp2rb.c index 264179a571..f9f554a304 100644 --- a/tools/bmp2rb.c +++ b/tools/bmp2rb.c @@ -581,7 +581,7 @@ void print_usage(void) "\t 2 Iriver H1x0 4-grey\n" "\t 3 Canonical 8-bit greyscale\n" "\t 4 16-bit packed 5-6-5 RGB (iriver H300)\n" - "\t 5 16-bit packed and byte-swapped 5-6-5 RGB (iPod)\n" + "\t 5 16-bit packed and byte-swapped 5-6-5 RGB (iPod, Fuzev2)\n" "\t 6 Greyscale iPod 4-grey\n" "\t 7 Greyscale X5 remote 4-grey\n" "\t 8 16-bit packed 5-6-5 RGB with a vertical stride\n"); diff --git a/tools/configure b/tools/configure index 4449d4fb02..e70963d601 100755 --- a/tools/configure +++ b/tools/configure @@ -2100,7 +2100,7 @@ fi target="-DSANSA_FUZEV2" memory=8 # not sure bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" - bmp2rb_native="$rootdir/tools/bmp2rb -f 4" + bmp2rb_native="$rootdir/tools/bmp2rb -f 5" tool="$rootdir/tools/scramble -add=fuz2" output="rockbox.sansa" bootoutput="bootloader-fuzev2.sansa" -- cgit v1.2.3