X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/211fd7e506bfea5886e3db5bca57fac2851cd5bf..3b35a8c145cb567b625d32030ba3a287b478dd43:/hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index 01a50b7..0e11866 100644
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -201,13 +201,13 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len
 	return 1;
 }
 
-static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh, libusb_transfer_cb_fn cb, void *data)
+static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh, libusb_transfer_cb_fn cb, void *data, int in_size)
 {
 	unsigned char *data_buf;
 	struct libusb_transfer *transfer;
 	int err;
 
-	data_buf = malloc(ASYNC_SIZE);
+	data_buf = malloc(in_size);
 	if (!data_buf) {
 		fprintf(stderr, "Can't allocate memory for data-buffer!\n");
 		return NULL;
@@ -221,9 +221,9 @@ static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh,
 	}
 
 	libusb_fill_interrupt_transfer(transfer, devh, EP_IN,
-			data_buf, ASYNC_SIZE, cb, data, USB_TIMEOUT);
+			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,7 +345,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 	cb_data->cb = cb;
 	cb_data->data = data;
 
-	dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data);
+	dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data, ASYNC_SIZE);
+
 	if (!dev->transfer) {
 		fprintf(stderr, "Can't prepare async device io!\n");
 		free(dev);
@@ -432,13 +433,11 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 		return -1;
 	} else if (err == 0) {
 		/* No pending timeout or a sane platform */
-		tv.tv_sec = timeout;
 	} else {
 		if ((tv.tv_sec == 0) && (tv.tv_usec == 0)) {
 			usb_event = 1;
-		} else if (tv.tv_sec > timeout) {
-			tv.tv_sec = timeout;
-			tv.tv_usec = 0;
+		} else if ((tv.tv_sec * 1000) < timeout) {
+			timeout = tv.tv_sec * 1000;
 		}
 	}
 
@@ -447,7 +446,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 			dev->pfd[i].revents = 0;
 		}
 
-		n = poll(dev->pfd, dev->n_pfd, tv.tv_sec * 1000);
+		n = poll(dev->pfd, dev->n_pfd, timeout);
 		if (n < 0) {
 			perror("poll");
 			errno = 0;