X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Finterfaces.c;h=dbc69d074abc9b7c993210343f1da7cc41d920f5;hp=778c4e3f27a3f4c46bc0a0ff826bb8d165b3df2a;hb=6446dbaacbf7c0607ea571ed7f5a4f32745544eb;hpb=44b06db78309cffc35fc1f054b0aa10a36f3451d

diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index 778c4e3f27..dbc69d074a 100644
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -42,51 +42,60 @@
  */
 
 #if BUILD_ZY1000 == 1
-extern jtag_interface_t zy1000_interface;
+extern struct jtag_interface zy1000_interface;
 #elif defined(BUILD_MINIDRIVER_DUMMY)
-extern jtag_interface_t minidummy_interface;
+extern struct jtag_interface minidummy_interface;
 #else // standard drivers
 #if BUILD_PARPORT == 1
-extern jtag_interface_t parport_interface;
+extern struct jtag_interface parport_interface;
 #endif
 #if BUILD_DUMMY == 1
-extern jtag_interface_t dummy_interface;
+extern struct jtag_interface dummy_interface;
 #endif
 #if BUILD_FT2232_FTD2XX == 1
-extern jtag_interface_t ft2232_interface;
+extern struct jtag_interface ft2232_interface;
 #endif
 #if BUILD_FT2232_LIBFTDI == 1
-extern jtag_interface_t ft2232_interface;
+extern struct jtag_interface ft2232_interface;
+#endif
+#if BUILD_USB_BLASTER_LIBFTDI == 1 || BUILD_USB_BLASTER_FTD2XX == 1
+extern struct jtag_interface usb_blaster_interface;
 #endif
 #if BUILD_AMTJTAGACCEL == 1
-extern jtag_interface_t amt_jtagaccel_interface;
+extern struct jtag_interface amt_jtagaccel_interface;
 #endif
 #if BUILD_EP93XX == 1
-extern jtag_interface_t ep93xx_interface;
+extern struct jtag_interface ep93xx_interface;
 #endif
 #if BUILD_AT91RM9200 == 1
-extern jtag_interface_t at91rm9200_interface;
+extern struct jtag_interface at91rm9200_interface;
 #endif
 #if BUILD_GW16012 == 1
-extern jtag_interface_t gw16012_interface;
+extern struct jtag_interface gw16012_interface;
 #endif
 #if BUILD_PRESTO_LIBFTDI == 1 || BUILD_PRESTO_FTD2XX == 1
-extern jtag_interface_t presto_interface;
+extern struct jtag_interface presto_interface;
 #endif
 #if BUILD_USBPROG == 1
-extern jtag_interface_t usbprog_interface;
+extern struct jtag_interface usbprog_interface;
 #endif
 #if BUILD_JLINK == 1
-extern jtag_interface_t jlink_interface;
+extern struct jtag_interface jlink_interface;
 #endif
 #if BUILD_VSLLINK == 1
-extern jtag_interface_t vsllink_interface;
+extern struct jtag_interface vsllink_interface;
 #endif
 #if BUILD_RLINK == 1
-extern jtag_interface_t rlink_interface;
+extern struct jtag_interface rlink_interface;
+#endif
+#if BUILD_ULINK == 1
+extern struct jtag_interface ulink_interface;
 #endif
 #if BUILD_ARMJTAGEW == 1
-extern jtag_interface_t armjtagew_interface;
+extern struct jtag_interface armjtagew_interface;
+#endif
+#if BUILD_BUSPIRATE == 1
+extern struct jtag_interface buspirate_interface;
 #endif
 #endif // standard drivers
 
@@ -97,7 +106,7 @@ extern jtag_interface_t armjtagew_interface;
  * The list should be defined to contain either one minidriver interface
  * or some number of standard driver interfaces, never both.
  */
-jtag_interface_t *jtag_interfaces[] = {
+struct jtag_interface *jtag_interfaces[] = {
 #if BUILD_ZY1000 == 1
 		&zy1000_interface,
 #elif defined(BUILD_MINIDRIVER_DUMMY)
@@ -115,6 +124,9 @@ jtag_interface_t *jtag_interfaces[] = {
 #if BUILD_FT2232_LIBFTDI == 1
 		&ft2232_interface,
 #endif
+#if BUILD_USB_BLASTER_LIBFTDI == 1 || BUILD_USB_BLASTER_FTD2XX == 1
+		&usb_blaster_interface,
+#endif
 #if BUILD_AMTJTAGACCEL == 1
 		&amt_jtagaccel_interface,
 #endif
@@ -142,9 +154,15 @@ jtag_interface_t *jtag_interfaces[] = {
 #if BUILD_RLINK == 1
 		&rlink_interface,
 #endif
+#if BUILD_ULINK == 1
+		&ulink_interface,
+#endif
 #if BUILD_ARMJTAGEW == 1
 		&armjtagew_interface,
 #endif
+#if BUILD_BUSPIRATE == 1
+		&buspirate_interface,
+#endif
 #endif // standard drivers
 		NULL,
 	};