From 9ab9786f67f3a3532aa5db339c4c22b2ea843ad7 Mon Sep 17 00:00:00 2001
From: duane <duane@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Sun, 28 Jun 2009 02:40:08 +0000
Subject: Refactor code, create target_state_name()

git-svn-id: svn://svn.berlios.de/openocd/trunk@2409 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/target/target.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'src/target/target.c')

diff --git a/src/target/target.c b/src/target/target.c
index f95e360f..a97835b3 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -237,6 +237,18 @@ const Jim_Nvp nvp_reset_modes[] = {
 	{ .name = NULL     , .value = -1 },
 };
 
+const char *
+target_state_name( target_t *t )
+{
+	const char *cp;
+	cp = Jim_Nvp_value2name_simple(nvp_target_state, t->state)->name;
+	if( !cp ){
+		LOG_ERROR("Invalid target state: %d", (int)(t->state));
+		cp = "(*BUG*unknown*BUG*)";
+	}
+	return cp;
+}
+
 static int max_target_number(void)
 {
 	target_t *t;
@@ -1085,8 +1097,7 @@ int target_arch_state(struct target_s *target)
 		return ERROR_OK;
 	}
 
-	LOG_USER("target state: %s",
-		 Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name);
+	LOG_USER("target state: %s", target_state_name( target ));
 
 	if (target->state != TARGET_HALTED)
 		return ERROR_OK;
@@ -1544,8 +1555,7 @@ DumpTargets:
 		char marker = ' ';
 
 		if (target->tap->enabled)
-			state = Jim_Nvp_value2name_simple(nvp_target_state,
-					target->state)->name;
+			state = target_state_name( target );
 		else
 			state = "tap-disabled";
 
@@ -4079,7 +4089,8 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 			return JIM_ERR;
 		}
 		Jim_SetResultString(goi.interp,
-							 Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name,-1);
+							target_state_name( target ),
+							-1);
 		return JIM_OK;
 	case TS_CMD_INVOKE_EVENT:
 		if (goi.argc != 1) {
-- 
cgit v1.2.3