X-Git-Url: http://developer.intra2net.com/git/?a=blobdiff_plain;f=src%2Fftdi_stream.c;h=6c40327b93f3252e3f46a23d700e0e4f28dea824;hb=889d9bb6786a03dfcd881a793beeb35c70590434;hp=076ebd44595716342efecb6f68764bfda967cd2d;hpb=705f012d7f828e212986c21f30abb2c12cb8068a;p=libftdi diff --git a/src/ftdi_stream.c b/src/ftdi_stream.c index 076ebd4..6c40327 100644 --- a/src/ftdi_stream.c +++ b/src/ftdi_stream.c @@ -153,7 +153,6 @@ ftdi_readstream(struct ftdi_context *ftdi, int xferIndex; int err = 0; - fprintf(stderr, "ftdi_readstream\n"); /* * Set up all transfers */ @@ -198,7 +197,7 @@ ftdi_readstream(struct ftdi_context *ftdi, */ if (ftdi_set_bitmode(ftdi, 0xff, BITMODE_SYNCFF) < 0) { - fprintf(stderr,"Can't set synchronous fifo mode\n", + fprintf(stderr,"Can't set synchronous fifo mode: %s\n", ftdi_get_error_string(ftdi)); goto cleanup; } @@ -216,10 +215,10 @@ ftdi_readstream(struct ftdi_context *ftdi, struct timeval timeout = { 0, ftdi->usb_read_timeout }; struct timeval now; - int err = libusb_handle_events_timeout(NULL, &timeout); + int err = libusb_handle_events_timeout(ftdi->usb_ctx, &timeout); if (err == LIBUSB_ERROR_INTERRUPTED) /* restart interrupted events */ - err = libusb_handle_events_timeout(NULL, &timeout); + err = libusb_handle_events_timeout(ftdi->usb_ctx, &timeout); if (!state.result) { state.result = err;