print out an error if srst_pulls_trst is not specified for

[openocd] / src / helper / command.c

diff --git a/src/helper/command.c b/src/helper/command.c
index 8d5a77ea297a17b9e1e4e9ca533683be9b196c23..0a120b102a4be492a918597dcc07b8d82084eba4 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -38,10 +38,13 @@
 #include <stdio.h>
 #include <unistd.h>
 
+int fast_and_dangerous = 0;
+
 void command_print_help_line(command_context_t* context, struct command_s *command, int indent);
 
 int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
 int build_unique_lengths(command_context_t *context, command_t *commands)
 {
@@ -140,12 +143,51 @@ command_t* register_command(command_context_t *context, command_t *parent, char
        return c;
 }
 
-int unregister_command(command_context_t *context, char *name)
+int unregister_all_commands(command_context_t *context)
 {
+       command_t *c, *c2;
+       
        unique_length_dirty = 1;
        
+       if (context == NULL)
+               return ERROR_OK;
+       
+       
+       while(NULL != context->commands)
+       {
+               c = context->commands;
+               
+               while(NULL != c->children)
+               {
+                       c2 = c->children;
+                       c->children = c->children->next;
+                       free(c2->name);
+                       c2->name = NULL;
+                       free(c2->help);
+                       c2->help = NULL;
+                       free(c2);
+                       c2 = NULL;
+               }
+               
+               context->commands = context->commands->next;
+               
+               free(c->name);
+               c->name = NULL;
+               free(c->help);
+               c->help = NULL;
+               free(c);
+               c = NULL;               
+       }
+       
+       return ERROR_OK;
+}
+
+int unregister_command(command_context_t *context, char *name)
+{
        command_t *c, *p = NULL, *c2;
        
+       unique_length_dirty = 1;
+       
        if ((!context) || (!name))
                return ERROR_INVALID_ARGUMENTS;
        
@@ -298,6 +340,7 @@ void command_print(command_context_t *context, char *format, ...)
 int find_and_run_command(command_context_t *context, command_t *commands, char *words[], int num_words, int start_word)
 {
        command_t *c;
+       int retval = ERROR_COMMAND_SYNTAX_ERROR;
        
        if (unique_length_dirty)
        {
@@ -321,6 +364,7 @@ int find_and_run_command(command_context_t *context, command_t *commands, char *
                                if (!c->handler)
                                {
                                        command_print(context, "No handler for command");
+                                       retval = ERROR_COMMAND_SYNTAX_ERROR;
                                        break;
                                }
                                else
@@ -330,6 +374,12 @@ int find_and_run_command(command_context_t *context, command_t *commands, char *
                                        {
                                                command_print(context, "Syntax error:");
                                                command_print_help_line(context, c, 0);
+                                       } else if (retval != ERROR_OK)
+                                       {
+                                               /* we do not print out an error message because the command *should*
+                                                * have printed out an error
+                                                */
+                                               LOG_DEBUG("Command failed with error code %d", retval); 
                                        }
                                        return retval; 
                                }
@@ -347,7 +397,7 @@ int find_and_run_command(command_context_t *context, command_t *commands, char *
        }
        
        command_print(context, "Command %s not found", words[start_word]);
-       return ERROR_OK;
+       return retval;
 }
 
 int command_run_line(command_context_t *context, char *line)
@@ -372,7 +422,7 @@ int command_run_line(command_context_t *context, char *line)
        if (*line && (line[0] == '#'))
                return ERROR_OK;
        
-       DEBUG("%s", line);
+       LOG_DEBUG("%s", line);
 
        nwords = parse_line(line, words, sizeof(words) / sizeof(words[0]));
        
@@ -444,7 +494,8 @@ int command_run_file(command_context_t *context, FILE *file, enum command_mode m
 void command_print_help_line(command_context_t* context, struct command_s *command, int indent)
 {
        command_t *c;
-       char indent_text[indent + 2];
+       char *indent_text=malloc(indent + 2);
+       
        char *help = "no help available";
        char name_buf[64];
        
@@ -472,6 +523,7 @@ void command_print_help_line(command_context_t* context, struct command_s *comma
                        command_print_help_line(context, c, indent + 1);
                }
        }
+       free(indent_text);
 }
 
 int command_print_help_match(command_context_t* context, command_t* c_first, char* name, char** args, int argc)
@@ -549,6 +601,9 @@ command_context_t* command_init()
        register_command(context, NULL, "time", handle_time_command,
                                         COMMAND_ANY, "time <cmd + args> - execute <cmd + args> and print time it took");
        
+       register_command(context, NULL, "fast", handle_fast_command,
+                                        COMMAND_ANY, "fast <enable/disable> - place at beginning of config files. Sets defaults to fast and dangerous.");
+       
        return context;
 }
 
@@ -568,14 +623,26 @@ int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **ar
        return ERROR_OK;
 }
 
-int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       if (argc<1)
+       if (argc!=1)
                return ERROR_COMMAND_SYNTAX_ERROR;
        
+       fast_and_dangerous = strcmp("enable", args[0])==0;
+       
+       return ERROR_OK;
+}
+
+
+int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
        duration_t duration;
        char *duration_text;
        int retval;
+       float t;
+       
+       if (argc<1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
        
        duration_start_measure(&duration);
        
@@ -583,7 +650,7 @@ int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        
        duration_stop_measure(&duration, &duration_text);
        
-       float t=duration.duration.tv_sec;
+       t=duration.duration.tv_sec;
        t+=((float)duration.duration.tv_usec / 1000000.0);
        command_print(cmd_ctx, "%s took %fs", args[0], t);