From: oharboe Date: Tue, 25 Aug 2009 19:52:02 +0000 (+0000) Subject: David Brownell Accomodate targets which don't support various... X-Git-Tag: v0.3.0-rc0~331 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=bd7cbd01e8a2e39c1a77d551cb1f8081f880c953 David Brownell Accomodate targets which don't support various target-specific reset operations. Maybe they can't; or it's a "not yet" thing. Note that the assert/deassert operations can't yet trigger for OMAP3 because resets currently include JTAG reset in all cases, resetting the ICEpick and thus disabling the TAP for Cortex-A8. git-svn-id: svn://svn.berlios.de/openocd/trunk@2620 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- diff --git a/src/target/target.c b/src/target/target.c index d219448602..381e774e88 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -559,6 +559,11 @@ static int target_soft_reset_halt_imp(struct target_s *target) LOG_ERROR("Target not examined yet"); return ERROR_FAIL; } + if (!target->type->soft_reset_halt_imp) { + LOG_ERROR("Target %s does not support soft_reset_halt", + target->cmd_name); + return ERROR_FAIL; + } return target->type->soft_reset_halt_imp(target); } @@ -4035,6 +4040,13 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv) } if (!target->tap->enabled) goto err_tap_disabled; + if (!target->type->assert_reset + || !target->type->deassert_reset) { + Jim_SetResult_sprintf(interp, + "No target-specific reset for %s", + target->cmd_name); + return JIM_ERR; + } /* determine if we should halt or not. */ target->reset_halt = !!a; /* When this happens - all workareas are invalid. */