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

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

diff --git a/src/target/etm.h b/src/target/etm.h
index 3de54eef2a2f9abec1c9065e9ea7833acbf7c62d..5aea65714134648d860e0f15daac1d012dfa90ae 100644 (file)
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -23,10 +23,10 @@
 #ifndef ETM_H
 #define ETM_H
 
-#include "trace.h"
-#include "arm_jtag.h"
+#include <target/trace.h>
+#include <target/arm_jtag.h>
 
-struct image_s;
+struct image;
 
 /* ETM registers (JTAG protocol) */
 enum
@@ -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 */
@@ -164,8 +164,8 @@ struct etm_context
        uint32_t trace_depth;           /* number of cycles to be analyzed, 0 if no data available */
        etm_portmode_t portmode;        /* normal, multiplexed or demultiplexed */
        etmv1_tracemode_t tracemode;    /* type of info trace contains */
-       int /*armv4_5_state_t*/ core_state;     /* current core state */
-       struct image_s *image;          /* source for target opcodes */
+       int /*arm_state*/ core_state;   /* current core state */
+       struct image *image;            /* source for target opcodes */
        uint32_t pipe_index;            /* current trace cycle */
        uint32_t data_index;            /* cycle holding next data packet */
        bool data_half;                 /* port half on a 16 bit port */
@@ -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)