summaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-21 15:59:41 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-21 15:59:41 +0000
commitdfbb9f3e89ae6a3769d0df2167208c7c07e22e3c (patch)
tree2d41deb5babf30f4dcd18e8085ffdfc378034660 /src/helper
parentc1ee650a9aead0bd25d7aa37fd65e5a3ed0c6e38 (diff)
downloadopenocd+libswd-dfbb9f3e89ae6a3769d0df2167208c7c07e22e3c.tar.gz
openocd+libswd-dfbb9f3e89ae6a3769d0df2167208c7c07e22e3c.tar.bz2
openocd+libswd-dfbb9f3e89ae6a3769d0df2167208c7c07e22e3c.tar.xz
openocd+libswd-dfbb9f3e89ae6a3769d0df2167208c7c07e22e3c.zip
- jtag_khz/speed are now single parameter only. These are used
from pre/post_reset event scripts. Adding the second parameter was a mistake seen in retrospect. this gives precise control in post_reset for *when* the post reset speed is set. The pre_reset event was added *after* the second parameter to jtag_khz/speed - the target implementations no longer gets involved in the reset mode scheme. Either they reset a target into a halted mode or not. target_process_reset() detects if the reset halt failed or not. - tcl target event names are now target_N_name. Mainly internal at this early stage, but best to get the naming right now. - added hardcoded reset modes from gdb_server.c. I don't know precisely what these defaults should be or if it should be made configurable. Perhaps some hardcoded defaults will do for now and it can be made configurable later. - bugfix in cortex_m3.c for reset_run_and_xxx? - issue syntax error upon obsolete argument in target command instead of printing message that will surely drown in the log git-svn-id: svn://svn.berlios.de/openocd/trunk@849 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/command.c1
-rw-r--r--src/helper/startup.tcl20
2 files changed, 5 insertions, 16 deletions
diff --git a/src/helper/command.c b/src/helper/command.c
index 12827ecd..0876d877 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -346,6 +346,7 @@ int run_command(command_context_t *context, command_t *c, char *words[], int num
if (!((context->mode == COMMAND_CONFIG) || (c->mode == COMMAND_ANY) || (c->mode == context->mode) ))
{
/* Config commands can not run after the config stage */
+ LOG_ERROR("Illegal mode for command");
return ERROR_FAIL;
}
diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index 4e12e30b..d3ddb30c 100644
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -93,20 +93,6 @@ proc help {args} {
add_help_text help "Tcl implementation of help command"
-#a bit of backwards compatibility
-proc ocd_throw {cmd} {
- set ocd_output ""
- eval $cmd
- return $ocd_output
-}
-
-#a bit of backwards compatibility
-proc openocd {cmd} {
- set ocd_output ""
- eval $cmd
- return $ocd_output
-}
-
# If a fn is unknown to Tcl, we try to execute it as an OpenOCD command
#
# We also support two level commands. "flash banks" is translated to
@@ -130,10 +116,13 @@ proc target_script {target_num eventname scriptname} {
}
# This is the script we invoke
- proc "target_[set eventname]_[set target_num]" {} "script $scriptname"
+ proc "target_[set target_num]_[set eventname]" {} "script $scriptname"
}
+add_help_text target_script "<target#> <event=reset/pre_reset/post_halt/pre_resume/gdb_program_config> <script_file>"
+
+
# Try flipping / and \ to find file if the filename does not
# match the precise spelling
proc find {filename} {
@@ -162,5 +151,4 @@ proc script {filename} {
add_help_text script "<filename> - filename of OpenOCD script (tcl) to run"
-add_help_text target_script "<target#> <event=reset/pre_reset/post_halt/pre_resume/gdb_program_config> <script_file>"