diff options
| author | Jeroen Hofstee <jeroen@myspectrum.nl> | 2013-01-12 12:07:59 +0000 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2013-03-21 10:38:51 +0100 |
| commit | a5796c51ce87870cde39c0b9cd29ac775d0fb514 (patch) | |
| tree | c148a31fdd935f3864c00bec138b18e4e33be368 /common/lcd.c | |
| parent | fbd239bea7d0847495da57dcf03248c13040c763 (diff) | |
| download | olio-uboot-2014.01-a5796c51ce87870cde39c0b9cd29ac775d0fb514.tar.xz olio-uboot-2014.01-a5796c51ce87870cde39c0b9cd29ac775d0fb514.zip | |
common/lcd.c: move the macro's to the c file
Hide the console macros since some reference global data which is
no longer present.
cc: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Diffstat (limited to 'common/lcd.c')
| -rw-r--r-- | common/lcd.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/common/lcd.c b/common/lcd.c index bd7155fcb..92debaf01 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -83,6 +83,34 @@ #define CONFIG_CONSOLE_SCROLL_LINES 1 #endif +/************************************************************************/ +/* ** CONSOLE DEFINITIONS & FUNCTIONS */ +/************************************************************************/ +#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO) +# define CONSOLE_ROWS ((panel_info.vl_row-BMP_LOGO_HEIGHT) \ + / VIDEO_FONT_HEIGHT) +#else +# define CONSOLE_ROWS (panel_info.vl_row / VIDEO_FONT_HEIGHT) +#endif + +#define CONSOLE_COLS (panel_info.vl_col / VIDEO_FONT_WIDTH) +#define CONSOLE_ROW_SIZE (VIDEO_FONT_HEIGHT * lcd_line_length) +#define CONSOLE_ROW_FIRST lcd_console_address +#define CONSOLE_ROW_SECOND (lcd_console_address + CONSOLE_ROW_SIZE) +#define CONSOLE_ROW_LAST (lcd_console_address + CONSOLE_SIZE \ + - CONSOLE_ROW_SIZE) +#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) +# define COLOR_MASK(c) (c) +#else +# error Unsupported LCD BPP. +#endif + DECLARE_GLOBAL_DATA_PTR; static void lcd_drawchars(ushort x, ushort y, uchar *str, int count); |