* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
- * Copyright (C) 2007,2008 Øyvind Harboe *
+ * Copyright (C) 2007,2008 Øyvind Harboe *
* oyvind.harboe@zylin.com *
* *
* Copyright (C) 2008 Richard Missenden *
#include "config.h"
#endif
-#include "log.h"
-#include "types.h"
#include "jtag.h"
#include "configuration.h"
#include "xsvf.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>
+#ifdef HAVE_STRINGS_H
#include <strings.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
+#endif
#define OPENOCD_VERSION \
- "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV
+ "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
static void print_version(void)
{
}
/* Give TELNET a way to find out what version this is */
-static int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_version_command)
{
- if (argc!=0)
+ if (argc != 0)
return ERROR_COMMAND_SYNTAX_ERROR;
command_print(cmd_ctx, OPENOCD_VERSION);
static void exit_handler(void)
{
- /* close JTAG interface */
- if (jtag && jtag->quit)
- jtag->quit();
+ jtag_interface_quit();
}
-static int log_target_callback_event_handler(struct target_s *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)
{
case TARGET_EVENT_GDB_START:
- target->display=0;
+ target->display = 0;
break;
case TARGET_EVENT_GDB_END:
- target->display=1;
+ target->display = 1;
break;
case TARGET_EVENT_HALTED:
if (target->display)
int ioutil_init(struct command_context_s *cmd_ctx);
/* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
-static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_init_command)
{
- if (argc!=0)
+ if (argc != 0)
return ERROR_COMMAND_SYNTAX_ERROR;
int retval;
- static int initialized=0;
+ static int initialized = 0;
if (initialized)
return ERROR_OK;
- initialized=1;
+ initialized = 1;
atexit(exit_handler);
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;
command_context_t *global_cmd_ctx;
-static command_context_t *setup_command_handler(void)
+/// src/hello.c gives a simple example for writing new command modules
+int hello_register_commands(struct command_context_s *cmd_ctx);
+
+/* NB! this fn can be invoked outside this file for non PC hosted builds */
+command_context_t *setup_command_handler(void)
{
command_context_t *cmd_ctx;
COMMAND_EXEC, "show OpenOCD version");
/* register subsystem commands */
+ hello_register_commands(cmd_ctx);
server_register_commands(cmd_ctx);
telnet_register_commands(cmd_ctx);
gdb_register_commands(cmd_ctx);
}
LOG_DEBUG("log init complete");
- LOG_OUTPUT( OPENOCD_VERSION "\n" );
+ LOG_OUTPUT(OPENOCD_VERSION "\n");
register_command(cmd_ctx, NULL, "init", handle_init_command,
COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
void httpd_stop(void);
-#if !BUILD_HTTPD
+#if !BUILD_HTTPD && !BUILD_ECOSBOARD
/* implementations of OpenOCD that uses multithreading needs to know when
* OpenOCD is sleeping. No-op in vanilla OpenOCD
*/
}
#endif
- LOG_OUTPUT("\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
-
print_version();
+ 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);
return EXIT_FAILURE;
ret = parse_config_file(cmd_ctx);
- if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) )
+ if ((ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION))
return EXIT_FAILURE;
#if BUILD_HTTPD
- if (httpd_start()!=ERROR_OK)
+ if (httpd_start() != ERROR_OK)
return EXIT_FAILURE;
#endif
if (ret != ERROR_COMMAND_CLOSE_CONNECTION)
{
command_context_mode(cmd_ctx, COMMAND_EXEC);
- if (command_run_line(cmd_ctx, "init")!=ERROR_OK)
+ if (command_run_line(cmd_ctx, "init") != ERROR_OK)
return EXIT_FAILURE;
/* handle network connections */