#include "config.h"
#endif
+#include "openocd.h"
#include "jtag.h"
#include "configuration.h"
#include "xsvf.h"
#include "mflash.h"
#include "server.h"
-#include "telnet_server.h"
#include "gdb_server.h"
-#include "tcl_server.h"
+#include "httpd.h"
#ifdef HAVE_STRINGS_H
#include <strings.h>
if (CMD_ARGC != 0)
return ERROR_COMMAND_SYNTAX_ERROR;
- command_print(cmd_ctx, OPENOCD_VERSION);
+ command_print(CMD_CTX, OPENOCD_VERSION);
return ERROR_OK;
}
int ioutil_init(struct command_context *cmd_ctx);
+static bool init_at_startup = true;
+
+COMMAND_HANDLER(handle_noinit_command)
+{
+ if (CMD_ARGC != 0)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ init_at_startup = false;
+ return ERROR_OK;
+}
+
/* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
COMMAND_HANDLER(handle_init_command)
{
atexit(exit_handler);
- if (target_init(cmd_ctx) != ERROR_OK)
+ command_context_mode(CMD_CTX, COMMAND_EXEC);
+
+ if (target_init(CMD_CTX) != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("target init complete");
- if ((retval = jtag_interface_init(cmd_ctx)) != ERROR_OK)
+ if ((retval = jtag_interface_init(CMD_CTX)) != ERROR_OK)
{
/* we must be able to set up the jtag interface */
return retval;
/* Try to initialize & examine the JTAG chain at this point, but
* continue startup regardless */
- if (jtag_init(cmd_ctx) == ERROR_OK)
+ if (jtag_init(CMD_CTX) == ERROR_OK)
{
LOG_DEBUG("jtag init complete");
if (target_examine() == ERROR_OK)
}
}
- if (flash_init_drivers(cmd_ctx) != ERROR_OK)
+ if (flash_init_drivers(CMD_CTX) != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("flash init complete");
- if (mflash_init_drivers(cmd_ctx) != ERROR_OK)
+ if (mflash_init_drivers(CMD_CTX) != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("mflash init complete");
- if (nand_init(cmd_ctx) != ERROR_OK)
+ if (nand_init(CMD_CTX) != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("NAND init complete");
- if (pld_init(cmd_ctx) != ERROR_OK)
+ if (pld_init(CMD_CTX) != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("pld init complete");
- /* initialize tcp server */
- server_init();
-
/* initialize telnet subsystem */
- telnet_init("Open On-Chip Debugger");
- gdb_init();
- tcl_init(); /* allows tcl to just connect without going thru telnet */
+ gdb_target_add_all(all_targets);
- target_register_event_callback(log_target_callback_event_handler, cmd_ctx);
+ target_register_event_callback(log_target_callback_event_handler, CMD_CTX);
return ERROR_OK;
}
-struct command_context *global_cmd_ctx;
+static const struct command_registration openocd_command_handlers[] = {
+ {
+ .name = "version",
+ .handler = &handle_version_command,
+ .mode = COMMAND_ANY,
+ .help = "show program version",
+ },
+ {
+ .name = "noinit",
+ .handler = &handle_noinit_command,
+ .mode = COMMAND_CONFIG,
+ .help = "Prevent 'init' from being called at startup.",
+ },
+ {
+ .name = "init",
+ .handler = &handle_init_command,
+ .mode = COMMAND_CONFIG,
+ .help = "Initializes configured targets and servers. "
+ "Changes command mode from CONFIG to EXEC. "
+ "Unless 'noinit' is called, this command is "
+ "called automatically at the end of startup.",
+
+ },
+ COMMAND_REGISTRATION_DONE
+};
-/// src/hello.c gives a simple example for writing new command modules
-int hello_register_commands(struct command_context *cmd_ctx);
+struct command_context *global_cmd_ctx;
/* NB! this fn can be invoked outside this file for non PC hosted builds */
struct command_context *setup_command_handler(void)
{
- struct command_context *cmd_ctx;
+ log_init();
+ LOG_DEBUG("log_init: complete");
- global_cmd_ctx = cmd_ctx = command_init();
+ struct command_context *cmd_ctx;
- register_command(cmd_ctx, NULL, "version", handle_version_command,
- COMMAND_EXEC, "show OpenOCD version");
+ global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl);
+ register_commands(cmd_ctx, NULL, openocd_command_handlers);
/* register subsystem commands */
- hello_register_commands(cmd_ctx);
server_register_commands(cmd_ctx);
- telnet_register_commands(cmd_ctx);
gdb_register_commands(cmd_ctx);
- tcl_register_commands(cmd_ctx); /* tcl server commands */
log_register_commands(cmd_ctx);
jtag_register_commands(cmd_ctx);
xsvf_register_commands(cmd_ctx);
pld_register_commands(cmd_ctx);
mflash_register_commands(cmd_ctx);
- if (log_init(cmd_ctx) != ERROR_OK)
- {
- exit(-1);
- }
- LOG_DEBUG("log init complete");
+ LOG_DEBUG("command registration: complete");
LOG_OUTPUT(OPENOCD_VERSION "\n");
- register_command(cmd_ctx, NULL, "init", handle_init_command,
- COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
-
return cmd_ctx;
}
-int httpd_start(void);
-void httpd_stop(void);
-
-
#if !BUILD_HTTPD && !BUILD_ECOSBOARD
/* implementations of OpenOCD that uses multithreading needs to know when
* OpenOCD is sleeping. No-op in vanilla OpenOCD
return EXIT_FAILURE;
ret = parse_config_file(cmd_ctx);
- if ((ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION))
+ if (ret != ERROR_OK)
return EXIT_FAILURE;
#if BUILD_HTTPD
- if (httpd_start() != ERROR_OK)
+ if (httpd_start(cmd_ctx) != ERROR_OK)
return EXIT_FAILURE;
#endif
- if (ret != ERROR_COMMAND_CLOSE_CONNECTION)
+ ret = server_init(cmd_ctx);
+ if (ERROR_OK != ret)
+ return EXIT_FAILURE;
+
+ if (init_at_startup)
{
- command_context_mode(cmd_ctx, COMMAND_EXEC);
- if (command_run_line(cmd_ctx, "init") != ERROR_OK)
- return EXIT_FAILURE;
+ ret = command_run_line(cmd_ctx, "init");
+ if (ERROR_OK != ret)
+ ret = EXIT_FAILURE;
+ }
- /* handle network connections */
+ /* handle network connections */
+ if (ERROR_OK == ret)
server_loop(cmd_ctx);
- }
- /* shut server down */
server_quit();
#if BUILD_HTTPD
httpd_stop();
#endif
- unregister_all_commands(cmd_ctx);
+ unregister_all_commands(cmd_ctx, NULL);
/* free commandline interface */
command_done(cmd_ctx);
-
- return EXIT_SUCCESS;
+ return ret;
}
projects / fw / openocd / blobdiff