X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fetb.h;h=b262841ca22d978f8870129efc8bd481af33571d;hb=83655bf49bfa03b0c57c20123984cf09c4c09393;hp=e3dcb1d7ce76ce778fc6b1854053ecfc9c52521f;hpb=3d6bcf07921753141a3905ee5619724573460cb3;p=openocd.git

diff --git a/src/target/etb.h b/src/target/etb.h
index e3dcb1d7ce..b262841ca2 100644
--- a/src/target/etb.h
+++ b/src/target/etb.h
@@ -20,43 +20,37 @@
 #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
 {
-    ETB_ID = 0x00,
-    ETB_RAM_DEPTH = 0x01,
-    ETB_RAM_WIDTH = 0x02,
-    ETB_STATUS = 0x03,
-    ETB_RAM_DATA = 0x04,
-    ETB_RAM_READ_POINTER = 0x05,
-    ETB_RAM_WRITE_POINTER = 0x06,
-    ETB_TRIGGER_COUNTER = 0x07,
-    ETB_CTRL = 0x08,
+	ETB_ID = 0x00,
+	ETB_RAM_DEPTH = 0x01,
+	ETB_RAM_WIDTH = 0x02,
+	ETB_STATUS = 0x03,
+	ETB_RAM_DATA = 0x04,
+	ETB_RAM_READ_POINTER = 0x05,
+	ETB_RAM_WRITE_POINTER = 0x06,
+	ETB_TRIGGER_COUNTER = 0x07,
+	ETB_CTRL = 0x08,
 };
 
 typedef struct etb_s
 {
 	etm_context_t *etm_ctx;
-	int chain_pos;
-	int cur_scan_chain;
+	jtag_tap_t *tap;
+	uint32_t cur_scan_chain;
 	reg_cache_t *reg_cache;
-	
+
 	/* ETB parameters */
-	int ram_depth;
-	int ram_width;
+	uint32_t ram_depth;
+	uint32_t ram_width;
 } etb_t;
 
 typedef struct etb_reg_s
 {
-	int addr;
+	uint32_t addr;
 	etb_t *etb;
 } etb_reg_t;
 
@@ -64,12 +58,10 @@ extern etm_capture_driver_t 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_write_reg(reg_t *reg, uint32_t value);
+extern int etb_read_reg_w_check(reg_t *reg, uint8_t* check_value, uint8_t* 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);
-
-extern int etb_register_commands(struct command_context_s *cmd_ctx);
+extern int etb_set_reg(reg_t *reg, uint32_t value);
+extern int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf);
 
 #endif /* ETB_H */