libjaylink: Update to latest Git version

[fw/openocd] / src / jtag / interfaces.c

diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index f6d82195d8167e85aee58728c24e15343e9bb9a7..286a73ac67483bf30ee0b0b00ccbdb5193d4386f 100644 (file)
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -23,10 +23,9 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -45,22 +44,25 @@
 extern struct jtag_interface zy1000_interface;
 #elif defined(BUILD_MINIDRIVER_DUMMY)
 extern struct jtag_interface minidummy_interface;
-#else // standard drivers
+#else /* standard drivers */
 #if BUILD_PARPORT == 1
 extern struct jtag_interface parport_interface;
 #endif
 #if BUILD_DUMMY == 1
 extern struct jtag_interface dummy_interface;
 #endif
-#if BUILD_FT2232_FTD2XX == 1
-extern struct jtag_interface ft2232_interface;
-#endif
-#if BUILD_FT2232_LIBFTDI == 1
-extern struct jtag_interface ft2232_interface;
+#if BUILD_FTDI == 1
+extern struct jtag_interface ftdi_interface;
 #endif
-#if BUILD_USB_BLASTER_LIBFTDI == 1 || BUILD_USB_BLASTER_FTD2XX == 1
+#if BUILD_USB_BLASTER == 1 || BUILD_USB_BLASTER_2 == 1
 extern struct jtag_interface usb_blaster_interface;
 #endif
+#if BUILD_JTAG_VPI == 1
+extern struct jtag_interface jtag_vpi_interface;
+#endif
+#if BUILD_FT232R == 1
+extern struct jtag_interface ft232r_interface;
+#endif
 #if BUILD_AMTJTAGACCEL == 1
 extern struct jtag_interface amt_jtagaccel_interface;
 #endif
@@ -73,12 +75,15 @@ extern struct jtag_interface at91rm9200_interface;
 #if BUILD_GW16012 == 1
 extern struct jtag_interface gw16012_interface;
 #endif
-#if BUILD_PRESTO_LIBFTDI == 1 || BUILD_PRESTO_FTD2XX == 1
+#if BUILD_PRESTO
 extern struct jtag_interface presto_interface;
 #endif
 #if BUILD_USBPROG == 1
 extern struct jtag_interface usbprog_interface;
 #endif
+#if BUILD_OPENJTAG == 1
+extern struct jtag_interface openjtag_interface;
+#endif
 #if BUILD_JLINK == 1
 extern struct jtag_interface jlink_interface;
 #endif
@@ -88,10 +93,49 @@ extern struct jtag_interface vsllink_interface;
 #if BUILD_RLINK == 1
 extern struct jtag_interface rlink_interface;
 #endif
+#if BUILD_ULINK == 1
+extern struct jtag_interface ulink_interface;
+#endif
 #if BUILD_ARMJTAGEW == 1
 extern struct jtag_interface armjtagew_interface;
 #endif
-#endif // standard drivers
+#if BUILD_BUSPIRATE == 1
+extern struct jtag_interface buspirate_interface;
+#endif
+#if BUILD_REMOTE_BITBANG == 1
+extern struct jtag_interface remote_bitbang_interface;
+#endif
+#if BUILD_HLADAPTER == 1
+extern struct jtag_interface hl_interface;
+#endif
+#if BUILD_OSBDM == 1
+extern struct jtag_interface osbdm_interface;
+#endif
+#if BUILD_OPENDOUS == 1
+extern struct jtag_interface opendous_interface;
+#endif
+#if BUILD_SYSFSGPIO == 1
+extern struct jtag_interface sysfsgpio_interface;
+#endif
+#if BUILD_AICE == 1
+extern struct jtag_interface aice_interface;
+#endif
+#if BUILD_BCM2835GPIO == 1
+extern struct jtag_interface bcm2835gpio_interface;
+#endif
+#if BUILD_CMSIS_DAP == 1
+extern struct jtag_interface cmsis_dap_interface;
+#endif
+#if BUILD_KITPROG == 1
+extern struct jtag_interface kitprog_interface;
+#endif
+#if BUILD_IMX_GPIO == 1
+extern struct jtag_interface imx_gpio_interface;
+#endif
+#if BUILD_XDS110 == 1
+extern struct jtag_interface xds110_interface;
+#endif
+#endif /* standard drivers */
 
 /**
  * The list of built-in JTAG interfaces, containing entries for those
@@ -105,22 +149,25 @@ struct jtag_interface *jtag_interfaces[] = {
                &zy1000_interface,
 #elif defined(BUILD_MINIDRIVER_DUMMY)
                &minidummy_interface,
-#else // standard drivers
+#else /* standard drivers */
 #if BUILD_PARPORT == 1
                &parport_interface,
 #endif
 #if BUILD_DUMMY == 1
                &dummy_interface,
 #endif
-#if BUILD_FT2232_FTD2XX == 1
-               &ft2232_interface,
+#if BUILD_FTDI == 1
+               &ftdi_interface,
 #endif
-#if BUILD_FT2232_LIBFTDI == 1
-               &ft2232_interface,
-#endif
-#if BUILD_USB_BLASTER_LIBFTDI == 1 || BUILD_USB_BLASTER_FTD2XX == 1
+#if BUILD_USB_BLASTER || BUILD_USB_BLASTER_2 == 1
                &usb_blaster_interface,
 #endif
+#if BUILD_JTAG_VPI == 1
+               &jtag_vpi_interface,
+#endif
+#if BUILD_FT232R == 1
+               &ft232r_interface,
+#endif
 #if BUILD_AMTJTAGACCEL == 1
                &amt_jtagaccel_interface,
 #endif
@@ -133,12 +180,15 @@ struct jtag_interface *jtag_interfaces[] = {
 #if BUILD_GW16012 == 1
                &gw16012_interface,
 #endif
-#if BUILD_PRESTO_LIBFTDI == 1 || BUILD_PRESTO_FTD2XX == 1
+#if BUILD_PRESTO
                &presto_interface,
 #endif
 #if BUILD_USBPROG == 1
                &usbprog_interface,
 #endif
+#if BUILD_OPENJTAG == 1
+               &openjtag_interface,
+#endif
 #if BUILD_JLINK == 1
                &jlink_interface,
 #endif
@@ -148,14 +198,53 @@ struct jtag_interface *jtag_interfaces[] = {
 #if BUILD_RLINK == 1
                &rlink_interface,
 #endif
+#if BUILD_ULINK == 1
+               &ulink_interface,
+#endif
 #if BUILD_ARMJTAGEW == 1
                &armjtagew_interface,
 #endif
-#endif // standard drivers
+#if BUILD_BUSPIRATE == 1
+               &buspirate_interface,
+#endif
+#if BUILD_REMOTE_BITBANG == 1
+               &remote_bitbang_interface,
+#endif
+#if BUILD_HLADAPTER == 1
+               &hl_interface,
+#endif
+#if BUILD_OSBDM == 1
+               &osbdm_interface,
+#endif
+#if BUILD_OPENDOUS == 1
+               &opendous_interface,
+#endif
+#if BUILD_SYSFSGPIO == 1
+               &sysfsgpio_interface,
+#endif
+#if BUILD_AICE == 1
+               &aice_interface,
+#endif
+#if BUILD_BCM2835GPIO == 1
+               &bcm2835gpio_interface,
+#endif
+#if BUILD_CMSIS_DAP == 1
+               &cmsis_dap_interface,
+#endif
+#if BUILD_KITPROG == 1
+               &kitprog_interface,
+#endif
+#if BUILD_IMX_GPIO == 1
+               &imx_gpio_interface,
+#endif
+#if BUILD_XDS110 == 1
+               &xds110_interface,
+#endif
+#endif /* standard drivers */
                NULL,
        };
 
 void jtag_interface_modules_load(const char *path)
 {
-       // @todo: implement dynamic module loading for JTAG interface drivers
+       /* @todo: implement dynamic module loading for JTAG interface drivers */
 }