diff options
author | wdenk <wdenk> | 2003-04-20 16:49:37 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2003-04-20 16:49:37 +0000 |
commit | 824a1ebffece80586d52c343b2f451086154dff8 (patch) | |
tree | 3f042c157d5585d76e641366f917dc3aef65a790 /cpu | |
parent | d791b1dc3e64a6a6317293245d884589bc5c6277 (diff) | |
download | bootable_bootloader_goldelico_gta04-824a1ebffece80586d52c343b2f451086154dff8.zip bootable_bootloader_goldelico_gta04-824a1ebffece80586d52c343b2f451086154dff8.tar.gz bootable_bootloader_goldelico_gta04-824a1ebffece80586d52c343b2f451086154dff8.tar.bz2 |
Compile fixes
Diffstat (limited to 'cpu')
-rw-r--r-- | cpu/mpc8xx/lcd.c | 102 |
1 files changed, 3 insertions, 99 deletions
diff --git a/cpu/mpc8xx/lcd.c b/cpu/mpc8xx/lcd.c index 1c3fb23..9e92676 100644 --- a/cpu/mpc8xx/lcd.c +++ b/cpu/mpc8xx/lcd.c @@ -1001,102 +1001,6 @@ static void lcd_enable (void) /*----------------------------------------------------------------------*/ -#if (CONFIG_COMMANDS & CFG_CMD_BMP) -/* - Display the BMP file located at address bmp_image. - Only uncompressed -*/ -int lcd_display_bitmap(ulong bmp_image) -{ - volatile immap_t *immr = (immap_t *) CFG_IMMR; - volatile cpm8xx_t *cp = &(immr->im_cpm); - ushort *cmap; - ushort i, j; - uchar *fb; - bmp_image_t *bmp=(bmp_image_t *)bmp_image; - uchar *bmap; - ushort padded_line; - unsigned long width, height; - unsigned colors,bpix; - unsigned long compression; - - if (!((bmp->header.signature[0]=='B') && - (bmp->header.signature[1]=='M'))) { - printf ("Error: no valid bmp image at %lx\n", bmp_image); - return 1; - } - - width = le32_to_cpu (bmp->header.width); - height = le32_to_cpu (bmp->header.height); - colors = 1<<le16_to_cpu (bmp->header.bit_count); - compression = le32_to_cpu (bmp->header.compression); - - bpix = NBITS(panel_info.vl_bpix); - - if ((bpix != 1) && (bpix != 8)) { - printf ("Error: %d bit/pixel mode not supported by U-Boot\n", - bpix); - return 1; - } - - if (bpix != le16_to_cpu(bmp->header.bit_count)) { - printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n", - bpix, - le16_to_cpu(bmp->header.bit_count)); - return 1; - } - - if (compression!=BMP_BI_RGB) { - printf ("Error: compression type %ld not supported\n", - compression); - return 1; - } - - debug ("Display-bmp: %d x %d with %d colors\n", - width, height, colors); - - if (bpix==8) { - /* Fill the entire color map */ - cmap = (ushort *)&(cp->lcd_cmap[255*sizeof(ushort)]); - - /* Set color map */ - for (i = 0; i < colors; ++i) { - bmp_color_table_entry_t cte = bmp->color_table[i]; - ushort colreg = - ((cte.red>>4) << 8) | - ((cte.green>>4) << 4) | - (cte.blue>>4) ; -#ifdef CFG_INVERT_COLORS - colreg ^= 0xFFF; -#endif - *cmap-- = colreg; - } - } - - padded_line = (width&0x3) ? ((width&~0x3)+4) : (width); - if (width>panel_info.vl_col) - width = panel_info.vl_col; - if (height>panel_info.vl_row) - height = panel_info.vl_row; - - bmap = (uchar *)bmp + le32_to_cpu (bmp->header.data_offset); - fb = (uchar *) - (lcd_base + - (((height>=panel_info.vl_row) ? panel_info.vl_row : height)-1) - * lcd_line_length); - for (i = 0; i < height; ++i) { - for (j = 0; j < width ; j++) - *(fb++)=255-*(bmap++); - bmap += (width - padded_line); - fb -= (width + lcd_line_length); - } - - return (0); -} -#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) */ - -/*----------------------------------------------------------------------*/ - #ifdef NOT_USED_SO_FAR static void lcd_disable (void) { @@ -1170,9 +1074,9 @@ static void bitmap_plot (int x, int y) #if (CONFIG_COMMANDS & CFG_CMD_BMP) /* - Display the BMP file located at address bmp_image. - Only uncompressed -*/ + * Display the BMP file located at address bmp_image. + * Only uncompressed + */ int lcd_display_bitmap(ulong bmp_image) { volatile immap_t *immr = (immap_t *) CFG_IMMR; |