From: Michael Gernoth Date: Sat, 15 Feb 2014 11:47:10 +0000 (+0100) Subject: don't expect to always receive a full frame X-Git-Tag: v0.100~38 X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/commitdiff_plain/bafd75c9511de5b554fb222331b88518ed2ee96e?ds=sidebyside;hp=6c5c2df75ff018417dd6abb38196d998d5fa5b10 don't expect to always receive a full frame with this the bootloader-workaround can also be removed, as the bootloader will only send 1 byte, not 64. --- diff --git a/hmcfgusb.c b/hmcfgusb.c index 90d741f..c90410a 100644 --- a/hmcfgusb.c +++ b/hmcfgusb.c @@ -223,7 +223,7 @@ static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh, libusb_fill_interrupt_transfer(transfer, devh, EP_IN, data_buf, in_size, cb, data, USB_TIMEOUT); - transfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK | LIBUSB_TRANSFER_FREE_BUFFER; + transfer->flags = LIBUSB_TRANSFER_FREE_BUFFER; err = libusb_submit_transfer(transfer); if (err != 0) { @@ -345,11 +345,7 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data) cb_data->cb = cb; cb_data->data = data; - /* Bootloader can only say ack/nack/done */ - if (dev->bootloader) - dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data, 1); - else - dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data, ASYNC_SIZE); + dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data, ASYNC_SIZE); if (!dev->transfer) { fprintf(stderr, "Can't prepare async device io!\n");