jtag/libusb_helper: permit adapters to compute their custom serials

[openocd.git] / src / jtag / aice / aice_usb.c

diff --git a/src/jtag/aice/aice_usb.c b/src/jtag/aice/aice_usb.c
index a5cccfef4c3786c91772aca3a4bf57b5a62ffdca..442754209399195b5fe4e40e6842627454e67a4d 100644 (file)
--- a/src/jtag/aice/aice_usb.c
+++ b/src/jtag/aice/aice_usb.c
@@ -2111,7 +2111,7 @@ static int aice_usb_open(struct aice_port_param_s *param)
        const uint16_t pids[] = { param->pid, 0 };
        struct libusb_device_handle *devh;
 
        const uint16_t pids[] = { param->pid, 0 };
        struct libusb_device_handle *devh;
 

-       if (jtag_libusb_open(vids, pids, NULL, &devh) != ERROR_OK)
+       if (jtag_libusb_open(vids, pids, NULL, &devh, NULL) != ERROR_OK)

                return ERROR_FAIL;
 
        /* BE ***VERY CAREFUL*** ABOUT MAKING CHANGES IN THIS
                return ERROR_FAIL;
 
        /* BE ***VERY CAREFUL*** ABOUT MAKING CHANGES IN THIS


@@ -2135,7 +2135,7 @@ static int aice_usb_open(struct aice_port_param_s *param)
        /* reopen jlink after usb_reset
         * on win32 this may take a second or two to re-enumerate */
        int retval;
        /* reopen jlink after usb_reset
         * on win32 this may take a second or two to re-enumerate */
        int retval;

-       while ((retval = jtag_libusb_open(vids, pids, NULL, &devh)) != ERROR_OK) {
+       while ((retval = jtag_libusb_open(vids, pids, NULL, &devh, NULL)) != ERROR_OK) {

                usleep(1000);
                timeout--;
                if (!timeout)
                usleep(1000);
                timeout--;
                if (!timeout)