X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Finterfaces.c;h=64fdd71d615bf7b8af55738942b2e343155f1b12;hb=f19ac83152b54a204b8148815a538d868973e1e1;hp=19d2fccca6ed5438c8f5bc810d8298c003bfd864;hpb=fe52282c37cc0c4ab9863e95ef6970e6fad540b4;p=openocd.git

diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index 19d2fccca6..64fdd71d61 100644
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -23,9 +23,7 @@
  *   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
@@ -62,9 +60,12 @@ 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_LIBFTDI == 1 || BUILD_USB_BLASTER_FTD2XX == 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_AMTJTAGACCEL == 1
 extern struct jtag_interface amt_jtagaccel_interface;
 #endif
@@ -83,6 +84,9 @@ extern struct jtag_interface presto_interface;
 #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
@@ -104,8 +108,8 @@ extern struct jtag_interface buspirate_interface;
 #if BUILD_REMOTE_BITBANG == 1
 extern struct jtag_interface remote_bitbang_interface;
 #endif
-#if BUILD_STLINK == 1
-extern struct jtag_interface stlink_interface;
+#if BUILD_HLADAPTER == 1
+extern struct jtag_interface hl_interface;
 #endif
 #if BUILD_OSBDM == 1
 extern struct jtag_interface osbdm_interface;
@@ -116,6 +120,15 @@ extern struct jtag_interface opendous_interface;
 #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
 #endif /* standard drivers */
 
 /**
@@ -146,9 +159,12 @@ struct jtag_interface *jtag_interfaces[] = {
 #if BUILD_FTDI == 1
 		&ftdi_interface,
 #endif
-#if BUILD_USB_BLASTER_LIBFTDI == 1 || BUILD_USB_BLASTER_FTD2XX == 1
+#if BUILD_USB_BLASTER_LIBFTDI == 1 || BUILD_USB_BLASTER_FTD2XX == 1 || BUILD_USB_BLASTER_2 == 1
 		&usb_blaster_interface,
 #endif
+#if BUILD_JTAG_VPI == 1
+		&jtag_vpi_interface,
+#endif
 #if BUILD_AMTJTAGACCEL == 1
 		&amt_jtagaccel_interface,
 #endif
@@ -167,6 +183,9 @@ struct jtag_interface *jtag_interfaces[] = {
 #if BUILD_USBPROG == 1
 		&usbprog_interface,
 #endif
+#if BUILD_OPENJTAG == 1
+		&openjtag_interface,
+#endif
 #if BUILD_JLINK == 1
 		&jlink_interface,
 #endif
@@ -188,8 +207,8 @@ struct jtag_interface *jtag_interfaces[] = {
 #if BUILD_REMOTE_BITBANG == 1
 		&remote_bitbang_interface,
 #endif
-#if BUILD_STLINK == 1
-		&stlink_interface,
+#if BUILD_HLADAPTER == 1
+		&hl_interface,
 #endif
 #if BUILD_OSBDM == 1
 		&osbdm_interface,
@@ -200,6 +219,15 @@ struct jtag_interface *jtag_interfaces[] = {
 #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
 #endif /* standard drivers */
 		NULL,
 	};