From 2cac9c333fae5a5c944e2cd05544d17ba3db1251 Mon Sep 17 00:00:00 2001 From: oharboe Date: Sat, 19 Jul 2008 08:04:32 +0000 Subject: daemon_startup is now retired in favour of adding "init" and "reset halt/init/run" to the end of the config file/openocd command line. git-svn-id: svn://svn.berlios.de/openocd/trunk@835 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/openocd.c | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/openocd.c') diff --git a/src/openocd.c b/src/openocd.c index 1094dcd6..6babbb84 100644 --- 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) { @@ -154,8 +139,6 @@ command_context_t *setup_command_handler(void) 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 +202,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); -- cgit v1.2.3