target_timer_callback_t -> struct target_timer_callback

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

diff --git a/src/target/etb.h b/src/target/etb.h
index cc58b659a837b20f97cbf24c6ef1e2c2f569049a..820d2961326bdb2b58ae988649138340b4941dad 100644 (file)
--- a/src/target/etb.h
+++ b/src/target/etb.h
@@ -20,8 +20,6 @@
 #ifndef ETB_H
 #define ETB_H
 
-#include "etm.h"
-
 /* ETB registers */
 enum
 {
@@ -39,23 +37,23 @@ enum
 typedef struct etb_s
 {
        etm_context_t *etm_ctx;
-       jtag_tap_t *tap;
+       struct jtag_tap *tap;
        uint32_t cur_scan_chain;
-       reg_cache_t *reg_cache;
+       struct reg_cache *reg_cache;
 
        /* ETB parameters */
        uint32_t ram_depth;
        uint32_t ram_width;
 } etb_t;
 
-typedef struct etb_reg_s
+struct etb_reg
 {
        uint32_t addr;
        etb_t *etb;
-} etb_reg_t;
+};
 
-extern etm_capture_driver_t etb_capture_driver;
+extern struct etm_capture_driver etb_capture_driver;
 
-reg_cache_t* etb_build_reg_cache(etb_t *etb);
+struct reg_cache* etb_build_reg_cache(etb_t *etb);
 
 #endif /* ETB_H */