X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/3b35a8c145cb567b625d32030ba3a287b478dd43..bf6d309acc912114438de68bb0d7bf7e09a47a85:/hmcfgusb.c?ds=inline

diff --git a/hmcfgusb.c b/hmcfgusb.c
index 0e11866..652eb42 100644
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -58,6 +58,7 @@
 
 static int quit = 0;
 static int debug = 0;
+static int libusb_initialized = 0;
 
 /* Not in all libusb-1.0 versions, so we have to roll our own :-( */
 static char * usb_strerror(int e)
@@ -124,26 +125,33 @@ static libusb_device_handle *hmcfgusb_find(int vid, int pid) {
 			err = libusb_open(dev, &devh);
 			if (err) {
 				fprintf(stderr, "Can't open device: %s\n", usb_strerror(err));
+				libusb_free_device_list(list, 1);
 				return NULL;
 			}
 
 			err = libusb_detach_kernel_driver(devh, INTERFACE);
 			if ((err != 0) && (err != LIBUSB_ERROR_NOT_FOUND)) {
 				fprintf(stderr, "Can't detach kernel driver: %s\n", usb_strerror(err));
+				libusb_close(devh);
+				libusb_free_device_list(list, 1);
 				return NULL;
 			}
 
 			err = libusb_claim_interface(devh, INTERFACE);
 			if ((err != 0)) {
 				fprintf(stderr, "Can't claim interface: %s\n", usb_strerror(err));
+				libusb_close(devh);
+				libusb_free_device_list(list, 1);
 				return NULL;
 			}
 
+			libusb_free_device_list(list, 0);
 			return devh;
 		}
 
 	}
 
+	libusb_free_device_list(list, 1);
 	return NULL;
 }
 
@@ -250,15 +258,11 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 
 	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
 		if (transfer->status != LIBUSB_TRANSFER_TIMED_OUT) {
-			fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status));
-			quit = EIO;
+			if (transfer->status != LIBUSB_TRANSFER_CANCELLED)
+				fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status));
 
-			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;
+			quit = EIO;
+			goto out;
 		}
 	} else {
 		if (cb_data && cb_data->cb) {
@@ -267,14 +271,7 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 
 			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;
+				goto out;
 			}
 		} else {
 			hexdump(transfer->buffer, transfer->actual_length, "> ");
@@ -284,8 +281,17 @@ 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));
-		libusb_free_transfer(transfer);
-		cb_data->dev->transfer = NULL;
+		goto out;
+	}
+
+	return;
+
+out:
+	libusb_free_transfer(transfer);
+	if (cb_data) {
+		if (cb_data->dev && cb_data->dev->transfer) {
+			cb_data->dev->transfer = NULL;
+		}
 		free(cb_data);
 	}
 }
@@ -300,18 +306,23 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 	int err;
 	int i;
 
-	err = libusb_init(NULL);
-	if (err != 0) {
-		fprintf(stderr, "Can't initialize libusb: %s\n", usb_strerror(err));
-		return NULL;
+	if (!libusb_initialized) {
+		err = libusb_init(NULL);
+		if (err != 0) {
+			fprintf(stderr, "Can't initialize libusb: %s\n", usb_strerror(err));
+			return NULL;
+		}
 	}
+	libusb_initialized = 1;
 
 	devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT);
 	if (!devh) {
 		devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT_BL);
 		if (!devh) {
 			fprintf(stderr, "Can't find/open hmcfgusb!\n");
-			libusb_exit(NULL);
+#ifdef NEED_LIBUSB_EXIT
+			hmcfgusb_exit();
+#endif
 			return NULL;
 		}
 		bootloader = 1;
@@ -321,7 +332,9 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 	if (!dev) {
 		perror("Can't allocate memory for hmcfgusb_dev");
 		libusb_close(devh);
-		libusb_exit(NULL);
+#ifdef NEED_LIBUSB_EXIT
+		hmcfgusb_exit();
+#endif
 		return NULL;
 	}
 
@@ -335,7 +348,9 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 		perror("Can't allocate memory for hmcfgusb_cb_data");
 		free(dev);
 		libusb_close(devh);
-		libusb_exit(NULL);
+#ifdef NEED_LIBUSB_EXIT
+		hmcfgusb_exit();
+#endif
 		return NULL;
 	}
 
@@ -352,17 +367,23 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 		free(dev);
 		free(cb_data);
 		libusb_close(devh);
-		libusb_exit(NULL);
+#ifdef NEED_LIBUSB_EXIT
+		hmcfgusb_exit();
+#endif
 		return NULL;
 	}
 
 	usb_pfd = libusb_get_pollfds(NULL);
 	if (!usb_pfd) {
 		fprintf(stderr, "Can't get FDset from libusb!\n");
+		libusb_cancel_transfer(dev->transfer);
+		libusb_handle_events(NULL);
 		free(dev);
 		free(cb_data);
 		libusb_close(devh);
-		libusb_exit(NULL);
+#ifdef NEED_LIBUSB_EXIT
+		hmcfgusb_exit();
+#endif
 		return NULL;
 	}
 
@@ -373,10 +394,14 @@ 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");
+		libusb_cancel_transfer(dev->transfer);
+		libusb_handle_events(NULL);
 		free(dev);
 		free(cb_data);
 		libusb_close(devh);
-		libusb_exit(NULL);
+#ifdef NEED_LIBUSB_EXIT
+		hmcfgusb_exit();
+#endif
 		return NULL;
 	}
 
@@ -529,6 +554,7 @@ void hmcfgusb_close(struct hmcfgusb_dev *dev)
 
 	if (dev->transfer) {
 		libusb_cancel_transfer(dev->transfer);
+		libusb_handle_events(NULL);
 	}
 
 	err = libusb_release_interface(dev->usb_devh, INTERFACE);
@@ -537,10 +563,19 @@ void hmcfgusb_close(struct hmcfgusb_dev *dev)
 	}
 
 	libusb_close(dev->usb_devh);
+#ifdef NEED_LIBUSB_EXIT
+	hmcfgusb_exit();
+#endif
 	free(dev->pfd);
 	free(dev);
+}
 
-	libusb_exit(NULL);
+void hmcfgusb_exit(void)
+{
+	if (libusb_initialized) {
+		libusb_exit(NULL);
+		libusb_initialized = 0;
+	}
 }
 
 void hmcfgusb_set_debug(int d)