reg_arch_type_t -> struct reg_arch_type

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

diff --git a/src/target/etm.h b/src/target/etm.h
index 317474ce079f9be254dd733fe5db448484ee3728..63e31f1b64dab1dffdcf874d3e97c32774293c7b 100644 (file)
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -140,12 +140,12 @@ enum
        ETMV1_TRIGGER_CYCLE = 0x2,
 };
 
-typedef struct etmv1_trace_data_s
+struct etmv1_trace_data
 {
        uint8_t pipestat;       /* bits 0-2 pipeline status */
        uint16_t packet;                /* packet data (4, 8 or 16 bit) */
        int flags;              /* ETMV1_TRACESYNC_CYCLE, ETMV1_TRIGGER_CYCLE */
-} etmv1_trace_data_t;
+};
 
 /* describe a trace context
  * if support for ETMv2 or ETMv3 is to be implemented,
@@ -155,12 +155,12 @@ typedef struct etmv1_trace_data_s
 typedef struct etm
 {
        target_t *target;               /* target this ETM is connected to */
-       reg_cache_t *reg_cache;         /* ETM register cache */
+       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 */
        uint32_t trigger_percent;       /* how much trace buffer to fill after trigger */
        trace_status_t capture_status;  /* current state of capture run */
-       etmv1_trace_data_t *trace_data; /* trace data */
+       struct etmv1_trace_data *trace_data;    /* trace data */
        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 */
@@ -207,7 +207,7 @@ typedef enum
        BR_RSVD7   = 0x7, /* reserved */
 } etmv1_branch_reason_t;
 
-reg_cache_t* etm_build_reg_cache(target_t *target,
+struct reg_cache* etm_build_reg_cache(target_t *target,
                struct arm_jtag *jtag_info, etm_context_t *etm_ctx);
 
 int etm_setup(target_t *target);