target: Cortex-M use consistent arm dap access

[fw/openocd] / src / target / oocd_trace.h

diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h
index 886ff79a69671d2d79901c9fdcaae3adf22e3c30..538f1b26b2680ce5d977c277f6db34b69222b7c8 100644 (file)
--- a/src/target/oocd_trace.h
+++ b/src/target/oocd_trace.h
@@ -17,16 +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 "etm.h"
-
 #include <termios.h>
 
 /* registers */
-enum
-{
+enum {
        OOCD_TRACE_ID = 0x7,
        OOCD_TRACE_ADDRESS = 0x0,
        OOCD_TRACE_TRIGGER_COUNTER = 0x01,
@@ -36,8 +34,7 @@ enum
 };
 
 /* commands */
-enum
-{
+enum {
        OOCD_TRACE_NOP = 0x0,
        OOCD_TRACE_READ_REG = 0x10,
        OOCD_TRACE_WRITE_REG = 0x18,
@@ -46,13 +43,12 @@ 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 struct etm_capture_driver oocd_trace_capture_driver;