X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=7763b95644d65d3dfce0d86e39e65e43dbde5112;hb=6a2fd7cad507ef24a7dc4ce3c5f8b5351dd12656;hp=ced09e900966f36d2042868cdafcc47fd4e30b00;hpb=a8234af06c16500426a421910886d26a46e6fa53;p=openocd.git

diff --git a/src/target/target.c b/src/target/target.c
index ced09e9009..7763b95644 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -378,24 +378,57 @@ target_t* get_current_target(command_context_t *cmd_ctx)
 
 int target_poll(struct target_s *target)
 {
+	int retval;
+
 	/* We can't poll until after examine */
 	if (!target_was_examined(target))
 	{
 		/* Fail silently lest we pollute the log */
 		return ERROR_FAIL;
 	}
-	return target->type->poll(target);
+
+	retval = target->type->poll(target);
+	if (retval != ERROR_OK)
+		return retval;
+
+	if (target->halt_issued)
+	{
+		if (target->state == TARGET_HALTED)
+		{
+			target->halt_issued = false;
+		} else
+		{
+			long long t = timeval_ms() - target->halt_issued_time;
+			if (t>1000)
+			{
+				target->halt_issued = false;
+				LOG_INFO("Halt timed out, wake up GDB.");
+				target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT);
+			}
+		}
+	}
+
+	return ERROR_OK;
 }
 
 int target_halt(struct target_s *target)
 {
+	int retval;
 	/* We can't poll until after examine */
 	if (!target_was_examined(target))
 	{
 		LOG_ERROR("Target not examined yet");
 		return ERROR_FAIL;
 	}
-	return target->type->halt(target);
+
+	retval = target->type->halt(target);
+	if (retval != ERROR_OK)
+		return retval;
+
+	target->halt_issued = true;
+	target->halt_issued_time = timeval_ms();
+
+	return ERROR_OK;
 }
 
 int target_resume(struct target_s *target, int current, uint32_t address, int handle_breakpoints, int debug_execution)
@@ -665,7 +698,6 @@ int target_init(struct command_context_s *cmd_ctx)
 		{
 			target->type->virt2phys = default_virt2phys;
 		}
-		target->type->virt2phys = default_virt2phys;
 		/* a non-invasive way(in terms of patches) to add some code that
 		 * runs before the type->write/read_memory implementation
 		 */
@@ -3419,6 +3451,10 @@ void target_all_handle_event(enum target_event e)
 	}
 }
 
+
+/* FIX? should we propagate errors here rather than printing them
+ * and continuing?
+ */
 void target_handle_event(target_t *target, enum target_event e)
 {
 	target_event_action_t *teap;
@@ -4060,11 +4096,11 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 
 		/* do the assert */
 		if (n->value == NVP_ASSERT) {
-			target->type->assert_reset(target);
+			e = target->type->assert_reset(target);
 		} else {
-			target->type->deassert_reset(target);
+			e = target->type->deassert_reset(target);
 		}
-		return JIM_OK;
+		return (e == ERROR_OK) ? JIM_OK : JIM_ERR;
 	case TS_CMD_HALT:
 		if (goi.argc) {
 			Jim_WrongNumArgs(goi.interp, 0, argv, "halt [no parameters]");
@@ -4072,8 +4108,8 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 		}
 		if (!target->tap->enabled)
 			goto err_tap_disabled;
-		target->type->halt(target);
-		return JIM_OK;
+		e = target->type->halt(target);
+		return (e == ERROR_OK) ? JIM_OK : JIM_ERR;
 	case TS_CMD_WAITSTATE:
 		/* params:  <name>  statename timeoutmsecs */
 		if (goi.argc != 2) {
@@ -4236,6 +4272,8 @@ static int target_create(Jim_GetOptInfo *goi)
 
 	target->display             = 1;
 
+	target->halt_issued			= false;
+
 	/* initialize trace information */
 	target->trace_info = malloc(sizeof(trace_t));
 	target->trace_info->num_trace_points         = 0;