X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=61fac56b23ae336021800bf834eae9e53c1c85b7;hp=fc1adb096ac2e2478d6d3777bc9d1b524d31c8e3;hb=4febcd8313cf46bea03bd5eacb3f287f19eb2961;hpb=1aa854684de1827edd3b605fc64a78a498f2358a

diff --git a/src/target/target.c b/src/target/target.c
index fc1adb096a..61fac56b23 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -50,7 +50,6 @@
 int cli_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv);
 
 
-int handle_arch_state_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_daemon_startup_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
@@ -89,6 +88,7 @@ extern target_type_t arm926ejs_target;
 extern target_type_t feroceon_target;
 extern target_type_t xscale_target;
 extern target_type_t cortexm3_target;
+extern target_type_t arm11_target;
 
 target_type_t *target_types[] =
 {
@@ -101,6 +101,7 @@ target_type_t *target_types[] =
 	&feroceon_target,
 	&xscale_target,
 	&cortexm3_target,
+	&arm11_target,
 	NULL,
 };
 
@@ -749,7 +750,6 @@ int target_register_commands(struct command_context_s *cmd_ctx)
 	register_command(cmd_ctx, NULL, "run_and_halt_time", handle_run_and_halt_time_command, COMMAND_CONFIG, NULL);
 	register_command(cmd_ctx, NULL, "working_area", handle_working_area_command, COMMAND_ANY, "working_area <target#> <address> <size> <'backup'|'nobackup'> [virtual address]");
 	register_command(cmd_ctx, NULL, "virt2phys", handle_virt2phys_command, COMMAND_ANY, "virt2phys <virtual address>");
-	register_command(cmd_ctx, NULL, "arch_state", handle_arch_state_command, COMMAND_ANY, "prints CPU state information");
 
 	return ERROR_OK;
 }
@@ -1488,11 +1488,7 @@ int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 	if (argc == 0)
 	{
 		target->type->poll(target);
-		command_print(cmd_ctx, "target state: %s", target_state_strings[target->state]);
-		if (target->state == TARGET_HALTED)
-		{
 			target_arch_state(target);
-		}
 	}
 	else
 	{
@@ -1547,7 +1543,6 @@ static int wait_state(struct command_context_s *cmd_ctx, char *cmd, enum target_
 	
 	gettimeofday(&timeout, NULL);
 	timeval_add_time(&timeout, 0, ms * 1000);
-	command_print(cmd_ctx, "waiting for target %s...", target_state_strings[state]);
 	
 	target_t *target = get_current_target(cmd_ctx);
 	for (;;)
@@ -1557,9 +1552,9 @@ static int wait_state(struct command_context_s *cmd_ctx, char *cmd, enum target_
 		target_call_timer_callbacks();
 		if (target->state == state)
 		{
-			command_print(cmd_ctx, "target %s", target_state_strings[state]);
 			break;
 		}
+		command_print(cmd_ctx, "waiting for target %s...", target_state_strings[state]);
 		
 		gettimeofday(&now, NULL);
 		if ((now.tv_sec > timeout.tv_sec) || ((now.tv_sec == timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec)))
@@ -1702,34 +1697,20 @@ int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **a
 	int retval;
 	target_t *target = get_current_target(cmd_ctx);
 	
-	DEBUG("-");
-	
 	if (argc == 0)
 		retval = target->type->resume(target, 1, 0, 1, 0); /* current pc, addr = 0, handle breakpoints, not debugging */
 	else if (argc == 1)
 		retval = target->type->resume(target, 0, strtoul(args[0], NULL, 0), 1, 0); /* addr = args[0], handle breakpoints, not debugging */
 	else
 	{
-		command_print(cmd_ctx, "usage: resume [address]");
-		return ERROR_OK;
-	}
-	
-	if (retval != ERROR_OK)
-	{	
-		switch (retval)
-		{
-			case ERROR_TARGET_NOT_HALTED:
-				command_print(cmd_ctx, "target not halted");
-				break;
-			default:
-				command_print(cmd_ctx, "unknown error... shutting down");
-				exit(-1);
-		}
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	target_process_events(cmd_ctx);
 	
-	return ERROR_OK;
+	target_arch_state(target);
+	
+	return retval;
 }
 
 int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
@@ -2351,13 +2332,3 @@ int handle_virt2phys_command(command_context_t *cmd_ctx, char *cmd, char **args,
 	}
 	return retval;
 }
-int handle_arch_state_command(command_context_t *cmd_ctx, char *cmd, char **args, int argc)
-{
-	int retval;
-	if (argc!=0)
-		return ERROR_COMMAND_SYNTAX_ERROR;
-	
-	target_t *target = get_target_by_num(cmd_ctx->current_target);
-	retval=target_arch_state(target);
-	return retval;
-}