X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/2a6eaefc7786a666d27c52a8e9bb0c1c4aeb2843..032d60505d30c95e5a01d652c728ccca7ddbf0ab:/hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index ce8c595..d086419 100644
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -39,6 +39,7 @@
 
 #define ID_VENDOR	0x1b1f
 #define ID_PRODUCT	0xc00f
+#define ID_PRODUCT_BL	0xc010
 
 /* TODO: dynamic */
 #define ASYNC_SIZE	0x0040
@@ -111,7 +112,8 @@ static libusb_device_handle *hmcfgusb_find() {
 		if (err)
 			continue;
 
-		if ((desc.idVendor == ID_VENDOR) && (desc.idProduct == ID_PRODUCT)) {
+		if ((desc.idVendor == ID_VENDOR) &&
+		    ((desc.idProduct == ID_PRODUCT) || (desc.idProduct == ID_PRODUCT_BL))) {
 			libusb_device *dev = list[i];
 
 			err = libusb_open(dev, &devh);
@@ -140,14 +142,14 @@ static libusb_device_handle *hmcfgusb_find() {
 	return NULL;
 }
 
-int hmcfgusb_send_null_frame(struct hmcfgusb_dev *usbdev)
+int hmcfgusb_send_null_frame(struct hmcfgusb_dev *usbdev, int silent)
 {
 	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));
+	if (err && (!silent)) {
+		fprintf(stderr, "Can't send null frame: %s\n", usb_strerror(err));
 		return 0;
 	}
 
@@ -163,9 +165,10 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len
 
 	if (debug) {
 		hexdump(send_data, len, "USB < ");
-		gettimeofday(&tv_start, NULL);
 	}
 
+	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));
@@ -173,15 +176,18 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len
 	}
 
 	if (done) {
-		if (!hmcfgusb_send_null_frame(usbdev)) {
+		if (!hmcfgusb_send_null_frame(usbdev, 0)) {
 			return 0;
 		}
 	}
 
-	if (debug) {
-		gettimeofday(&tv_end, NULL);
-		msec = ((tv_end.tv_sec-tv_start.tv_sec)*1000)+((tv_end.tv_usec-tv_start.tv_usec)/1000);
-		fprintf(stderr, "send took %dms!\n", msec);
+	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;
@@ -236,7 +242,7 @@ 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: %d!\n", transfer->status);
+			fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status));
 			quit = EIO;
 
 			if (cb_data && cb_data->dev && cb_data->dev->transfer) {
@@ -403,6 +409,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;
 		}
 	}