[Openocd-svn] r2620 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-08-25 21:52:02 +0200 (Tue, 25 Aug 2009)
New Revision: 2620

Modified:
   trunk/src/target/target.c
Log:
David Brownell <da...@pa...> 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.

Modified: trunk/src/target/target.c
===================================================================
--- trunk/src/target/target.c	2009-08-25 13:00:45 UTC (rev 2619)
+++ trunk/src/target/target.c	2009-08-25 19:52:02 UTC (rev 2620)
@@ -559,6 +559,11 @@
 		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 @@
 		}
 		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. */