X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Flibusb_helper.c;h=b8f1124e3b70ee4a6dd7239c0e152f6c051b155b;hb=4cb3c9fae2a6a6cb5cf2c664179edace22abf5f6;hp=33f680cc66cfc835c3c93fe182266860241a651d;hpb=08ee7bb982b16742f52cfdc6c649d82ffa2eb177;p=openocd.git

diff --git a/src/jtag/drivers/libusb_helper.c b/src/jtag/drivers/libusb_helper.c
index 33f680cc66..b8f1124e3b 100644
--- a/src/jtag/drivers/libusb_helper.c
+++ b/src/jtag/drivers/libusb_helper.c
@@ -20,9 +20,12 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <jtag/drivers/jtag_usb_common.h>
+
+#include <string.h>
+
+#include <helper/log.h>
+#include <jtag/adapter.h>
 #include "libusb_helper.h"
-#include "log.h"
 
 /*
  * comment from libusb:
@@ -85,7 +88,7 @@ static bool jtag_libusb_location_equal(struct libusb_device *device)
 	}
 	dev_bus = libusb_get_bus_number(device);
 
-	return jtag_usb_location_equal(dev_bus, port_path, path_len);
+	return adapter_usb_location_equal(dev_bus, port_path, path_len);
 }
 #else /* HAVE_LIBUSB_GET_PORT_NUMBERS */
 static bool jtag_libusb_location_equal(struct libusb_device *device)
@@ -177,7 +180,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
 		if (!jtag_libusb_match_ids(&dev_desc, vids, pids))
 			continue;
 
-		if (jtag_usb_get_location() && !jtag_libusb_location_equal(devs[idx]))
+		if (adapter_usb_get_location() && !jtag_libusb_location_equal(devs[idx]))
 			continue;
 
 		err_code = libusb_open(devs[idx], &libusb_handle);
@@ -189,7 +192,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
 		}
 
 		/* Device must be open to use libusb_get_string_descriptor_ascii. */
-		if (serial != NULL &&
+		if (serial &&
 				!jtag_libusb_match_serial(libusb_handle, &dev_desc, serial, adapter_get_alternate_serial)) {
 			serial_mismatch = true;
 			libusb_close(libusb_handle);
@@ -285,7 +288,7 @@ int jtag_libusb_set_configuration(struct libusb_device_handle *devh,
 		return retval;
 
 	retval = libusb_get_config_descriptor(udev, configuration, &config);
-	if (retval != 0 || config == NULL)
+	if (retval != 0 || !config)
 		return retval;
 
 	/* Only change the configuration if it is not already set to the