open device in bootloader-mode, too

[hmcfgusb] / hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index ce8c595268918381544c756d60f3b36d0045ae5f..05f16bed4f10a1b2284b2a98b230cca0896b5da7 100644 (file)
--- 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);
@@ -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));
@@ -178,10 +181,13 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len
                }
        }
 
-       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;
@@ -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;
                }
        }