zy1000: drop the code, deprecated in v0.10.0

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

diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index 45e30c9b0418c79dd695509a802c58d4e682db1c..d229d8cb07b7e92e1f134b4c0176dfb6d93ef147 100644 (file)
--- 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,9 +42,7 @@
  * 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)
+#if defined(BUILD_MINIDRIVER_DUMMY)
 extern struct adapter_driver minidummy_adapter_driver;
 #else /* standard drivers */
 #if BUILD_PARPORT == 1
@@ -60,6 +60,9 @@ extern struct adapter_driver usb_blaster_adapter_driver;
 #if BUILD_JTAG_VPI == 1
 extern struct adapter_driver jtag_vpi_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
@@ -129,7 +132,7 @@ extern struct adapter_driver aice_adapter_driver;
 #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
@@ -157,9 +160,7 @@ extern struct adapter_driver rshim_dap_adapter_driver;
  * 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)
+#if defined(BUILD_MINIDRIVER_DUMMY)
                &minidummy_adapter_driver,
 #else /* standard drivers */
 #if BUILD_PARPORT == 1
@@ -177,6 +178,9 @@ struct adapter_driver *adapter_drivers[] = {
 #if BUILD_JTAG_VPI == 1
                &jtag_vpi_adapter_driver,
 #endif
+#if BUILD_JTAG_DPI == 1
+               &jtag_dpi_adapter_driver,
+#endif
 #if BUILD_FT232R == 1
                &ft232r_adapter_driver,
 #endif
@@ -246,7 +250,7 @@ struct adapter_driver *adapter_drivers[] = {
 #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