open device in bootloader-mode, too

[hmcfgusb] / hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index f35138f6d7bbe22cddb13bf1b55074de818fc161..05f16bed4f10a1b2284b2a98b230cca0896b5da7 100644 (file)
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -39,6 +39,7 @@
 
 #define ID_VENDOR      0x1b1f
 #define ID_PRODUCT     0xc00f
 
 #define ID_VENDOR      0x1b1f
 #define ID_PRODUCT     0xc00f

+#define ID_PRODUCT_BL  0xc010

 
 /* TODO: dynamic */
 #define ASYNC_SIZE     0x0040
 
 /* TODO: dynamic */
 #define ASYNC_SIZE     0x0040


@@ -111,7 +112,8 @@ static libusb_device_handle *hmcfgusb_find() {
                if (err)
                        continue;
 
                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);
                        libusb_device *dev = list[i];
 
                        err = libusb_open(dev, &devh);


@@ -407,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 == 0) && (tv.tv_usec == 0)) {
                        usb_event = 1;

+               } else if (tv.tv_sec > timeout) {
+                       tv.tv_sec = timeout;
+                       tv.tv_usec = 0;

                }
        }
 
                }
        }