ARM: use <target/arm.h> not armv4_5.h

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

diff --git a/src/target/etm_dummy.c b/src/target/etm_dummy.c
index 598c79939e6c72f2481bfa01bbf4b3a60be0a188..19a078f13cf9a93672d18d1f7c74ea0796363acf 100644 (file)
--- a/src/target/etm_dummy.c
+++ b/src/target/etm_dummy.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "armv4_5.h"
+#include "arm.h"
 #include "etm_dummy.h"
 
 
@@ -30,18 +30,18 @@ COMMAND_HANDLER(handle_etm_dummy_config_command)
        struct target *target;
        struct arm *arm;
 
-       target = get_target(args[0]);
+       target = get_target(CMD_ARGV[0]);
 
        if (!target)
        {
-               LOG_ERROR("target '%s' not defined", args[0]);
+               LOG_ERROR("target '%s' not defined", CMD_ARGV[0]);
                return ERROR_FAIL;
        }
 
        arm = target_to_arm(target);
        if (!is_arm(arm))
        {
-               command_print(cmd_ctx, "target '%s' isn't an ARM", args[0]);
+               command_print(CMD_CTX, "target '%s' isn't an ARM", CMD_ARGV[0]);
                return ERROR_FAIL;
        }
 
@@ -58,16 +58,24 @@ COMMAND_HANDLER(handle_etm_dummy_config_command)
        return ERROR_OK;
 }
 
-static int etm_dummy_register_commands(struct command_context_s *cmd_ctx)
-{
-       command_t *etm_dummy_cmd;
-
-       etm_dummy_cmd = register_command(cmd_ctx, NULL, "etm_dummy", NULL, COMMAND_ANY, "Dummy ETM capture driver");
-
-       register_command(cmd_ctx, etm_dummy_cmd, "config", handle_etm_dummy_config_command, COMMAND_CONFIG, NULL);
-
-       return ERROR_OK;
-}
+static const struct command_registration etm_dummy_config_command_handlers[] = {
+       {
+               .name = "config",
+               .handler = &handle_etm_dummy_config_command,
+               .mode = COMMAND_CONFIG,
+               .usage = "<target>",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration etm_dummy_command_handlers[] = {
+       {
+               .name = "etm_dummy",
+               .mode = COMMAND_ANY,
+               .help = "Dummy ETM capture driver command group",
+               .chain = etm_dummy_config_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
 static int etm_dummy_init(struct etm_context *etm_ctx)
 {
@@ -97,7 +105,7 @@ static int etm_dummy_stop_capture(struct etm_context *etm_ctx)
 struct etm_capture_driver etm_dummy_capture_driver =
 {
        .name = "dummy",
-       .register_commands = etm_dummy_register_commands,
+       .commands = etm_dummy_command_handlers,
        .init = etm_dummy_init,
        .status = etm_dummy_status,
        .start_capture = etm_dummy_start_capture,