ETM cleanup

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

diff --git a/src/target/etb.h b/src/target/etb.h
index a41443b8cf998c2a1bc3feac94d201d0519e8689..da9c9b3be947cc2dcddfca62c8dc59738a2848d4 100644 (file)
--- 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
 {
@@ -46,30 +38,22 @@ typedef struct etb_s
 {
        etm_context_t *etm_ctx;
        jtag_tap_t *tap;
-       int cur_scan_chain;
+       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;
 
 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_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);
+reg_cache_t* etb_build_reg_cache(etb_t *etb);
 
 #endif /* ETB_H */