[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-195-gea530015b

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  ea530015b0f69d7a0e3ee3dca6fb69554e6d2046 (commit)
      from  e17fe4db0f256ee4fb97dcfd6b9f7f55c966b190 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ea530015b0f69d7a0e3ee3dca6fb69554e6d2046
Author: Antonio Borneo <bor...@gm...>
Date:   Mon May 1 00:40:18 2023 +0200

    jtag: move in interface.h the adapter_driver's declaration
    
    The static analyser 'sparse' complains, while compiling a jtag
    driver, that the struct adapter_driver is declared in the file as
    non static, but it is not exposed through an include file.
    The message is:
            warning: symbol 'XXX' was not declared. Should it be static?
    
    Move the list of adapter_driver's declaration in interface.h
    Drop the preprocessor #ifdef/#endif around the declaration, as it
    has no effect when the declaration is not used and/or the symbol
    does not exist.
    
    Change-Id: I5b8f5fe48a89ff0ffce38d547c551cd196379fbf
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7665
    Tested-by: jenkins

diff --git a/src/jtag/interface.h b/src/jtag/interface.h
index a8d9ee47e..ccea9b266 100644
--- a/src/jtag/interface.h
+++ b/src/jtag/interface.h
@@ -364,4 +364,42 @@ int adapter_config_trace(bool enabled, enum tpiu_pin_protocol pin_protocol,
 		unsigned int traceclkin_freq, uint16_t *prescaler);
 int adapter_poll_trace(uint8_t *buf, size_t *size);
 
+extern struct adapter_driver am335xgpio_adapter_driver;
+extern struct adapter_driver amt_jtagaccel_adapter_driver;
+extern struct adapter_driver armjtagew_adapter_driver;
+extern struct adapter_driver at91rm9200_adapter_driver;
+extern struct adapter_driver bcm2835gpio_adapter_driver;
+extern struct adapter_driver buspirate_adapter_driver;
+extern struct adapter_driver cmsis_dap_adapter_driver;
+extern struct adapter_driver dummy_adapter_driver;
+extern struct adapter_driver ep93xx_adapter_driver;
+extern struct adapter_driver esp_usb_adapter_driver;
+extern struct adapter_driver ft232r_adapter_driver;
+extern struct adapter_driver ftdi_adapter_driver;
+extern struct adapter_driver gw16012_adapter_driver;
+extern struct adapter_driver hl_adapter_driver;
+extern struct adapter_driver imx_gpio_adapter_driver;
+extern struct adapter_driver jlink_adapter_driver;
+extern struct adapter_driver jtag_dpi_adapter_driver;
+extern struct adapter_driver jtag_vpi_adapter_driver;
+extern struct adapter_driver kitprog_adapter_driver;
+extern struct adapter_driver linuxgpiod_adapter_driver;
+extern struct adapter_driver opendous_adapter_driver;
+extern struct adapter_driver openjtag_adapter_driver;
+extern struct adapter_driver osbdm_adapter_driver;
+extern struct adapter_driver parport_adapter_driver;
+extern struct adapter_driver presto_adapter_driver;
+extern struct adapter_driver remote_bitbang_adapter_driver;
+extern struct adapter_driver rlink_adapter_driver;
+extern struct adapter_driver rshim_dap_adapter_driver;
+extern struct adapter_driver stlink_dap_adapter_driver;
+extern struct adapter_driver sysfsgpio_adapter_driver;
+extern struct adapter_driver ulink_adapter_driver;
+extern struct adapter_driver usb_blaster_adapter_driver;
+extern struct adapter_driver usbprog_adapter_driver;
+extern struct adapter_driver vdebug_adapter_driver;
+extern struct adapter_driver vsllink_adapter_driver;
+extern struct adapter_driver xds110_adapter_driver;
+extern struct adapter_driver xlnx_pcie_xvc_adapter_driver;
+
 #endif /* OPENOCD_JTAG_INTERFACE_H */
diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index 12848be03..48a194fd5 100644
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -24,125 +24,13 @@
 #include "interfaces.h"
 
 /** @file
- * This file includes declarations for all built-in jtag interfaces,
- * which are then listed in the adapter_drivers array.
+ * This file collects all the built-in JTAG interfaces in the adapter_drivers
+ * array.
  *
  * Dynamic loading can be implemented be searching for shared libraries
  * that contain an adapter_driver structure that can added to this list.
  */
 
-#if BUILD_PARPORT == 1
-extern struct adapter_driver parport_adapter_driver;
-#endif
-#if BUILD_DUMMY == 1
-extern struct adapter_driver dummy_adapter_driver;
-#endif
-#if BUILD_FTDI == 1
-extern struct adapter_driver ftdi_adapter_driver;
-#endif
-#if BUILD_USB_BLASTER == 1 || BUILD_USB_BLASTER_2 == 1
-extern struct adapter_driver usb_blaster_adapter_driver;
-#endif
-#if BUILD_ESP_USB_JTAG == 1
-extern struct adapter_driver esp_usb_adapter_driver;
-#endif
-#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
-#if BUILD_AMTJTAGACCEL == 1
-extern struct adapter_driver amt_jtagaccel_adapter_driver;
-#endif
-#if BUILD_EP93XX == 1
-extern struct adapter_driver ep93xx_adapter_driver;
-#endif
-#if BUILD_AT91RM9200 == 1
-extern struct adapter_driver at91rm9200_adapter_driver;
-#endif
-#if BUILD_GW16012 == 1
-extern struct adapter_driver gw16012_adapter_driver;
-#endif
-#if BUILD_PRESTO
-extern struct adapter_driver presto_adapter_driver;
-#endif
-#if BUILD_USBPROG == 1
-extern struct adapter_driver usbprog_adapter_driver;
-#endif
-#if BUILD_OPENJTAG == 1
-extern struct adapter_driver openjtag_adapter_driver;
-#endif
-#if BUILD_JLINK == 1
-extern struct adapter_driver jlink_adapter_driver;
-#endif
-#if BUILD_VSLLINK == 1
-extern struct adapter_driver vsllink_adapter_driver;
-#endif
-#if BUILD_RLINK == 1
-extern struct adapter_driver rlink_adapter_driver;
-#endif
-#if BUILD_ULINK == 1
-extern struct adapter_driver ulink_adapter_driver;
-#endif
-#if BUILD_ARMJTAGEW == 1
-extern struct adapter_driver armjtagew_adapter_driver;
-#endif
-#if BUILD_BUSPIRATE == 1
-extern struct adapter_driver buspirate_adapter_driver;
-#endif
-#if BUILD_REMOTE_BITBANG == 1
-extern struct adapter_driver remote_bitbang_adapter_driver;
-#endif
-#if BUILD_HLADAPTER == 1
-extern struct adapter_driver hl_adapter_driver;
-#endif
-#if BUILD_OSBDM == 1
-extern struct adapter_driver osbdm_adapter_driver;
-#endif
-#if BUILD_OPENDOUS == 1
-extern struct adapter_driver opendous_adapter_driver;
-#endif
-#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_BCM2835GPIO == 1
-extern struct adapter_driver bcm2835gpio_adapter_driver;
-#endif
-#if BUILD_CMSIS_DAP_USB == 1 || BUILD_CMSIS_DAP_HID == 1
-extern struct adapter_driver cmsis_dap_adapter_driver;
-#endif
-#if BUILD_KITPROG == 1
-extern struct adapter_driver kitprog_adapter_driver;
-#endif
-#if BUILD_IMX_GPIO == 1
-extern struct adapter_driver imx_gpio_adapter_driver;
-#endif
-#if BUILD_XDS110 == 1
-extern struct adapter_driver xds110_adapter_driver;
-#endif
-#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
-#if BUILD_AM335XGPIO == 1
-extern struct adapter_driver am335xgpio_adapter_driver;
-#endif
-
 /**
  * The list of built-in JTAG interfaces, containing entries for those
  * drivers that were enabled by the @c configure script.

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/interface.h  |  38 +++++++++++++++++
 src/jtag/interfaces.c | 116 +-------------------------------------------------
 2 files changed, 40 insertions(+), 114 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository