#include "openocd.h"
#include <jtag/driver.h>
#include <jtag/jtag.h>
-#include <jtag/transport.h>
+#include <transport/transport.h>
#include <helper/ioutil.h>
#include <helper/util.h>
#include <helper/configuration.h>
#include <server/server.h>
#include <server/gdb_server.h>
-#include <server/httpd.h>
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
-
-#define OPENOCD_VERSION \
- "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
+#define OPENOCD_VERSION \
+ "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
/* Give scripts and TELNET a way to find out what version this is */
static int jim_version_command(Jim_Interp *interp, int argc,
- Jim_Obj * const *argv)
+ Jim_Obj * const *argv)
{
if (argc > 2)
- {
return JIM_ERR;
- }
const char *str = "";
- char * version_str;
+ char *version_str;
version_str = OPENOCD_VERSION;
-
+
if (argc == 2)
str = Jim_GetString(argv[1], NULL);
if (strcmp("git", str) == 0)
- {
version_str = GITVERSION;
- }
-
+
Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
return JIM_OK;
}
-static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv)
+static int log_target_callback_event_handler(struct target *target,
+ enum target_event event,
+ void *priv)
{
- switch (event)
- {
+ switch (event) {
case TARGET_EVENT_GDB_START:
target->display = 0;
break;
target->display = 1;
break;
case TARGET_EVENT_HALTED:
- if (target->display)
- {
+ if (target->display) {
/* do not display information when debugger caused the halt */
target_arch_state(target);
}
return ERROR_COMMAND_SYNTAX_ERROR;
int retval;
- static int initialized = 0;
+ static int initialized;
if (initialized)
return ERROR_OK;
if (ERROR_OK != retval)
return ERROR_FAIL;
- if ((retval = adapter_init(CMD_CTX)) != ERROR_OK)
- {
+ retval = adapter_init(CMD_CTX);
+ if (retval != ERROR_OK) {
/* we must be able to set up the debug adapter */
return retval;
}
return ERROR_OK;
}
-
-static int jim_stacktrace_command(Jim_Interp *interp, int argc,
- Jim_Obj * const *argv)
-{
- if (argc != 1)
- {
- return JIM_ERR;
- }
- Jim_Obj * stacktrace = Jim_DuplicateObj(interp, interp->stackTrace);
-
- /* insert actual error site at beginning of list*/
- Jim_Obj *procname = Jim_NewStringObj(interp, "", -1); /* Uhhh... don't know this one. */
- Jim_ListInsertElements(interp, stacktrace, 0, 1, &procname);
- Jim_Obj *filename = Jim_NewStringObj(interp, interp->errorFileName, -1);
- Jim_ListInsertElements(interp, stacktrace, 1, 1, &filename);
- Jim_Obj *line = Jim_NewIntObj(interp, interp->errorLine);
- Jim_ListInsertElements(interp, stacktrace, 2, 1, &line);
-
- Jim_SetResult(interp, stacktrace);
-
- return JIM_OK;
-}
-
static const struct command_registration openocd_command_handlers[] = {
{
.name = "version",
.handler = &handle_noinit_command,
.mode = COMMAND_CONFIG,
.help = "Prevent 'init' from being called at startup.",
+ .usage = ""
},
{
.name = "init",
"Changes command mode from CONFIG to EXEC. "
"Unless 'noinit' is called, this command is "
"called automatically at the end of startup.",
-
+ .usage = ""
},
{
.name = "add_script_search_dir",
.handler = &handle_add_script_search_dir_command,
.mode = COMMAND_ANY,
.help = "dir to search for config files and scripts",
-
- },
- {
- .name = "stacktrace",
- .jim_handler = jim_stacktrace_command,
- .mode = COMMAND_ANY,
- .help = "returns the stacktrace as a list of triples: proc, file, line."
- "The stack trace is reset when a new stack trace is being built after "
- "a new failure has occurred.",
+ .usage = "<directory>"
},
COMMAND_REGISTRATION_DONE
};
struct command_context *cmd_ctx = command_init(startup, interp);
/* register subsystem commands */
- typedef int (*command_registrant_t)(struct command_context *cmd_ctx);
+ typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value);
static const command_registrant_t command_registrants[] = {
&openocd_register_commands,
&server_register_commands,
&mflash_register_commands,
NULL
};
- for (unsigned i = 0; NULL != command_registrants[i]; i++)
- {
+ for (unsigned i = 0; NULL != command_registrants[i]; i++) {
int retval = (*command_registrants[i])(cmd_ctx);
- if (ERROR_OK != retval)
- {
+ if (ERROR_OK != retval) {
command_done(cmd_ctx);
return NULL;
}
LOG_DEBUG("command registration: complete");
LOG_OUTPUT(OPENOCD_VERSION "\n"
- "Licensed under GNU GPL v2\n");
+ "Licensed under GNU GPL v2\n");
global_cmd_ctx = cmd_ctx;
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[])
+/** OpenOCD runtime meat that can become single-thread in future. It parse
+ * commandline, reads configuration, sets up the target and starts server loop.
+ * Commandline arguments are passed into this function from openocd_main().
+ */
+static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ctx)
{
int ret;
- /* initialize commandline interface */
- struct command_context *cmd_ctx;
-
- cmd_ctx = setup_command_handler(NULL);
-
- if (util_init(cmd_ctx) != ERROR_OK)
- return EXIT_FAILURE;
-
- if (ioutil_init(cmd_ctx) != ERROR_OK)
- return EXIT_FAILURE;
-
- LOG_OUTPUT("For bug reports, read\n\t"
- "http://openocd.berlios.de/doc/doxygen/bugs.html"
- "\n");
-
- command_context_mode(cmd_ctx, COMMAND_CONFIG);
- command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
-
if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
return EXIT_FAILURE;
if (ret != ERROR_OK)
return EXIT_FAILURE;
- if (httpd_start(cmd_ctx) != ERROR_OK)
- return EXIT_FAILURE;
-
ret = server_init(cmd_ctx);
if (ERROR_OK != ret)
return EXIT_FAILURE;
- if (init_at_startup)
- {
+ if (init_at_startup) {
ret = command_run_line(cmd_ctx, "init");
if (ERROR_OK != ret)
- ret = EXIT_FAILURE;
+ return EXIT_FAILURE;
}
- /* handle network connections */
- if (ERROR_OK == ret)
- server_loop(cmd_ctx);
+ server_loop(cmd_ctx);
server_quit();
- httpd_stop();
+ return ret;
+}
+
+/* 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[])
+{
+ int ret;
+
+ /* initialize commandline interface */
+ struct command_context *cmd_ctx;
+
+ cmd_ctx = setup_command_handler(NULL);
+
+ if (util_init(cmd_ctx) != ERROR_OK)
+ return EXIT_FAILURE;
+
+ if (ioutil_init(cmd_ctx) != ERROR_OK)
+ return EXIT_FAILURE;
+
+ LOG_OUTPUT("For bug reports, read\n\t"
+ "http://openocd.sourceforge.net/doc/doxygen/bugs.html"
+ "\n");
+
+ command_context_mode(cmd_ctx, COMMAND_CONFIG);
+ command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
+
+ /* Start the executable meat that can evolve into thread in future. */
+ ret = openocd_thread(argc, argv, cmd_ctx);
unregister_all_commands(cmd_ctx, NULL);
projects / fw / openocd / blobdiff