summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.in1
-rw-r--r--src/jtag/Makefile.am68
-rw-r--r--src/jtag/drivers/Makefile.am74
-rw-r--r--src/jtag/drivers/Makefile.rlink (renamed from src/jtag/rlink/Makefile)0
-rw-r--r--src/jtag/drivers/amt_jtagaccel.c (renamed from src/jtag/amt_jtagaccel.c)0
-rw-r--r--src/jtag/drivers/arm-jtag-ew.c (renamed from src/jtag/arm-jtag-ew.c)0
-rw-r--r--src/jtag/drivers/at91rm9200.c (renamed from src/jtag/at91rm9200.c)0
-rw-r--r--src/jtag/drivers/bitbang.c (renamed from src/jtag/bitbang.c)0
-rw-r--r--src/jtag/drivers/bitbang.h (renamed from src/jtag/bitbang.h)0
-rw-r--r--src/jtag/drivers/bitq.c (renamed from src/jtag/bitq.c)0
-rw-r--r--src/jtag/drivers/bitq.h (renamed from src/jtag/bitq.h)0
-rw-r--r--src/jtag/drivers/driver.c (renamed from src/jtag/driver.c)0
-rw-r--r--src/jtag/drivers/dummy.c (renamed from src/jtag/dummy.c)0
-rw-r--r--src/jtag/drivers/ep93xx.c (renamed from src/jtag/ep93xx.c)0
-rw-r--r--src/jtag/drivers/ft2232.c (renamed from src/jtag/ft2232.c)0
-rw-r--r--src/jtag/drivers/gw16012.c (renamed from src/jtag/gw16012.c)0
-rw-r--r--src/jtag/drivers/jlink.c (renamed from src/jtag/jlink.c)0
-rw-r--r--src/jtag/drivers/parport.c (renamed from src/jtag/parport.c)0
-rw-r--r--src/jtag/drivers/presto.c (renamed from src/jtag/presto.c)0
-rw-r--r--src/jtag/drivers/rlink.c (renamed from src/jtag/rlink/rlink.c)6
-rw-r--r--src/jtag/drivers/rlink.h (renamed from src/jtag/rlink/rlink.h)0
-rw-r--r--src/jtag/drivers/rlink_call.m4 (renamed from src/jtag/rlink/call.m4)0
-rw-r--r--src/jtag/drivers/rlink_dtc_cmd.h (renamed from src/jtag/rlink/dtc_cmd.h)0
-rw-r--r--src/jtag/drivers/rlink_ep1_cmd.h (renamed from src/jtag/rlink/ep1_cmd.h)0
-rw-r--r--src/jtag/drivers/rlink_init.m4 (renamed from src/jtag/rlink/init.m4)0
-rw-r--r--src/jtag/drivers/rlink_speed_table.c (renamed from src/jtag/rlink/rlink_speed_table.c)2
-rw-r--r--src/jtag/drivers/rlink_st7.h (renamed from src/jtag/rlink/st7.h)0
-rw-r--r--src/jtag/drivers/usb_common.c (renamed from src/jtag/usb_common.c)0
-rw-r--r--src/jtag/drivers/usb_common.h (renamed from src/jtag/usb_common.h)0
-rw-r--r--src/jtag/drivers/usbprog.c (renamed from src/jtag/usbprog.c)0
-rw-r--r--src/jtag/drivers/vsllink.c (renamed from src/jtag/vsllink.c)0
31 files changed, 86 insertions, 65 deletions
diff --git a/configure.in b/configure.in
index 7b2b4af3..5020ed64 100644
--- a/configure.in
+++ b/configure.in
@@ -1117,6 +1117,7 @@ AC_OUTPUT(dnl
src/Makefile dnl
src/helper/Makefile dnl
src/jtag/Makefile dnl
+ src/jtag/drivers/Makefile dnl
src/xsvf/Makefile dnl
src/svf/Makefile dnl
src/target/Makefile dnl
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 5254a2b5..c735897e 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -5,7 +5,9 @@ AM_CPPFLAGS = \
METASOURCES = AUTO
noinst_LTLIBRARIES = libjtag.la
+SUBDIRS =
DRIVERFILES =
+libjtag_la_LIBADD =
if MINIDRIVER
@@ -20,63 +22,14 @@ endif
else
-# Standard Driver: common files
-DRIVERFILES += driver.c commands.c
+DRIVERFILES += commands.c
-if USB
-DRIVERFILES += usb_common.c
-endif
-
-if BITBANG
-DRIVERFILES += bitbang.c
-endif
-if PARPORT
-DRIVERFILES += parport.c
-endif
-if DUMMY
-DRIVERFILES += dummy.c
-endif
-if FT2232_DRIVER
-DRIVERFILES += ft2232.c
-endif
-if AMTJTAGACCEL
-DRIVERFILES += amt_jtagaccel.c
-endif
-if EP93XX
-DRIVERFILES += ep93xx.c
-endif
-if AT91RM9200
-DRIVERFILES += at91rm9200.c
-endif
-if GW16012
-DRIVERFILES += gw16012.c
-endif
-if BITQ
-DRIVERFILES += bitq.c
-endif
-if PRESTO_DRIVER
-DRIVERFILES += presto.c
-endif
-if USBPROG
-DRIVERFILES += usbprog.c
-endif
-if JLINK
-DRIVERFILES += jlink.c
-endif
-if RLINK
-DRIVERFILES += rlink/rlink.c rlink/rlink_speed_table.c
-endif
-if VSLLINK
-DRIVERFILES += vsllink.c
-endif
-if ARMJTAGEW
-DRIVERFILES += arm-jtag-ew.c
-endif
+SUBDIRS += drivers
+libjtag_la_LIBADD += $(top_builddir)/src/jtag/drivers/libocdjtagdrivers.la
endif
# endif // MINIDRIVER
-
libjtag_la_SOURCES = \
core.c \
interface.c \
@@ -85,19 +38,12 @@ libjtag_la_SOURCES = \
$(DRIVERFILES)
noinst_HEADERS = \
+ commands.h \
interface.h \
interfaces.h \
- commands.h \
minidriver.h \
- bitbang.h \
jtag.h \
- bitq.h \
- rlink/dtc_cmd.h \
- rlink/ep1_cmd.h \
- rlink/rlink.h \
- rlink/st7.h \
- minidummy/jtag_minidriver.h \
- usb_common.h
+ minidummy/jtag_minidriver.h
EXTRA_DIST = startup.tcl
diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
new file mode 100644
index 00000000..0a007b4c
--- /dev/null
+++ b/src/jtag/drivers/Makefile.am
@@ -0,0 +1,74 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/helper \
+ -I$(top_srcdir)/src/jtag
+
+noinst_LTLIBRARIES = libocdjtagdrivers.la
+
+libocdjtagdrivers_la_SOURCES = \
+ $(DRIVERFILES)
+
+DRIVERFILES =
+
+# Standard Driver: common files
+DRIVERFILES += driver.c
+
+if USB
+DRIVERFILES += usb_common.c
+endif
+
+if BITBANG
+DRIVERFILES += bitbang.c
+endif
+if PARPORT
+DRIVERFILES += parport.c
+endif
+if DUMMY
+DRIVERFILES += dummy.c
+endif
+if FT2232_DRIVER
+DRIVERFILES += ft2232.c
+endif
+if AMTJTAGACCEL
+DRIVERFILES += amt_jtagaccel.c
+endif
+if EP93XX
+DRIVERFILES += ep93xx.c
+endif
+if AT91RM9200
+DRIVERFILES += at91rm9200.c
+endif
+if GW16012
+DRIVERFILES += gw16012.c
+endif
+if BITQ
+DRIVERFILES += bitq.c
+endif
+if PRESTO_DRIVER
+DRIVERFILES += presto.c
+endif
+if USBPROG
+DRIVERFILES += usbprog.c
+endif
+if JLINK
+DRIVERFILES += jlink.c
+endif
+if RLINK
+DRIVERFILES += rlink.c rlink_speed_table.c
+endif
+if VSLLINK
+DRIVERFILES += vsllink.c
+endif
+if ARMJTAGEW
+DRIVERFILES += arm-jtag-ew.c
+endif
+
+noinst_HEADERS = \
+ bitbang.h \
+ bitq.h \
+ rlink.h \
+ rlink_dtc_cmd.h \
+ rlink_ep1_cmd.h \
+ rlink_st7.h \
+ usb_common.h
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff --git a/src/jtag/rlink/Makefile b/src/jtag/drivers/Makefile.rlink
index 94c53f50..94c53f50 100644
--- a/src/jtag/rlink/Makefile
+++ b/src/jtag/drivers/Makefile.rlink
diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/drivers/amt_jtagaccel.c
index d26482a6..d26482a6 100644
--- a/src/jtag/amt_jtagaccel.c
+++ b/src/jtag/drivers/amt_jtagaccel.c
diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index 46c31070..46c31070 100644
--- a/src/jtag/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
diff --git a/src/jtag/at91rm9200.c b/src/jtag/drivers/at91rm9200.c
index ff9f7a41..ff9f7a41 100644
--- a/src/jtag/at91rm9200.c
+++ b/src/jtag/drivers/at91rm9200.c
diff --git a/src/jtag/bitbang.c b/src/jtag/drivers/bitbang.c
index 69c17298..69c17298 100644
--- a/src/jtag/bitbang.c
+++ b/src/jtag/drivers/bitbang.c
diff --git a/src/jtag/bitbang.h b/src/jtag/drivers/bitbang.h
index db5c4cb8..db5c4cb8 100644
--- a/src/jtag/bitbang.h
+++ b/src/jtag/drivers/bitbang.h
diff --git a/src/jtag/bitq.c b/src/jtag/drivers/bitq.c
index 74555d2b..74555d2b 100644
--- a/src/jtag/bitq.c
+++ b/src/jtag/drivers/bitq.c
diff --git a/src/jtag/bitq.h b/src/jtag/drivers/bitq.h
index 48b47db7..48b47db7 100644
--- a/src/jtag/bitq.h
+++ b/src/jtag/drivers/bitq.h
diff --git a/src/jtag/driver.c b/src/jtag/drivers/driver.c
index cadd88e8..cadd88e8 100644
--- a/src/jtag/driver.c
+++ b/src/jtag/drivers/driver.c
diff --git a/src/jtag/dummy.c b/src/jtag/drivers/dummy.c
index c2beb092..c2beb092 100644
--- a/src/jtag/dummy.c
+++ b/src/jtag/drivers/dummy.c
diff --git a/src/jtag/ep93xx.c b/src/jtag/drivers/ep93xx.c
index c679b216..c679b216 100644
--- a/src/jtag/ep93xx.c
+++ b/src/jtag/drivers/ep93xx.c
diff --git a/src/jtag/ft2232.c b/src/jtag/drivers/ft2232.c
index 29b6389c..29b6389c 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
diff --git a/src/jtag/gw16012.c b/src/jtag/drivers/gw16012.c
index b827fd53..b827fd53 100644
--- a/src/jtag/gw16012.c
+++ b/src/jtag/drivers/gw16012.c
diff --git a/src/jtag/jlink.c b/src/jtag/drivers/jlink.c
index 9b2326bd..9b2326bd 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/drivers/jlink.c
diff --git a/src/jtag/parport.c b/src/jtag/drivers/parport.c
index e5f56113..e5f56113 100644
--- a/src/jtag/parport.c
+++ b/src/jtag/drivers/parport.c
diff --git a/src/jtag/presto.c b/src/jtag/drivers/presto.c
index f4e689c2..f4e689c2 100644
--- a/src/jtag/presto.c
+++ b/src/jtag/drivers/presto.c
diff --git a/src/jtag/rlink/rlink.c b/src/jtag/drivers/rlink.c
index bb33ad8f..a039080e 100644
--- a/src/jtag/rlink/rlink.c
+++ b/src/jtag/drivers/rlink.c
@@ -31,9 +31,9 @@
#include "interface.h"
#include "commands.h"
#include "rlink.h"
-#include "st7.h"
-#include "ep1_cmd.h"
-#include "dtc_cmd.h"
+#include "rlink_st7.h"
+#include "rlink_ep1_cmd.h"
+#include "rlink_dtc_cmd.h"
#include "usb_common.h"
diff --git a/src/jtag/rlink/rlink.h b/src/jtag/drivers/rlink.h
index b53be5ce..b53be5ce 100644
--- a/src/jtag/rlink/rlink.h
+++ b/src/jtag/drivers/rlink.h
diff --git a/src/jtag/rlink/call.m4 b/src/jtag/drivers/rlink_call.m4
index 0139c7c2..0139c7c2 100644
--- a/src/jtag/rlink/call.m4
+++ b/src/jtag/drivers/rlink_call.m4
diff --git a/src/jtag/rlink/dtc_cmd.h b/src/jtag/drivers/rlink_dtc_cmd.h
index 98975098..98975098 100644
--- a/src/jtag/rlink/dtc_cmd.h
+++ b/src/jtag/drivers/rlink_dtc_cmd.h
diff --git a/src/jtag/rlink/ep1_cmd.h b/src/jtag/drivers/rlink_ep1_cmd.h
index b30e1bb1..b30e1bb1 100644
--- a/src/jtag/rlink/ep1_cmd.h
+++ b/src/jtag/drivers/rlink_ep1_cmd.h
diff --git a/src/jtag/rlink/init.m4 b/src/jtag/drivers/rlink_init.m4
index 3e64523c..3e64523c 100644
--- a/src/jtag/rlink/init.m4
+++ b/src/jtag/drivers/rlink_init.m4
diff --git a/src/jtag/rlink/rlink_speed_table.c b/src/jtag/drivers/rlink_speed_table.c
index 2ef62ee3..fa40fe8c 100644
--- a/src/jtag/rlink/rlink_speed_table.c
+++ b/src/jtag/drivers/rlink_speed_table.c
@@ -4,7 +4,7 @@
#endif
#include "rlink.h"
-#include "st7.h"
+#include "rlink_st7.h"
static const uint8_t dtc_64[] = {
0, 2, 68, 84, 67, 2, 13, 160, 176, 151, 147, 182, 141, 152, 177, 129, 148,
diff --git a/src/jtag/rlink/st7.h b/src/jtag/drivers/rlink_st7.h
index 5f337ef1..5f337ef1 100644
--- a/src/jtag/rlink/st7.h
+++ b/src/jtag/drivers/rlink_st7.h
diff --git a/src/jtag/usb_common.c b/src/jtag/drivers/usb_common.c
index 463f1af9..463f1af9 100644
--- a/src/jtag/usb_common.c
+++ b/src/jtag/drivers/usb_common.c
diff --git a/src/jtag/usb_common.h b/src/jtag/drivers/usb_common.h
index da395add..da395add 100644
--- a/src/jtag/usb_common.h
+++ b/src/jtag/drivers/usb_common.h
diff --git a/src/jtag/usbprog.c b/src/jtag/drivers/usbprog.c
index 204d0e2e..204d0e2e 100644
--- a/src/jtag/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
diff --git a/src/jtag/vsllink.c b/src/jtag/drivers/vsllink.c
index cc3308f5..cc3308f5 100644
--- a/src/jtag/vsllink.c
+++ b/src/jtag/drivers/vsllink.c
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-23 19:23:50 +0000