CRAMFS: support cramfs in RAM

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

diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c
index 6dd60709ee34086067092bff0c73ea6014447fad..74ab24ca9467b280d7ce6a1b20a52a1cba221f30 100644 (file)
--- a/common/cmd_bmp.c
+++ b/common/cmd_bmp.c
@@ -26,13 +26,70 @@
  */
 
 #include <common.h>
+#include <lcd.h>
 #include <bmp_layout.h>
 #include <command.h>
-
-#if (CONFIG_COMMANDS & CFG_CMD_BMP)
+#include <asm/byteorder.h>
+#include <malloc.h>
 
 static int bmp_info (ulong addr);
-static int bmp_display (ulong addr);
+static int bmp_display (ulong addr, int x, int y);
+
+/*
+ * Allocate and decompress a BMP image using gunzip().
+ *
+ * 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.
+ */
+#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;
+       }
+
+       puts("Gzipped BMP image detected!\n");
+
+       return bmp;
+}
+#else
+bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
+{
+       return NULL;
+}
+#endif
+
 
 /*
  * Subroutine:  do_bmp
@@ -47,6 +104,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,8 +113,13 @@ 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);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -66,18 +129,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);
+               cmd_usage(cmdtp);
                return 1;
        }
 }
 
 U_BOOT_CMD(
-       bmp,    3,      1,      do_bmp,
-       "bmp     - manipulate BMP image data\n",
-       "info <imageAddr>    - display image info\n"
-       "bmp display <imageAddr> - display image\n"
+       bmp,    5,      1,      do_bmp,
+       "manipulate BMP image data",
+       "info <imageAddr>          - display image info\n"
+       "bmp display <imageAddr> [x y] - display image at x,y"
 );
 
 /*
@@ -93,15 +156,25 @@ U_BOOT_CMD(
 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 +188,35 @@ 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)
+       extern int lcd_display_bitmap (ulong, int, int);
+
+       ret = lcd_display_bitmap ((unsigned long)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;
+}