Remove unnecessary call to libusb_get_device_descriptor().

[libsigrok.git] / src / hardware / lascar-el-usb / protocol.c

diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index 9e20edc68e3618ee99949670d332967a8ffcbeb2..709e36779a8b2dfa93418fdba9eabf51cbdc85bb 100644 (file)
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -17,12 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -77,7 +78,7 @@ static libusb_device_handle *lascar_open(struct libusb_device *dev)
        return dev_hdl;
 }
 
-static void mark_xfer(struct libusb_transfer *xfer)
+static void LIBUSB_CALL mark_xfer(struct libusb_transfer *xfer)
 {
 
        xfer->user_data = GINT_TO_POINTER(1);
@@ -96,7 +97,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
 
        sr_spew("Reading config block.");
 
-       drvc = di->priv;
+       drvc = di->context;
        *configlen = 0;
 
        if (!(xfer_in = libusb_alloc_transfer(0)) ||
@@ -111,7 +112,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
        /* Keep a read request waiting in the wings, ready to pounce
         * the moment the device sends something. */
        libusb_fill_bulk_transfer(xfer_in, dev_hdl, LASCAR_EP_IN,
-                       buf, 256, mark_xfer, 0, 10000);
+                       buf, 256, mark_xfer, 0, BULK_XFER_TIMEOUT);
        if (libusb_submit_transfer(xfer_in) != 0)
                goto cleanup;
 
@@ -132,7 +133,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
                        start = 0;
                        break;
                }
-               g_usleep(5000);
+               g_usleep(SLEEP_US_LONG);
                libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
        }
        if (!start) {
@@ -165,7 +166,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
                        start = 0;
                        break;
                }
-               g_usleep(5000);
+               g_usleep(SLEEP_US_LONG);
                libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
        }
        if (!start) {
@@ -182,16 +183,16 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
        *configlen = buflen;
 
 cleanup:
-       if (!xfer_in->user_data || !xfer_in->user_data) {
+       if (!xfer_in->user_data || !xfer_out->user_data) {
                if (!xfer_in->user_data)
                        libusb_cancel_transfer(xfer_in);
                if (!xfer_out->user_data)
                        libusb_cancel_transfer(xfer_out);
                start = g_get_monotonic_time();
                while (!xfer_in->user_data || !xfer_out->user_data) {
-                       if (g_get_monotonic_time() - start > 10000)
+                       if (g_get_monotonic_time() - start > EVENTS_TIMEOUT)
                                break;
-                       g_usleep(1000);
+                       g_usleep(SLEEP_US_SHORT);
                        libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
                }
        }
@@ -213,7 +214,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
 
        sr_spew("Writing config block.");
 
-       drvc = di->priv;
+       drvc = di->context;
 
        if (!(xfer_in = libusb_alloc_transfer(0)) ||
                        !(xfer_out = libusb_alloc_transfer(0)))
@@ -228,7 +229,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
        /* Keep a read request waiting in the wings, ready to pounce
         * the moment the device sends something. */
        libusb_fill_bulk_transfer(xfer_in, dev_hdl, LASCAR_EP_IN,
-                       buf, 256, mark_xfer, 0, 10000);
+                       buf, 256, mark_xfer, 0, BULK_XFER_TIMEOUT);
        if (libusb_submit_transfer(xfer_in) != 0) {
                ret = SR_ERR;
                goto cleanup;
@@ -247,7 +248,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
        tv.tv_sec = 0;
        tv.tv_usec = 0;
        while (!xfer_out->user_data) {
-               g_usleep(5000);
+               g_usleep(SLEEP_US_LONG);
                libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
        }
 
@@ -258,7 +259,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
                goto cleanup;
        }
        while (!xfer_in->user_data || !xfer_out->user_data) {
-               g_usleep(5000);
+               g_usleep(SLEEP_US_LONG);
                libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
        }
 
@@ -268,16 +269,16 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
        }
 
 cleanup:
-       if (!xfer_in->user_data || !xfer_in->user_data) {
+       if (!xfer_in->user_data || !xfer_out->user_data) {
                if (!xfer_in->user_data)
                        libusb_cancel_transfer(xfer_in);
                if (!xfer_out->user_data)
                        libusb_cancel_transfer(xfer_out);
                start = g_get_monotonic_time();
                while (!xfer_in->user_data || !xfer_out->user_data) {
-                       if (g_get_monotonic_time() - start > 10000)
+                       if (g_get_monotonic_time() - start > EVENTS_TIMEOUT)
                                break;
-                       g_usleep(1000);
+                       g_usleep(SLEEP_US_SHORT);
                        libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
                }
        }
@@ -351,21 +352,15 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address)
        struct drv_context *drvc;
        struct sr_dev_inst *sdi;
        struct libusb_device **devlist;
-       struct libusb_device_descriptor des;
        libusb_device_handle *dev_hdl;
-       int dummy, ret, i;
+       int dummy, i;
        unsigned char config[MAX_CONFIGBLOCK_SIZE];
 
-       drvc = di->priv;
+       drvc = di->context;
        sdi = NULL;
 
        libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
        for (i = 0; devlist[i]; i++) {
-               if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
-                       sr_err("Failed to get device descriptor: %d.", ret);
-                       continue;
-               }
-
                if (libusb_get_bus_number(devlist[i]) != bus ||
                                libusb_get_device_address(devlist[i]) != address)
                        continue;
@@ -436,6 +431,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                                analog.unit = SR_UNIT_CELSIUS;
                        analog.data = temp;
                        sr_session_send(devc->cb_data, &packet);
+                       g_slist_free(analog.channels);
                }
 
                ch = sdi->channels->next->data;
@@ -445,6 +441,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                        analog.unit = SR_UNIT_PERCENTAGE;
                        analog.data = rh;
                        sr_session_send(devc->cb_data, &packet);
+                       g_slist_free(analog.channels);
                }
 
                g_free(temp);
@@ -462,7 +459,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                        break;
                for (i = 0; i < samples; i++) {
                        s = (buf[i * 2] << 8) | buf[i * 2 + 1];
-                       analog.data[i] = (s * devc->co_high + devc->co_low) / 1000000;
+                       analog.data[i] = (s * devc->co_high + devc->co_low) / (1000 * 1000);
                        if (analog.data[i] < 0.0)
                                analog.data[i] = 0.0;
                }
@@ -479,7 +476,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 
 SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data)
 {
-       struct drv_context *drvc = di->priv;
+       struct drv_context *drvc = di->context;
        struct sr_datafeed_packet packet;
        struct sr_dev_inst *sdi;
        struct timeval tv;
@@ -503,7 +500,7 @@ SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data)
        return TRUE;
 }
 
-SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *transfer)
 {
        struct dev_context *devc;
        struct sr_dev_inst *sdi;