]> cvs.zerfleddert.de Git - hmcfgusb/blobdiff - hmcfgusb.c
add OTA support for culfw-based devices
[hmcfgusb] / hmcfgusb.c
index 0e45cbc59ec68b50c488964510d138437df3f786..c90410a4d0ad2411dcc228ac9c2f291e6e44af0e 100644 (file)
 #include <math.h>
 #include <poll.h>
 #include <errno.h>
+#include <sys/time.h>
 #include <libusb-1.0/libusb.h>
 
+/* Workaround for old libusb-1.0 */
+#ifndef LIBUSB_CALL
+#define LIBUSB_CALL
+#define libusb_handle_events_timeout_completed(ctx, tv, x) libusb_handle_events_timeout(ctx, tv)
+#endif
+
 #include "hexdump.h"
 #include "hmcfgusb.h"
 
-#define USB_TIMEOUT            10000
+#define USB_TIMEOUT    10000
 
 #define ID_VENDOR      0x1b1f
 #define ID_PRODUCT     0xc00f
+#define ID_PRODUCT_BL  0xc010
 
 /* TODO: dynamic */
 #define ASYNC_SIZE     0x0040
 #define EP_OUT         0x02
 #define EP_IN          0x83
 
+#define INTERFACE      0
+
 static int quit = 0;
+static int debug = 0;
 
 /* Not in all libusb-1.0 versions, so we have to roll our own :-( */
 static char * usb_strerror(int e)
@@ -87,7 +98,7 @@ static char * usb_strerror(int e)
        return unknerr;
 }
 
-static libusb_device_handle *hmcfgusb_find() {
+static libusb_device_handle *hmcfgusb_find(int vid, int pid) {
        libusb_device_handle *devh = NULL;
        libusb_device **list;
        ssize_t cnt;
@@ -107,7 +118,7 @@ static libusb_device_handle *hmcfgusb_find() {
                if (err)
                        continue;
 
-               if ((desc.idVendor == ID_VENDOR) && (desc.idProduct == ID_PRODUCT)) {
+               if ((desc.idVendor == vid) && (desc.idProduct == pid)) {
                        libusb_device *dev = list[i];
 
                        err = libusb_open(dev, &devh);
@@ -116,13 +127,13 @@ static libusb_device_handle *hmcfgusb_find() {
                                return NULL;
                        }
 
-                       err = libusb_detach_kernel_driver(devh, 0);
+                       err = libusb_detach_kernel_driver(devh, INTERFACE);
                        if ((err != 0) && (err != LIBUSB_ERROR_NOT_FOUND)) {
                                fprintf(stderr, "Can't detach kernel driver: %s\n", usb_strerror(err));
                                return NULL;
                        }
 
-                       err = libusb_claim_interface(devh, 0);
+                       err = libusb_claim_interface(devh, INTERFACE);
                        if ((err != 0)) {
                                fprintf(stderr, "Can't claim interface: %s\n", usb_strerror(err));
                                return NULL;
@@ -136,40 +147,67 @@ static libusb_device_handle *hmcfgusb_find() {
        return NULL;
 }
 
+int hmcfgusb_send_null_frame(struct hmcfgusb_dev *usbdev, int silent)
+{
+       int err;
+       int cnt;
+       unsigned char out[0x40];
+
+       memset(out, 0, sizeof(out));
+
+       err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, out, 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 ret;
+       struct timeval tv_start, tv_end;
+       int msec;
+
+       if (debug) {
+               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));
-               if (err == LIBUSB_ERROR_NO_DEVICE)
-                       exit(EXIT_FAILURE);
                return 0;
        }
 
        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 (err == LIBUSB_ERROR_NO_DEVICE)
-                               exit(EXIT_FAILURE);
+               if (!hmcfgusb_send_null_frame(usbdev, 0)) {
                        return 0;
                }
        }
 
-       return ret;
+       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;
 }
 
-static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh, libusb_transfer_cb_fn cb, void *data)
+static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh, libusb_transfer_cb_fn cb, void *data, int in_size)
 {
        unsigned char *data_buf;
        struct libusb_transfer *transfer;
        int err;
 
-       data_buf = malloc(ASYNC_SIZE);
+       data_buf = malloc(in_size);
        if (!data_buf) {
                fprintf(stderr, "Can't allocate memory for data-buffer!\n");
                return NULL;
@@ -183,15 +221,14 @@ static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh,
        }
 
        libusb_fill_interrupt_transfer(transfer, devh, EP_IN,
-                       data_buf, ASYNC_SIZE, cb, data, USB_TIMEOUT);
+                       data_buf, in_size, cb, data, USB_TIMEOUT);
 
-       transfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK;
+       transfer->flags = LIBUSB_TRANSFER_FREE_BUFFER;
 
        err = libusb_submit_transfer(transfer);
        if (err != 0) {
                fprintf(stderr, "Can't submit transfer: %s\n", usb_strerror(err));
                libusb_free_transfer(transfer);
-               free(data_buf);
                return NULL;
        }
 
@@ -199,6 +236,7 @@ static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh,
 }
 
 struct hmcfgusb_cb_data {
+       struct hmcfgusb_dev *dev;
        hmcfgusb_cb_fn cb;
        void *data;
 };
@@ -208,34 +246,47 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
        int err;
        struct hmcfgusb_cb_data *cb_data;
 
+       cb_data = transfer->user_data;
+
        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) {
+                               libusb_free_transfer(cb_data->dev->transfer);
+                               cb_data->dev->transfer = NULL;
+                               free(cb_data);
+                       }
                        return;
                }
+       } else {
+               if (cb_data && cb_data->cb) {
+                       if (debug)
+                               hexdump(transfer->buffer, transfer->actual_length, "USB > ");
 
-               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);
-               }
-               return;
-       }
+                       if (!cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data)) {
+                               quit = EIO;
 
-       cb_data = transfer->user_data;
-       if (cb_data && cb_data->cb) {
-               cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data);
-       } else {
-               hexdump(transfer->buffer, transfer->actual_length, "RECV> ");
+                               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, "> ");
+               }
        }
 
        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);
+               cb_data->dev->transfer = NULL;
+               free(cb_data);
        }
 }
 
@@ -245,6 +296,7 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
        const struct libusb_pollfd **usb_pfd = NULL;
        struct hmcfgusb_dev *dev = NULL;
        struct hmcfgusb_cb_data *cb_data = NULL;
+       int bootloader = 0;
        int err;
        int i;
 
@@ -254,35 +306,53 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
                return NULL;
        }
 
-       devh = hmcfgusb_find();
+       devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT);
        if (!devh) {
-               fprintf(stderr, "Can't find/open hmcfgusb!\n");
-               return NULL;
+               devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT_BL);
+               if (!devh) {
+                       fprintf(stderr, "Can't find/open hmcfgusb!\n");
+                       libusb_exit(NULL);
+                       return NULL;
+               }
+               bootloader = 1;
        }
 
        dev = malloc(sizeof(struct hmcfgusb_dev));
        if (!dev) {
                perror("Can't allocate memory for hmcfgusb_dev");
+               libusb_close(devh);
+               libusb_exit(NULL);
                return NULL;
        }
 
        memset(dev, 0, sizeof(struct hmcfgusb_dev));
        dev->usb_devh = devh;
+       dev->bootloader = bootloader;
+       dev->opened_at = time(NULL);
 
        cb_data = malloc(sizeof(struct hmcfgusb_cb_data));
        if (!cb_data) {
                perror("Can't allocate memory for hmcfgusb_cb_data");
+               free(dev);
+               libusb_close(devh);
+               libusb_exit(NULL);
                return NULL;
        }
 
        memset(cb_data, 0, sizeof(struct hmcfgusb_cb_data));
 
+       cb_data->dev = dev;
        cb_data->cb = cb;
        cb_data->data = data;
 
-       dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data);
+       dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data, ASYNC_SIZE);
+
        if (!dev->transfer) {
                fprintf(stderr, "Can't prepare async device io!\n");
+               free(dev);
+               free(cb_data);
+               libusb_close(devh);
+               libusb_exit(NULL);
                return NULL;
        }
 
@@ -290,6 +360,9 @@ 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);
+               free(cb_data);
+               libusb_close(devh);
+               libusb_exit(NULL);
                return NULL;
        }
 
@@ -300,6 +373,10 @@ 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");
+               free(dev);
+               free(cb_data);
+               libusb_close(devh);
+               libusb_exit(NULL);
                return NULL;
        }
 
@@ -315,6 +392,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 
        dev->n_pfd = dev->n_usb_pfd;
 
+       quit = 0;
+
        return dev;
 }
 
@@ -338,6 +417,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;
@@ -357,6 +437,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;
                }
        }
 
@@ -368,9 +451,11 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
                n = poll(dev->pfd, dev->n_pfd, tv.tv_sec * 1000);
                if (n < 0) {
                        perror("poll");
+                       errno = 0;
                        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) {
@@ -378,6 +463,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
                                                usb_event = 1;
                                                break;
                                        } else {
+                                               errno = 0;
                                                return dev->pfd[fd_n].fd;
                                        }
                                }
@@ -389,14 +475,77 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
                memset(&tv, 0, sizeof(tv));
                err = libusb_handle_events_timeout_completed(NULL, &tv, NULL);
                if (err < 0) {
-                       fprintf(stderr, "libusb_handle_events_completed: %s\n", usb_strerror(err));
+                       fprintf(stderr, "libusb_handle_events_timeout_completed: %s\n", usb_strerror(err));
                        errno = EIO;
                        return -1;
                }
        }
 
-       if (quit)
+       errno = 0;
+       if (quit) {
+               fprintf(stderr, "closing device-connection due to error %d\n", quit);
                errno = quit;
+       }
+
+       if (timed_out)
+               errno = ETIMEDOUT;
 
        return -1;
 }
+
+void hmcfgusb_enter_bootloader(struct hmcfgusb_dev *dev)
+{
+       uint8_t out[ASYNC_SIZE];
+
+       if (dev->bootloader) {
+               fprintf(stderr, "request for bootloader mode, but device already in bootloader!\n");
+               return;
+       }
+
+       memset(out, 0, sizeof(out));
+       out[0] = 'B';
+       hmcfgusb_send(dev, out, sizeof(out), 1);
+
+       return;
+}
+
+void hmcfgusb_leave_bootloader(struct hmcfgusb_dev *dev)
+{
+       uint8_t out[ASYNC_SIZE];
+
+       if (!dev->bootloader) {
+               fprintf(stderr, "request for leaving bootloader mode, but device already in normal mode!\n");
+               return;
+       }
+
+       memset(out, 0, sizeof(out));
+       out[0] = 'K';
+       hmcfgusb_send(dev, out, sizeof(out), 1);
+
+       return;
+}
+
+void hmcfgusb_close(struct hmcfgusb_dev *dev)
+{
+       int err;
+
+       if (dev->transfer) {
+               libusb_cancel_transfer(dev->transfer);
+       }
+
+       err = libusb_release_interface(dev->usb_devh, INTERFACE);
+       if ((err != 0)) {
+               fprintf(stderr, "Can't release interface: %s\n", usb_strerror(err));
+       }
+
+       libusb_close(dev->usb_devh);
+       free(dev->pfd);
+       free(dev);
+
+       libusb_exit(NULL);
+}
+
+void hmcfgusb_set_debug(int d)
+{
+       debug = d;
+}
Impressum, Datenschutz