X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/1ee8653afbf410ed34f9dbc18ffe4beaf3c159e4..ee8d07d894fa10e47b4441a4db473496c701cb0f:/hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index 652eb42..90e82f2 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
@@ -61,7 +61,7 @@ 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)
+static const char* usb_strerror(int e)
 {
 	static char unknerr[256];
 
@@ -99,7 +99,31 @@ static char * usb_strerror(int e)
 	return unknerr;
 }
 
-static libusb_device_handle *hmcfgusb_find(int vid, int pid) {
+static const char* usb_str_transfer_status(int e)
+{
+	static char unknerr[256];
+
+	switch (e) {
+		case LIBUSB_TRANSFER_COMPLETED:
+			return "Transfer completed";
+		case LIBUSB_TRANSFER_ERROR:
+			return "Transfer error";
+		case LIBUSB_TRANSFER_TIMED_OUT:
+			return "Transfer timed out";
+		case LIBUSB_TRANSFER_CANCELLED:
+			return "Transfer cancelled";
+		case LIBUSB_TRANSFER_STALL:
+			return "For bulk/interrupt endpoints: endpoint stalled. For control endpoints: control request not supported.";
+		case LIBUSB_TRANSFER_NO_DEVICE:
+			return "No device";
+		case LIBUSB_TRANSFER_OVERFLOW:
+			return "Transfer overflow";
+	};
+	snprintf(unknerr, sizeof(unknerr), "Unknown transfer status %d / 0x%02x", e, e);
+	return unknerr;
+}
+
+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 +153,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));
@@ -259,7 +303,7 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
 		if (transfer->status != LIBUSB_TRANSFER_TIMED_OUT) {
 			if (transfer->status != LIBUSB_TRANSFER_CANCELLED)
-				fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status));
+				fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_str_transfer_status(transfer->status));
 
 			quit = EIO;
 			goto out;
@@ -296,7 +340,7 @@ out:
 	}
 }
 
-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;
@@ -315,11 +359,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