X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/627e3f3325f221daeb7dfe3610cc6d5caecc3b58..62f60cc1519f114c5906cafaf49c34dc90729643:/hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index 75838fe..65b4763 100644
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -29,6 +29,7 @@
 #include <math.h>
 #include <poll.h>
 #include <errno.h>
+#include <sys/time.h>
 #include <libusb-1.0/libusb.h>
 
 #include "hexdump.h"
@@ -139,13 +140,33 @@ static libusb_device_handle *hmcfgusb_find() {
 	return NULL;
 }
 
+int hmcfgusb_send_null_frame(struct hmcfgusb_dev *usbdev)
+{
+	int err;
+	int cnt;
+
+	err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, NULL, 0, &cnt, USB_TIMEOUT);
+	if (err) {
+		fprintf(stderr, "Can't send data: %s\n", usb_strerror(err));
+		return 0;
+	}
+
+	return 1;
+}
+
 int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len, int done)
 {
 	int err;
 	int cnt;
+	struct timeval tv_start, tv_end;
+	int msec;
 
-	if (debug)
+	if (debug) {
 		hexdump(send_data, len, "USB < ");
+	}
+
+	gettimeofday(&tv_start, NULL);
+
 	err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, send_data, len, &cnt, USB_TIMEOUT);
 	if (err) {
 		fprintf(stderr, "Can't send data: %s\n", usb_strerror(err));
@@ -153,13 +174,20 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len
 	}
 
 	if (done) {
-		err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, send_data, 0, &cnt, USB_TIMEOUT);
-		if (err) {
-			fprintf(stderr, "Can't send data: %s\n", usb_strerror(err));
+		if (!hmcfgusb_send_null_frame(usbdev)) {
 			return 0;
 		}
 	}
 
+	gettimeofday(&tv_end, NULL);
+	msec = ((tv_end.tv_sec-tv_start.tv_sec)*1000)+((tv_end.tv_usec-tv_start.tv_usec)/1000);
+
+	if (msec > 100) {
+		fprintf(stderr, "usb-transfer took more than 100ms (%dms), this may lead to timing problems!\n", msec);
+	} else if (debug) {
+		fprintf(stderr, "usb-transfer took %dms!\n", msec);
+	}
+
 	return 1;
 }
 
@@ -191,7 +219,6 @@ static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh,
 	if (err != 0) {
 		fprintf(stderr, "Can't submit transfer: %s\n", usb_strerror(err));
 		libusb_free_transfer(transfer);
-		free(data_buf);
 		return NULL;
 	}
 
@@ -219,6 +246,7 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 			if (cb_data && cb_data->dev && cb_data->dev->transfer) {
 				libusb_free_transfer(cb_data->dev->transfer);
 				cb_data->dev->transfer = NULL;
+				free(cb_data);
 			}
 			return;
 		}
@@ -226,7 +254,18 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 		if (cb_data && cb_data->cb) {
 			if (debug)
 				hexdump(transfer->buffer, transfer->actual_length, "USB > ");
-			cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data);
+
+			if (!cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data)) {
+				quit = EIO;
+
+				if (cb_data && cb_data->dev && cb_data->dev->transfer) {
+					libusb_free_transfer(cb_data->dev->transfer);
+					cb_data->dev->transfer = NULL;
+					free(cb_data);
+				}
+
+				return;
+			}
 		} else {
 			hexdump(transfer->buffer, transfer->actual_length, "> ");
 		}
@@ -235,8 +274,9 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 	err = libusb_submit_transfer(transfer);
 	if (err != 0) {
 		fprintf(stderr, "Can't re-submit transfer: %s\n", usb_strerror(err));
-		free(transfer->buffer);
 		libusb_free_transfer(transfer);
+		cb_data->dev->transfer = NULL;
+		free(cb_data);
 	}
 }
 
@@ -273,6 +313,7 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 	cb_data = malloc(sizeof(struct hmcfgusb_cb_data));
 	if (!cb_data) {
 		perror("Can't allocate memory for hmcfgusb_cb_data");
+		free(dev);
 		return NULL;
 	}
 
@@ -285,6 +326,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 	dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data);
 	if (!dev->transfer) {
 		fprintf(stderr, "Can't prepare async device io!\n");
+		free(dev);
+		free(cb_data);
 		return NULL;
 	}
 
@@ -292,6 +335,7 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 	if (!usb_pfd) {
 		fprintf(stderr, "Can't get FDset from libusb!\n");
 		free(dev);
+		free(cb_data);
 		return NULL;
 	}
 
@@ -302,6 +346,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 	dev->pfd = malloc(dev->n_usb_pfd * sizeof(struct pollfd));
 	if (!dev->pfd) {
 		perror("Can't allocate memory for poll-fds");
+		free(dev);
+		free(cb_data);
 		return NULL;
 	}
 
@@ -317,6 +363,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 
 	dev->n_pfd = dev->n_usb_pfd;
 
+	quit = 0;
+
 	return dev;
 }
 
@@ -359,6 +407,9 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int 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;
 		}
 	}
 
@@ -370,6 +421,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 		n = poll(dev->pfd, dev->n_pfd, tv.tv_sec * 1000);
 		if (n < 0) {
 			perror("poll");
+			errno = 0;
 			return -1;
 		} else if (n == 0) {
 			usb_event = 1;
@@ -380,6 +432,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 						usb_event = 1;
 						break;
 					} else {
+						errno = 0;
 						return dev->pfd[fd_n].fd;
 					}
 				}
@@ -397,8 +450,11 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 		}
 	}
 
-	if (quit)
+	errno = 0;
+	if (quit) {
+		fprintf(stderr, "closing device-connection due to error %d\n", quit);
 		errno = quit;
+	}
 
 	return -1;
 }