Fix do_div() usage in nand process output

[karo-tx-uboot.git] / common / cmd_bmp.c

diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c
index 69f6fa6585dab549eec473287726a292a798bfe6..241aa8357a3ce3ccea7e3fee4f137c53b1dcd128 100644 (file)
--- a/common/cmd_bmp.c
+++ b/common/cmd_bmp.c
@@ -28,11 +28,15 @@
 #include <common.h>
 #include <bmp_layout.h>
 #include <command.h>
+#include <asm/byteorder.h>
+#include <malloc.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_BMP)
+#if defined(CONFIG_CMD_BMP)
 
 static int bmp_info (ulong addr);
-static int bmp_display (ulong addr);
+static int bmp_display (ulong addr, int x, int y);
+
+int gunzip(void *, int, unsigned char *, unsigned long *);
 
 /*
  * Subroutine:  do_bmp
@@ -47,6 +51,7 @@ static int bmp_display (ulong addr);
 int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        ulong addr;
+       int x = 0, y = 0;
 
        switch (argc) {
        case 2:         /* use load_addr as default address */
@@ -55,6 +60,11 @@ int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        case 3:         /* use argument */
                addr = simple_strtoul(argv[2], NULL, 16);
                break;
+       case 5:
+               addr = simple_strtoul(argv[2], NULL, 16);
+               x = simple_strtoul(argv[3], NULL, 10);
+               y = simple_strtoul(argv[4], NULL, 10);
+               break;
        default:
                printf ("Usage:\n%s\n", cmdtp->usage);
                return 1;
@@ -66,18 +76,18 @@ int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if (strncmp(argv[1],"info",1) == 0) {
                return (bmp_info(addr));
        } else if (strncmp(argv[1],"display",1) == 0) {
-               return (bmp_display(addr));
+           return (bmp_display(addr, x, y));
        } else {
                printf ("Usage:\n%s\n", cmdtp->usage);
                return 1;
        }
 }
 
-cmd_tbl_t U_BOOT_CMD(BMP) = MK_CMD_ENTRY(
-       "bmp",  3,      1,      do_bmp,
+U_BOOT_CMD(
+       bmp,    5,      1,      do_bmp,
        "bmp     - manipulate BMP image data\n",
-       "info <imageAddr>    - display image info\n"
-       "bmp display <imageAddr> - display image\n"
+       "info <imageAddr>          - display image info\n"
+       "bmp display <imageAddr> [x y] - display image at x,y\n"
 );
 
 /*
@@ -93,15 +103,64 @@ cmd_tbl_t U_BOOT_CMD(BMP) = MK_CMD_ENTRY(
 static int bmp_info(ulong addr)
 {
        bmp_image_t *bmp=(bmp_image_t *)addr;
+#ifdef CONFIG_VIDEO_BMP_GZIP
+       unsigned char *dst = NULL;
+       ulong len;
+#endif /* CONFIG_VIDEO_BMP_GZIP */
+
        if (!((bmp->header.signature[0]=='B') &&
              (bmp->header.signature[1]=='M'))) {
+
+#ifdef CONFIG_VIDEO_BMP_GZIP
+               /*
+                * Decompress bmp image
+                */
+               len = CFG_VIDEO_LOGO_MAX_SIZE;
+               dst = malloc(CFG_VIDEO_LOGO_MAX_SIZE);
+               if (dst == NULL) {
+                       printf("Error: malloc in gunzip failed!\n");
+                       return(1);
+               }
+               if (gunzip(dst, CFG_VIDEO_LOGO_MAX_SIZE, (uchar *)addr, &len) != 0) {
+                       printf("There is no valid bmp file at the given address\n");
+                       return(1);
+               }
+               if (len == CFG_VIDEO_LOGO_MAX_SIZE) {
+                       printf("Image could be truncated (increase CFG_VIDEO_LOGO_MAX_SIZE)!\n");
+               }
+
+               /*
+                * Set addr to decompressed image
+                */
+               bmp = (bmp_image_t *)dst;
+
+               /*
+                * Check for bmp mark 'BM'
+                */
+               if (!((bmp->header.signature[0] == 'B') &&
+                     (bmp->header.signature[1] == 'M'))) {
+                       printf("There is no valid bmp file at the given address\n");
+                       free(dst);
+                       return(1);
+               }
+
+               printf("Gzipped BMP image detected!\n");
+#else /* CONFIG_VIDEO_BMP_GZIP */
                printf("There is no valid bmp file at the given address\n");
                return(1);
+#endif /* CONFIG_VIDEO_BMP_GZIP */
        }
        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));
+
+#ifdef CONFIG_VIDEO_BMP_GZIP
+       if (dst) {
+               free(dst);
+       }
+#endif /* CONFIG_VIDEO_BMP_GZIP */
+
        return(0);
 }
 
@@ -115,11 +174,18 @@ 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);
+#if defined(CONFIG_LCD)
+       extern int lcd_display_bitmap (ulong, int, int);
 
-       return (lcd_display_bitmap (addr));
+       return (lcd_display_bitmap (addr, x, y));
+#elif defined(CONFIG_VIDEO)
+       extern int video_display_bitmap (ulong, int, int);
+       return (video_display_bitmap (addr, x, y));
+#else
+# error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO
+#endif
 }
 
-#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) */
+#endif /* defined(CONFIG_CMD_BMP) */