From 0bbe5708820c6dcbef4937371c95bda8f5ba77a6 Mon Sep 17 00:00:00 2001 From: oharboe Date: Mon, 10 Nov 2008 08:33:03 +0000 Subject: [PATCH] minor cleanup git-svn-id: svn://svn.berlios.de/openocd/trunk@1149 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/startup.tcl | 19 +++---------------- src/server/gdb_server.c | 2 +- src/server/telnet_server.c | 3 +++ 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl index f43967104..75940e914 100644 --- a/src/helper/startup.tcl +++ b/src/helper/startup.tcl @@ -21,19 +21,6 @@ proc get_help_text {} { return $ocd_helptext } -# Production command -# FIX!!! need to figure out how to feed back relevant output -# from e.g. "flash banks" command... -proc board_produce {filename serialnumber} { - openocd "reset init" - openocd "flash write_image erase $filename [flash] bin"]] - openocd "verify_image $filename [flash] bin"]] - echo "Successfully ran production procedure" -} - -proc board_test {} { - echo "Production test not implemented" -} # Show flash in human readable form # This is an example of a human readable form of a low level fn @@ -277,18 +264,18 @@ proc ocd_process_reset { MODE } { proc production_info {} { return "Imagine an explanation here..." } -add_help_text production_info "Displays information on production procedure for target script" +add_help_text production_info "Displays information on production procedure for target script. Implement this procedure in target script." proc production {firmwarefile serialnumber} { puts "Imagine production procedure running successfully. Programmed $firmwarefile with serial number $serialnumber" } -add_help_text production "Runs production procedure. Throws exception if procedure failed. Prints progress messages." +add_help_text production " - Runs production procedure. Throws exception if procedure failed. Prints progress messages. Implement this procedure in the target script." proc production_test {} { puts "Imagine nifty test procedure having run to completion here." } -add_help_text production "Runs test procedure. Throws exception if procedure failed. Prints progress messages." +add_help_text production "Runs test procedure. Throws exception if procedure failed. Prints progress messages. Implement in target script." proc load {args} { return [eval "load_image $args"] diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index febad6e2f..ea6f6b75a 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -2184,7 +2184,7 @@ int handle_gdb_port_command(struct command_context_s *cmd_ctx, char *cmd, char * { if (argc == 0) { - command_print(cmd_ctx, "gdb_port: %ld", gdb_port); + command_print(cmd_ctx, "%d", gdb_port); return ERROR_OK; } diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c index 6b0904951..514b8d0ab 100644 --- a/src/server/telnet_server.c +++ b/src/server/telnet_server.c @@ -637,7 +637,10 @@ int telnet_register_commands(command_context_t *command_context) int handle_telnet_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { if (argc == 0) + { + command_print(cmd_ctx, "%d", telnet_port); return ERROR_OK; + } telnet_port = strtoul(args[0], NULL, 0);