Build Permutations with ftd2xx and libftdi addressed. Also added a new se of regressi...

[openocd.git] / src / helper / options.c

diff --git a/src/helper/options.c b/src/helper/options.c
index 75d4f2e9b217bcd5959ae44dcdb2eaa2ab5ee88e..203791bd66024fd68c9c70615db2f672e37840c8 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2004, 2005 by Dominic Rath                              *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.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     *
@@ -21,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 <stdio.h>
 #include <stdlib.h>
@@ -40,14 +46,15 @@ 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}
 };
 
 int configuration_output_handler(struct command_context_s *context, const char* line)
 {
-       LOG_INFO_N(line);
+       LOG_USER_N(line);
 
        return ERROR_OK;
 }
@@ -92,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)
@@ -137,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;
                }
        }
 
@@ -151,15 +171,16 @@ 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 <name>\n");
                LOG_OUTPUT("--command    | -c\trun <command>\n");
+               LOG_OUTPUT("--pipe       | -p\tuse pipes for gdb communication\n");
                exit(-1);
        }       
 
        if (version_flag)
        {
                /* Nothing to do, version gets printed automatically. */
-               exit(-1);
-       }       
-
-
+               // It is not an error to request the VERSION number.
+               exit(0);
+       }
+       
        return ERROR_OK;
 }