arm_adi_v5: Rename TAR and CSW setters and make them AP-specific

[openocd] / src / target / oocd_trace.h

diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h
index dfa6449e4ef79bc49e24aa237cb7bdb0f98a2143..5773674d31dc7ca8fb9328fc642acefd1e024a11 100644 (file)
--- a/src/target/oocd_trace.h
+++ b/src/target/oocd_trace.h
@@ -15,21 +15,16 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 */