Commit 8a86270e authored by Lars Poeschel's avatar Lars Poeschel Committed by Miguel Ojeda
Browse files

auxdisplay: cleanup unnecessary hd44780 code in charlcd 



This cleans up now unnecessary hd44780 specific code from charlcd. We
obsoleted this with the last patch. So another chunk of hd44780 specific
code can be dropped from charlcd.

Reviewed-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarLars Poeschel <poeschel@lemonage.de>
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent d2f2187e

drivers/auxdisplay/charlcd.c

+1 −31
Original line number Diff line number Diff line
@@ -25,21 +25,8 @@ 
/* Keep the backlight on this many seconds for each flash */

#define LCD_BL_TEMPO_PERIOD	4



/* LCD commands */

#define LCD_CMD_DISPLAY_CTRL	0x08	/* Display control */

#define LCD_CMD_DISPLAY_ON	0x04	/* Set display on */

#define LCD_CMD_CURSOR_ON	0x02	/* Set cursor on */

#define LCD_CMD_BLINK_ON	0x01	/* Set blink on */



#define LCD_CMD_FUNCTION_SET	0x20	/* Set function */

#define LCD_CMD_DATA_LEN_8BITS	0x10	/* Set data length to 8 bits */

#define LCD_CMD_TWO_LINES	0x08	/* Set to two display lines */

#define LCD_CMD_FONT_5X10_DOTS	0x04	/* Set char font to 5x10 dots */



#define LCD_CMD_SET_CGRAM_ADDR	0x40	/* Set char generator RAM address */



#define LCD_CMD_SET_DDRAM_ADDR 0x80    /* Set display data RAM address */



#define LCD_ESCAPE_LEN		24	/* Max chars for LCD escape command */

#define LCD_ESCAPE_CHAR		27	/* Use char 27 for escape command */
@@ -431,24 +418,7 @@ static inline int handle_lcd_special_code(struct charlcd *lcd) 
	if (oldflags == priv->flags)

		return processed;



	/* check whether one of B,C,D flags were changed */

	if ((oldflags ^ priv->flags) &

	    (LCD_FLAG_B | LCD_FLAG_C | LCD_FLAG_D))

		/* set display mode */

		hdc->write_cmd(hdc,

			LCD_CMD_DISPLAY_CTRL |

			((priv->flags & LCD_FLAG_D) ? LCD_CMD_DISPLAY_ON : 0) |

			((priv->flags & LCD_FLAG_C) ? LCD_CMD_CURSOR_ON : 0) |

			((priv->flags & LCD_FLAG_B) ? LCD_CMD_BLINK_ON : 0));

	/* check whether one of F,N flags was changed */

	else if ((oldflags ^ priv->flags) & (LCD_FLAG_F | LCD_FLAG_N))

		hdc->write_cmd(hdc,

			LCD_CMD_FUNCTION_SET |

			((hdc->ifwidth == 8) ? LCD_CMD_DATA_LEN_8BITS : 0) |

			((priv->flags & LCD_FLAG_F) ? LCD_CMD_FONT_5X10_DOTS : 0) |

			((priv->flags & LCD_FLAG_N) ? LCD_CMD_TWO_LINES : 0));

	/* check whether L flag was changed */

	else if ((oldflags ^ priv->flags) & LCD_FLAG_L)

	if ((oldflags ^ priv->flags) & LCD_FLAG_L)

		charlcd_backlight(lcd, !!(priv->flags & LCD_FLAG_L));



	return processed;