summaryrefslogtreecommitdiff
path: root/src/target/target.c
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-11-25 16:38:08 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2009-11-25 16:38:08 -0800
commitb715a81f5b95144118d8f946d4191f1dc844783a (patch)
treeb3c553cd43e489f00105d4ba52bccafa1705375f /src/target/target.c
parentac06d41fc723c264e989673be16f9f21a1896518 (diff)
downloadopenocd+libswd-b715a81f5b95144118d8f946d4191f1dc844783a.tar.gz
openocd+libswd-b715a81f5b95144118d8f946d4191f1dc844783a.tar.bz2
openocd+libswd-b715a81f5b95144118d8f946d4191f1dc844783a.tar.xz
openocd+libswd-b715a81f5b95144118d8f946d4191f1dc844783a.zip
target: target_get_name() --> target_type_name()
There are two names that may matter on a per-target basis. One is a per-instance name (for example, "at91sam7s.cpu"). The other is the name of its type (for example, "arm7tdmi"), which is shared among multiple targets. Currently target_get_name() returns the type name, which is misleading and is rarely appropriate for target diagnostics. Rename that as target_type_name(). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/target.c')
-rw-r--r--src/target/target.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/target/target.c b/src/target/target.c
index 97a93c06..f46fc67b 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -522,7 +522,7 @@ int target_examine(void)
}
return retval;
}
-const char *target_get_name(struct target *target)
+const char *target_type_name(struct target *target)
{
return target->type->name;
}
@@ -766,7 +766,7 @@ int target_init(struct command_context *cmd_ctx)
if ((retval = target->type->init_target(cmd_ctx, target)) != ERROR_OK)
{
- LOG_ERROR("target '%s' init failed", target_get_name(target));
+ LOG_ERROR("target '%s' init failed", target_type_name(target));
return retval;
}
@@ -1698,7 +1698,7 @@ DumpTargets:
target->target_number,
marker,
target->cmd_name,
- target_get_name(target),
+ target_type_name(target),
Jim_Nvp_value2name_simple(nvp_target_endian,
target->endianness)->name,
target->tap->dotted_name,
@@ -3511,7 +3511,7 @@ void target_handle_event(struct target *target, enum target_event e)
LOG_DEBUG("target: (%d) %s (%s) event: %d (%s) action: %s",
target->target_number,
target->cmd_name,
- target_get_name(target),
+ target_type_name(target),
e,
Jim_Nvp_value2name_simple(nvp_target_event, e)->name,
Jim_GetString(teap->body, NULL));
@@ -3585,16 +3585,20 @@ static int target_configure(Jim_GetOptInfo *goi, struct target *target)
case TCFG_TYPE:
/* not setable */
if (goi->isconfigure) {
- Jim_SetResult_sprintf(goi->interp, "not setable: %s", n->name);
+ Jim_SetResult_sprintf(goi->interp,
+ "not settable: %s", n->name);
return JIM_ERR;
} else {
no_params:
if (goi->argc != 0) {
- Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "NO PARAMS");
+ Jim_WrongNumArgs(goi->interp,
+ goi->argc, goi->argv,
+ "NO PARAMS");
return JIM_ERR;
}
}
- Jim_SetResultString(goi->interp, target_get_name(target), -1);
+ Jim_SetResultString(goi->interp,
+ target_type_name(target), -1);
/* loop for more */
break;
case TCFG_EVENT: