X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fetb.h;h=820d2961326bdb2b58ae988649138340b4941dad;hp=cc58b659a837b20f97cbf24c6ef1e2c2f569049a;hb=93459582fd340e4f63efed0fab9abd49a2cb6373;hpb=3885ab5a5af7ece410ce3eeb1059da3ea950436a

diff --git a/src/target/etb.h b/src/target/etb.h
index cc58b659a8..820d296132 100644
--- 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 */