flash-ota: add support for TSCUL (patch from noansi)

[hmcfgusb] / hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index 83c9719b04b0d71e7324343a4aa75e7f147d3f87..bcb85a4a75e2417e6c26fa73e1ce5c8824a2e416 100644 (file)
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -1,6 +1,6 @@
 /* HM-CFG-USB libusb-driver
  *
 /* HM-CFG-USB libusb-driver
  *

- * Copyright (c) 2013 Michael Gernoth <michael@gernoth.net>
+ * Copyright (c) 2013-16 Michael Gernoth <michael@gernoth.net>

  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to


@@ -58,6 +58,7 @@
 
 static int quit = 0;
 static int debug = 0;
 
 static int quit = 0;
 static int debug = 0;

+static int libusb_initialized = 0;

 
 /* Not in all libusb-1.0 versions, so we have to roll our own :-( */
 static char * usb_strerror(int e)
 
 /* Not in all libusb-1.0 versions, so we have to roll our own :-( */
 static char * usb_strerror(int e)


@@ -98,7 +99,7 @@ static char * usb_strerror(int e)
        return unknerr;
 }
 
        return unknerr;
 }
 

-static libusb_device_handle *hmcfgusb_find(int vid, int pid) {
+static libusb_device_handle *hmcfgusb_find(int vid, int pid, char *serial) {

        libusb_device_handle *devh = NULL;
        libusb_device **list;
        ssize_t cnt;
        libusb_device_handle *devh = NULL;
        libusb_device **list;
        ssize_t cnt;


@@ -124,26 +125,53 @@ static libusb_device_handle *hmcfgusb_find(int vid, int pid) {
                        err = libusb_open(dev, &devh);
                        if (err) {
                                fprintf(stderr, "Can't open device: %s\n", usb_strerror(err));
                        err = libusb_open(dev, &devh);
                        if (err) {
                                fprintf(stderr, "Can't open device: %s\n", usb_strerror(err));

+                               libusb_free_device_list(list, 1);

                                return NULL;
                        }
 
                                return NULL;
                        }
 

+                       if (serial) {
+                               if (desc.iSerialNumber > 0) {
+                                       uint8_t devSerial[256];
+                                       err = libusb_get_string_descriptor_ascii(devh, desc.iSerialNumber, devSerial, sizeof(devSerial));
+                                       if (err < 0) {
+                                               fprintf(stderr, "Can't read serial-number: %s\n", usb_strerror(err));
+                                               libusb_close(devh);
+                                               libusb_free_device_list(list, 1);
+                                               return NULL;
+                                       }
+                                       if (strcmp((char*)devSerial, (char*)serial)) {
+                                               libusb_close(devh);
+                                               continue;
+                                       }
+                               } else {
+                                       libusb_close(devh);
+                                       continue;
+                               }
+                       }
+

                        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));
                        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));

+                               libusb_close(devh);
+                               libusb_free_device_list(list, 1);

                                return NULL;
                        }
 
                        err = libusb_claim_interface(devh, INTERFACE);
                        if ((err != 0)) {
                                fprintf(stderr, "Can't claim interface: %s\n", usb_strerror(err));
                                return NULL;
                        }
 
                        err = libusb_claim_interface(devh, INTERFACE);
                        if ((err != 0)) {
                                fprintf(stderr, "Can't claim interface: %s\n", usb_strerror(err));

+                               libusb_close(devh);
+                               libusb_free_device_list(list, 1);

                                return NULL;
                        }
 
                                return NULL;
                        }
 

+                       libusb_free_device_list(list, 0);

                        return devh;
                }
 
        }
 
                        return devh;
                }
 
        }
 

+       libusb_free_device_list(list, 1);

        return NULL;
 }
 
        return NULL;
 }
 


@@ -250,15 +278,11 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 
        if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
                if (transfer->status != LIBUSB_TRANSFER_TIMED_OUT) {
 
        if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
                if (transfer->status != LIBUSB_TRANSFER_TIMED_OUT) {

-                       fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status));
-                       quit = EIO;
+                       if (transfer->status != LIBUSB_TRANSFER_CANCELLED)
+                               fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status));

 
 

-                       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;
+                       quit = EIO;
+                       goto out;

                }
        } else {
                if (cb_data && cb_data->cb) {
                }
        } else {
                if (cb_data && cb_data->cb) {


@@ -267,14 +291,7 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 
                        if (!cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data)) {
                                quit = EIO;
 
                        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;
+                               goto out;

                        }
                } else {
                        hexdump(transfer->buffer, transfer->actual_length, "> ");
                        }
                } else {
                        hexdump(transfer->buffer, transfer->actual_length, "> ");


@@ -284,16 +301,22 @@ 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));

-               libusb_free_transfer(transfer);
-               if (cb_data) {
-                       if (cb_data->dev)
-                               cb_data->dev->transfer = NULL;
-                       free(cb_data);
+               goto out;
+       }
+
+       return;
+
+out:
+       libusb_free_transfer(transfer);
+       if (cb_data) {
+               if (cb_data->dev && cb_data->dev->transfer) {
+                       cb_data->dev->transfer = NULL;

                }
                }

+               free(cb_data);

        }
 }
 
        }
 }
 

-struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
+struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data, char *serial)

 {
        libusb_device_handle *devh = NULL;
        const struct libusb_pollfd **usb_pfd = NULL;
 {
        libusb_device_handle *devh = NULL;
        const struct libusb_pollfd **usb_pfd = NULL;


@@ -303,18 +326,27 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
        int err;
        int i;
 
        int err;
        int i;
 

-       err = libusb_init(NULL);
-       if (err != 0) {
-               fprintf(stderr, "Can't initialize libusb: %s\n", usb_strerror(err));
-               return NULL;
+       if (!libusb_initialized) {
+               err = libusb_init(NULL);
+               if (err != 0) {
+                       fprintf(stderr, "Can't initialize libusb: %s\n", usb_strerror(err));
+                       return NULL;
+               }

        }
        }

+       libusb_initialized = 1;

 
 

-       devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT);
+       devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT, serial);

        if (!devh) {
        if (!devh) {

-               devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT_BL);
+               devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT_BL, serial);

                if (!devh) {
                if (!devh) {

-                       fprintf(stderr, "Can't find/open hmcfgusb!\n");
-                       libusb_exit(NULL);
+                       if (serial) {
+                               fprintf(stderr, "Can't find/open HM-CFG-USB with serial %s!\n", serial);
+                       } else {
+                               fprintf(stderr, "Can't find/open HM-CFG-USB!\n");
+                       }
+#ifdef NEED_LIBUSB_EXIT
+                       hmcfgusb_exit();
+#endif

                        return NULL;
                }
                bootloader = 1;
                        return NULL;
                }
                bootloader = 1;


@@ -324,7 +356,9 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
        if (!dev) {
                perror("Can't allocate memory for hmcfgusb_dev");
                libusb_close(devh);
        if (!dev) {
                perror("Can't allocate memory for hmcfgusb_dev");
                libusb_close(devh);

-               libusb_exit(NULL);
+#ifdef NEED_LIBUSB_EXIT
+               hmcfgusb_exit();
+#endif

                return NULL;
        }
 
                return NULL;
        }
 


@@ -338,7 +372,9 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
                perror("Can't allocate memory for hmcfgusb_cb_data");
                free(dev);
                libusb_close(devh);
                perror("Can't allocate memory for hmcfgusb_cb_data");
                free(dev);
                libusb_close(devh);

-               libusb_exit(NULL);
+#ifdef NEED_LIBUSB_EXIT
+               hmcfgusb_exit();
+#endif

                return NULL;
        }
 
                return NULL;
        }
 


@@ -355,17 +391,23 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
                free(dev);
                free(cb_data);
                libusb_close(devh);
                free(dev);
                free(cb_data);
                libusb_close(devh);

-               libusb_exit(NULL);
+#ifdef NEED_LIBUSB_EXIT
+               hmcfgusb_exit();
+#endif

                return NULL;
        }
 
        usb_pfd = libusb_get_pollfds(NULL);
        if (!usb_pfd) {
                fprintf(stderr, "Can't get FDset from libusb!\n");
                return NULL;
        }
 
        usb_pfd = libusb_get_pollfds(NULL);
        if (!usb_pfd) {
                fprintf(stderr, "Can't get FDset from libusb!\n");

+               libusb_cancel_transfer(dev->transfer);
+               libusb_handle_events(NULL);

                free(dev);
                free(cb_data);
                libusb_close(devh);
                free(dev);
                free(cb_data);
                libusb_close(devh);

-               libusb_exit(NULL);
+#ifdef NEED_LIBUSB_EXIT
+               hmcfgusb_exit();
+#endif

                return NULL;
        }
 
                return NULL;
        }
 


@@ -376,10 +418,14 @@ 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");

+               libusb_cancel_transfer(dev->transfer);
+               libusb_handle_events(NULL);

                free(dev);
                free(cb_data);
                libusb_close(devh);
                free(dev);
                free(cb_data);
                libusb_close(devh);

-               libusb_exit(NULL);
+#ifdef NEED_LIBUSB_EXIT
+               hmcfgusb_exit();
+#endif

                return NULL;
        }
 
                return NULL;
        }
 


@@ -532,6 +578,7 @@ void hmcfgusb_close(struct hmcfgusb_dev *dev)
 
        if (dev->transfer) {
                libusb_cancel_transfer(dev->transfer);
 
        if (dev->transfer) {
                libusb_cancel_transfer(dev->transfer);

+               libusb_handle_events(NULL);

        }
 
        err = libusb_release_interface(dev->usb_devh, INTERFACE);
        }
 
        err = libusb_release_interface(dev->usb_devh, INTERFACE);


@@ -540,10 +587,19 @@ void hmcfgusb_close(struct hmcfgusb_dev *dev)
        }
 
        libusb_close(dev->usb_devh);
        }
 
        libusb_close(dev->usb_devh);

+#ifdef NEED_LIBUSB_EXIT
+       hmcfgusb_exit();
+#endif

        free(dev->pfd);
        free(dev);
        free(dev->pfd);
        free(dev);

+}

 
 

-       libusb_exit(NULL);
+void hmcfgusb_exit(void)
+{
+       if (libusb_initialized) {
+               libusb_exit(NULL);
+               libusb_initialized = 0;
+       }

 }
 
 void hmcfgusb_set_debug(int d)
 }
 
 void hmcfgusb_set_debug(int d)