Subtree merge tag 'v6.12-dts' of dts repo [1] into dts/upstream

[J-u-boot.git] / cmd / osd.c

diff --git a/cmd/osd.c b/cmd/osd.c
index 0b1fa499368a30b6a130ba38f8bd6ee9a9a6c77d..5671338d9e7bc27173c9852a7b387de1d4dbd881 100644 (file)
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -9,7 +9,7 @@
  * Dirk Eibach,  Guntermann & Drunck GmbH, [email protected]
  */
 
-#include <common.h>
+#include <command.h>
 #include <dm.h>
 #include <hexdump.h>
 #include <video_osd.h>
@@ -74,14 +74,14 @@ static int osd_get_osd_cur(struct udevice **osdp)
  */
 static void show_osd(struct udevice *osd)
 {
-       printf("OSD %d:\t%s", osd->req_seq, osd->name);
+       printf("OSD %d:\t%s", dev_seq(osd), osd->name);
        if (device_active(osd))
-               printf("  (active %d)", osd->seq);
+               printf("  (active)");
        printf("\n");
 }
 
-static int do_osd_write(cmd_tbl_t *cmdtp, int flag, int argc,
-                       char * const argv[])
+static int do_osd_write(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
 {
        uint x, y;
        uint count;
@@ -98,10 +98,10 @@ static int do_osd_write(cmd_tbl_t *cmdtp, int flag, int argc,
                return CMD_RET_FAILURE;
        }
 
-       x = simple_strtoul(argv[1], NULL, 16);
-       y = simple_strtoul(argv[2], NULL, 16);
+       x = hextoul(argv[1], NULL);
+       y = hextoul(argv[2], NULL);
        hexstr = argv[3];
-       count = (argc > 4) ? simple_strtoul(argv[4], NULL, 16) : 1;
+       count = (argc > 4) ? hextoul(argv[4], NULL) : 1;
 
        buflen = strlen(hexstr) / 2;
 
@@ -131,8 +131,8 @@ static int do_osd_write(cmd_tbl_t *cmdtp, int flag, int argc,
        return CMD_RET_SUCCESS;
 }
 
-static int do_osd_print(cmd_tbl_t *cmdtp, int flag, int argc,
-                       char * const argv[])
+static int do_osd_print(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
 {
        uint x, y;
        u8 color;
@@ -147,9 +147,9 @@ static int do_osd_print(cmd_tbl_t *cmdtp, int flag, int argc,
                return CMD_RET_FAILURE;
        }
 
-       x = simple_strtoul(argv[1], NULL, 16);
-       y = simple_strtoul(argv[2], NULL, 16);
-       color = simple_strtoul(argv[3], NULL, 16);
+       x = hextoul(argv[1], NULL);
+       y = hextoul(argv[2], NULL);
+       color = hextoul(argv[3], NULL);
        text = argv[4];
 
        res = video_osd_print(osd_cur, x, y, color, text);
@@ -161,8 +161,8 @@ static int do_osd_print(cmd_tbl_t *cmdtp, int flag, int argc,
        return CMD_RET_SUCCESS;
 }
 
-static int do_osd_size(cmd_tbl_t *cmdtp, int flag, int argc,
-                      char * const argv[])
+static int do_osd_size(struct cmd_tbl *cmdtp, int flag, int argc,
+                      char *const argv[])
 {
        uint x, y;
        int res;
@@ -175,8 +175,8 @@ static int do_osd_size(cmd_tbl_t *cmdtp, int flag, int argc,
                return CMD_RET_FAILURE;
        }
 
-       x = simple_strtoul(argv[1], NULL, 16);
-       y = simple_strtoul(argv[2], NULL, 16);
+       x = hextoul(argv[1], NULL);
+       y = hextoul(argv[2], NULL);
 
        res = video_osd_set_size(osd_cur, x, y);
        if (res) {
@@ -187,8 +187,8 @@ static int do_osd_size(cmd_tbl_t *cmdtp, int flag, int argc,
        return CMD_RET_SUCCESS;
 }
 
-static int do_show_osd(cmd_tbl_t *cmdtp, int flag, int argc,
-                      char * const argv[])
+static int do_show_osd(struct cmd_tbl *cmdtp, int flag, int argc,
+                      char *const argv[])
 {
        struct udevice *osd;
 
@@ -210,7 +210,7 @@ static int do_show_osd(cmd_tbl_t *cmdtp, int flag, int argc,
                int i, res;
 
                /* show specific OSD */
-               i = simple_strtoul(argv[1], NULL, 10);
+               i = dectoul(argv[1], NULL);
 
                res = uclass_get_device_by_seq(UCLASS_VIDEO_OSD, i, &osd);
                if (res) {
@@ -223,8 +223,8 @@ static int do_show_osd(cmd_tbl_t *cmdtp, int flag, int argc,
        return CMD_RET_SUCCESS;
 }
 
-static int do_osd_num(cmd_tbl_t *cmdtp, int flag, int argc,
-                     char * const argv[])
+static int do_osd_num(struct cmd_tbl *cmdtp, int flag, int argc,
+                     char *const argv[])
 {
        int osd_no;
        int res = 0;
@@ -234,12 +234,12 @@ static int do_osd_num(cmd_tbl_t *cmdtp, int flag, int argc,
                struct udevice *osd;
 
                if (!osd_get_osd_cur(&osd))
-                       osd_no = osd->seq;
+                       osd_no = dev_seq(osd);
                else
                        osd_no = -1;
                printf("Current osd is %d\n", osd_no);
        } else {
-               osd_no = simple_strtoul(argv[1], NULL, 10);
+               osd_no = dectoul(argv[1], NULL);
                printf("Setting osd to %d\n", osd_no);
 
                res = cmd_osd_set_osd_num(osd_no);
@@ -250,7 +250,7 @@ static int do_osd_num(cmd_tbl_t *cmdtp, int flag, int argc,
        return res ? CMD_RET_FAILURE : CMD_RET_SUCCESS;
 }
 
-static cmd_tbl_t cmd_osd_sub[] = {
+static struct cmd_tbl cmd_osd_sub[] = {
        U_BOOT_CMD_MKENT(show, 1, 1, do_show_osd, "", ""),
        U_BOOT_CMD_MKENT(dev, 1, 1, do_osd_num, "", ""),
        U_BOOT_CMD_MKENT(write, 4, 1, do_osd_write, "", ""),
@@ -258,9 +258,9 @@ static cmd_tbl_t cmd_osd_sub[] = {
        U_BOOT_CMD_MKENT(size, 2, 1, do_osd_size, "", ""),
 };
 
-static int do_osd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_osd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
-       cmd_tbl_t *c;
+       struct cmd_tbl *c;
 
        if (argc < 2)
                return CMD_RET_USAGE;
@@ -277,12 +277,12 @@ static int do_osd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return CMD_RET_USAGE;
 }
 
-static char osd_help_text[] =
+U_BOOT_LONGHELP(osd,
        "show  - show OSD info\n"
        "osd dev [dev] - show or set current OSD\n"
        "write [pos_x] [pos_y] [buffer] [count] - write 8-bit hex encoded buffer to osd memory at a given position\n"
        "print [pos_x] [pos_y] [color] [text] - write ASCII buffer (given by text data and driver-specific color information) to osd memory\n"
-       "size [size_x] [size_y] - set OSD XY size in characters\n";
+       "size [size_x] [size_y] - set OSD XY size in characters\n");
 
 U_BOOT_CMD(
        osd, 6, 1, do_osd,