imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/target: call event handlers around examine when polling resumes 

The target might be using Tcl examine-start and examine-end handlers,
they need to be called when the target gets reexamined after polling
succeeds again.

Change-Id: I371380c6f3c427ec7a0206d73426f6589f18a9bd
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2536
Tested-by: jenkins
Reviewed-by: Stian Skjelstad <stian@nixia.no>
This commit is contained in:
Paul Fertser 2015-02-09 16:43:58 +03:00
parent 889b246d93
commit ebe9b7a661
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/target/target.c
View File

@ -685,7 +685,15 @@ static int default_check_reset(struct target *target)
int target_examine_one(struct target *target)
{
return target->type->examine(target);
target_call_event_callbacks(target, TARGET_EVENT_EXAMINE_START);
int retval = target->type->examine(target);
if (retval != ERROR_OK)
return retval;
target_call_event_callbacks(target, TARGET_EVENT_EXAMINE_END);
return ERROR_OK;
}
static int jtag_enable_callback(enum jtag_event event, void *priv)
@ -697,15 +705,7 @@ static int jtag_enable_callback(enum jtag_event event, void *priv)
jtag_unregister_event_callback(jtag_enable_callback, target);
target_call_event_callbacks(target, TARGET_EVENT_EXAMINE_START);
int retval = target_examine_one(target);
if (retval != ERROR_OK)
return retval;
target_call_event_callbacks(target, TARGET_EVENT_EXAMINE_END);
return retval;
return target_examine_one(target);
}
/* Targets that correctly implement init + examine, i.e.
@ -726,13 +726,9 @@ int target_examine(void)
continue;
}
target_call_event_callbacks(target, TARGET_EVENT_EXAMINE_START);
retval = target_examine_one(target);
if (retval != ERROR_OK)
return retval;
target_call_event_callbacks(target, TARGET_EVENT_EXAMINE_END);
}
return retval;
}