projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
command: Remove the cmd_tbl_t typedef
[oweals/u-boot.git]
/
cmd
/
bmp.c
diff --git
a/cmd/bmp.c
b/cmd/bmp.c
index 02bdf48b4d422ced97dea7587f07d74c0aee6d6e..0ad23231cbedbebf278560cef83e86a93950b658 100644
(file)
--- a/
cmd/bmp.c
+++ b/
cmd/bmp.c
@@
-9,16
+9,17
@@
*/
#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 <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);
@@
-57,7
+58,7
@@
struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
bmp = dst;
/* align to 32-bit-aligned-address + 2 */
bmp = dst;
/* align to 32-bit-aligned-address + 2 */
- bmp = (struct bmp_image *)((((u
nsigned in
t)dst + 1) & ~3) + 2);
+ bmp = (struct bmp_image *)((((u
intptr_
t)dst + 1) & ~3) + 2);
if (gunzip(bmp, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE, map_sysmem(addr, 0),
&len) != 0) {
if (gunzip(bmp, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE, map_sysmem(addr, 0),
&len) != 0) {
@@
-90,13
+91,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
+110,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,16
+119,22
@@
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 4:
addr = simple_strtoul(argv[1], NULL, 16);
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);
+ if (!strcmp(argv[2], "m"))
+ x = BMP_ALIGN_CENTER;
+ else
+ x = simple_strtoul(argv[2], NULL, 10);
+ if (!strcmp(argv[3], "m"))
+ y = BMP_ALIGN_CENTER;
+ else
+ y = simple_strtoul(argv[3], NULL, 10);
break;
default:
return CMD_RET_USAGE;
break;
default:
return CMD_RET_USAGE;
@@
-134,7
+143,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, "", ""),
};
@@
-155,9
+164,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--;
@@
-249,9
+258,11
@@
int bmp_display(ulong addr, int x, int y)
if (!ret) {
bool align = false;
if (!ret) {
bool align = false;
-# ifdef CONFIG_SPLASH_SCREEN_ALIGN
- align = true;
-# endif /* CONFIG_SPLASH_SCREEN_ALIGN */
+ if (CONFIG_IS_ENABLED(SPLASH_SCREEN_ALIGN) ||
+ x == BMP_ALIGN_CENTER ||
+ y == BMP_ALIGN_CENTER)
+ align = true;
+
ret = video_bmp_display(dev, addr, x, y, align);
}
#elif defined(CONFIG_LCD)
ret = video_bmp_display(dev, addr, x, y, align);
}
#elif defined(CONFIG_LCD)