X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2Finterfaces.c;h=ddf70cc240babb93a368e3c228a2aeecca047359;hb=f998a2aaf19c14b46fd7f7dd50607a0904f40bd3;hp=c35484693c65824d4b6615d68b8b6d47b458f17e;hpb=efd1d642220a4f6d3b9a9607c186452b265400d2;p=fw%2Fopenocd

diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index c35484693..ddf70cc24 100644
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -12,6 +12,8 @@
  *   Copyright (C) 2009 Zachary T Welch                                    *
  *   zw@superlucidity.net                                                  *
  *                                                                         *
+ *   Copyright (C) 2020, Ampere Computing LLC                              *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -40,11 +42,6 @@
  * that contain an adapter_driver structure that can added to this list.
  */
 
-#if BUILD_ZY1000 == 1
-extern struct adapter_driver zy1000_adapter_driver;
-#elif defined(BUILD_MINIDRIVER_DUMMY)
-extern struct adapter_driver minidummy_adapter_driver;
-#else /* standard drivers */
 #if BUILD_PARPORT == 1
 extern struct adapter_driver parport_adapter_driver;
 #endif
@@ -60,6 +57,12 @@ extern struct adapter_driver usb_blaster_adapter_driver;
 #if BUILD_JTAG_VPI == 1
 extern struct adapter_driver jtag_vpi_adapter_driver;
 #endif
+#if BUILD_VDEBUG == 1
+extern struct adapter_driver vdebug_adapter_driver;
+#endif
+#if BUILD_JTAG_DPI == 1
+extern struct adapter_driver jtag_dpi_adapter_driver;
+#endif
 #if BUILD_FT232R == 1
 extern struct adapter_driver ft232r_adapter_driver;
 #endif
@@ -117,13 +120,19 @@ extern struct adapter_driver opendous_adapter_driver;
 #if BUILD_SYSFSGPIO == 1
 extern struct adapter_driver sysfsgpio_adapter_driver;
 #endif
+#if BUILD_LINUXGPIOD == 1
+extern struct adapter_driver linuxgpiod_adapter_driver;
+#endif
+#if BUILD_XLNX_PCIE_XVC == 1
+extern struct adapter_driver xlnx_pcie_xvc_adapter_driver;
+#endif
 #if BUILD_AICE == 1
 extern struct adapter_driver aice_adapter_driver;
 #endif
 #if BUILD_BCM2835GPIO == 1
 extern struct adapter_driver bcm2835gpio_adapter_driver;
 #endif
-#if BUILD_CMSIS_DAP == 1
+#if BUILD_CMSIS_DAP_USB == 1 || BUILD_CMSIS_DAP_HID == 1
 extern struct adapter_driver cmsis_dap_adapter_driver;
 #endif
 #if BUILD_KITPROG == 1
@@ -135,21 +144,18 @@ extern struct adapter_driver imx_gpio_adapter_driver;
 #if BUILD_XDS110 == 1
 extern struct adapter_driver xds110_adapter_driver;
 #endif
-#endif /* standard drivers */
+#if BUILD_HLADAPTER_STLINK == 1
+extern struct adapter_driver stlink_dap_adapter_driver;
+#endif
+#if BUILD_RSHIM == 1
+extern struct adapter_driver rshim_dap_adapter_driver;
+#endif
 
 /**
  * The list of built-in JTAG interfaces, containing entries for those
  * drivers that were enabled by the @c configure script.
- *
- * The list should be defined to contain either one minidriver interface
- * or some number of standard driver interfaces, never both.
  */
 struct adapter_driver *adapter_drivers[] = {
-#if BUILD_ZY1000 == 1
-		&zy1000_adapter_driver,
-#elif defined(BUILD_MINIDRIVER_DUMMY)
-		&minidummy_adapter_driver,
-#else /* standard drivers */
 #if BUILD_PARPORT == 1
 		&parport_adapter_driver,
 #endif
@@ -165,6 +171,12 @@ struct adapter_driver *adapter_drivers[] = {
 #if BUILD_JTAG_VPI == 1
 		&jtag_vpi_adapter_driver,
 #endif
+#if BUILD_VDEBUG == 1
+		&vdebug_adapter_driver,
+#endif
+#if BUILD_JTAG_DPI == 1
+		&jtag_dpi_adapter_driver,
+#endif
 #if BUILD_FT232R == 1
 		&ft232r_adapter_driver,
 #endif
@@ -222,13 +234,19 @@ struct adapter_driver *adapter_drivers[] = {
 #if BUILD_SYSFSGPIO == 1
 		&sysfsgpio_adapter_driver,
 #endif
+#if BUILD_LINUXGPIOD == 1
+		&linuxgpiod_adapter_driver,
+#endif
+#if BUILD_XLNX_PCIE_XVC == 1
+		&xlnx_pcie_xvc_adapter_driver,
+#endif
 #if BUILD_AICE == 1
 		&aice_adapter_driver,
 #endif
 #if BUILD_BCM2835GPIO == 1
 		&bcm2835gpio_adapter_driver,
 #endif
-#if BUILD_CMSIS_DAP == 1
+#if BUILD_CMSIS_DAP_USB == 1 || BUILD_CMSIS_DAP_HID == 1
 		&cmsis_dap_adapter_driver,
 #endif
 #if BUILD_KITPROG == 1
@@ -240,11 +258,11 @@ struct adapter_driver *adapter_drivers[] = {
 #if BUILD_XDS110 == 1
 		&xds110_adapter_driver,
 #endif
-#endif /* standard drivers */
+#if BUILD_HLADAPTER_STLINK == 1
+		&stlink_dap_adapter_driver,
+#endif
+#if BUILD_RSHIM == 1
+		&rshim_dap_adapter_driver,
+#endif
 		NULL,
 	};
-
-void adapter_driver_modules_load(const char *path)
-{
-	/* @todo: implement dynamic module loading for adapter drivers */
-}