stackprot: Make our test a bit more complex

[pandora-u-boot.git] / cmd / host.c

diff --git a/cmd/host.c b/cmd/host.c
index f7d3eae..6aa3d91 100644 (file)
--- a/cmd/host.c
+++ b/cmd/host.c
@@ -4,56 +4,76 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <dm.h>
 #include <fs.h>
 #include <part.h>
 #include <sandboxblockdev.h>
+#include <dm/device_compat.h>
 #include <linux/errno.h>
 
 static int host_curr_device = -1;
 
-static int do_host_load(cmd_tbl_t *cmdtp, int flag, int argc,
-                          char * const argv[])
+static int do_host_load(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
 {
        return do_load(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX);
 }
 
-static int do_host_ls(cmd_tbl_t *cmdtp, int flag, int argc,
-                          char * const argv[])
+static int do_host_ls(struct cmd_tbl *cmdtp, int flag, int argc,
+                     char *const argv[])
 {
        return do_ls(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX);
 }
 
-static int do_host_size(cmd_tbl_t *cmdtp, int flag, int argc,
-                          char * const argv[])
+static int do_host_size(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
 {
        return do_size(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX);
 }
 
-static int do_host_save(cmd_tbl_t *cmdtp, int flag, int argc,
-                          char * const argv[])
+static int do_host_save(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
 {
        return do_save(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX);
 }
 
-static int do_host_bind(cmd_tbl_t *cmdtp, int flag, int argc,
-                          char * const argv[])
+static int do_host_bind(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
 {
-       if (argc < 2 || argc > 3)
-               return CMD_RET_USAGE;
+       bool removable = false;
+       const char *dev_str;
+       char *file;
        char *ep;
-       char *dev_str = argv[1];
-       char *file = argc >= 3 ? argv[2] : NULL;
-       int dev = simple_strtoul(dev_str, &ep, 16);
+       int dev;
+
+       /* Skip 'bind' */
+       argc--;
+       argv++;
+       if (argc < 2)
+               return CMD_RET_USAGE;
+
+       if (!strcmp(argv[0], "-r")) {
+               removable = true;
+               argc--;
+               argv++;
+       }
+
+       if (argc > 2)
+               return CMD_RET_USAGE;
+       dev_str = argv[0];
+       dev = simple_strtoul(dev_str, &ep, 16);
        if (*ep) {
                printf("** Bad device specification %s **\n", dev_str);
                return CMD_RET_USAGE;
        }
-       return host_dev_bind(dev, file);
+       file = argc > 1 ? argv[1] : NULL;
+
+       return !!host_dev_bind(dev, file, removable);
 }
 
-static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc,
-                          char * const argv[])
+static int do_host_info(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
 {
        if (argc < 1 || argc > 2)
                return CMD_RET_USAGE;
@@ -89,7 +109,7 @@ static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc,
                struct host_block_dev *host_dev;
 
 #ifdef CONFIG_BLK
-               host_dev = dev_get_priv(blk_dev->bdev);
+               host_dev = dev_get_plat(blk_dev->bdev);
 #else
                host_dev = blk_dev->priv;
 #endif
@@ -99,8 +119,8 @@ static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc,
        return 0;
 }
 
-static int do_host_dev(cmd_tbl_t *cmdtp, int flag, int argc,
-                      char * const argv[])
+static int do_host_dev(struct cmd_tbl *cmdtp, int flag, int argc,
+                      char *const argv[])
 {
        int dev;
        char *ep;
@@ -139,20 +159,20 @@ static int do_host_dev(cmd_tbl_t *cmdtp, int flag, int argc,
        return 0;
 }
 
-static cmd_tbl_t cmd_host_sub[] = {
+static struct cmd_tbl cmd_host_sub[] = {
        U_BOOT_CMD_MKENT(load, 7, 0, do_host_load, "", ""),
        U_BOOT_CMD_MKENT(ls, 3, 0, do_host_ls, "", ""),
        U_BOOT_CMD_MKENT(save, 6, 0, do_host_save, "", ""),
        U_BOOT_CMD_MKENT(size, 3, 0, do_host_size, "", ""),
-       U_BOOT_CMD_MKENT(bind, 3, 0, do_host_bind, "", ""),
+       U_BOOT_CMD_MKENT(bind, 4, 0, do_host_bind, "", ""),
        U_BOOT_CMD_MKENT(info, 3, 0, do_host_info, "", ""),
        U_BOOT_CMD_MKENT(dev, 0, 1, do_host_dev, "", ""),
 };
 
-static int do_host(cmd_tbl_t *cmdtp, int flag, int argc,
-                     char * const argv[])
+static int do_host(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
-       cmd_tbl_t *c;
+       struct cmd_tbl *c;
 
        /* Skip past 'host' */
        argc--;
@@ -176,7 +196,8 @@ U_BOOT_CMD(
        "host save hostfs - <addr> <filename> <bytes> [<offset>] - "
                "save a file to host\n"
        "host size hostfs - <filename> - determine size of file on host\n"
-       "host bind <dev> [<filename>] - bind \"host\" device to file\n"
+       "host bind [-r] <dev> [<filename>] - bind \"host\" device to file\n"
+       "     -r = mark as removable\n"
        "host info [<dev>]            - show device binding & info\n"
        "host dev [<dev>] - Set or retrieve the current host device\n"
        "host commands use the \"hostfs\" device. The \"host\" device is used\n"