remove libusb0_common support 32/5432/5
authorOleksij Rempel <linux@rempel-privat.de>
Mon, 3 Feb 2020 18:44:40 +0000 (19:44 +0100)
committerOleksij Rempel <linux@rempel-privat.de>
Tue, 3 Mar 2020 06:48:43 +0000 (06:48 +0000)
Supporting two libusb versions provides additional development challenges
without additional advantage. In most cases we need to patch libusb0_common and
libusb1_common without real ability to test libusb0_common.

Change-Id: Icbb19c6809b14533fe2acf7a877377b3be4cbd61
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Reviewed-on: http://openocd.zylin.com/5432
Tested-by: jenkins
configure.ac
src/jtag/drivers/Makefile.am
src/jtag/drivers/libusb0_common.c [deleted file]
src/jtag/drivers/libusb0_common.h [deleted file]
src/jtag/drivers/libusb_common.h

index e87959c040fa6f5c9ce7dd368960cef01aa609ac..497b15fd1e47fbf37fad676fb2281ad514ed9bb9 100644 (file)
@@ -116,10 +116,8 @@ m4_define([USB1_ADAPTERS],
        [[usb_blaster_2], [Altera USB-Blaster II Compatible], [USB_BLASTER_2]],
        [[ft232r], [Bitbang mode of FT232R based devices], [FT232R]],
        [[vsllink], [Versaloon-Link JTAG Programmer], [VSLLINK]],
        [[usb_blaster_2], [Altera USB-Blaster II Compatible], [USB_BLASTER_2]],
        [[ft232r], [Bitbang mode of FT232R based devices], [FT232R]],
        [[vsllink], [Versaloon-Link JTAG Programmer], [VSLLINK]],
-       [[xds110], [TI XDS110 Debug Probe], [XDS110]]])
-
-m4_define([USB_ADAPTERS],
-       [[[osbdm], [OSBDM (JTAG only) Programmer], [OSBDM]],
+       [[xds110], [TI XDS110 Debug Probe], [XDS110]],
+       [[osbdm], [OSBDM (JTAG only) Programmer], [OSBDM]],
        [[opendous], [eStick/opendous JTAG Programmer], [OPENDOUS]],
        [[aice], [Andes JTAG Programmer], [AICE]]])
 
        [[opendous], [eStick/opendous JTAG Programmer], [OPENDOUS]],
        [[aice], [Andes JTAG Programmer], [AICE]]])
 
@@ -235,7 +233,6 @@ m4_define([AC_ARG_ADAPTERS], [
 
 AC_ARG_ADAPTERS([
   USB1_ADAPTERS,
 
 AC_ARG_ADAPTERS([
   USB1_ADAPTERS,
-  USB_ADAPTERS,
   USB0_ADAPTERS,
   HIDAPI_ADAPTERS,
   HIDAPI_USB1_ADAPTERS,
   USB0_ADAPTERS,
   HIDAPI_ADAPTERS,
   HIDAPI_USB1_ADAPTERS,
@@ -665,7 +662,6 @@ m4_define([PROCESS_ADAPTERS], [
 ])
 
 PROCESS_ADAPTERS([USB1_ADAPTERS], ["x$use_libusb1" = "xyes"], [libusb-1.x])
 ])
 
 PROCESS_ADAPTERS([USB1_ADAPTERS], ["x$use_libusb1" = "xyes"], [libusb-1.x])
-PROCESS_ADAPTERS([USB_ADAPTERS], ["x$use_libusb1" = "xyes" -o "x$use_libusb0" = "xyes"], [libusb-1.x or libusb-0.1])
 PROCESS_ADAPTERS([USB0_ADAPTERS], ["x$use_libusb0" = "xyes"], [libusb-0.1])
 PROCESS_ADAPTERS([HIDAPI_ADAPTERS], ["x$use_hidapi" = "xyes"], [hidapi])
 PROCESS_ADAPTERS([HIDAPI_USB1_ADAPTERS], ["x$use_hidapi" = "xyes" -a "x$use_libusb1" = "xyes"], [hidapi and libusb-1.x])
 PROCESS_ADAPTERS([USB0_ADAPTERS], ["x$use_libusb0" = "xyes"], [libusb-0.1])
 PROCESS_ADAPTERS([HIDAPI_ADAPTERS], ["x$use_hidapi" = "xyes"], [hidapi])
 PROCESS_ADAPTERS([HIDAPI_USB1_ADAPTERS], ["x$use_hidapi" = "xyes" -a "x$use_libusb1" = "xyes"], [hidapi and libusb-1.x])
@@ -800,7 +796,7 @@ echo
 echo
 echo OpenOCD configuration summary
 echo --------------------------------------------------
 echo
 echo OpenOCD configuration summary
 echo --------------------------------------------------
-m4_foreach([adapter], [USB1_ADAPTERS, USB_ADAPTERS, USB0_ADAPTERS,
+m4_foreach([adapter], [USB1_ADAPTERS, USB0_ADAPTERS,
        HIDAPI_ADAPTERS, HIDAPI_USB1_ADAPTERS, LIBFTDI_ADAPTERS,
        LIBJAYLINK_ADAPTERS, PCIE_ADAPTERS],
        [s=m4_format(["%-40s"], ADAPTER_DESC([adapter]))
        HIDAPI_ADAPTERS, HIDAPI_USB1_ADAPTERS, LIBFTDI_ADAPTERS,
        LIBJAYLINK_ADAPTERS, PCIE_ADAPTERS],
        [s=m4_format(["%-40s"], ADAPTER_DESC([adapter]))
index 7fbcd584f20daa365bea8caa335f92e0d9d90bca..47b19470ee35408d6861912c20957b1ae9464d7f 100644 (file)
@@ -31,9 +31,6 @@ if USE_LIBUSB0
 DRIVERFILES += %D%/usb_common.c
 %C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBUSB0_CFLAGS)
 %C%_libocdjtagdrivers_la_LIBADD += $(LIBUSB0_LIBS)
 DRIVERFILES += %D%/usb_common.c
 %C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBUSB0_CFLAGS)
 %C%_libocdjtagdrivers_la_LIBADD += $(LIBUSB0_LIBS)
-if !USE_LIBUSB1
-DRIVERFILES += %D%/libusb0_common.c
-endif
 endif
 
 if USE_LIBFTDI
 endif
 
 if USE_LIBFTDI
@@ -171,7 +168,6 @@ DRIVERHEADERS = \
        %D%/bitbang.h \
        %D%/bitq.h \
        %D%/jtag_usb_common.h \
        %D%/bitbang.h \
        %D%/bitq.h \
        %D%/jtag_usb_common.h \
-       %D%/libusb0_common.h \
        %D%/libusb1_common.h \
        %D%/libusb_common.h \
        %D%/minidriver_imp.h \
        %D%/libusb1_common.h \
        %D%/libusb_common.h \
        %D%/minidriver_imp.h \
diff --git a/src/jtag/drivers/libusb0_common.c b/src/jtag/drivers/libusb0_common.c
deleted file mode 100644 (file)
index 0e78589..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009 by Zachary T Welch <zw@superlucidity.net>          *
- *                                                                         *
- *   Copyright (C) 2011 by Mauro Gamba <maurillo71@gmail.com>              *
- *                                                                         *
- *   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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "log.h"
-#include "libusb0_common.h"
-
-static int jtag_libusb_error(int err)
-{
-       switch (err) {
-       case 0:
-               return ERROR_OK;
-       case -ETIMEDOUT:
-               return ERROR_TIMEOUT_REACHED;
-       default:
-               return ERROR_FAIL;
-       }
-}
-
-static bool jtag_libusb_match(struct jtag_libusb_device *dev,
-               const uint16_t vids[], const uint16_t pids[])
-{
-       for (unsigned i = 0; vids[i]; i++) {
-               if (dev->descriptor.idVendor == vids[i] &&
-                       dev->descriptor.idProduct == pids[i]) {
-                       return true;
-               }
-       }
-       return false;
-}
-
-/* Returns true if the string descriptor indexed by str_index in device matches string */
-static bool string_descriptor_equal(usb_dev_handle *device, uint8_t str_index,
-                                                                       const char *string)
-{
-       int retval;
-       bool matched;
-       char desc_string[256+1]; /* Max size of string descriptor */
-
-       if (str_index == 0)
-               return false;
-
-       retval = usb_get_string_simple(device, str_index,
-                       desc_string, sizeof(desc_string)-1);
-       if (retval < 0) {
-               LOG_ERROR("usb_get_string_simple() failed with %d", retval);
-               return false;
-       }
-
-       /* Null terminate descriptor string in case it needs to be logged. */
-       desc_string[sizeof(desc_string)-1] = '\0';
-
-       matched = strncmp(string, desc_string, sizeof(desc_string)) == 0;
-       if (!matched)
-               LOG_DEBUG("Device serial number '%s' doesn't match requested serial '%s'",
-                       desc_string, string);
-       return matched;
-}
-
-int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
-               const char *serial,
-               struct jtag_libusb_device_handle **out)
-{
-       int retval = ERROR_FAIL;
-       bool serial_mismatch = false;
-       struct jtag_libusb_device_handle *libusb_handle;
-       usb_init();
-
-       usb_find_busses();
-       usb_find_devices();
-
-       struct usb_bus *busses = usb_get_busses();
-       for (struct usb_bus *bus = busses; bus; bus = bus->next) {
-               for (struct usb_device *dev = bus->devices;
-                               dev; dev = dev->next) {
-                       if (!jtag_libusb_match(dev, vids, pids))
-                               continue;
-
-                       libusb_handle = usb_open(dev);
-                       if (NULL == libusb_handle) {
-                               LOG_ERROR("usb_open() failed with %s", usb_strerror());
-                               continue;
-                       }
-
-                       /* Device must be open to use libusb_get_string_descriptor_ascii. */
-                       if (serial != NULL &&
-                                       !string_descriptor_equal(libusb_handle, dev->descriptor.iSerialNumber, serial)) {
-                               serial_mismatch = true;
-                               usb_close(libusb_handle);
-                               continue;
-                       }
-                       *out = libusb_handle;
-                       retval = ERROR_OK;
-                       serial_mismatch = false;
-                       break;
-               }
-       }
-
-       if (serial_mismatch)
-               LOG_INFO("No device matches the serial string");
-
-       return retval;
-}
-
-void jtag_libusb_close(jtag_libusb_device_handle *dev)
-{
-       /* Close device */
-       usb_close(dev);
-}
-
-int jtag_libusb_control_transfer(jtag_libusb_device_handle *dev, uint8_t requestType,
-               uint8_t request, uint16_t wValue, uint16_t wIndex, char *bytes,
-               uint16_t size, unsigned int timeout)
-{
-       int transferred = 0;
-
-       transferred = usb_control_msg(dev, requestType, request, wValue, wIndex,
-                               bytes, size, timeout);
-
-       if (transferred < 0)
-               transferred = 0;
-
-       return transferred;
-}
-
-int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
-               int size, int timeout, int *transferred)
-{
-       int ret;
-
-       *transferred = 0;
-
-       ret = usb_bulk_write(dev, ep, bytes, size, timeout);
-
-       if (ret < 0) {
-               LOG_ERROR("usb_bulk_write error: %i", ret);
-               return jtag_libusb_error(ret);
-       }
-
-       return ERROR_OK;
-}
-
-int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
-               int size, int timeout, int *transferred)
-{
-       int ret;
-
-       *transferred = 0;
-
-       ret = usb_bulk_read(dev, ep, bytes, size, timeout);
-
-       if (ret < 0) {
-               LOG_ERROR("usb_bulk_read error: %i", ret);
-               return jtag_libusb_error(ret);
-       }
-
-       return ERROR_OK;
-}
-
-int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
-               int configuration)
-{
-       struct jtag_libusb_device *udev = jtag_libusb_get_device(devh);
-
-       return usb_set_configuration(devh,
-                       udev->config[configuration].bConfigurationValue);
-}
-
-int jtag_libusb_choose_interface(struct jtag_libusb_device_handle *devh,
-               unsigned int *usb_read_ep,
-               unsigned int *usb_write_ep,
-               int bclass, int subclass, int protocol, int trans_type)
-{
-       struct jtag_libusb_device *udev = jtag_libusb_get_device(devh);
-       struct usb_interface *iface = udev->config->interface;
-       struct usb_interface_descriptor *desc = iface->altsetting;
-
-       *usb_read_ep = *usb_write_ep = 0;
-
-       for (int i = 0; i < desc->bNumEndpoints; i++) {
-               if ((bclass > 0 && desc->bInterfaceClass != bclass) ||
-                   (subclass > 0 && desc->bInterfaceSubClass != subclass) ||
-                   (protocol > 0 && desc->bInterfaceProtocol != protocol) ||
-                   (trans_type > 0 && (desc->endpoint[i].bmAttributes & 0x3) != trans_type))
-                       continue;
-
-               uint8_t epnum = desc->endpoint[i].bEndpointAddress;
-               bool is_input = epnum & 0x80;
-               LOG_DEBUG("usb ep %s %02x", is_input ? "in" : "out", epnum);
-               if (is_input)
-                       *usb_read_ep = epnum;
-               else
-                       *usb_write_ep = epnum;
-
-               if (*usb_read_ep && *usb_write_ep) {
-                       LOG_DEBUG("Claiming interface %d", (int)desc->bInterfaceNumber);
-                       usb_claim_interface(devh, (int)desc->bInterfaceNumber);
-                       return ERROR_OK;
-               }
-       }
-
-       return ERROR_FAIL;
-}
-
-int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid)
-{
-       if (!dev)
-               return ERROR_FAIL;
-
-       *pid = dev->descriptor.idProduct;
-       return ERROR_OK;
-}
diff --git a/src/jtag/drivers/libusb0_common.h b/src/jtag/drivers/libusb0_common.h
deleted file mode 100644 (file)
index 6f632c4..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009 by Zachary T Welch <zw@superlucidity.net>          *
- *                                                                         *
- *   Copyright (C) 2011 by Mauro Gamba <maurillo71@gmail.com>              *
- *                                                                         *
- *   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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef OPENOCD_JTAG_DRIVERS_LIBUSB0_COMMON_H
-#define OPENOCD_JTAG_DRIVERS_LIBUSB0_COMMON_H
-
-#include <usb.h>
-
-#define jtag_libusb_device                     usb_device
-#define jtag_libusb_device_handle              usb_dev_handle
-#define jtag_libusb_device_descriptor          usb_device_descriptor
-#define jtag_libusb_interface                  usb_interface
-#define jtag_libusb_interface_descriptor       usb_interface_descriptor
-#define jtag_libusb_endpoint_descriptor                usb_endpoint_descriptor
-#define jtag_libusb_config_descriptor          usb_config_descriptor
-
-#define jtag_libusb_reset_device(dev)          usb_reset(dev)
-#define jtag_libusb_get_device(devh)           usb_device(devh)
-
-/* make some defines compatible to libusb1 */
-#define LIBUSB_REQUEST_TYPE_VENDOR             USB_TYPE_VENDOR
-#define LIBUSB_RECIPIENT_DEVICE                        USB_RECIP_DEVICE
-#define LIBUSB_ENDPOINT_OUT                            USB_ENDPOINT_OUT
-#define LIBUSB_ENDPOINT_IN                             USB_ENDPOINT_IN
-#define LIBUSB_TRANSFER_TYPE_BULK              USB_ENDPOINT_TYPE_BULK
-
-static inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh,
-                                      int iface)
-{
-       return usb_claim_interface(devh, iface);
-};
-
-static inline int jtag_libusb_release_interface(jtag_libusb_device_handle *devh,
-                                      int iface)
-{
-       return usb_release_interface(devh, iface);
-}
-
-int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
-               const char *serial,
-               struct jtag_libusb_device_handle **out);
-void jtag_libusb_close(jtag_libusb_device_handle *dev);
-int jtag_libusb_control_transfer(jtag_libusb_device_handle *dev,
-               uint8_t requestType, uint8_t request, uint16_t wValue,
-               uint16_t wIndex, char *bytes,   uint16_t size, unsigned int timeout);
-int jtag_libusb_bulk_write(struct jtag_libusb_device_handle *dev, int ep,
-               char *bytes, int size, int timeout, int *transferred);
-int jtag_libusb_bulk_read(struct jtag_libusb_device_handle *dev, int ep,
-               char *bytes, int size, int timeout, int *transferred);
-int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
-               int configuration);
-int jtag_libusb_choose_interface(struct jtag_libusb_device_handle *devh,
-               unsigned int *usb_read_ep,
-               unsigned int *usb_write_ep,
-               int bclass, int subclass, int protocol, int trans_type);
-int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid);
-
-#endif /* OPENOCD_JTAG_DRIVERS_LIBUSB0_COMMON_H */
index 599a0a9b09841f0b298515f12ba347ccdec1071e..47aca5d91e381eb13b89f8f28690a0b15a879917 100644 (file)
@@ -20,8 +20,6 @@
 
 #ifdef HAVE_LIBUSB1
 #include "libusb1_common.h"
 
 #ifdef HAVE_LIBUSB1
 #include "libusb1_common.h"
-#else
-#include "libusb0_common.h"
 #endif
 
 #endif /* OPENOCD_JTAG_DRIVERS_LIBUSB_COMMON_H */
 #endif
 
 #endif /* OPENOCD_JTAG_DRIVERS_LIBUSB_COMMON_H */

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)