summaryrefslogtreecommitdiff
path: root/src/target/target.c
diff options
context:
space:
mode:
authordrath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2007-01-22 14:47:00 +0000
committerdrath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2007-01-22 14:47:00 +0000
commit4fc97d3f2726efa147cfdb0c456eace51550e1e3 (patch)
treef6bbfc0aa3ceebdf723c23f84b3e764548c1add4 /src/target/target.c
parentadaed4c1c776f0830387eb86c3d81f00f240be6e (diff)
downloadopenocd_libswd-4fc97d3f2726efa147cfdb0c456eace51550e1e3.tar.gz
openocd_libswd-4fc97d3f2726efa147cfdb0c456eace51550e1e3.tar.bz2
openocd_libswd-4fc97d3f2726efa147cfdb0c456eace51550e1e3.tar.xz
openocd_libswd-4fc97d3f2726efa147cfdb0c456eace51550e1e3.zip
- fix incorrect parsing of whitespace in command.c (thanks to Magnus Lundin)
- fix infinite recursion in target_init_handler (thanks to jw and Magnus Lundin) - fix CFI flash handlign with buswidth < 32bit (thanks to Daniele Orio for reporting this) - add support for reading JTAG device id (currently only as debug output on startup) - cleaned up handling of EmbeddedICE registers. Supported functionality and register size now determined by EmbeddedICE version number. - small cleanups/fixes git-svn-id: svn://svn.berlios.de/openocd/trunk@124 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/target.c')
-rw-r--r--src/target/target.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/target/target.c b/src/target/target.c
index 73228888..8c6d97df 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -209,6 +209,8 @@ int target_init_handler(struct target_s *target, enum target_event event, void *
if ((event == TARGET_EVENT_HALTED) && (target->reset_script))
{
+ target_unregister_event_callback(target_init_handler, priv);
+
script = fopen(target->reset_script, "r");
if (!script)
{
@@ -221,8 +223,6 @@ int target_init_handler(struct target_s *target, enum target_event event, void *
fclose(script);
jtag_execute_queue();
-
- target_unregister_event_callback(target_init_handler, priv);
}
return ERROR_OK;