GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lcd: remove LCD_MONOCHROME

Browse source 
No one is using LCD_MONOCHROME; remove related code.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Nikita Kiryanov 2014-12-08 17:14:38 +02:00 • committed by Anatolij Gustschin
parent ad8a245620
commit f4469f50b0
4 changed files with 3 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
common/lcd.c
View file

@ -97,10 +97,7 @@
#define CONSOLE_SIZE (CONSOLE_ROW_SIZE * CONSOLE_ROWS) #define CONSOLE_SIZE (CONSOLE_ROW_SIZE * CONSOLE_ROWS)
#define CONSOLE_SCROLL_SIZE (CONSOLE_SIZE - CONSOLE_ROW_SIZE) #define CONSOLE_SCROLL_SIZE (CONSOLE_SIZE - CONSOLE_ROW_SIZE)
#if LCD_BPP == LCD_MONOCHROME #if (LCD_BPP == LCD_COLOR8) || (LCD_BPP == LCD_COLOR16) || \
# define COLOR_MASK(c) ((c) | (c) << 1 | (c) << 2 | (c) << 3 | \
(c) << 4 | (c) << 5 | (c) << 6 | (c) << 7)
#elif (LCD_BPP == LCD_COLOR8) || (LCD_BPP == LCD_COLOR16) || \
(LCD_BPP == LCD_COLOR32) (LCD_BPP == LCD_COLOR32)
# define COLOR_MASK(c) (c) # define COLOR_MASK(c) (c)
#else #else
@ -313,10 +310,6 @@ static void lcd_drawchars(ushort x, ushort y, uchar *str, int count)
y += BMP_LOGO_HEIGHT; y += BMP_LOGO_HEIGHT;
#endif #endif
#if LCD_BPP == LCD_MONOCHROME
ushort off = x * (1 << LCD_BPP) % 8;
#endif
dest = (uchar *)(lcd_base + y * lcd_line_length + x * NBITS(LCD_BPP)/8); dest = (uchar *)(lcd_base + y * lcd_line_length + x * NBITS(LCD_BPP)/8);
for (row = 0; row < VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) { for (row = 0; row < VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) {
@ -330,33 +323,18 @@ static void lcd_drawchars(ushort x, ushort y, uchar *str, int count)
uchar *d = dest; uchar *d = dest;
#endif #endif
#if LCD_BPP == LCD_MONOCHROME
uchar rest = *d & -(1 << (8 - off));
uchar sym;
#endif
for (i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {
uchar c, bits; uchar c, bits;
c = *s++; c = *s++;
bits = video_fontdata[c * VIDEO_FONT_HEIGHT + row]; bits = video_fontdata[c * VIDEO_FONT_HEIGHT + row];
#if LCD_BPP == LCD_MONOCHROME
sym = (COLOR_MASK(lcd_color_fg) & bits) |
(COLOR_MASK(lcd_color_bg) & ~bits);
*d++ = rest | (sym >> off);
rest = sym << (8-off);
#else /* LCD_BPP == LCD_COLOR8 or LCD_COLOR16 or LCD_COLOR32 */
for (c = 0; c < 8; ++c) { for (c = 0; c < 8; ++c) {
*d++ = (bits & 0x80) ? *d++ = (bits & 0x80) ?
lcd_color_fg : lcd_color_bg; lcd_color_fg : lcd_color_bg;
bits <<= 1; bits <<= 1;
} }
#endif
} }
#if LCD_BPP == LCD_MONOCHROME
*d = rest | (*d & ((1 << (8 - off)) - 1));
#endif
} }
} }
@ -443,11 +421,7 @@ int drv_lcd_init(void)
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
void lcd_clear(void) void lcd_clear(void)
{ {
#if LCD_BPP == LCD_MONOCHROME #if LCD_BPP == LCD_COLOR8
/* Setting the palette */
lcd_initcolregs();
#elif LCD_BPP == LCD_COLOR8
/* Setting the palette */ /* Setting the palette */
lcd_setcolreg(CONSOLE_COLOR_BLACK, 0, 0, 0); lcd_setcolreg(CONSOLE_COLOR_BLACK, 0, 0, 0);
lcd_setcolreg(CONSOLE_COLOR_RED, 0xFF, 0, 0); lcd_setcolreg(CONSOLE_COLOR_RED, 0xFF, 0, 0);

17
drivers/video/mpc8xx_lcd.c
View file

@ -357,23 +357,6 @@ lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue)
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
#if LCD_BPP == LCD_MONOCHROME
static
void lcd_initcolregs (void)
{
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
volatile cpm8xx_t *cp = &(immr->im_cpm);
ushort regno;
for (regno = 0; regno < 16; regno++) {
cp->lcd_cmap[regno * 2] = 0;
cp->lcd_cmap[(regno * 2) + 1] = regno & 0x0f;
}
}
#endif
/*----------------------------------------------------------------------*/
void lcd_enable (void) void lcd_enable (void)
{ {
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR; volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;

15
drivers/video/pxa_lcd.c
View file

@ -378,21 +378,6 @@ lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue)
} }
#endif /* LCD_COLOR8 */ #endif /* LCD_COLOR8 */
/*----------------------------------------------------------------------*/
#if LCD_BPP == LCD_MONOCHROME
void lcd_initcolregs (void)
{
struct pxafb_info *fbi = &panel_info.pxa;
cmap = (ushort *)fbi->palette;
ushort regno;
for (regno = 0; regno < 16; regno++) {
cmap[regno * 2] = 0;
cmap[(regno * 2) + 1] = regno & 0x0f;
}
}
#endif /* LCD_MONOCHROME */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
__weak void lcd_enable(void) __weak void lcd_enable(void)
{ {

10
include/lcd.h
View file

@ -359,15 +359,7 @@ void lcd_sync(void);
/************************************************************************/ /************************************************************************/
/* ** CONSOLE CONSTANTS */ /* ** CONSOLE CONSTANTS */
/************************************************************************/ /************************************************************************/
#if LCD_BPP == LCD_MONOCHROME #if LCD_BPP == LCD_COLOR8
/*
* Simple black/white definitions
*/
# define CONSOLE_COLOR_BLACK 0
# define CONSOLE_COLOR_WHITE 1 /* Must remain last / highest */
#elif LCD_BPP == LCD_COLOR8
/* /*
* 8bpp color definitions * 8bpp color definitions