summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomek CEDRO <cederom@tlen.pl>2011-06-25 14:35:06 +0200
committerTomek CEDRO <cederom@tlen.pl>2011-06-25 14:35:06 +0200
commit4c6cba205cde7cd56583af4b3e64476c33ea4278 (patch)
treed2e39671e941a70310dc5dc3eaee670e08513001
parentdc647115408c78ad39ed76fb12bf6cf7db7254fa (diff)
downloadopenocd_libswd-4c6cba205cde7cd56583af4b3e64476c33ea4278.tar.gz
openocd_libswd-4c6cba205cde7cd56583af4b3e64476c33ea4278.tar.bz2
openocd_libswd-4c6cba205cde7cd56583af4b3e64476c33ea4278.tar.xz
openocd_libswd-4c6cba205cde7cd56583af4b3e64476c33ea4278.zip
TRANSPORT/TARGET: Updated source tree to build and use new swd infrastructure from src/transport not jtag/swd.h nor target/adi_v5_swd.c.
-rw-r--r--src/target/Makefile.am2
-rw-r--r--src/target/adi_v5_swd.c2
-rw-r--r--src/target/arm_adi_v5.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index eb1e6dbf..bd179254 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -85,13 +85,13 @@ ARM_DEBUG_SRC = \
arm_semihosting.c \
arm_adi_v5.c \
adi_v5_jtag.c \
- adi_v5_swd.c \
embeddedice.c \
trace.c \
etb.c \
etm.c \
$(OOCD_TRACE_FILES) \
etm_dummy.c
+# adi_v5_swd.c
AVR32_SRC = \
avr32_ap7k.c \
diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index 5a3570d5..924136e2 100644
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -53,7 +53,7 @@
#include <transport/transport.h>
#include <jtag/interface.h>
-#include <jtag/swd.h>
+#include <transport/swd.h>
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 66ec114f..cfef7880 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -10,7 +10,8 @@
* *
* Copyright (C) 2009-2010 by David Brownell *
* *
- * Copyright (C) 2011 Tomasz Boleslaw CEDRO <cederom@tlen.pl> * *
+ * Copyright (C) 2011 Tomasz Boleslaw CEDRO *
+ * cederom@tlen.pl, http://www.tomek.cedro.info *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -76,6 +77,7 @@
#include <helper/time_support.h>
#include <jtag/interface.h>
#include <transport/transport.h>
+#include <transport/swd.h>
//We need to have access to information on other layers such as transport etc
//these are kept in global interface structure for now. Change ASAP.