X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/6df7655e668c418754a930d29568c7189454ed12..1e79d00a9f4c2f059c8bd2dc22e601c4ed4065d6:/hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index f35138f..0857a4b 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,17 @@ 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;
+	unsigned char out[0x40];
 
-	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));
+	memset(out, 0, sizeof(out));
+
+	err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, out, sizeof(out), &cnt, USB_TIMEOUT);
+	if (err && (!silent)) {
+		fprintf(stderr, "Can't send null frame: %s\n", usb_strerror(err));
 		return 0;
 	}
 
@@ -174,7 +179,7 @@ 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;
 		}
 	}
@@ -240,7 +245,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) {
@@ -388,6 +393,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 {
 	struct timeval tv;
 	int usb_event = 0;
+	int timed_out = 0;
 	int i;
 	int n;
 	int fd_n;
@@ -407,6 +413,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;
 		}
 	}
 
@@ -422,6 +431,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 			return -1;
 		} else if (n == 0) {
 			usb_event = 1;
+			timed_out = 1;
 		} else {
 			for (fd_n = 0; fd_n < dev->n_pfd; fd_n++) {
 				if (dev->pfd[fd_n].revents) {
@@ -453,6 +463,9 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 		errno = quit;
 	}
 
+	if (timed_out)
+		errno = ETIMEDOUT;
+
 	return -1;
 }