lcd_color_fg and lcd_color_bg had to be declared in board specific
code, but were not actually used there; in addition, we have getter /
setter functions for these, which were not used either.
Get rid of the global variables, and use the getter function where
needed (so far no setter calls are needed).
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Alessandro Rubini <rubini@unipv.it>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Bo Shen <voice.shen@atmel.com>
Cc: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stelian Pop <stelian@popies.net>
Cc: Tom Warren <twarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Jeroen Hofstee <jeroen@myspectrum.nl>
[agust: also fixed cm_t35 board while rebasing]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
void lcd_enable (void);
int lcd_line_length;
void lcd_enable (void);
int lcd_line_length;
-int lcd_color_fg;
-int lcd_color_bg;
void *lcd_base; /* Start of framebuffer memory */
void *lcd_console_address; /* Start of console buffer */
void *lcd_base; /* Start of framebuffer memory */
void *lcd_console_address; /* Start of console buffer */
-int lcd_color_fg;
-int lcd_color_bg;
-
/*
* Frame buffer memory information
*/
/*
* Frame buffer memory information
*/
-int lcd_color_fg;
-int lcd_color_bg;
void *lcd_base;
short console_col;
short console_row;
void *lcd_base;
short console_col;
short console_row;
-int lcd_color_fg;
-int lcd_color_bg;
-
/*
* Frame buffer memory information
*/
/*
* Frame buffer memory information
*/
static void lcd_setfgcolor(int color);
static void lcd_setbgcolor(int color);
static void lcd_setfgcolor(int color);
static void lcd_setbgcolor(int color);
+static int lcd_color_fg;
+static int lcd_color_bg;
+
char lcd_is_enabled = 0;
static char lcd_flush_dcache; /* 1 to flush dcache after each lcd update */
char lcd_is_enabled = 0;
static char lcd_flush_dcache; /* 1 to flush dcache after each lcd update */
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
-#ifdef NOT_USED_SO_FAR
-static int lcd_getfgcolor(void)
+int lcd_getfgcolor(void)
-#endif /* NOT_USED_SO_FAR */
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
/* These variables are required by lcd.c -- although it sets them by itself */
int lcd_line_length;
/* These variables are required by lcd.c -- although it sets them by itself */
int lcd_line_length;
-int lcd_color_fg;
-int lcd_color_bg;
void *lcd_base;
void *lcd_console_address;
short console_col;
void *lcd_base;
void *lcd_console_address;
short console_col;
#include <atmel_hlcdc.h>
int lcd_line_length;
#include <atmel_hlcdc.h>
int lcd_line_length;
-int lcd_color_fg;
-int lcd_color_bg;
void *lcd_base; /* Start of framebuffer memory */
void *lcd_console_address; /* Start of console buffer */
void *lcd_base; /* Start of framebuffer memory */
void *lcd_console_address; /* Start of console buffer */
#include <atmel_lcdc.h>
int lcd_line_length;
#include <atmel_lcdc.h>
int lcd_line_length;
-int lcd_color_fg;
-int lcd_color_bg;
void *lcd_base; /* Start of framebuffer memory */
void *lcd_console_address; /* Start of console buffer */
void *lcd_base; /* Start of framebuffer memory */
void *lcd_console_address; /* Start of console buffer */
#include "exynos_fb.h"
int lcd_line_length;
#include "exynos_fb.h"
int lcd_line_length;
-int lcd_color_fg;
-int lcd_color_bg;
void *lcd_base;
void *lcd_console_address;
void *lcd_base;
void *lcd_console_address;
-int lcd_color_fg;
-int lcd_color_bg;
void *lcd_base; /* Start of framebuffer memory */
void *lcd_console_address; /* Start of console buffer */
void *lcd_base; /* Start of framebuffer memory */
void *lcd_console_address; /* Start of console buffer */
for (i = 0; i < lcd_cursor_width; ++i) {
color = *d;
for (i = 0; i < lcd_cursor_width; ++i) {
color = *d;
+ color ^= lcd_getfgcolor();
extern char lcd_is_enabled;
extern int lcd_line_length;
extern char lcd_is_enabled;
extern int lcd_line_length;
-extern int lcd_color_fg;
-extern int lcd_color_bg;
/*
* Frame buffer memory information
*/
/*
* Frame buffer memory information
*/
-extern void *lcd_base; /* Start of framebuffer memory */
+extern void *lcd_base; /* Start of framebuffer memory */
extern void *lcd_console_address; /* Start of console buffer */
extern short console_col;
extern void *lcd_console_address; /* Start of console buffer */
extern short console_col;
ushort red, ushort green, ushort blue);
extern void lcd_initcolregs (void);
ushort red, ushort green, ushort blue);
extern void lcd_initcolregs (void);
+extern int lcd_getfgcolor(void);
+
/* gunzip_bmp used if CONFIG_VIDEO_BMP_GZIP */
extern struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp);
extern int bmp_display(ulong addr, int x, int y);
/* gunzip_bmp used if CONFIG_VIDEO_BMP_GZIP */
extern struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp);
extern int bmp_display(ulong addr, int x, int y);