X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fetb.h;h=49385ee90d0c99897f8cf8f2828ec9ed0804091c;hb=60a2d85af1afbc207ae5fb9dafdbe4c8b49ad5bb;hp=af6e25499f1dcfcfd2a69e61a0b25a5a6bf8d651;hpb=8c1ec4f0e1a7dd37a2549d83b6cd5c8c57eb34aa;p=openocd.git

diff --git a/src/target/etb.h b/src/target/etb.h
index af6e25499f..49385ee90d 100644
--- a/src/target/etb.h
+++ b/src/target/etb.h
@@ -20,14 +20,6 @@
 #ifndef ETB_H
 #define ETB_H
 
-#include "command.h"
-#include "target.h"
-#include "register.h"
-#include "arm_jtag.h"
-
-#include "etb.h"
-#include "etm.h"
-
 /* ETB registers */
 enum
 {
@@ -42,32 +34,26 @@ enum
 	ETB_CTRL = 0x08,
 };
 
-typedef struct etb_s
+struct etb
 {
-	etm_context_t *etm_ctx;
-	jtag_tap_t *tap;
-	u32 cur_scan_chain;
-	reg_cache_t *reg_cache;
-	
+	struct etm_context *etm_ctx;
+	struct jtag_tap *tap;
+	uint32_t cur_scan_chain;
+	struct reg_cache *reg_cache;
+
 	/* ETB parameters */
-	u32 ram_depth;
-	u32 ram_width;
-} etb_t;
+	uint32_t ram_depth;
+	uint32_t ram_width;
+};
 
-typedef struct etb_reg_s
+struct etb_reg
 {
-	u32 addr;
-	etb_t *etb;
-} etb_reg_t;
+	uint32_t addr;
+	struct etb *etb;
+};
 
-extern etm_capture_driver_t etb_capture_driver;
+extern struct etm_capture_driver etb_capture_driver;
 
-extern reg_cache_t* etb_build_reg_cache(etb_t *etb);
-extern int etb_read_reg(reg_t *reg);
-extern int etb_write_reg(reg_t *reg, u32 value);
-extern int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask);
-extern int etb_store_reg(reg_t *reg);
-extern int etb_set_reg(reg_t *reg, u32 value);
-extern int etb_set_reg_w_exec(reg_t *reg, u8 *buf);
+struct reg_cache* etb_build_reg_cache(struct etb *etb);
 
 #endif /* ETB_H */