jtag: interfaces: sort the drivers by alphabetic order

Add comments to require the list of drivers to be kept sorted.
While there:
- align the check on BUILD_PRESTO and BUILD_USB_BLASTER;
- fix indentation of the closing parenthesis.

Change-Id: Ic78281b1cdfb5bf72ea41427233e76516001b429
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/8950
Tested-by: jenkins

diff --git a/src/jtag/interface.h b/src/jtag/interface.h
index 475dbed36e21ec2d3d235539f329019879f43180..8349973613aa64ef3e5eb83e9e4d6231135dc3ec 100644 (file)
--- a/src/jtag/interface.h
+++ b/src/jtag/interface.h
@@ -371,6 +371,7 @@ 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);
 
+// Keep in alphabetic order this list of drivers
 extern struct adapter_driver am335xgpio_adapter_driver;
 extern struct adapter_driver amt_jtagaccel_adapter_driver;
 extern struct adapter_driver angie_adapter_driver;

diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index e49bd9e0f33c61b2c2cd2417146dd3910763ec64..834247245b5b3cc743c7a05ce1b5079ac9aef8e0 100644 (file)
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -36,125 +36,128 @@
  * drivers that were enabled by the @c configure script.
  */
 struct adapter_driver *adapter_drivers[] = {
-#if BUILD_PARPORT == 1
-               &parport_adapter_driver,
+               // Keep in alphabetic order this list of drivers
+
+#if BUILD_AM335XGPIO == 1
+               &am335xgpio_adapter_driver,
 #endif
-#if BUILD_DUMMY == 1
-               &dummy_adapter_driver,
+#if BUILD_AMTJTAGACCEL == 1
+               &amt_jtagaccel_adapter_driver,
 #endif
-#if BUILD_FTDI == 1
-               &ftdi_adapter_driver,
+#if BUILD_ANGIE == 1
+               &angie_adapter_driver,
 #endif
-#if BUILD_USB_BLASTER || BUILD_USB_BLASTER_2 == 1
-               &usb_blaster_adapter_driver,
+#if BUILD_ARMJTAGEW == 1
+               &armjtagew_adapter_driver,
 #endif
-#if BUILD_ESP_USB_JTAG == 1
-               &esp_usb_adapter_driver,
+#if BUILD_AT91RM9200 == 1
+               &at91rm9200_adapter_driver,
 #endif
-#if BUILD_JTAG_VPI == 1
-               &jtag_vpi_adapter_driver,
+#if BUILD_BCM2835GPIO == 1
+               &bcm2835gpio_adapter_driver,
 #endif
-#if BUILD_VDEBUG == 1
-               &vdebug_adapter_driver,
+#if BUILD_BUS_PIRATE == 1
+               &buspirate_adapter_driver,
 #endif
-#if BUILD_JTAG_DPI == 1
-               &jtag_dpi_adapter_driver,
+#if BUILD_CMSIS_DAP_USB == 1 || BUILD_CMSIS_DAP_HID == 1
+               &cmsis_dap_adapter_driver,
 #endif
-#if BUILD_FT232R == 1
-               &ft232r_adapter_driver,
+#if BUILD_DMEM == 1
+               &dmem_dap_adapter_driver,
 #endif
-#if BUILD_AMTJTAGACCEL == 1
-               &amt_jtagaccel_adapter_driver,
+#if BUILD_DUMMY == 1
+               &dummy_adapter_driver,
 #endif
 #if BUILD_EP93XX == 1
                &ep93xx_adapter_driver,
 #endif
-#if BUILD_AT91RM9200 == 1
-               &at91rm9200_adapter_driver,
+#if BUILD_ESP_USB_JTAG == 1
+               &esp_usb_adapter_driver,
+#endif
+#if BUILD_FT232R == 1
+               &ft232r_adapter_driver,
+#endif
+#if BUILD_FTDI == 1
+               &ftdi_adapter_driver,
 #endif
 #if BUILD_GW16012 == 1
                &gw16012_adapter_driver,
 #endif
-#if BUILD_PRESTO
-               &presto_adapter_driver,
-#endif
-#if BUILD_USBPROG == 1
-               &usbprog_adapter_driver,
+#if BUILD_HLADAPTER == 1
+               &hl_adapter_driver,
 #endif
-#if BUILD_OPENJTAG == 1
-               &openjtag_adapter_driver,
+#if BUILD_IMX_GPIO == 1
+               &imx_gpio_adapter_driver,
 #endif
 #if BUILD_JLINK == 1
                &jlink_adapter_driver,
 #endif
-#if BUILD_VSLLINK == 1
-               &vsllink_adapter_driver,
-#endif
-#if BUILD_RLINK == 1
-               &rlink_adapter_driver,
+#if BUILD_JTAG_DPI == 1
+               &jtag_dpi_adapter_driver,
 #endif
-#if BUILD_ULINK == 1
-               &ulink_adapter_driver,
+#if BUILD_JTAG_VPI == 1
+               &jtag_vpi_adapter_driver,
 #endif
-#if BUILD_ANGIE == 1
-               &angie_adapter_driver,
+#if BUILD_KITPROG == 1
+               &kitprog_adapter_driver,
 #endif
-#if BUILD_ARMJTAGEW == 1
-               &armjtagew_adapter_driver,
+#if BUILD_LINUXGPIOD == 1
+               &linuxgpiod_adapter_driver,
 #endif
-#if BUILD_BUS_PIRATE == 1
-               &buspirate_adapter_driver,
+#if BUILD_LINUXSPIDEV == 1
+               &linuxspidev_adapter_driver,
 #endif
-#if BUILD_REMOTE_BITBANG == 1
-               &remote_bitbang_adapter_driver,
+#if BUILD_OPENDOUS == 1
+               &opendous_adapter_driver,
 #endif
-#if BUILD_HLADAPTER == 1
-               &hl_adapter_driver,
+#if BUILD_OPENJTAG == 1
+               &openjtag_adapter_driver,
 #endif
 #if BUILD_OSBDM == 1
                &osbdm_adapter_driver,
 #endif
-#if BUILD_OPENDOUS == 1
-               &opendous_adapter_driver,
+#if BUILD_PARPORT == 1
+               &parport_adapter_driver,
 #endif
-#if BUILD_SYSFSGPIO == 1
-               &sysfsgpio_adapter_driver,
+#if BUILD_PRESTO == 1
+               &presto_adapter_driver,
 #endif
-#if BUILD_LINUXGPIOD == 1
-               &linuxgpiod_adapter_driver,
+#if BUILD_REMOTE_BITBANG == 1
+               &remote_bitbang_adapter_driver,
 #endif
-#if BUILD_LINUXSPIDEV == 1
-               &linuxspidev_adapter_driver,
+#if BUILD_RLINK == 1
+               &rlink_adapter_driver,
 #endif
-#if BUILD_XLNX_PCIE_XVC == 1
-               &xlnx_pcie_xvc_adapter_driver,
+#if BUILD_RSHIM == 1
+               &rshim_dap_adapter_driver,
 #endif
-#if BUILD_BCM2835GPIO == 1
-               &bcm2835gpio_adapter_driver,
+#if BUILD_HLADAPTER_STLINK == 1
+               &stlink_dap_adapter_driver,
 #endif
-#if BUILD_CMSIS_DAP_USB == 1 || BUILD_CMSIS_DAP_HID == 1
-               &cmsis_dap_adapter_driver,
+#if BUILD_SYSFSGPIO == 1
+               &sysfsgpio_adapter_driver,
 #endif
-#if BUILD_KITPROG == 1
-               &kitprog_adapter_driver,
+#if BUILD_ULINK == 1
+               &ulink_adapter_driver,
 #endif
-#if BUILD_IMX_GPIO == 1
-               &imx_gpio_adapter_driver,
+#if BUILD_USB_BLASTER == 1 || BUILD_USB_BLASTER_2 == 1
+               &usb_blaster_adapter_driver,
 #endif
-#if BUILD_XDS110 == 1
-               &xds110_adapter_driver,
+#if BUILD_USBPROG == 1
+               &usbprog_adapter_driver,
 #endif
-#if BUILD_HLADAPTER_STLINK == 1
-               &stlink_dap_adapter_driver,
+#if BUILD_VDEBUG == 1
+               &vdebug_adapter_driver,
 #endif
-#if BUILD_RSHIM == 1
-               &rshim_dap_adapter_driver,
+#if BUILD_VSLLINK == 1
+               &vsllink_adapter_driver,
 #endif
-#if BUILD_DMEM == 1
-               &dmem_dap_adapter_driver,
+#if BUILD_XDS110 == 1
+               &xds110_adapter_driver,
 #endif
-#if BUILD_AM335XGPIO == 1
-               &am335xgpio_adapter_driver,
+#if BUILD_XLNX_PCIE_XVC == 1
+               &xlnx_pcie_xvc_adapter_driver,
 #endif
+
                NULL,
-       };
+};