X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/018f85faaef11f00f1f7736ccfe4d8f2fc9671ab..7ba4ea19644711d8f86c2df3a244da797e23cc96:/hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index e3cde0f..bcb85a4 100644
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -1,6 +1,6 @@
 /* HM-CFG-USB libusb-driver
  *
- * Copyright (c) 2013 Michael Gernoth <michael@gernoth.net>
+ * Copyright (c) 2013-16 Michael Gernoth <michael@gernoth.net>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -99,7 +99,7 @@ static char * usb_strerror(int e)
 	return unknerr;
 }
 
-static libusb_device_handle *hmcfgusb_find(int vid, int pid) {
+static libusb_device_handle *hmcfgusb_find(int vid, int pid, char *serial) {
 	libusb_device_handle *devh = NULL;
 	libusb_device **list;
 	ssize_t cnt;
@@ -129,6 +129,26 @@ static libusb_device_handle *hmcfgusb_find(int vid, int pid) {
 				return NULL;
 			}
 
+			if (serial) {
+				if (desc.iSerialNumber > 0) {
+					uint8_t devSerial[256];
+					err = libusb_get_string_descriptor_ascii(devh, desc.iSerialNumber, devSerial, sizeof(devSerial));
+					if (err < 0) {
+						fprintf(stderr, "Can't read serial-number: %s\n", usb_strerror(err));
+						libusb_close(devh);
+						libusb_free_device_list(list, 1);
+						return NULL;
+					}
+					if (strcmp((char*)devSerial, (char*)serial)) {
+						libusb_close(devh);
+						continue;
+					}
+				} else {
+					libusb_close(devh);
+					continue;
+				}
+			}
+
 			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));
@@ -262,15 +282,7 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 				fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status));
 
 			quit = EIO;
-
-			libusb_free_transfer(transfer);
-			if (cb_data) {
-				if (cb_data->dev && cb_data->dev->transfer) {
-					cb_data->dev->transfer = NULL;
-				}
-				free(cb_data);
-			}
-			return;
+			goto out;
 		}
 	} else {
 		if (cb_data && cb_data->cb) {
@@ -279,14 +291,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;
-
-				libusb_free_transfer(transfer);
-				if (cb_data && cb_data->dev && cb_data->dev->transfer) {
-					cb_data->dev->transfer = NULL;
-					free(cb_data);
-				}
-
-				return;
+				goto out;
 			}
 		} else {
 			hexdump(transfer->buffer, transfer->actual_length, "> ");
@@ -296,16 +301,22 @@ 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);
-		if (cb_data) {
-			if (cb_data->dev)
-				cb_data->dev->transfer = NULL;
-			free(cb_data);
+		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);
 	}
 }
 
-struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
+struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data, char *serial)
 {
 	libusb_device_handle *devh = NULL;
 	const struct libusb_pollfd **usb_pfd = NULL;
@@ -324,11 +335,15 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 	}
 	libusb_initialized = 1;
 
-	devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT);
+	devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT, serial);
 	if (!devh) {
-		devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT_BL);
+		devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT_BL, serial);
 		if (!devh) {
-			fprintf(stderr, "Can't find/open hmcfgusb!\n");
+			if (serial) {
+				fprintf(stderr, "Can't find/open HM-CFG-USB with serial %s!\n", serial);
+			} else {
+				fprintf(stderr, "Can't find/open HM-CFG-USB!\n");
+			}
 #ifdef NEED_LIBUSB_EXIT
 			hmcfgusb_exit();
 #endif