Merge branch 'master' of /home/wd/git/u-boot/master

[people/ms/u-boot.git] / common / cmd_bmp.c

diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c
index 2437e2278017664bc05da3c3b1f3c6ffb5e2da1b..d51cc554c19fec927c61619d9bbf5b2776eb4724 100644 (file)
--- a/common/cmd_bmp.c
+++ b/common/cmd_bmp.c
@@ -26,6 +26,7 @@
  */
 
 #include <common.h>
+#include <lcd.h>
 #include <bmp_layout.h>
 #include <command.h>
 #include <asm/byteorder.h>
@@ -34,8 +35,6 @@
 static int bmp_info (ulong addr);
 static int bmp_display (ulong addr, int x, int y);
 
-int gunzip(void *, int, unsigned char *, unsigned long *);
-
 /*
  * Allocate and decompress a BMP image using gunzip().
  *
@@ -46,7 +45,7 @@ int gunzip(void *, int, unsigned char *, unsigned long *);
  * didn't contain a valid BMP signature.
  */
 #ifdef CONFIG_VIDEO_BMP_GZIP
-static bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
+bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
 {
        void *dst;
        unsigned long len;
@@ -55,19 +54,19 @@ static bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
        /*
         * Decompress bmp image
         */
-       len = CFG_VIDEO_LOGO_MAX_SIZE;
-       dst = malloc(CFG_VIDEO_LOGO_MAX_SIZE);
+       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, CFG_VIDEO_LOGO_MAX_SIZE, (uchar *)addr, &len) != 0) {
+       if (gunzip(dst, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE, (uchar *)addr, &len) != 0) {
                free(dst);
                return NULL;
        }
-       if (len == CFG_VIDEO_LOGO_MAX_SIZE)
+       if (len == CONFIG_SYS_VIDEO_LOGO_MAX_SIZE)
                puts("Image could be truncated"
-                               " (increase CFG_VIDEO_LOGO_MAX_SIZE)!\n");
+                               " (increase CONFIG_SYS_VIDEO_LOGO_MAX_SIZE)!\n");
 
        bmp = dst;
 
@@ -85,12 +84,58 @@ static bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
        return bmp;
 }
 #else
-static bmp_image_t *gunzip_bmp(unsigned long addr)
+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 1:         /* use load_addr as default address */
+               addr = load_addr;
+               break;
+       case 2:         /* use argument */
+               addr = simple_strtoul(argv[1], NULL, 16);
+               break;
+       default:
+               return cmd_usage(cmdtp);
+       }
+
+       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));
+}
+
+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, "", ""),
+};
 
 /*
  * Subroutine:  do_bmp
@@ -102,46 +147,27 @@ static bmp_image_t *gunzip_bmp(unsigned long addr)
  * Return:      None
  *
  */
-int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       ulong addr;
-       int x = 0, y = 0;
+       cmd_tbl_t *c;
 
-       switch (argc) {
-       case 2:         /* use load_addr as default address */
-               addr = load_addr;
-               break;
-       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;
-       }
+       /* Strip off leading 'bmp' command argument */
+       argc--;
+       argv++;
 
-       /* 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, x, y));
-       } else {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       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,
-       "bmp     - manipulate BMP image data\n",
+       "manipulate BMP image data",
        "info <imageAddr>          - display image info\n"
-       "bmp display <imageAddr> [x y] - display image at x,y\n"
+       "bmp display <imageAddr> [x y] - display image at x,y"
 );
 
 /*