LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lcd: logo: move generic cmap setting to lcd_logo_set_cmap() 

Get rid of platform-specific #ifdefs in bitmap_plot() by moving the generic
case of setting cmap into the weak lcd_logo_set_cmap().

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Bo Shen <voice.shen@atmel.com>
Tested-by: Josh Wu <josh.wu@atmel.com>
Cc: Bo Shen <voice.shen@atmel.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Nikita Kiryanov 2015-02-03 13:32:26 +02:00 committed by Anatolij Gustschin
parent 0ee261f6d3
commit 2306457c45
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/lcd.c
View File

@ -387,44 +387,30 @@ int lcd_getbgcolor(void)
#ifdef CONFIG_LCD_LOGO #ifdef CONFIG_LCD_LOGO
__weak void lcd_logo_set_cmap(void) __weak void lcd_logo_set_cmap(void)
{ {
int i;
ushort *cmap = configuration_get_cmap();
for (i = 0; i < ARRAY_SIZE(bmp_logo_palette); ++i)
*cmap++ = bmp_logo_palette[i];
} }
void bitmap_plot(int x, int y) void bitmap_plot(int x, int y)
{ {
ushort *cmap = (ushort *)bmp_logo_palette;
ushort i, j; ushort i, j;
uchar *bmap; uchar *bmap;
uchar *fb; uchar *fb;
ushort *fb16; ushort *fb16;
unsigned bpix = NBITS(panel_info.vl_bpix); unsigned bpix = NBITS(panel_info.vl_bpix);
debug("Logo: width %d height %d colors %d cmap %d\n", debug("Logo: width %d height %d colors %d\n",
BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS, BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS);
ARRAY_SIZE(bmp_logo_palette));
bmap = &bmp_logo_bitmap[0]; bmap = &bmp_logo_bitmap[0];
fb = (uchar *)(lcd_base + y * lcd_line_length + x * bpix / 8); fb = (uchar *)(lcd_base + y * lcd_line_length + x * bpix / 8);
if (bpix < 12) { if (bpix < 12) {
/* Leave room for default color map
* default case: generic system with no cmap (most likely 16bpp)
* cmap was set to the source palette, so no change is done.
* This avoids even more ifdefs in the next stanza
*/
cmap = configuration_get_cmap();
WATCHDOG_RESET(); WATCHDOG_RESET();
/* Set color map */
#if defined(CONFIG_ATMEL_LCD) || defined(CONFIG_MPC823)
lcd_logo_set_cmap(); lcd_logo_set_cmap();
#else
for (i = 0; i < ARRAY_SIZE(bmp_logo_palette); ++i) {
ushort colreg = bmp_logo_palette[i];
*cmap++ = colreg;
}
#endif
WATCHDOG_RESET(); WATCHDOG_RESET();
for (i = 0; i < BMP_LOGO_HEIGHT; ++i) { for (i = 0; i < BMP_LOGO_HEIGHT; ++i) {