gaffe in previous commit fixed. "reset run" now works again for arm7/9

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 1094dcd633c1ee9e2cbb57e1ee02934c710c0ceb..c694b6a8afe3d6d5cbaf56b9b25f0896723bd8a3 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -66,21 +66,6 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **
        return ERROR_OK;
 }
 
-static int daemon_startup = 0;
-
-int handle_daemon_startup_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       if (argc==0)
-               return ERROR_OK;
-       if (argc > 1 )
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       
-       daemon_startup = strcmp("reset", args[0])==0;
-       
-       command_print(cmd_ctx, OPENOCD_VERSION);
-
-       return ERROR_OK;
-}
 
 void exit_handler(void)
 {
@@ -146,16 +131,16 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        return ERROR_OK;
 }
 
+command_context_t *global_cmd_ctx;
+
 command_context_t *setup_command_handler(void)
 {
        command_context_t *cmd_ctx;
        
-       cmd_ctx = command_init();
+       global_cmd_ctx = cmd_ctx = command_init();
        
        register_command(cmd_ctx, NULL, "version", handle_version_command,
                                         COMMAND_EXEC, "show OpenOCD version");
-       register_command(cmd_ctx, NULL, "daemon_startup", handle_daemon_startup_command, COMMAND_CONFIG, 
-                       "deprecated - use \"init\" and \"reset\" at end of startup script instead");
        
        /* register subsystem commands */
        server_register_commands(cmd_ctx);
@@ -219,9 +204,6 @@ int openocd_main(int argc, char *argv[])
        if (command_run_line(cmd_ctx, "init")!=ERROR_OK)
                return EXIT_FAILURE;
        
-       if (daemon_startup)
-               command_run_line(cmd_ctx, "reset");
-       
        /* handle network connections */
        server_loop(cmd_ctx);