No one is using LCD_MONOCHROME; remove related code.
Signed-off-by: Nikita Kiryanov nik...@compulab.co.il
Cc: Wolfgang Denk w...@denx.de
Cc: Anatolij Gustschin ag...@denx.de
---
common/lcd.c | 30 ++
drivers/video/mpc8xx_lcd.c | 17 -
drivers/video/pxa_lcd.c| 15 ---
include/lcd.h | 10 +-
4 files changed, 3 insertions(+), 69 deletions(-)
diff --git a/common/lcd.c b/common/lcd.c
index ff53cf1..4c86f6c 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -96,10 +96,7 @@
#define CONSOLE_SIZE (CONSOLE_ROW_SIZE * CONSOLE_ROWS)
#define CONSOLE_SCROLL_SIZE(CONSOLE_SIZE - CONSOLE_ROW_SIZE)
-#if LCD_BPP == LCD_MONOCHROME
-# 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) || \
+#if (LCD_BPP == LCD_COLOR8) || (LCD_BPP == LCD_COLOR16) || \
(LCD_BPP == LCD_COLOR32)
# define COLOR_MASK(c) (c)
#else
@@ -312,10 +309,6 @@ static void lcd_drawchars(ushort x, ushort y, uchar *str,
int count)
y += BMP_LOGO_HEIGHT;
#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);
for (row = 0; row VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) {
@@ -329,33 +322,18 @@ static void lcd_drawchars(ushort x, ushort y, uchar *str,
int count)
uchar *d = dest;
#endif
-#if LCD_BPP == LCD_MONOCHROME
- uchar rest = *d -(1 (8 - off));
- uchar sym;
-#endif
for (i = 0; i count; ++i) {
uchar c, bits;
c = *s++;
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) {
*d++ = (bits 0x80) ?
lcd_color_fg : lcd_color_bg;
bits = 1;
}
-#endif
}
-#if LCD_BPP == LCD_MONOCHROME
- *d = rest | (*d ((1 (8 - off)) - 1));
-#endif
}
}
@@ -442,11 +420,7 @@ int drv_lcd_init(void)
/*--*/
void lcd_clear(void)
{
-#if LCD_BPP == LCD_MONOCHROME
- /* Setting the palette */
- lcd_initcolregs();
-
-#elif LCD_BPP == LCD_COLOR8
+#if LCD_BPP == LCD_COLOR8
/* Setting the palette */
lcd_setcolreg(CONSOLE_COLOR_BLACK, 0, 0, 0);
lcd_setcolreg(CONSOLE_COLOR_RED, 0xFF, 0, 0);
diff --git a/drivers/video/mpc8xx_lcd.c b/drivers/video/mpc8xx_lcd.c
index 3ea240d..3c16bf6 100644
--- a/drivers/video/mpc8xx_lcd.c
+++ b/drivers/video/mpc8xx_lcd.c
@@ -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)
{
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
diff --git a/drivers/video/pxa_lcd.c b/drivers/video/pxa_lcd.c
index e19f6ac..f66f615 100644
--- a/drivers/video/pxa_lcd.c
+++ b/drivers/video/pxa_lcd.c
@@ -379,21 +379,6 @@ lcd_setcolreg (ushort regno, ushort red, ushort green,
ushort blue)
#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)
{
}
diff --git a/include/lcd.h b/include/lcd.h
index 020d880..01609ac 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -359,15 +359,7 @@ void lcd_sync(void);
//
/* ** CONSOLE CONSTANTS
