]> git.ipfire.org Git - people/ms/u-boot.git/blame - common/cmd_bmp.c
cmd_usage(): simplify return code handling
[people/ms/u-boot.git] / common / cmd_bmp.c
CommitLineData
059ae173
WD
1/*
2 * (C) Copyright 2002
b37c7e5e 3 * Detlev Zundel, DENX Software Engineering, dzu@denx.de.
059ae173
WD
4 *
5 * See file CREDITS for list of people who contributed to this
6 * project.
7 *
8 * This program is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU General Public License as
10 * published by the Free Software Foundation; either version 2 of
11 * the License, or (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
21 * MA 02111-1307 USA
22 */
23
24/*
25 * BMP handling routines
26 */
27
28#include <common.h>
6111722a 29#include <lcd.h>
059ae173
WD
30#include <bmp_layout.h>
31#include <command.h>
8655b6f8 32#include <asm/byteorder.h>
c29ab9d7 33#include <malloc.h>
059ae173 34
059ae173 35static int bmp_info (ulong addr);
4b248f3f 36static int bmp_display (ulong addr, int x, int y);
059ae173 37
43ef1c38
HCE
38/*
39 * Allocate and decompress a BMP image using gunzip().
40 *
41 * Returns a pointer to the decompressed image data. Must be freed by
42 * the caller after use.
43 *
44 * Returns NULL if decompression failed, or if the decompressed data
45 * didn't contain a valid BMP signature.
46 */
47#ifdef CONFIG_VIDEO_BMP_GZIP
c01171ea 48bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
43ef1c38
HCE
49{
50 void *dst;
51 unsigned long len;
52 bmp_image_t *bmp;
53
54 /*
55 * Decompress bmp image
56 */
6d0f6bcf
JCPV
57 len = CONFIG_SYS_VIDEO_LOGO_MAX_SIZE;
58 dst = malloc(CONFIG_SYS_VIDEO_LOGO_MAX_SIZE);
43ef1c38
HCE
59 if (dst == NULL) {
60 puts("Error: malloc in gunzip failed!\n");
61 return NULL;
62 }
6d0f6bcf 63 if (gunzip(dst, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE, (uchar *)addr, &len) != 0) {
43ef1c38
HCE
64 free(dst);
65 return NULL;
66 }
6d0f6bcf 67 if (len == CONFIG_SYS_VIDEO_LOGO_MAX_SIZE)
43ef1c38 68 puts("Image could be truncated"
6d0f6bcf 69 " (increase CONFIG_SYS_VIDEO_LOGO_MAX_SIZE)!\n");
43ef1c38
HCE
70
71 bmp = dst;
72
73 /*
74 * Check for bmp mark 'BM'
75 */
76 if (!((bmp->header.signature[0] == 'B') &&
77 (bmp->header.signature[1] == 'M'))) {
78 free(dst);
79 return NULL;
80 }
81
82 puts("Gzipped BMP image detected!\n");
83
84 return bmp;
85}
86#else
c01171ea 87bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
43ef1c38
HCE
88{
89 return NULL;
90}
91#endif
92
54841ab5 93static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
9acd4f0e
FM
94{
95 ulong addr;
43ef1c38 96
9acd4f0e
FM
97 switch (argc) {
98 case 1: /* use load_addr as default address */
99 addr = load_addr;
100 break;
101 case 2: /* use argument */
102 addr = simple_strtoul(argv[1], NULL, 16);
103 break;
104 default:
47e26b1b 105 return cmd_usage(cmdtp);
9acd4f0e
FM
106 }
107
108 return (bmp_info(addr));
109}
110
54841ab5 111static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
059ae173
WD
112{
113 ulong addr;
4b248f3f 114 int x = 0, y = 0;
059ae173
WD
115
116 switch (argc) {
9acd4f0e 117 case 1: /* use load_addr as default address */
059ae173
WD
118 addr = load_addr;
119 break;
9acd4f0e
FM
120 case 2: /* use argument */
121 addr = simple_strtoul(argv[1], NULL, 16);
059ae173 122 break;
9acd4f0e
FM
123 case 4:
124 addr = simple_strtoul(argv[1], NULL, 16);
125 x = simple_strtoul(argv[2], NULL, 10);
126 y = simple_strtoul(argv[3], NULL, 10);
4b248f3f 127 break;
059ae173 128 default:
47e26b1b 129 return cmd_usage(cmdtp);
059ae173
WD
130 }
131
9acd4f0e
FM
132 return (bmp_display(addr, x, y));
133}
134
135static cmd_tbl_t cmd_bmp_sub[] = {
136 U_BOOT_CMD_MKENT(info, 3, 0, do_bmp_info, "", ""),
137 U_BOOT_CMD_MKENT(display, 5, 0, do_bmp_display, "", ""),
138};
139
140/*
141 * Subroutine: do_bmp
142 *
143 * Description: Handler for 'bmp' command..
144 *
145 * Inputs: argv[1] contains the subcommand
146 *
147 * Return: None
148 *
149 */
54841ab5 150static int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
9acd4f0e
FM
151{
152 cmd_tbl_t *c;
153
154 /* Strip off leading 'bmp' command argument */
155 argc--;
156 argv++;
157
158 c = find_cmd_tbl(argv[0], &cmd_bmp_sub[0], ARRAY_SIZE(cmd_bmp_sub));
159
47e26b1b 160 if (c)
9acd4f0e 161 return c->cmd(cmdtp, flag, argc, argv);
47e26b1b
WD
162 else
163 return cmd_usage(cmdtp);
059ae173
WD
164}
165
0d498393 166U_BOOT_CMD(
4b248f3f 167 bmp, 5, 1, do_bmp,
2fb2604d 168 "manipulate BMP image data",
4b248f3f 169 "info <imageAddr> - display image info\n"
a89c33db 170 "bmp display <imageAddr> [x y] - display image at x,y"
b0fce99b
WD
171);
172
059ae173
WD
173/*
174 * Subroutine: bmp_info
175 *
176 * Description: Show information about bmp file in memory
177 *
178 * Inputs: addr address of the bmp file
179 *
180 * Return: None
181 *
182 */
183static int bmp_info(ulong addr)
184{
185 bmp_image_t *bmp=(bmp_image_t *)addr;
43ef1c38 186 unsigned long len;
c29ab9d7 187
059ae173 188 if (!((bmp->header.signature[0]=='B') &&
43ef1c38
HCE
189 (bmp->header.signature[1]=='M')))
190 bmp = gunzip_bmp(addr, &len);
c29ab9d7 191
43ef1c38 192 if (bmp == NULL) {
059ae173 193 printf("There is no valid bmp file at the given address\n");
43ef1c38 194 return 1;
059ae173 195 }
43ef1c38 196
059ae173
WD
197 printf("Image size : %d x %d\n", le32_to_cpu(bmp->header.width),
198 le32_to_cpu(bmp->header.height));
199 printf("Bits per pixel: %d\n", le16_to_cpu(bmp->header.bit_count));
200 printf("Compression : %d\n", le32_to_cpu(bmp->header.compression));
c29ab9d7 201
43ef1c38
HCE
202 if ((unsigned long)bmp != addr)
203 free(bmp);
c29ab9d7 204
059ae173
WD
205 return(0);
206}
207
208/*
209 * Subroutine: bmp_display
210 *
211 * Description: Display bmp file located in memory
212 *
213 * Inputs: addr address of the bmp file
214 *
215 * Return: None
216 *
217 */
4b248f3f 218static int bmp_display(ulong addr, int x, int y)
059ae173 219{
43ef1c38
HCE
220 int ret;
221 bmp_image_t *bmp = (bmp_image_t *)addr;
222 unsigned long len;
223
224 if (!((bmp->header.signature[0]=='B') &&
225 (bmp->header.signature[1]=='M')))
226 bmp = gunzip_bmp(addr, &len);
227
228 if (!bmp) {
229 printf("There is no valid bmp file at the given address\n");
230 return 1;
231 }
232
281e00a3
WD
233#if defined(CONFIG_LCD)
234 extern int lcd_display_bitmap (ulong, int, int);
059ae173 235
43ef1c38 236 ret = lcd_display_bitmap ((unsigned long)bmp, x, y);
281e00a3 237#elif defined(CONFIG_VIDEO)
4b248f3f 238 extern int video_display_bitmap (ulong, int, int);
43ef1c38
HCE
239
240 ret = video_display_bitmap ((unsigned long)bmp, x, y);
281e00a3
WD
241#else
242# error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO
4b248f3f 243#endif
43ef1c38
HCE
244
245 if ((unsigned long)bmp != addr)
246 free(bmp);
247
248 return ret;
059ae173 249}