|
@@ -211,10 +211,13 @@ void lcd_printf(const char *fmt, ...)
|
|
static void lcd_drawchars (ushort x, ushort y, uchar *str, int count)
|
|
static void lcd_drawchars (ushort x, ushort y, uchar *str, int count)
|
|
{
|
|
{
|
|
uchar *dest;
|
|
uchar *dest;
|
|
- ushort off, row;
|
|
|
|
|
|
+ ushort row;
|
|
|
|
+
|
|
|
|
+#if LCD_BPP == LCD_MONOCHROME
|
|
|
|
+ ushort off = x * (1 << LCD_BPP) % 8;
|
|
|
|
+#endif
|
|
|
|
|
|
dest = (uchar *)(lcd_base + y * lcd_line_length + x * (1 << LCD_BPP) / 8);
|
|
dest = (uchar *)(lcd_base + y * lcd_line_length + x * (1 << LCD_BPP) / 8);
|
|
- off = x * (1 << LCD_BPP) % 8;
|
|
|
|
|
|
|
|
for (row=0; row < VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) {
|
|
for (row=0; row < VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) {
|
|
uchar *s = str;
|
|
uchar *s = str;
|
|
@@ -614,7 +617,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
|
|
unsigned long width, height, byte_width;
|
|
unsigned long width, height, byte_width;
|
|
unsigned long pwidth = panel_info.vl_col;
|
|
unsigned long pwidth = panel_info.vl_col;
|
|
unsigned colors, bpix, bmp_bpix;
|
|
unsigned colors, bpix, bmp_bpix;
|
|
- unsigned long compression;
|
|
|
|
#if defined CONFIG_PXA250 || defined CONFIG_PXA27X || defined CONFIG_CPU_MONAHANS
|
|
#if defined CONFIG_PXA250 || defined CONFIG_PXA27X || defined CONFIG_CPU_MONAHANS
|
|
struct pxafb_info *fbi = &panel_info.pxa;
|
|
struct pxafb_info *fbi = &panel_info.pxa;
|
|
#elif defined(CONFIG_MPC823)
|
|
#elif defined(CONFIG_MPC823)
|
|
@@ -632,7 +634,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
|
|
height = le32_to_cpu (bmp->header.height);
|
|
height = le32_to_cpu (bmp->header.height);
|
|
bmp_bpix = le16_to_cpu(bmp->header.bit_count);
|
|
bmp_bpix = le16_to_cpu(bmp->header.bit_count);
|
|
colors = 1 << bmp_bpix;
|
|
colors = 1 << bmp_bpix;
|
|
- compression = le32_to_cpu (bmp->header.compression);
|
|
|
|
|
|
|
|
bpix = NBITS(panel_info.vl_bpix);
|
|
bpix = NBITS(panel_info.vl_bpix);
|
|
|
|
|