X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Foocd_trace.h;h=538f1b26b2680ce5d977c277f6db34b69222b7c8;hb=2dde122b66b3bf1a4d3c2798fb4b369b66de9309;hp=dfa6449e4ef79bc49e24aa237cb7bdb0f98a2143;hpb=8c1ec4f0e1a7dd37a2549d83b6cd5c8c57eb34aa;p=openocd.git

diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h
index dfa6449e4e..538f1b26b2 100644
--- a/src/target/oocd_trace.h
+++ b/src/target/oocd_trace.h
@@ -17,19 +17,14 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef OOCD_TRACE_H
 #define OOCD_TRACE_H
 
-#include "command.h"
-
-#include "etm.h"
-
 #include <termios.h>
-#include <unistd.h>
 
 /* registers */
-enum
-{
+enum {
 	OOCD_TRACE_ID = 0x7,
 	OOCD_TRACE_ADDRESS = 0x0,
 	OOCD_TRACE_TRIGGER_COUNTER = 0x01,
@@ -39,8 +34,7 @@ enum
 };
 
 /* commands */
-enum
-{
+enum {
 	OOCD_TRACE_NOP = 0x0,
 	OOCD_TRACE_READ_REG = 0x10,
 	OOCD_TRACE_WRITE_REG = 0x18,
@@ -49,14 +43,13 @@ enum
 	OOCD_TRACE_RESYNC = 0xf0,
 };
 
-typedef struct oocd_trace_s
-{
-	etm_context_t *etm_ctx;
+struct oocd_trace {
+	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 struct etm_capture_driver oocd_trace_capture_driver;
 
 #endif /* OOCD_TRACE_TRACE_H */