projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-ti
[platform/kernel/u-boot.git]
/
include
/
lcd.h
diff --git
a/include/lcd.h
b/include/lcd.h
index
ea5860c
..
160f940
100644
(file)
--- a/
include/lcd.h
+++ b/
include/lcd.h
@@
-12,6
+12,7
@@
#ifndef _LCD_H_
#define _LCD_H_
#ifndef _LCD_H_
#define _LCD_H_
+#include <lcd_console.h>
extern char lcd_is_enabled;
extern char lcd_is_enabled;
@@
-250,7
+251,7
@@
typedef struct vidinfo {
void *priv; /* Pointer to driver-specific data */
} vidinfo_t;
void *priv; /* Pointer to driver-specific data */
} vidinfo_t;
-#endif /* CONFIG_MPC823, CONFIG_CPU_PXA25X, CONFIG_
MCC200, CONFIG_
ATMEL_LCD */
+#endif /* CONFIG_MPC823, CONFIG_CPU_PXA25X, CONFIG_ATMEL_LCD */
extern vidinfo_t panel_info;
extern vidinfo_t panel_info;
@@
-291,6
+292,20
@@
int lcd_get_screen_rows(void);
int lcd_get_screen_columns(void);
/**
int lcd_get_screen_columns(void);
/**
+ * Get the background color of the LCD
+ *
+ * @return background color value
+ */
+int lcd_getbgcolor(void);
+
+/**
+ * Get the foreground color of the LCD
+ *
+ * @return foreground color value
+ */
+int lcd_getfgcolor(void);
+
+/**
* Set the position of the text cursor
*
* @param col Column to place cursor (0 = left side)
* Set the position of the text cursor
*
* @param col Column to place cursor (0 = left side)
@@
-359,15
+374,7
@@
void lcd_sync(void);
/************************************************************************/
/* ** CONSOLE CONSTANTS */
/************************************************************************/
/************************************************************************/
/* ** CONSOLE CONSTANTS */
/************************************************************************/
-#if LCD_BPP == LCD_MONOCHROME
-
-/*
- * Simple black/white definitions
- */
-# define CONSOLE_COLOR_BLACK 0
-# define CONSOLE_COLOR_WHITE 1 /* Must remain last / highest */
-
-#elif LCD_BPP == LCD_COLOR8
+#if LCD_BPP == LCD_COLOR8
/*
* 8bpp color definitions
/*
* 8bpp color definitions