global: Convert simple_strtoul() with hex to hextoul()

[platform/kernel/u-boot.git] / board / gdsys / common / osd_cmd.c

diff --git a/board/gdsys/common/osd_cmd.c b/board/gdsys/common/osd_cmd.c
index 53179b9..6a9c0b4 100644 (file)
--- a/board/gdsys/common/osd_cmd.c
+++ b/board/gdsys/common/osd_cmd.c
@@ -10,13 +10,14 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <dm.h>
 #include <hexdump.h>
 #include <video_osd.h>
 #include <malloc.h>
 
-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[])
 {
        struct udevice *dev;
        uint x, y;
@@ -29,10 +30,10 @@ static int do_osd_write(cmd_tbl_t *cmdtp, int flag, int argc,
        if (argc < 4 || (strlen(argv[3])) % 2)
                return CMD_RET_USAGE;
 
-       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;
 
@@ -68,8 +69,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[])
 {
        struct udevice *dev;
        uint x, y;
@@ -79,9 +80,9 @@ static int do_osd_print(cmd_tbl_t *cmdtp, int flag, int argc,
        if (argc < 5)
                return CMD_RET_USAGE;
 
-       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];
 
        for (uclass_first_device(UCLASS_VIDEO_OSD, &dev);
@@ -99,8 +100,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[])
 {
        struct udevice *dev;
        uint x, y;
@@ -108,8 +109,8 @@ static int do_osd_size(cmd_tbl_t *cmdtp, int flag, int argc,
        if (argc < 3)
                return CMD_RET_USAGE;
 
-       x = simple_strtoul(argv[1], NULL, 16);
-       y = simple_strtoul(argv[2], NULL, 16);
+       x = hextoul(argv[1], NULL);
+       y = hextoul(argv[2], NULL);
 
        for (uclass_first_device(UCLASS_VIDEO_OSD, &dev);
             dev;