ARM11: use shared DSCR bit names

[openocd.git] / src / target / etm.c

diff --git a/src/target/etm.c b/src/target/etm.c
index 0f7b41ec0a0871a3958cbc4c5c4d9327467995ce..520e22f6089c9a20c5785992f4bd1a0e8abb3d8f 100644 (file)
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -1374,7 +1374,8 @@ COMMAND_HANDLER(handle_etm_config_command)
        arm = target_to_arm(target);
        if (!is_arm(arm)) {
                command_print(CMD_CTX, "target '%s' is '%s'; not an ARM",
-                               target->cmd_name, target_get_name(target));
+                               target_name(target),
+                               target_type_name(target));
                return ERROR_FAIL;
        }
 
@@ -1471,8 +1472,9 @@ COMMAND_HANDLER(handle_etm_config_command)
        {
                if (strcmp(CMD_ARGV[4], etm_capture_drivers[i]->name) == 0)
                {
-                       int retval;
-                       if ((retval = etm_capture_drivers[i]->register_commands(CMD_CTX)) != ERROR_OK)
+                       int retval = register_commands(CMD_CTX, NULL,
+                                       etm_capture_drivers[i]->commands);
+                       if (ERROR_OK != retval)
                        {
                                free(etm_ctx);
                                return retval;
@@ -2103,7 +2105,7 @@ static const struct command_registration etm_config_command_handlers[] = {
        },
        COMMAND_REGISTRATION_DONE
 };
-static const struct command_registration etm_command_handlers[] = {
+const struct command_registration etm_command_handlers[] = {
        {
                .name = "etm",
                .mode = COMMAND_ANY,
@@ -2113,11 +2115,6 @@ static const struct command_registration etm_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-int etm_register_commands(struct command_context *cmd_ctx)
-{
-       return register_commands(cmd_ctx, NULL, etm_command_handlers);
-}
-
 static const struct command_registration etm_exec_command_handlers[] = {
        {
                .name = "tracemode", handle_etm_tracemode_command,