Audit and eliminate redundant #include directives in other target files.

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

diff --git a/src/target/etb.h b/src/target/etb.h
index e3dcb1d7ce76ce778fc6b1854053ecfc9c52521f..e0f7dbe355111f23db3e45ecf85fe9aa75f22232 100644 (file)
--- 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;
+       u32 cur_scan_chain;
        reg_cache_t *reg_cache;
-       
+
        /* ETB parameters */
-       int ram_depth;
-       int ram_width;
+       u32 ram_depth;
+       u32 ram_width;
 } etb_t;
 
 typedef struct etb_reg_s
 {
-       int addr;
+       u32 addr;
        etb_t *etb;
 } etb_reg_t;
 
@@ -70,6 +64,4 @@ 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);
-
 #endif /* ETB_H */