X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=common%2Fcmd_bmp.c;h=682f395b4d75f19173449581edced54ecc912845;hb=24b0da3aebb63d945cbdad79a587dc6f90b7bec5;hp=69f6fa6585dab549eec473287726a292a798bfe6;hpb=b37c7e5e5c3c80c68f49a31c4308b159bb5bda1a;p=karo-tx-uboot.git diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index 69f6fa6585..682f395b4d 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -26,58 +26,154 @@ */ #include +#include #include #include - -#if (CONFIG_COMMANDS & CFG_CMD_BMP) +#include +#include static int bmp_info (ulong addr); -static int bmp_display (ulong addr); +static int bmp_display (ulong addr, int x, int y); /* - * Subroutine: do_bmp + * Allocate and decompress a BMP image using gunzip(). * - * Description: Handler for 'bmp' command.. - * - * Inputs: argv[1] contains the subcommand - * - * Return: None + * Returns a pointer to the decompressed image data. Must be freed by + * the caller after use. * + * Returns NULL if decompression failed, or if the decompressed data + * didn't contain a valid BMP signature. */ -int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +#ifdef CONFIG_VIDEO_BMP_GZIP +bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp) +{ + void *dst; + unsigned long len; + bmp_image_t *bmp; + + /* + * Decompress bmp image + */ + len = CONFIG_SYS_VIDEO_LOGO_MAX_SIZE; + dst = malloc(CONFIG_SYS_VIDEO_LOGO_MAX_SIZE); + if (dst == NULL) { + puts("Error: malloc in gunzip failed!\n"); + return NULL; + } + if (gunzip(dst, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE, (uchar *)addr, &len) != 0) { + free(dst); + return NULL; + } + if (len == CONFIG_SYS_VIDEO_LOGO_MAX_SIZE) + puts("Image could be truncated" + " (increase CONFIG_SYS_VIDEO_LOGO_MAX_SIZE)!\n"); + + bmp = dst; + + /* + * Check for bmp mark 'BM' + */ + if (!((bmp->header.signature[0] == 'B') && + (bmp->header.signature[1] == 'M'))) { + free(dst); + return NULL; + } + + debug("Gzipped BMP image detected!\n"); + + return bmp; +} +#else +bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp) +{ + return NULL; +} +#endif + +static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) { ulong addr; switch (argc) { - case 2: /* use load_addr as default address */ + case 1: /* use load_addr as default address */ addr = load_addr; break; - case 3: /* use argument */ - addr = simple_strtoul(argv[2], NULL, 16); + case 2: /* use argument */ + addr = simple_strtoul(argv[1], NULL, 16); break; default: - printf ("Usage:\n%s\n", cmdtp->usage); - return 1; + return cmd_usage(cmdtp); } - /* Allow for short names - * Adjust length if more sub-commands get added - */ - if (strncmp(argv[1],"info",1) == 0) { - return (bmp_info(addr)); - } else if (strncmp(argv[1],"display",1) == 0) { - return (bmp_display(addr)); - } else { - printf ("Usage:\n%s\n", cmdtp->usage); - return 1; + return (bmp_info(addr)); +} + +static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +{ + ulong addr; + int x = 0, y = 0; + + switch (argc) { + case 1: /* use load_addr as default address */ + addr = load_addr; + break; + case 2: /* use argument */ + addr = simple_strtoul(argv[1], NULL, 16); + break; + case 4: + addr = simple_strtoul(argv[1], NULL, 16); + x = simple_strtoul(argv[2], NULL, 10); + y = simple_strtoul(argv[3], NULL, 10); + break; + default: + return cmd_usage(cmdtp); } + + return (bmp_display(addr, x, y)); } -cmd_tbl_t U_BOOT_CMD(BMP) = MK_CMD_ENTRY( - "bmp", 3, 1, do_bmp, - "bmp - manipulate BMP image data\n", - "info - display image info\n" - "bmp display - display image\n" +static cmd_tbl_t cmd_bmp_sub[] = { + U_BOOT_CMD_MKENT(info, 3, 0, do_bmp_info, "", ""), + U_BOOT_CMD_MKENT(display, 5, 0, do_bmp_display, "", ""), +}; + +#ifdef CONFIG_NEEDS_MANUAL_RELOC +void bmp_reloc(void) { + fixup_cmdtable(cmd_bmp_sub, ARRAY_SIZE(cmd_bmp_sub)); +} +#endif + +/* + * Subroutine: do_bmp + * + * Description: Handler for 'bmp' command.. + * + * Inputs: argv[1] contains the subcommand + * + * Return: None + * + */ +static int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + cmd_tbl_t *c; + + /* Strip off leading 'bmp' command argument */ + argc--; + argv++; + + c = find_cmd_tbl(argv[0], &cmd_bmp_sub[0], ARRAY_SIZE(cmd_bmp_sub)); + + if (c) + return c->cmd(cmdtp, flag, argc, argv); + else + return cmd_usage(cmdtp); +} + +U_BOOT_CMD( + bmp, 5, 1, do_bmp, + "manipulate BMP image data", + "info - display image info\n" + "bmp display [x y] - display image at x,y" ); /* @@ -93,15 +189,25 @@ cmd_tbl_t U_BOOT_CMD(BMP) = MK_CMD_ENTRY( static int bmp_info(ulong addr) { bmp_image_t *bmp=(bmp_image_t *)addr; + unsigned long len; + if (!((bmp->header.signature[0]=='B') && - (bmp->header.signature[1]=='M'))) { + (bmp->header.signature[1]=='M'))) + bmp = gunzip_bmp(addr, &len); + + if (bmp == NULL) { printf("There is no valid bmp file at the given address\n"); - return(1); + return 1; } + printf("Image size : %d x %d\n", le32_to_cpu(bmp->header.width), le32_to_cpu(bmp->header.height)); printf("Bits per pixel: %d\n", le16_to_cpu(bmp->header.bit_count)); printf("Compression : %d\n", le32_to_cpu(bmp->header.compression)); + + if ((unsigned long)bmp != addr) + free(bmp); + return(0); } @@ -115,11 +221,33 @@ static int bmp_info(ulong addr) * Return: None * */ -static int bmp_display(ulong addr) +static int bmp_display(ulong addr, int x, int y) { - extern int lcd_display_bitmap (ulong); + int ret; + bmp_image_t *bmp = (bmp_image_t *)addr; + unsigned long len; - return (lcd_display_bitmap (addr)); -} + if (!((bmp->header.signature[0]=='B') && + (bmp->header.signature[1]=='M'))) + bmp = gunzip_bmp(addr, &len); -#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) */ + if (!bmp) { + printf("There is no valid bmp file at the given address\n"); + return 1; + } + +#if defined(CONFIG_LCD) + ret = lcd_display_bitmap((ulong)bmp, x, y); +#elif defined(CONFIG_VIDEO) + extern int video_display_bitmap (ulong, int, int); + + ret = video_display_bitmap ((unsigned long)bmp, x, y); +#else +# error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO +#endif + + if ((unsigned long)bmp != addr) + free(bmp); + + return ret; +}