jtag: linuxgpiod: fix detection for line request bias

[openocd.git] / src / jtag / drivers / mpsse.c

diff --git a/src/jtag/drivers/mpsse.c b/src/jtag/drivers/mpsse.c
index fad91dde2f80019a7be4227416f6d7098342e9ea..f3499e3864fcb92ef8228d2b1f4ccaacb3b86f41 100644 (file)
--- a/src/jtag/drivers/mpsse.c
+++ b/src/jtag/drivers/mpsse.c
@@ -265,6 +265,24 @@ static bool open_matching_device(struct mpsse_ctx *ctx, const uint16_t vids[], c
        case 0x900:
                ctx->type = TYPE_FT232H;
                break;
+       case 0x2800:
+               ctx->type = TYPE_FT2233HP;
+               break;
+       case 0x2900:
+               ctx->type = TYPE_FT4233HP;
+               break;
+       case 0x3000:
+               ctx->type = TYPE_FT2232HP;
+               break;
+       case 0x3100:
+               ctx->type = TYPE_FT4232HP;
+               break;
+       case 0x3200:
+               ctx->type = TYPE_FT233HP;
+               break;
+       case 0x3300:
+               ctx->type = TYPE_FT232HP;
+               break;
        default:
                LOG_ERROR("unsupported FTDI chip type: 0x%04x", desc.bcdDevice);
                goto error;
@@ -880,20 +898,6 @@ int mpsse_flush(struct mpsse_ctx *ctx)
 
                retval = libusb_handle_events_timeout_completed(ctx->usb_ctx, &timeout_usb, NULL);
                keep_alive();
-               if (retval == LIBUSB_ERROR_NO_DEVICE || retval == LIBUSB_ERROR_INTERRUPTED)
-                       break;
-
-               if (retval != LIBUSB_SUCCESS) {
-                       libusb_cancel_transfer(write_transfer);
-                       if (read_transfer)
-                               libusb_cancel_transfer(read_transfer);
-                       while (!write_result.done || !read_result.done) {
-                               retval = libusb_handle_events_timeout_completed(ctx->usb_ctx,
-                                                               &timeout_usb, NULL);
-                               if (retval != LIBUSB_SUCCESS)
-                                       break;
-                       }
-               }
 
                int64_t now = timeval_ms();
                if (now - start > warn_after) {
@@ -901,6 +905,15 @@ int mpsse_flush(struct mpsse_ctx *ctx)
                                        "ms.", now - start);
                        warn_after *= 2;
                }
+
+               if (retval == LIBUSB_ERROR_INTERRUPTED)
+                       continue;
+
+               if (retval != LIBUSB_SUCCESS) {
+                       libusb_cancel_transfer(write_transfer);
+                       if (read_transfer)
+                               libusb_cancel_transfer(read_transfer);
+               }
        }
 
 error_check: