drivers: call adapter_get_required_serial() in jtag_libusb_open()

[fw/openocd] / src / jtag / drivers / libusb_helper.h

diff --git a/src/jtag/drivers/libusb_helper.h b/src/jtag/drivers/libusb_helper.h
index 3e77865d61b55a905fa433b2ab11ab9b0abeaf2d..2ddb246b3d2f6ad47ec3202842d6e88271d5a4a8 100644 (file)
--- a/src/jtag/drivers/libusb_helper.h
+++ b/src/jtag/drivers/libusb_helper.h
@@ -28,13 +28,12 @@ typedef char * (*adapter_get_alternate_serial_fn)(struct libusb_device_handle *d
                struct libusb_device_descriptor *dev_desc);
 
 int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
-               const char *serial,
                struct libusb_device_handle **out,
                adapter_get_alternate_serial_fn adapter_get_alternate_serial);
 void jtag_libusb_close(struct libusb_device_handle *dev);
 int jtag_libusb_control_transfer(struct libusb_device_handle *dev,
-               uint8_t requestType, uint8_t request, uint16_t wValue,
-               uint16_t wIndex, char *bytes,   uint16_t size, unsigned int timeout);
+               uint8_t request_type, uint8_t request, uint16_t value,
+               uint16_t index, char *bytes, uint16_t size, unsigned int timeout);
 int jtag_libusb_bulk_write(struct libusb_device_handle *dev, int ep,
                char *bytes, int size, int timeout, int *transferred);
 int jtag_libusb_bulk_read(struct libusb_device_handle *dev, int ep,