diff options
-rw-r--r-- | firmware/export/config/sansafuzev2.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c | 6 | ||||
-rw-r--r-- | tools/bmp2rb.c | 2 | ||||
-rwxr-xr-x | 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 @@ | |||
86 | #define LCD_WIDTH 220 | 86 | #define LCD_WIDTH 220 |
87 | #define LCD_HEIGHT 176 | 87 | #define LCD_HEIGHT 176 |
88 | #define LCD_DEPTH 16 /* 65536 colours */ | 88 | #define LCD_DEPTH 16 /* 65536 colours */ |
89 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ | 89 | #define LCD_PIXELFORMAT RGB565SWAPPED /* rgb565 swapped */ |
90 | 90 | ||
91 | 91 | ||
92 | /* AS3514 or newer */ | 92 | /* 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) | |||
133 | { /* need to do a single 16bit write beforehand if the address is | 133 | { /* need to do a single 16bit write beforehand if the address is |
134 | * not word aligned or count is 1, switch to 16bit mode if needed */ | 134 | * not word aligned or count is 1, switch to 16bit mode if needed */ |
135 | dbop_set_mode(16); | 135 | dbop_set_mode(16); |
136 | DBOP_DOUT16 = swap16(*p_bytes++); | 136 | DBOP_DOUT16 = *p_bytes++; |
137 | if (!(--count)) | 137 | if (!(--count)) |
138 | return; | 138 | return; |
139 | } | 139 | } |
@@ -146,7 +146,7 @@ static void dbop_write_data(const int16_t* p_bytes, int count) | |||
146 | 146 | ||
147 | while (count > 1) | 147 | while (count > 1) |
148 | { | 148 | { |
149 | DBOP_DOUT32 = swap_odd_even32(*data++); | 149 | DBOP_DOUT32 = *data++; |
150 | count -= 2; | 150 | count -= 2; |
151 | 151 | ||
152 | /* Wait if push fifo is full */ | 152 | /* Wait if push fifo is full */ |
@@ -179,7 +179,7 @@ static void lcd_write_cmd(unsigned short cmd) | |||
179 | 179 | ||
180 | static void lcd_write_reg(int reg, int value) | 180 | static void lcd_write_reg(int reg, int value) |
181 | { | 181 | { |
182 | int16_t data = value; | 182 | int16_t data = swap16(value); |
183 | lcd_write_cmd(reg); | 183 | lcd_write_cmd(reg); |
184 | dbop_write_data(&data, 1); | 184 | dbop_write_data(&data, 1); |
185 | } | 185 | } |
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) | |||
581 | "\t 2 Iriver H1x0 4-grey\n" | 581 | "\t 2 Iriver H1x0 4-grey\n" |
582 | "\t 3 Canonical 8-bit greyscale\n" | 582 | "\t 3 Canonical 8-bit greyscale\n" |
583 | "\t 4 16-bit packed 5-6-5 RGB (iriver H300)\n" | 583 | "\t 4 16-bit packed 5-6-5 RGB (iriver H300)\n" |
584 | "\t 5 16-bit packed and byte-swapped 5-6-5 RGB (iPod)\n" | 584 | "\t 5 16-bit packed and byte-swapped 5-6-5 RGB (iPod, Fuzev2)\n" |
585 | "\t 6 Greyscale iPod 4-grey\n" | 585 | "\t 6 Greyscale iPod 4-grey\n" |
586 | "\t 7 Greyscale X5 remote 4-grey\n" | 586 | "\t 7 Greyscale X5 remote 4-grey\n" |
587 | "\t 8 16-bit packed 5-6-5 RGB with a vertical stride\n"); | 587 | "\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 | |||
2100 | target="-DSANSA_FUZEV2" | 2100 | target="-DSANSA_FUZEV2" |
2101 | memory=8 # not sure | 2101 | memory=8 # not sure |
2102 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 2102 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
2103 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 2103 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" |
2104 | tool="$rootdir/tools/scramble -add=fuz2" | 2104 | tool="$rootdir/tools/scramble -add=fuz2" |
2105 | output="rockbox.sansa" | 2105 | output="rockbox.sansa" |
2106 | bootoutput="bootloader-fuzev2.sansa" | 2106 | bootoutput="bootloader-fuzev2.sansa" |