summaryrefslogtreecommitdiff
path: root/src/target/xscale.c
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/target/xscale.c
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/target/xscale.c')
-rw-r--r--src/target/xscale.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/target/xscale.c b/src/target/xscale.c
index d3c1b064..d776e210 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -1699,7 +1699,7 @@ int xscale_deassert_reset(target_t *target)
xscale_write_dcsr(target, 0, 1);
target->state = TARGET_RUNNING;
- if ((target->reset_mode != RESET_HALT) && (target->reset_mode != RESET_INIT))
+ if (!target->reset_halt)
{
jtag_add_sleep(10000);