X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fetm_dummy.c;h=6bb2cde4ff1d49b36db5f7af562d34b29f9ced59;hb=996613522df32870b23e68d8d63e523908694598;hp=ee4c3e691aba98f3019fb736ee36d6fdc33df5f7;hpb=56504fdd7353732525e34f1e3fbd44346588f979;p=openocd.git

diff --git a/src/target/etm_dummy.c b/src/target/etm_dummy.c
index ee4c3e691a..6bb2cde4ff 100644
--- a/src/target/etm_dummy.c
+++ b/src/target/etm_dummy.c
@@ -21,33 +21,33 @@
 #include "config.h"
 #endif
 
+#include "armv4_5.h"
 #include "etm_dummy.h"
-#include "arm7_9_common.h"
 
 
-static int handle_etm_dummy_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_etm_dummy_config_command)
 {
 	target_t *target;
-	armv4_5_common_t *armv4_5;
-	arm7_9_common_t *arm7_9;
+	struct arm *arm;
 
-	target = get_target_by_num(strtoul(args[0], NULL, 0));
+	target = get_target(args[0]);
 
 	if (!target)
 	{
-		LOG_ERROR("target number '%s' not defined", args[0]);
+		LOG_ERROR("target '%s' not defined", args[0]);
 		return ERROR_FAIL;
 	}
 
-	if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+	arm = target_to_arm(target);
+	if (!is_arm(arm))
 	{
-		command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
+		command_print(cmd_ctx, "target '%s' isn't an ARM", args[0]);
 		return ERROR_FAIL;
 	}
 
-	if (arm7_9->etm_ctx)
+	if (arm->etm)
 	{
-		arm7_9->etm_ctx->capture_driver_priv = NULL;
+		arm->etm->capture_driver_priv = NULL;
 	}
 	else
 	{