X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Foocd_trace.h;h=e7584e4c9dbf26d37afcb8cef5cf6b1090593af4;hp=49b4b890188ed5fcad146d73599abfc2811eb0d8;hb=5fbf4d4cc3f67ec8b2fb3d8a789117583a84e1a1;hpb=f4e03e3b902104f5cf8aab1ea3cd5db2bb36890e

diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h
index 49b4b89018..e7584e4c9d 100644
--- a/src/target/oocd_trace.h
+++ b/src/target/oocd_trace.h
@@ -13,20 +13,16 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef OOCD_TRACE_H
-#define OOCD_TRACE_H
 
-#include "etm.h"
+#ifndef OPENOCD_TARGET_OOCD_TRACE_H
+#define OPENOCD_TARGET_OOCD_TRACE_H
 
 #include <termios.h>
 
 /* registers */
-enum
-{
+enum {
 	OOCD_TRACE_ID = 0x7,
 	OOCD_TRACE_ADDRESS = 0x0,
 	OOCD_TRACE_TRIGGER_COUNTER = 0x01,
@@ -36,8 +32,7 @@ enum
 };
 
 /* commands */
-enum
-{
+enum {
 	OOCD_TRACE_NOP = 0x0,
 	OOCD_TRACE_READ_REG = 0x10,
 	OOCD_TRACE_WRITE_REG = 0x18,
@@ -46,9 +41,8 @@ enum
 	OOCD_TRACE_RESYNC = 0xf0,
 };
 
-struct oocd_trace
-{
-	etm_context_t *etm_ctx;
+struct oocd_trace {
+	struct etm_context *etm_ctx;
 	char *tty;
 	int tty_fd;
 	struct termios oldtio, newtio;
@@ -56,4 +50,4 @@ struct oocd_trace
 
 extern struct etm_capture_driver oocd_trace_capture_driver;
 
-#endif /* OOCD_TRACE_TRACE_H */
+#endif /* OPENOCD_TARGET_OOCD_TRACE_H */