transport: move files over to transport folder

as we introduce swd and jtag as two transports, we want
to start up with a new transport folder to organize the
code a bit.

diff --git a/configure.in b/configure.in
index 8315a18d229935b6af2b774d3b792a5bf7c75bdf..cb62c8590f482b66306ea0061f9bdac7039e2103 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1167,6 +1167,7 @@ AC_OUTPUT(dnl
     src/helper/Makefile dnl
     src/jtag/Makefile dnl
     src/jtag/drivers/Makefile dnl
+    src/transport/Makefile dnl
     src/xsvf/Makefile dnl
     src/svf/Makefile dnl
     src/target/Makefile dnl

diff --git a/src/Makefile.am b/src/Makefile.am
index 3d7b05f6a3c8e75ddb933ade5e87e8f6dbce4543..60d1189bff65c8197bec43fc9f3364831f1d6c2a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = \
        jtag \
        helper \
        target \
+       transport \
        flash \
        svf \
        xsvf \
@@ -98,6 +99,7 @@ libopenocd_la_LIBADD = \
        $(top_builddir)/src/svf/libsvf.la \
        $(top_builddir)/src/pld/libpld.la \
        $(top_builddir)/src/jtag/libjtag.la \
+       $(top_builddir)/src/transport/libtransport.la \
        $(top_builddir)/src/flash/libflash.la \
        $(top_builddir)/src/target/libtarget.la \
        $(top_builddir)/src/server/libserver.la \

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index fa964a352cb858e41dd2eaf7ccbf672f88af8711..2717dc5417dae117fcad6dd26cfee1cf0fa72ffe 100644 (file)
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -56,7 +56,6 @@ libjtag_la_SOURCES = \
        interface.c \
        interfaces.c \
        tcl.c \
-       transport.c \
        $(DRIVERFILES)
 
 noinst_HEADERS = \
@@ -66,7 +65,6 @@ noinst_HEADERS = \
        interfaces.h \
        minidriver.h \
        jtag.h \
-       transport.h \
        minidriver/minidriver_imp.h \
        minidummy/jtag_minidriver.h
 

diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index e16f756eb8b6a5421cc9c06d1ee6ebd9e03a2a22..94843d7d4a4661c29e80e838b7fb0d6363db59f5 100644 (file)
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -35,7 +35,7 @@
 #include "minidriver.h"
 #include "interface.h"
 #include "interfaces.h"
-#include "transport.h"
+#include <transport/transport.h>
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 22d0b8c302e8a09c6b09c127840fffbf1019e47e..b26701e3c01b83476b8cfb90ba9b04ff8a2afaa7 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -33,7 +33,7 @@
 
 #include "jtag.h"
 #include "interface.h"
-#include "transport.h"
+#include <transport/transport.h>
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>

diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index bde170050d15bbea93c38011a48e094c0624925b..38ead566cf3290fd619cb3a1666bb3d7dfb10b85 100644 (file)
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -81,7 +81,7 @@
 
 /* project specific includes */
 #include <jtag/interface.h>
-#include <jtag/transport.h>
+#include <transport/transport.h>
 #include <helper/time_support.h>
 
 #if IS_CYGWIN == 1

diff --git a/src/openocd.c b/src/openocd.c
index a5002d19268b1f58c167bc18c9acf07002816404..57676f5209e75bcd8dfaab732a8a1e467e7787fe 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -31,7 +31,7 @@
 #include "openocd.h"
 #include <jtag/driver.h>
 #include <jtag/jtag.h>
-#include <jtag/transport.h>
+#include <transport/transport.h>
 #include <helper/ioutil.h>
 #include <helper/util.h>
 #include <helper/configuration.h>

diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index 39f38572c541d07c3866a96ad34802289d65b681..5a3570d536f457734f084fcbb0e408ef78c9afa0 100644 (file)
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -50,7 +50,7 @@
 #include "arm_adi_v5.h"
 #include <helper/time_support.h>
 
-#include <jtag/transport.h>
+#include <transport/transport.h>
 #include <jtag/interface.h>
 
 #include <jtag/swd.h>

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
new file mode 100644 (file)
index 0000000..7c6224a
--- /dev/null
+++ b/src/transport/Makefile.am
@@ -0,0 +1,11 @@
+include $(top_srcdir)/common.mk
+
+#METASOURCES = AUTO
+noinst_LTLIBRARIES = libtransport.la
+libtransport_la_SOURCES = \
+       transport.c
+
+noinst_HEADERS = \
+       transport.h
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

diff --git a/src/jtag/transport.c b/src/transport/transport.c
similarity index 99%
rename from src/jtag/transport.c
rename to src/transport/transport.c
index 60228803342ef2ed81441f91ceeb58c3449a8630..b5e4b9003c3ac378af62e6e93aa27a8bbcd7f1a3 100644 (file)
--- a/src/jtag/transport.c
+++ b/src/transport/transport.c
@@ -44,7 +44,7 @@
 
 #include <helper/log.h>
 
-#include "transport.h"
+#include <transport/transport.h>
 
 extern struct command_context *global_cmd_ctx;
 

diff --git a/src/jtag/transport.h b/src/transport/transport.h
similarity index 95%
rename from src/jtag/transport.h
rename to src/transport/transport.h
index d2d38ec200622a5a832770f56efb64ce63720a06..6ece39e5b181d216a921df17224a1662bd852a2e 100644 (file)
--- a/src/jtag/transport.h
+++ b/src/transport/transport.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010 by David Brownell
+ * Copyright (C) 2011 Tomasz Boleslaw CEDRO (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
@@ -16,6 +17,9 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifndef TRANSPORT_H
+#define TRANSPORT_H
+
 #include "helper/command.h"
 
 /**
@@ -78,3 +82,5 @@ COMMAND_HELPER(transport_list_parse, char ***vector);
 int allow_transports(struct command_context *ctx, const char **vector);
 
 bool transports_are_declared(void);
+
+#endif