#include "types.h"
#include "jtag.h"
#include "configuration.h"
-#include "interpreter.h"
#include "xsvf.h"
#include "target.h"
#include "flash.h"
#include "server.h"
#include "telnet_server.h"
#include "gdb_server.h"
+#include "tcl_server.h"
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
#include <errno.h>
-/* Give TELNET a way to find out what version this is */
-int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
- command_print(cmd_ctx, OPENOCD_VERSION);
+#ifdef _WIN32
+#include <malloc.h>
+#else
+#include <alloca.h>
+#endif
- return ERROR_OK;
-}
+#include "replacements.h"
-static int daemon_startup = 0;
-int handle_daemon_startup_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+/* Give TELNET a way to find out what version this is */
+int handle_version_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;
jtag->quit();
}
-
/* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
initialized=1;
- command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
-
atexit(exit_handler);
-
if (target_init(cmd_ctx) != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("jtag interface init complete");
/* Try to initialize & examine the JTAG chain at this point, but
- * continue startup regardless
- */
+ * continue startup regardless */
if (jtag_init(cmd_ctx) == ERROR_OK)
{
LOG_DEBUG("jtag init complete");
LOG_DEBUG("jtag examine complete");
}
}
-
if (flash_init_drivers(cmd_ctx) != ERROR_OK)
return ERROR_FAIL;
/* initialize telnet subsystem */
telnet_init("Open On-Chip Debugger");
gdb_init();
+ tcl_init(); /* allows tcl to just connect without going thru telnet */
return ERROR_OK;
}
-
-/* implementations of OpenOCD that uses multithreading needs to lock OpenOCD while calling
- * OpenOCD fn's. No-op in vanilla OpenOCD
- */
-void lockBigLock()
+command_context_t *setup_command_handler(void)
{
-}
-void unlockBigLock()
-{
-}
-
-/* Hook to add scripting language */
-int jim_command(command_context_t *context, char *line)
-{
- LOG_ERROR("Syntax error");
- return ERROR_COMMAND_SYNTAX_ERROR;
-}
-
-int main(int argc, char *argv[])
-{
- /* initialize commandline interface */
- command_context_t *cmd_ctx, *cfg_cmd_ctx;
+ command_context_t *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);
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);
- interpreter_register_commands(cmd_ctx);
xsvf_register_commands(cmd_ctx);
target_register_commands(cmd_ctx);
flash_register_commands(cmd_ctx);
pld_register_commands(cmd_ctx);
if (log_init(cmd_ctx) != ERROR_OK)
- return EXIT_FAILURE;
+ {
+ exit(-1);
+ }
LOG_DEBUG("log init 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;
+}
+
+/* normally this is the main() function entry, but if OpenOCD is linked
+ * into application, then this fn will not be invoked, but rather that
+ * application will have it's own implementation of main(). */
+int openocd_main(int argc, char *argv[])
+{
+ /* initialize commandline interface */
+ command_context_t *cmd_ctx;
+
+ cmd_ctx = setup_command_handler();
+
/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
- register_command(cmd_ctx, NULL, "init", handle_init_command,
- COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
-
- cfg_cmd_ctx = copy_command_context(cmd_ctx);
- cfg_cmd_ctx->mode = COMMAND_CONFIG;
- command_set_output_handler(cfg_cmd_ctx, configuration_output_handler, NULL);
-
- if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK)
- return EXIT_FAILURE;
+ command_context_mode(cmd_ctx, COMMAND_CONFIG);
+ command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
- if (parse_config_file(cfg_cmd_ctx) != ERROR_OK)
+ if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
return EXIT_FAILURE;
- command_done(cfg_cmd_ctx);
+ if (parse_config_file(cmd_ctx) != ERROR_OK)
+ return EXIT_FAILURE;
+ command_context_mode(cmd_ctx, COMMAND_EXEC);
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);
return EXIT_SUCCESS;
}
-
Code Review / openocd.git / blobdiff