From 47d044934727c3d5a57658ddd324b407dd73860a Mon Sep 17 00:00:00 2001 From: ntfreak Date: Mon, 15 Dec 2008 09:43:26 +0000 Subject: - add ability for openocd to communicate to gdb using pipes (stdin/stdout). - this is enabled by new command line option option --pipe. git-svn-id: svn://svn.berlios.de/openocd/trunk@1242 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/options.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'src/helper/options.c') diff --git a/src/helper/options.c b/src/helper/options.c index cce77e5a..2ac9143e 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -24,10 +24,13 @@ #include "config.h" #endif +#include "replacements.h" + #include "types.h" #include "command.h" #include "configuration.h" #include "log.h" +#include "server.h" #include #include @@ -43,8 +46,9 @@ static struct option long_options[] = {"debug", optional_argument, 0, 'd'}, {"file", required_argument, 0, 'f'}, {"search", required_argument, 0, 's'}, - {"log_output", required_argument, 0, 'l'}, + {"log_output", required_argument, 0, 'l'}, {"command", required_argument, 0, 'c'}, + {"pipe", no_argument, 0, 'p'}, {0, 0, 0, 0} }; @@ -95,7 +99,7 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[] /* getopt_long stores the option index here. */ int option_index = 0; - c = getopt_long(argc, argv, "hvd::l:f:s:c:", long_options, &option_index); + c = getopt_long(argc, argv, "hvd::l:f:s:c:p", long_options, &option_index); /* Detect the end of the options. */ if (c == -1) @@ -140,7 +144,20 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[] add_config_command(optarg); } break; - + case 'p': /* --pipe | -p */ +#if BUILD_ECOSBOARD == 1 + /* pipes unsupported on hosted platforms */ + LOG_WARNING("pipes not supported on this platform"); +#else +#ifdef IS_MINGW + /* pipes currently unsupported on win32 */ + LOG_WARNING("pipes currently unsupported on win32"); + exit(1); +#else + server_use_pipes = 1; +#endif +#endif + break; } } @@ -154,6 +171,7 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[] LOG_OUTPUT("--debug | -d\tset debug level <0-3>\n"); LOG_OUTPUT("--log_output | -l\tredirect log output to file \n"); LOG_OUTPUT("--command | -c\trun \n"); + LOG_OUTPUT("--pipe | -p\tuse pipes for gdb communication\n"); exit(-1); } @@ -161,7 +179,7 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[] { /* Nothing to do, version gets printed automatically. */ exit(-1); - } - + } + return ERROR_OK; } -- cgit v1.2.3