X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm920t.c;h=5b4c175fdddd9da3ad72101c5728fe21c2795bd9;hp=67657c94ccd903062b4994db9be827a5736148b8;hb=4eadb146c18d9d5faaefc9c258d2aa715e3a1596;hpb=0960cbeeddd3023f45ed5541907819798e62dc1b

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 67657c94cc..5b4c175fdd 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -24,6 +24,7 @@
 #include "arm920t.h"
 #include "jtag.h"
 #include "log.h"
+#include "time_support.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -46,7 +47,7 @@ int arm920t_handle_read_cache_command(struct command_context_s *cmd_ctx, char *c
 int arm920t_handle_read_mmu_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
 /* forward declarations */
-int arm920t_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target);
+int arm920t_target_create(struct target_s *target, Jim_Interp *interp);
 int arm920t_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int arm920t_quit(void);
 int arm920t_arch_state(struct target_s *target);
@@ -89,7 +90,7 @@ target_type_t arm920t_target =
 	.remove_watchpoint = arm7_9_remove_watchpoint,
 
 	.register_commands = arm920t_register_commands,
-	.target_command = arm920t_target_command,
+	.target_create = arm920t_target_create,
 	.init_target = arm920t_init_target,
 	.examine = arm9tdmi_examine,
 	.quit = arm920t_quit
@@ -565,7 +566,7 @@ int arm920t_arch_state(struct target_s *target)
 			"cpsr: 0x%8.8x pc: 0x%8.8x\n"
 			"MMU: %s, D-Cache: %s, I-Cache: %s",
 			 armv4_5_state_strings[armv4_5->core_state],
-			 target_debug_reason_strings[target->debug_reason],
+			 Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name,
 			 armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],
 			 buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
 			 buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32),
@@ -629,11 +630,12 @@ int arm920t_soft_reset_halt(struct target_s *target)
 	arm9tdmi_common_t *arm9tdmi = arm7_9->arch_info;
 	arm920t_common_t *arm920t = arm9tdmi->arch_info;
 	reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
-	int i;
 	
 	target_halt(target);
 	
-	for (i=0; i<10; i++)
+	long long then=timeval_ms();
+	int timeout;
+	while (!(timeout=((timeval_ms()-then)>1000)))
 	{
 		if (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_DBGACK, 1) == 0)
 		{
@@ -643,10 +645,16 @@ int arm920t_soft_reset_halt(struct target_s *target)
 		{
 			break;
 		}
-		/* do not eat all CPU, time out after 1 se*/
-		alive_sleep(100);
+		if (debug_level>=3)
+		{
+			/* do not eat all CPU, time out after 1 se*/
+			alive_sleep(100);
+		} else
+		{
+			keep_alive();
+		}
 	}
-	if (i==10)
+	if (timeout)
 	{
 		LOG_ERROR("Failed to halt CPU after 1 sec");
 		return ERROR_TARGET_TIMEOUT;
@@ -691,7 +699,7 @@ int arm920t_quit(void)
 	return ERROR_OK;
 }
 
-int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, int chain_pos, char *variant)
+int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, int chain_pos, const char *variant)
 {
 	arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_common;
 	arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;
@@ -727,27 +735,11 @@ int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, int chai
 	return ERROR_OK;
 }
 
-int arm920t_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target)
+int arm920t_target_create(struct target_s *target, Jim_Interp *interp)
 {
-	int chain_pos;
-	char *variant = NULL;
-	arm920t_common_t *arm920t = malloc(sizeof(arm920t_common_t));
-	memset(arm920t, 0, sizeof(*arm920t));
-	
-	if (argc < 4)
-	{
-		LOG_ERROR("'target arm920t' requires at least one additional argument");
-		exit(-1);
-	}
-	
-	chain_pos = strtoul(args[3], NULL, 0);
-	
-	if (argc >= 5)
-		variant = args[4];
-	
-	LOG_DEBUG("chain_pos: %i, variant: %s", chain_pos, variant);
+	arm920t_common_t *arm920t = calloc(1,sizeof(arm920t_common_t));
 	
-	arm920t_init_arch_info(target, arm920t, chain_pos, variant);
+	arm920t_init_arch_info(target, arm920t, target->chain_position, target->variant);
 
 	return ERROR_OK;
 }