#define ID_VENDOR 0x1b1f
#define ID_PRODUCT 0xc00f
+#define ID_PRODUCT_BL 0xc010
/* TODO: dynamic */
#define ASYNC_SIZE 0x0040
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);
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;
}
}
if (done) {
- if (!hmcfgusb_send_null_frame(usbdev)) {
+ if (!hmcfgusb_send_null_frame(usbdev, 0)) {
return 0;
}
}
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 can lead to timing problems!\n", msec);
+ 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);
}
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) {
} 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;
}
}