diff options
| author | Nikita Kiryanov <nikita@compulab.co.il> | 2014-12-08 17:14:44 +0200 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2015-01-10 17:53:36 +0100 |
| commit | 88b326a31e4b7c2b6550980944b9b72f40c1bda0 (patch) | |
| tree | 5d494ce9b74c813e5779da54adbfba79aacc9fc5 /common/lcd.c | |
| parent | 4d03634e5da40dc092b6e5b985f74aedfe04f81e (diff) | |
lcd: make lcd_drawchars() independant of lcd_base
lcd_logo() has the following return value:
#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
return (void *)((ulong)lcd_base + BMP_LOGO_HEIGHT * lcd_line_length);
#else
return (void *)lcd_base;
#endif
This return value gets assigned to lcd_console_address.
lcd_console_address is not assigned or modified anywhere else.
Thus:
#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO):
y' = BMP_LOGO_HEIGHT + y;
lcd_base + y' * lcd_line_length ==
lcd_base + (BMP_LOGO_HEIGHT + y) * lcd_line_length ==
lcd_base + BMP_LOGO_HEIGHT * lcd_line_length + y * lcd_line_length ==
lcd_console_address + y * lcd_line_length
#else
lcd_base + y * lcd_line_length == lcd_console_address + y * lcd_line_length
#endif
This is a preparatory step for extracting lcd console code into its own
file.
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/lcd.c')
| -rw-r--r-- | common/lcd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/common/lcd.c b/common/lcd.c index 1259446a0e5..4ff952442ac 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -318,11 +318,8 @@ static void lcd_drawchars(ushort x, ushort y, uchar *str, int count) ushort row; int fg_color, bg_color; -#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO) - y += BMP_LOGO_HEIGHT; -#endif - - dest = (uchar *)(lcd_base + y * lcd_line_length + x * NBITS(LCD_BPP)/8); + dest = (uchar *)(lcd_console_address + + y * lcd_line_length + x * NBITS(LCD_BPP) / 8); for (row = 0; row < VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) { uchar *s = str; |