Expose command table search for sub-commands

[karo-tx-uboot.git] / common / command.c

diff --git a/common/command.c b/common/command.c
index 861796d9a5a1bd89ba87009a71c445134c887434..fc9d79c7d15d6c14c12657d021e9d0ca6c2f3f17 100644 (file)
--- a/common/command.c
+++ b/common/command.c
@@ -341,10 +341,10 @@ cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = {
 /***************************************************************************
  * find command table entry for a command
  */
-cmd_tbl_t *find_cmd (const char *cmd)
+cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len)
 {
        cmd_tbl_t *cmdtp;
-       cmd_tbl_t *cmdtp_temp = &__u_boot_cmd_start;    /*Init value */
+       cmd_tbl_t *cmdtp_temp = table;  /*Init value */
        const char *p;
        int len;
        int n_found = 0;
@@ -355,8 +355,8 @@ cmd_tbl_t *find_cmd (const char *cmd)
         */
        len = ((p = strchr(cmd, '.')) == NULL) ? strlen (cmd) : (p - cmd);
 
-       for (cmdtp = &__u_boot_cmd_start;
-            cmdtp != &__u_boot_cmd_end;
+       for (cmdtp = table;
+            cmdtp != table + table_len;
             cmdtp++) {
                if (strncmp (cmd, cmdtp->name, len) == 0) {
                        if (len == strlen (cmdtp->name))
@@ -373,6 +373,12 @@ cmd_tbl_t *find_cmd (const char *cmd)
        return NULL;    /* not found or ambiguous command */
 }
 
+cmd_tbl_t *find_cmd (const char *cmd)
+{
+       int len = &__u_boot_cmd_end - &__u_boot_cmd_start;
+       return find_cmd_tbl(cmd, &__u_boot_cmd_start, len);
+}
+
 #ifdef CONFIG_AUTO_COMPLETE
 
 int var_complete(int argc, char *argv[], char last_char, int maxv, char *cmdv[])
@@ -654,3 +660,27 @@ int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp)
 }
 
 #endif
+
+#ifdef CMD_DATA_SIZE
+int cmd_get_data_size(char* arg, int default_size)
+{
+       /* Check for a size specification .b, .w or .l.
+        */
+       int len = strlen(arg);
+       if (len > 2 && arg[len-2] == '.') {
+               switch(arg[len-1]) {
+               case 'b':
+                       return 1;
+               case 'w':
+                       return 2;
+               case 'l':
+                       return 4;
+               case 's':
+                       return -2;
+               default:
+                       return -1;
+               }
+       }
+       return default_size;
+}
+#endif