projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
cmd
/
bmp.c
diff --git
a/cmd/bmp.c
b/cmd/bmp.c
index 00f0256a30e257b7a50028642c9051e85b79de19..6040fa5d95d62f0dcb0f32a66eadb07328ad84f2 100644
(file)
--- a/
cmd/bmp.c
+++ b/
cmd/bmp.c
@@
-9,16
+9,18
@@
*/
#include <common.h>
*/
#include <common.h>
-#include <dm.h>
-#include <lcd.h>
-#include <mapmem.h>
#include <bmp_layout.h>
#include <command.h>
#include <bmp_layout.h>
#include <command.h>
-#include <asm/byteorder.h>
+#include <dm.h>
+#include <gzip.h>
+#include <image.h>
+#include <lcd.h>
+#include <log.h>
#include <malloc.h>
#include <mapmem.h>
#include <splash.h>
#include <video.h>
#include <malloc.h>
#include <mapmem.h>
#include <splash.h>
#include <video.h>
+#include <asm/byteorder.h>
static int bmp_info (ulong addr);
static int bmp_info (ulong addr);
@@
-90,13
+92,14
@@
struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
}
#endif
}
#endif
-static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
+static int do_bmp_info(struct cmd_tbl *cmdtp, int flag, int argc,
+ char *const argv[])
{
ulong addr;
switch (argc) {
{
ulong addr;
switch (argc) {
- case 1: /* use load_addr as default address */
- addr = load_addr;
+ case 1: /* use
image_
load_addr as default address */
+ addr =
image_
load_addr;
break;
case 2: /* use argument */
addr = simple_strtoul(argv[1], NULL, 16);
break;
case 2: /* use argument */
addr = simple_strtoul(argv[1], NULL, 16);
@@
-108,7
+111,8
@@
static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[
return (bmp_info(addr));
}
return (bmp_info(addr));
}
-static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
+static int do_bmp_display(struct cmd_tbl *cmdtp, int flag, int argc,
+ char *const argv[])
{
ulong addr;
int x = 0, y = 0;
{
ulong addr;
int x = 0, y = 0;
@@
-116,8
+120,8
@@
static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar
splash_get_pos(&x, &y);
switch (argc) {
splash_get_pos(&x, &y);
switch (argc) {
- case 1: /* use load_addr as default address */
- addr = load_addr;
+ case 1: /* use
image_
load_addr as default address */
+ addr =
image_
load_addr;
break;
case 2: /* use argument */
addr = simple_strtoul(argv[1], NULL, 16);
break;
case 2: /* use argument */
addr = simple_strtoul(argv[1], NULL, 16);
@@
-140,7
+144,7
@@
static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar
return (bmp_display(addr, x, y));
}
return (bmp_display(addr, x, y));
}
-static
cmd_tbl_t
cmd_bmp_sub[] = {
+static
struct cmd_tbl
cmd_bmp_sub[] = {
U_BOOT_CMD_MKENT(info, 3, 0, do_bmp_info, "", ""),
U_BOOT_CMD_MKENT(display, 5, 0, do_bmp_display, "", ""),
};
U_BOOT_CMD_MKENT(info, 3, 0, do_bmp_info, "", ""),
U_BOOT_CMD_MKENT(display, 5, 0, do_bmp_display, "", ""),
};
@@
-161,9
+165,9
@@
void bmp_reloc(void) {
* Return: None
*
*/
* Return: None
*
*/
-static int do_bmp(
cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
+static int do_bmp(
struct cmd_tbl *cmdtp, int flag, int argc, char *
const argv[])
{
{
-
cmd_tbl_t
*c;
+
struct cmd_tbl
*c;
/* Strip off leading 'bmp' command argument */
argc--;
/* Strip off leading 'bmp' command argument */
argc--;