From 4457800afe9ab2e1e7e466570b52a764cbd22574 Mon Sep 17 00:00:00 2001 From: ntfreak Date: Wed, 15 Oct 2008 15:11:36 +0000 Subject: - fix tcl_port typo in docs - remove build warning from openocd.c - add missing svn props git-svn-id: svn://svn.berlios.de/openocd/trunk@1065 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- doc/openocd.texi | 10 +++++----- src/openocd.c | 19 +++---------------- src/target/interface/openocd-usb.cfg | 18 +++++++++--------- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/doc/openocd.texi b/doc/openocd.texi index 77a8a8ed..10d40570 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -263,6 +263,11 @@ OpenOCD command line using the @option{-c} command line switch. @item @b{telnet_port} <@var{number}> @cindex telnet_port Port on which to listen for incoming telnet connections +@item @b{tcl_port} <@var{number}> +@cindex tcl_port +Port on which to listen for incoming TCL syntax. This port is intended as +a simplified RPC connection that can be used by clients to issue commands +and get the output from the TCL engine. @item @b{gdb_port} <@var{number}> @cindex gdb_port First port on which to listen for incoming GDB connections. The GDB port for the @@ -293,11 +298,6 @@ Default behaviour is <@var{enable}> Set to <@var{enable}> to cause OpenOCD to program the flash memory when a vFlash packet is received. Default behaviour is <@var{enable}> - at item @b{tcl_port} <@var{number}> - at cindex tcl_port -Port on which to listen for incoming TCL syntax. This port is intended as -a simplified RPC connection that can be used by clients to issue commands -and get the output from the TCL engine. @end itemize @section JTAG interface configuration diff --git a/src/openocd.c b/src/openocd.c index 6adbbc61..ab7db033 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -63,19 +63,14 @@ #include "replacements.h" - - - - - -void print_version() +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"); + 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 */ @@ -83,14 +78,6 @@ void print_version() /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */ } - - - - - - - - /* 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) { @@ -229,7 +216,7 @@ int openocd_main(int argc, char *argv[]) cmd_ctx = setup_command_handler(); - LOG_OUTPUT( "\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n"); + LOG_OUTPUT("\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n"); print_version(); diff --git a/src/target/interface/openocd-usb.cfg b/src/target/interface/openocd-usb.cfg index 628e9e01..dbcc9f19 100644 --- a/src/target/interface/openocd-usb.cfg +++ b/src/target/interface/openocd-usb.cfg @@ -1,9 +1,9 @@ -#interface -interface ft2232 -ft2232_vid_pid 0x0403 0x6010 -ft2232_device_desc "Dual RS232" -ft2232_layout "oocdlink" -ft2232_latency 2 -# 6/(1+n) Mhz TCLK -jtag_speed 1 - +#interface +interface ft2232 +ft2232_vid_pid 0x0403 0x6010 +ft2232_device_desc "Dual RS232" +ft2232_layout "oocdlink" +ft2232_latency 2 +# 6/(1+n) Mhz TCLK +jtag_speed 1 + -- cgit v1.2.3