do not report errors when sending of the wakeup-frame fails
[hmcfgusb] / hmcfgusb.c
index bfe0369d28ca865deb0840219ed307eb2782bd7f..825b3132a3bbc660d37ef6a41259fbc7b785d6e7 100644 (file)
@@ -29,6 +29,7 @@
 #include <math.h>
 #include <poll.h>
 #include <errno.h>
 #include <math.h>
 #include <poll.h>
 #include <errno.h>
+#include <sys/time.h>
 #include <libusb-1.0/libusb.h>
 
 #include "hexdump.h"
 #include <libusb-1.0/libusb.h>
 
 #include "hexdump.h"
@@ -38,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
@@ -110,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);
@@ -139,13 +142,33 @@ static libusb_device_handle *hmcfgusb_find() {
        return NULL;
 }
 
        return NULL;
 }
 
+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 && (!silent)) {
+               fprintf(stderr, "Can't send null frame: %s\n", usb_strerror(err));
+               return 0;
+       }
+
+       return 1;
+}
+
 int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len, int done)
 {
        int err;
        int cnt;
 int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len, int done)
 {
        int err;
        int cnt;
+       struct timeval tv_start, tv_end;
+       int msec;
 
 
-       if (debug)
+       if (debug) {
                hexdump(send_data, len, "USB < ");
                hexdump(send_data, len, "USB < ");
+       }
+
+       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));
        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));
@@ -153,13 +176,20 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len
        }
 
        if (done) {
        }
 
        if (done) {
-               err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, send_data, 0, &cnt, USB_TIMEOUT);
-               if (err) {
-                       fprintf(stderr, "Can't send data: %s\n", usb_strerror(err));
+               if (!hmcfgusb_send_null_frame(usbdev, 0)) {
                        return 0;
                }
        }
 
                        return 0;
                }
        }
 
+       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;
 }
 
        return 1;
 }
 
@@ -218,6 +248,7 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
                        if (cb_data && cb_data->dev && cb_data->dev->transfer) {
                                libusb_free_transfer(cb_data->dev->transfer);
                                cb_data->dev->transfer = NULL;
                        if (cb_data && cb_data->dev && cb_data->dev->transfer) {
                                libusb_free_transfer(cb_data->dev->transfer);
                                cb_data->dev->transfer = NULL;
+                               free(cb_data);
                        }
                        return;
                }
                        }
                        return;
                }
@@ -225,7 +256,18 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
                if (cb_data && cb_data->cb) {
                        if (debug)
                                hexdump(transfer->buffer, transfer->actual_length, "USB > ");
                if (cb_data && cb_data->cb) {
                        if (debug)
                                hexdump(transfer->buffer, transfer->actual_length, "USB > ");
-                       cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data);
+
+                       if (!cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data)) {
+                               quit = EIO;
+
+                               if (cb_data && cb_data->dev && cb_data->dev->transfer) {
+                                       libusb_free_transfer(cb_data->dev->transfer);
+                                       cb_data->dev->transfer = NULL;
+                                       free(cb_data);
+                               }
+
+                               return;
+                       }
                } else {
                        hexdump(transfer->buffer, transfer->actual_length, "> ");
                }
                } else {
                        hexdump(transfer->buffer, transfer->actual_length, "> ");
                }
@@ -234,8 +276,9 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
        err = libusb_submit_transfer(transfer);
        if (err != 0) {
                fprintf(stderr, "Can't re-submit transfer: %s\n", usb_strerror(err));
        err = libusb_submit_transfer(transfer);
        if (err != 0) {
                fprintf(stderr, "Can't re-submit transfer: %s\n", usb_strerror(err));
-               free(transfer->buffer);
                libusb_free_transfer(transfer);
                libusb_free_transfer(transfer);
+               cb_data->dev->transfer = NULL;
+               free(cb_data);
        }
 }
 
        }
 }
 
@@ -272,6 +315,7 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
        cb_data = malloc(sizeof(struct hmcfgusb_cb_data));
        if (!cb_data) {
                perror("Can't allocate memory for hmcfgusb_cb_data");
        cb_data = malloc(sizeof(struct hmcfgusb_cb_data));
        if (!cb_data) {
                perror("Can't allocate memory for hmcfgusb_cb_data");
+               free(dev);
                return NULL;
        }
 
                return NULL;
        }
 
@@ -284,6 +328,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
        dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data);
        if (!dev->transfer) {
                fprintf(stderr, "Can't prepare async device io!\n");
        dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data);
        if (!dev->transfer) {
                fprintf(stderr, "Can't prepare async device io!\n");
+               free(dev);
+               free(cb_data);
                return NULL;
        }
 
                return NULL;
        }
 
@@ -291,6 +337,7 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
        if (!usb_pfd) {
                fprintf(stderr, "Can't get FDset from libusb!\n");
                free(dev);
        if (!usb_pfd) {
                fprintf(stderr, "Can't get FDset from libusb!\n");
                free(dev);
+               free(cb_data);
                return NULL;
        }
 
                return NULL;
        }
 
@@ -301,6 +348,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
        dev->pfd = malloc(dev->n_usb_pfd * sizeof(struct pollfd));
        if (!dev->pfd) {
                perror("Can't allocate memory for poll-fds");
        dev->pfd = malloc(dev->n_usb_pfd * sizeof(struct pollfd));
        if (!dev->pfd) {
                perror("Can't allocate memory for poll-fds");
+               free(dev);
+               free(cb_data);
                return NULL;
        }
 
                return NULL;
        }
 
@@ -360,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;
                }
        }
 
                }
        }
 
Impressum, Datenschutz