diff options
| author | Guennadi Liakhovetski <lg@denx.de> | 2009-02-06 10:37:53 +0100 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2009-02-24 10:19:00 +0100 |
| commit | b245e65ee3c4cce3ccf008a21f4528239655876c (patch) | |
| tree | ca587d380503291ea2729b712e8d80143ca61dfc /include/lcd.h | |
| parent | a303dfb0e9a93e516ea9427b5c09543d5f74ade1 (diff) | |
| download | u-boot-b245e65ee3c4cce3ccf008a21f4528239655876c.tar.gz u-boot-b245e65ee3c4cce3ccf008a21f4528239655876c.tar.bz2 u-boot-b245e65ee3c4cce3ccf008a21f4528239655876c.zip | |
LCD: support 8bpp BMPs on 16bpp displays
This patch also simplifies some ifdefs in lcd.c, introduces a generic
vidinfo_t, which new drivers are encouraged to use and old drivers to switch
over to.
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'include/lcd.h')
| -rw-r--r-- | include/lcd.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/include/lcd.h b/include/lcd.h index 512221e9c4..f054cac05f 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -148,14 +148,6 @@ typedef struct vidinfo { extern vidinfo_t panel_info; -#elif defined(CONFIG_MCC200) -typedef struct vidinfo { - ushort vl_col; /* Number of columns (i.e. 160) */ - ushort vl_row; /* Number of rows (i.e. 100) */ - - u_char vl_bpix; /* Bits per pixel, 0 = 1 */ -} vidinfo_t; - #elif defined(CONFIG_ATMEL_LCD) typedef struct vidinfo { @@ -183,6 +175,19 @@ typedef struct vidinfo { extern vidinfo_t panel_info; +#else + +typedef struct vidinfo { + ushort vl_col; /* Number of columns (i.e. 160) */ + ushort vl_row; /* Number of rows (i.e. 100) */ + + u_char vl_bpix; /* Bits per pixel, 0 = 1 */ + + ushort *cmap; /* Pointer to the colormap */ + + void *priv; /* Pointer to driver-specific data */ +} vidinfo_t; + #endif /* CONFIG_MPC823, CONFIG_PXA250 or CONFIG_MCC200 or CONFIG_ATMEL_LCD */ /* Video functions */ |