make sure to close the device and call libusb_exit() on errors in hmcfgusb_init()

[hmcfgusb] / hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index 825b3132a3bbc660d37ef6a41259fbc7b785d6e7..01a50b773f88e0f4cb3892dcb91d86de2e637979 100644 (file)
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -32,6 +32,12 @@
 #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"
 
@@ -92,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;
@@ -112,8 +118,7 @@ static libusb_device_handle *hmcfgusb_find() {
                if (err)
                        continue;
 
-               if ((desc.idVendor == ID_VENDOR) &&
-                   ((desc.idProduct == ID_PRODUCT) || (desc.idProduct == ID_PRODUCT_BL))) {
+               if ((desc.idVendor == vid) && (desc.idProduct == pid)) {
                        libusb_device *dev = list[i];
 
                        err = libusb_open(dev, &devh);
@@ -146,8 +151,11 @@ 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, NULL, 0, &cnt, USB_TIMEOUT);
+       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;
@@ -242,7 +250,7 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 
        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) {
@@ -288,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;
 
@@ -297,25 +306,36 @@ 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;
        }
 
@@ -330,6 +350,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
                fprintf(stderr, "Can't prepare async device io!\n");
                free(dev);
                free(cb_data);
+               libusb_close(devh);
+               libusb_exit(NULL);
                return NULL;
        }
 
@@ -338,6 +360,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
                fprintf(stderr, "Can't get FDset from libusb!\n");
                free(dev);
                free(cb_data);
+               libusb_close(devh);
+               libusb_exit(NULL);
                return NULL;
        }
 
@@ -350,6 +374,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
                perror("Can't allocate memory for poll-fds");
                free(dev);
                free(cb_data);
+               libusb_close(devh);
+               libusb_exit(NULL);
                return NULL;
        }
 
@@ -390,6 +416,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;
@@ -427,6 +454,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
                        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) {
@@ -458,9 +486,44 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
                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;