ARM7/9: shrink run_algorithm_inner() lines

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

diff --git a/src/target/etm.h b/src/target/etm.h
index 531206cc635f338e7b5136b53c74cb3b10d90960..c8da794768be7460badefcd155efe5d9a6769462 100644 (file)
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -126,7 +126,7 @@ struct etm_context;
 struct etm_capture_driver
 {
        char *name;
-       int (*register_commands)(struct command_context_s *cmd_ctx);
+       const struct command_registration *commands;
        int (*init)(struct etm_context *etm_ctx);
        trace_status_t (*status)(struct etm_context *etm_ctx);
        int (*read_trace)(struct etm_context *etm_ctx);
@@ -154,7 +154,7 @@ struct etmv1_trace_data
  */
 struct etm_context
 {
-       target_t *target;               /* target this ETM is connected to */
+       struct target *target;          /* target this ETM is connected to */
        struct reg_cache *reg_cache;            /* ETM register cache */
        struct etm_capture_driver *capture_driver;      /* driver used to access ETM data */
        void *capture_driver_priv;      /* capture driver private data */
@@ -207,12 +207,12 @@ typedef enum
        BR_RSVD7   = 0x7, /* reserved */
 } etmv1_branch_reason_t;
 
-struct reg_cache* etm_build_reg_cache(target_t *target,
+struct reg_cache* etm_build_reg_cache(struct target *target,
                struct arm_jtag *jtag_info, struct etm_context *etm_ctx);
 
-int etm_setup(target_t *target);
+int etm_setup(struct target *target);
 
-int etm_register_commands(struct command_context_s *cmd_ctx);
+extern const struct command_registration etm_command_handlers[];
 
 #define ERROR_ETM_INVALID_DRIVER       (-1300)
 #define ERROR_ETM_PORTMODE_NOT_SUPPORTED       (-1301)