summaryrefslogtreecommitdiff
path: root/include/lcd.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-01-14 21:26:15 (GMT)
committerTom Rini <trini@ti.com>2015-01-14 21:26:15 (GMT)
commit28c4dae114c9b94b2a1111d81d4da716e9fc2cba (patch)
treeaf724165971829de9394145db5dced80d6ef932b /include/lcd.h
parent16ae7827226ce8b255245d1932e8069f00997a26 (diff)
parent73b462b84568ac887ae9ad083580289175202327 (diff)
downloadu-boot-fsl-qoriq-28c4dae114c9b94b2a1111d81d4da716e9fc2cba.tar.xz
Merge branch 'next' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include/lcd.h')
-rw-r--r--include/lcd.h25
1 files changed, 16 insertions, 9 deletions
diff --git a/include/lcd.h b/include/lcd.h
index 020d880..160f940 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -12,6 +12,7 @@
#ifndef _LCD_H_
#define _LCD_H_
+#include <lcd_console.h>
extern char lcd_is_enabled;
@@ -291,6 +292,20 @@ int lcd_get_screen_rows(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)
@@ -359,15 +374,7 @@ void lcd_sync(void);
/************************************************************************/
/* ** 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