move jtag drivers to src/jtag/drivers

Moves JTAG interface drivers to src/jtag/drivers/,
Adds src/jtag/drivers/Makefile.am.
Builds libocdjtagdrivers.la.

Flattens the rlink driver files into the drivers/ directory, adding
the 'rlink_' prefix or '.rlink' suffix as appropriate.
__archive__
Zachary T Welch 2009-12-02 17:18:05 -08:00
parent fe9228a32d
commit 865efd828a
31 changed files with 86 additions and 65 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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,