Add target_examine_one wrapper:
- replaces all calls to target->type->examine. git-svn-id: svn://svn.berlios.de/openocd/trunk@1968 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
d00ac17e8e
commit
4deb42ed00
|
@ -1051,7 +1051,7 @@ int arm7_9_deassert_reset(target_t *target)
|
||||||
{
|
{
|
||||||
LOG_WARNING("srst pulls trst - can not reset into halted mode. Issuing halt after reset.");
|
LOG_WARNING("srst pulls trst - can not reset into halted mode. Issuing halt after reset.");
|
||||||
/* set up embedded ice registers again */
|
/* set up embedded ice registers again */
|
||||||
if ((retval=target->type->examine(target))!=ERROR_OK)
|
if ((retval = target_examine_one(target)) != ERROR_OK)
|
||||||
return retval;
|
return retval;
|
||||||
|
|
||||||
if ((retval=target_poll(target))!=ERROR_OK)
|
if ((retval=target_poll(target))!=ERROR_OK)
|
||||||
|
|
|
@ -467,6 +467,11 @@ static int default_examine(struct target_s *target)
|
||||||
return ERROR_OK;
|
return ERROR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int target_examine_one(struct target_s *target)
|
||||||
|
{
|
||||||
|
return target->type->examine(target);
|
||||||
|
}
|
||||||
|
|
||||||
/* Targets that correctly implement init+examine, i.e.
|
/* Targets that correctly implement init+examine, i.e.
|
||||||
* no communication with target during init:
|
* no communication with target during init:
|
||||||
*
|
*
|
||||||
|
@ -478,7 +483,7 @@ int target_examine(void)
|
||||||
target_t *target = all_targets;
|
target_t *target = all_targets;
|
||||||
while (target)
|
while (target)
|
||||||
{
|
{
|
||||||
if ((retval = target->type->examine(target))!=ERROR_OK)
|
if ((retval = target_examine_one(target)) != ERROR_OK)
|
||||||
return retval;
|
return retval;
|
||||||
target = target->next;
|
target = target->next;
|
||||||
}
|
}
|
||||||
|
|
|
@ -406,6 +406,12 @@ extern target_t *get_target(const char *id);
|
||||||
*/
|
*/
|
||||||
extern const char *target_get_name(struct target_s *target);
|
extern const char *target_get_name(struct target_s *target);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Examine the specified @a target.
|
||||||
|
*
|
||||||
|
* This routine is a wrapper for target->type->examine.
|
||||||
|
*/
|
||||||
|
extern int target_examine_one(struct target_s *target);
|
||||||
/// @returns @c true if the target has been examined.
|
/// @returns @c true if the target has been examined.
|
||||||
extern bool target_was_examined(struct target_s *target);
|
extern bool target_was_examined(struct target_s *target);
|
||||||
/// Sets the @c examined flag for the given target.
|
/// Sets the @c examined flag for the given target.
|
||||||
|
|
Loading…
Reference in New Issue