* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
+ * Copyright (C) 2007,2008 Øyvind Harboe *
+ * oyvind.harboe@zylin.com *
+ * *
+ * Copyright (C) 2008 Richard Missenden *
+ * richard.missenden@googlemail.com *
+ * *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
#include "types.h"
#include "jtag.h"
#include "configuration.h"
-#include "interpreter.h"
#include "xsvf.h"
#include "target.h"
#include "flash.h"
#include "nand.h"
#include "pld.h"
+#include "mflash.h"
#include "command.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"
+
+void print_version(void)
+{
+ /* 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 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 */
+ LOG_OUTPUT( "$URL$\n");
+ /* 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 */
+ /* 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 */
+ /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
}
-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;
}
-
void exit_handler(void)
{
/* close JTAG interface */
jtag->quit();
}
+static int log_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
+{
+ switch (event)
+ {
+ case TARGET_EVENT_GDB_START:
+ target->display=0;
+ break;
+ case TARGET_EVENT_GDB_END:
+ target->display=1;
+ break;
+ case TARGET_EVENT_HALTED:
+ if (target->display)
+ {
+ /* do not display information when debugger caused the halt */
+ target_arch_state(target);
+ }
+ break;
+ default:
+ break;
+ }
+
+ return ERROR_OK;
+}
/* 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)
static int initialized=0;
if (initialized)
return ERROR_OK;
-
+
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("target init complete");
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");
- if (target_examine(cmd_ctx) == ERROR_OK)
+ if (target_examine() == ERROR_OK)
{
LOG_DEBUG("jtag examine complete");
}
}
-
if (flash_init_drivers(cmd_ctx) != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("flash init complete");
+ if (mflash_init_drivers(cmd_ctx) != ERROR_OK)
+ return ERROR_FAIL;
+ LOG_DEBUG("mflash init complete");
+
if (nand_init(cmd_ctx) != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("NAND init complete");
/* initialize telnet subsystem */
telnet_init("Open On-Chip Debugger");
gdb_init();
+ tcl_init(); /* allows tcl to just connect without going thru telnet */
+
+ target_register_event_callback(log_target_callback_event_handler, cmd_ctx);
return ERROR_OK;
}
+command_context_t *global_cmd_ctx;
-/* implementations of OpenOCD that uses multithreading needs to lock OpenOCD while calling
- * OpenOCD fn's. No-op in vanilla OpenOCD
- */
-void lockBigLock()
-{
-}
-void unlockBigLock()
+command_context_t *setup_command_handler(void)
{
-}
+ command_context_t *cmd_ctx;
-/* 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;
- 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);
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);
nand_register_commands(cmd_ctx);
pld_register_commands(cmd_ctx);
-
+ mflash_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" );
-
-
- /* 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 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 */
- LOG_OUTPUT( "$URL$\n");
- /* 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 */
- /* 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 */
- /* 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;
+ 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[])
+{
+ int ret;
+
+ /* initialize commandline interface */
+ command_context_t *cmd_ctx;
- if (parse_config_file(cfg_cmd_ctx) != ERROR_OK)
+ cmd_ctx = setup_command_handler();
+
+ LOG_OUTPUT( "\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
+
+ print_version();
+
+ 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;
-
- command_done(cfg_cmd_ctx);
- if (command_run_line(cmd_ctx, "init")!=ERROR_OK)
+ ret = parse_config_file(cmd_ctx);
+ if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) )
return EXIT_FAILURE;
-
- if (daemon_startup)
- command_run_line(cmd_ctx, "reset");
- /* handle network connections */
- server_loop(cmd_ctx);
+ if (ret != ERROR_COMMAND_CLOSE_CONNECTION)
+ {
+ command_context_mode(cmd_ctx, COMMAND_EXEC);
+ if (command_run_line(cmd_ctx, "init")!=ERROR_OK)
+ return EXIT_FAILURE;
+
+ /* handle network connections */
+ server_loop(cmd_ctx);
+ }
/* shut server down */
server_quit();
unregister_all_commands(cmd_ctx);
-
+
/* free commandline interface */
command_done(cmd_ctx);
return EXIT_SUCCESS;
}
-
Code Review / openocd.git / blobdiff