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.tags/v0.5.0-rc1
@@ -1167,6 +1167,7 @@ AC_OUTPUT(dnl | |||||
src/helper/Makefile dnl | src/helper/Makefile dnl | ||||
src/jtag/Makefile dnl | src/jtag/Makefile dnl | ||||
src/jtag/drivers/Makefile dnl | src/jtag/drivers/Makefile dnl | ||||
src/transport/Makefile dnl | |||||
src/xsvf/Makefile dnl | src/xsvf/Makefile dnl | ||||
src/svf/Makefile dnl | src/svf/Makefile dnl | ||||
src/target/Makefile dnl | src/target/Makefile dnl | ||||
@@ -4,6 +4,7 @@ SUBDIRS = \ | |||||
jtag \ | jtag \ | ||||
helper \ | helper \ | ||||
target \ | target \ | ||||
transport \ | |||||
flash \ | flash \ | ||||
svf \ | svf \ | ||||
xsvf \ | xsvf \ | ||||
@@ -98,6 +99,7 @@ libopenocd_la_LIBADD = \ | |||||
$(top_builddir)/src/svf/libsvf.la \ | $(top_builddir)/src/svf/libsvf.la \ | ||||
$(top_builddir)/src/pld/libpld.la \ | $(top_builddir)/src/pld/libpld.la \ | ||||
$(top_builddir)/src/jtag/libjtag.la \ | $(top_builddir)/src/jtag/libjtag.la \ | ||||
$(top_builddir)/src/transport/libtransport.la \ | |||||
$(top_builddir)/src/flash/libflash.la \ | $(top_builddir)/src/flash/libflash.la \ | ||||
$(top_builddir)/src/target/libtarget.la \ | $(top_builddir)/src/target/libtarget.la \ | ||||
$(top_builddir)/src/server/libserver.la \ | $(top_builddir)/src/server/libserver.la \ | ||||
@@ -56,7 +56,6 @@ libjtag_la_SOURCES = \ | |||||
interface.c \ | interface.c \ | ||||
interfaces.c \ | interfaces.c \ | ||||
tcl.c \ | tcl.c \ | ||||
transport.c \ | |||||
$(DRIVERFILES) | $(DRIVERFILES) | ||||
noinst_HEADERS = \ | noinst_HEADERS = \ | ||||
@@ -66,7 +65,6 @@ noinst_HEADERS = \ | |||||
interfaces.h \ | interfaces.h \ | ||||
minidriver.h \ | minidriver.h \ | ||||
jtag.h \ | jtag.h \ | ||||
transport.h \ | |||||
minidriver/minidriver_imp.h \ | minidriver/minidriver_imp.h \ | ||||
minidummy/jtag_minidriver.h | minidummy/jtag_minidriver.h | ||||
@@ -35,7 +35,7 @@ | |||||
#include "minidriver.h" | #include "minidriver.h" | ||||
#include "interface.h" | #include "interface.h" | ||||
#include "interfaces.h" | #include "interfaces.h" | ||||
#include "transport.h" | |||||
#include <transport/transport.h> | |||||
#ifdef HAVE_STRINGS_H | #ifdef HAVE_STRINGS_H | ||||
#include <strings.h> | #include <strings.h> | ||||
@@ -33,7 +33,7 @@ | |||||
#include "jtag.h" | #include "jtag.h" | ||||
#include "interface.h" | #include "interface.h" | ||||
#include "transport.h" | |||||
#include <transport/transport.h> | |||||
#ifdef HAVE_STRINGS_H | #ifdef HAVE_STRINGS_H | ||||
#include <strings.h> | #include <strings.h> | ||||
@@ -81,7 +81,7 @@ | |||||
/* project specific includes */ | /* project specific includes */ | ||||
#include <jtag/interface.h> | #include <jtag/interface.h> | ||||
#include <jtag/transport.h> | |||||
#include <transport/transport.h> | |||||
#include <helper/time_support.h> | #include <helper/time_support.h> | ||||
#if IS_CYGWIN == 1 | #if IS_CYGWIN == 1 | ||||
@@ -31,7 +31,7 @@ | |||||
#include "openocd.h" | #include "openocd.h" | ||||
#include <jtag/driver.h> | #include <jtag/driver.h> | ||||
#include <jtag/jtag.h> | #include <jtag/jtag.h> | ||||
#include <jtag/transport.h> | |||||
#include <transport/transport.h> | |||||
#include <helper/ioutil.h> | #include <helper/ioutil.h> | ||||
#include <helper/util.h> | #include <helper/util.h> | ||||
#include <helper/configuration.h> | #include <helper/configuration.h> | ||||
@@ -50,7 +50,7 @@ | |||||
#include "arm_adi_v5.h" | #include "arm_adi_v5.h" | ||||
#include <helper/time_support.h> | #include <helper/time_support.h> | ||||
#include <jtag/transport.h> | |||||
#include <transport/transport.h> | |||||
#include <jtag/interface.h> | #include <jtag/interface.h> | ||||
#include <jtag/swd.h> | #include <jtag/swd.h> | ||||
@@ -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 |
@@ -44,7 +44,7 @@ | |||||
#include <helper/log.h> | #include <helper/log.h> | ||||
#include "transport.h" | |||||
#include <transport/transport.h> | |||||
extern struct command_context *global_cmd_ctx; | extern struct command_context *global_cmd_ctx; | ||||
@@ -1,5 +1,6 @@ | |||||
/* | /* | ||||
* Copyright (c) 2010 by David Brownell | * 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 | * 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 | * 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 | * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||||
*/ | */ | ||||
#ifndef TRANSPORT_H | |||||
#define TRANSPORT_H | |||||
#include "helper/command.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); | int allow_transports(struct command_context *ctx, const char **vector); | ||||
bool transports_are_declared(void); | bool transports_are_declared(void); | ||||
#endif |