X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Foocd_trace.h;h=7c334f248d6d53aed929f6bf24575dbd62a7076a;hb=0a1b7dcfc40385f09b5eb088cd97d6ff25a5816d;hp=77e985fbb612f86b79437261093e83b56f60514c;hpb=3d6bcf07921753141a3905ee5619724573460cb3;p=fw%2Fopenocd

diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h
index 77e985fbb..7c334f248 100644
--- a/src/target/oocd_trace.h
+++ b/src/target/oocd_trace.h
@@ -20,22 +20,19 @@
 #ifndef OOCD_TRACE_H
 #define OOCD_TRACE_H
 
-#include "command.h"
-
-#include "etm.h"
+#include <target/etm.h>
 
 #include <termios.h>
-#include <unistd.h>
 
 /* registers */
 enum
 {
-    OOCD_TRACE_ID = 0x7,
-    OOCD_TRACE_ADDRESS = 0x0,
-    OOCD_TRACE_TRIGGER_COUNTER = 0x01,
-    OOCD_TRACE_CONTROL = 0x2,
-    OOCD_TRACE_STATUS = 0x3,
-    OOCD_TRACE_SDRAM_COUNTER = 0x4,
+	OOCD_TRACE_ID = 0x7,
+	OOCD_TRACE_ADDRESS = 0x0,
+	OOCD_TRACE_TRIGGER_COUNTER = 0x01,
+	OOCD_TRACE_CONTROL = 0x2,
+	OOCD_TRACE_STATUS = 0x3,
+	OOCD_TRACE_SDRAM_COUNTER = 0x4,
 };
 
 /* commands */
@@ -49,16 +46,14 @@ enum
 	OOCD_TRACE_RESYNC = 0xf0,
 };
 
-typedef struct oocd_trace_s
+struct oocd_trace
 {
-	etm_context_t *etm_ctx;
+	struct etm_context *etm_ctx;
 	char *tty;
 	int tty_fd;
 	struct termios oldtio, newtio;
-} oocd_trace_t;
-
-extern etm_capture_driver_t oocd_trace_capture_driver;
+};
 
-extern int oocd_trace_register_commands(struct command_context_s *cmd_ctx);
+extern struct etm_capture_driver oocd_trace_capture_driver;
 
 #endif /* OOCD_TRACE_TRACE_H */