diff options
| author | Nikita Kiryanov <nikita@compulab.co.il> | 2015-02-03 13:32:24 +0200 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2015-02-10 13:27:28 +0100 |
| commit | a02e9481396bbd831d9bd970515f277de516fa28 (patch) | |
| tree | 7a25c98d7723dc4d5e56e0bfd7db288ac9c7cac0 /common/lcd.c | |
| parent | 27fad01b7fca1ed9ae946ced37c3d4bde828ba14 (diff) | |
| download | u-boot-midas-a02e9481396bbd831d9bd970515f277de516fa28.tar.gz u-boot-midas-a02e9481396bbd831d9bd970515f277de516fa28.tar.bz2 u-boot-midas-a02e9481396bbd831d9bd970515f277de516fa28.zip | |
lcd: atmel: introduce lcd_logo_set_cmap
Reduce the bitmap_plot #ifdef complexity by extracting Atmel-specific code for
setting cmap into a new function lcd_logo_set_cmap(), which is implemented in
atmel_lcdfb driver and defined as part of common/lcd.c api with a weak dummy
version. In the Atmel implementation, ARRAY_SIZE(bmp_logo_palette) is
switched for BMP_LOGO_COLORS to avoid having to include bmp_logo_data.h, which
would cause a compilation error because the logo data and palette arrays would
be defined twice.
This is a step towards cleaning bitmap_plot() of platform-specific code.
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>
Diffstat (limited to 'common/lcd.c')
| -rw-r--r-- | common/lcd.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/common/lcd.c b/common/lcd.c index efd9a87545..7fcac1d9fb 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -385,13 +385,13 @@ int lcd_getbgcolor(void) /************************************************************************/ #ifdef CONFIG_LCD_LOGO +__weak void lcd_logo_set_cmap(void) +{ +} + void bitmap_plot(int x, int y) { -#ifdef CONFIG_ATMEL_LCD - uint *cmap = (uint *)bmp_logo_palette; -#else ushort *cmap = (ushort *)bmp_logo_palette; -#endif ushort i, j; uchar *bmap; uchar *fb; @@ -417,8 +417,6 @@ void bitmap_plot(int x, int y) */ #if defined(CONFIG_MPC823) cmap = (ushort *) &(cp->lcd_cmap[BMP_LOGO_OFFSET * sizeof(ushort)]); -#elif defined(CONFIG_ATMEL_LCD) - cmap = (uint *)configuration_get_cmap(); #else cmap = configuration_get_cmap(); #endif @@ -426,25 +424,14 @@ void bitmap_plot(int x, int y) WATCHDOG_RESET(); /* Set color map */ +#ifdef CONFIG_ATMEL_LCD + lcd_logo_set_cmap(); +#else for (i = 0; i < ARRAY_SIZE(bmp_logo_palette); ++i) { ushort colreg = bmp_logo_palette[i]; -#ifdef CONFIG_ATMEL_LCD - uint lut_entry; -#ifdef CONFIG_ATMEL_LCD_BGR555 - lut_entry = ((colreg & 0x000F) << 11) | - ((colreg & 0x00F0) << 2) | - ((colreg & 0x0F00) >> 7); -#else /* CONFIG_ATMEL_LCD_RGB565 */ - lut_entry = ((colreg & 0x000F) << 1) | - ((colreg & 0x00F0) << 3) | - ((colreg & 0x0F00) << 4); -#endif - *(cmap + BMP_LOGO_OFFSET) = lut_entry; - cmap++; -#else /* !CONFIG_ATMEL_LCD */ *cmap++ = colreg; -#endif /* CONFIG_ATMEL_LCD */ } +#endif WATCHDOG_RESET(); |