etm_capture_driver_t -> struct etm_capture_driver

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

diff --git a/src/target/etm.h b/src/target/etm.h
index 2335c983e163caa98857839a422615f235667a0f..317474ce079f9be254dd733fe5db448484ee3728 100644 (file)
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -25,7 +25,6 @@
 
 #include "trace.h"
 #include "arm_jtag.h"
-#include "armv4_5.h"
 
 struct image_s;
 
@@ -69,14 +68,15 @@ enum
        /* N task contexts */
        ETM_CONTEXTID_COMPARATOR_VALUE = 0x6c,
        ETM_CONTEXTID_COMPARATOR_MASK = 0x6f,
+       ETM_ID = 0x79,
 };
 
-typedef struct etm_reg_s
+struct etm_reg
 {
        uint32_t value;
        const struct etm_reg_info *reg_info;
-       arm_jtag_t *jtag_info;
-} etm_reg_t;
+       struct arm_jtag *jtag_info;
+};
 
 typedef enum
 {
@@ -84,7 +84,13 @@ typedef enum
        ETM_PORT_4BIT           = 0x00,
        ETM_PORT_8BIT           = 0x10,
        ETM_PORT_16BIT          = 0x20,
-       ETM_PORT_WIDTH_MASK     = 0x70,
+       ETM_PORT_24BIT          = 0x30,
+       ETM_PORT_32BIT          = 0x40,
+       ETM_PORT_48BIT          = 0x50,
+       ETM_PORT_64BIT          = 0x60,
+       ETM_PORT_1BIT           = 0x00 | (1 << 21),
+       ETM_PORT_2BIT           = 0x10 | (1 << 21),
+       ETM_PORT_WIDTH_MASK     = 0x70 | (1 << 21),
        /* Port modes */
        ETM_PORT_NORMAL    = 0x00000,
        ETM_PORT_MUXED     = 0x10000,
@@ -117,7 +123,7 @@ typedef enum
 /* forward-declare ETM context */
 struct etm;
 
-typedef struct etm_capture_driver_s
+struct etm_capture_driver
 {
        char *name;
        int (*register_commands)(struct command_context_s *cmd_ctx);
@@ -126,7 +132,7 @@ typedef struct etm_capture_driver_s
        int (*read_trace)(struct etm *etm_ctx);
        int (*start_capture)(struct etm *etm_ctx);
        int (*stop_capture)(struct etm *etm_ctx);
-} etm_capture_driver_t;
+};
 
 enum
 {
@@ -150,7 +156,7 @@ typedef struct etm
 {
        target_t *target;               /* target this ETM is connected to */
        reg_cache_t *reg_cache;         /* ETM register cache */
-       etm_capture_driver_t *capture_driver;   /* driver used to access ETM data */
+       struct etm_capture_driver *capture_driver;      /* driver used to access ETM data */
        void *capture_driver_priv;      /* capture driver private data */
        uint32_t trigger_percent;       /* how much trace buffer to fill after trigger */
        trace_status_t capture_status;  /* current state of capture run */
@@ -158,7 +164,7 @@ typedef struct etm
        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 */
-       armv4_5_state_t core_state;     /* current core state */
+       int /*armv4_5_state_t*/ core_state;     /* current core state */
        struct image_s *image;          /* source for target opcodes */
        uint32_t pipe_index;            /* current trace cycle */
        uint32_t data_index;            /* cycle holding next data packet */
@@ -167,6 +173,7 @@ typedef struct etm
        bool ptr_ok;                    /* whether last_ptr is valid */
        uint8_t bcd_vers;               /* e.g. 0x13 == ETMv1.3 */
        uint32_t config;                /* cache of ETM_CONFIG value */
+       uint32_t id;                    /* cache of ETM_ID value, or 0 */
        uint32_t current_pc;            /* current program counter */
        uint32_t last_branch;           /* last branch address output */
        uint32_t last_branch_reason;    /* type of last branch encountered */
@@ -201,7 +208,7 @@ typedef enum
 } etmv1_branch_reason_t;
 
 reg_cache_t* etm_build_reg_cache(target_t *target,
-               arm_jtag_t *jtag_info, etm_context_t *etm_ctx);
+               struct arm_jtag *jtag_info, etm_context_t *etm_ctx);
 
 int etm_setup(target_t *target);