Build: Set local include directories in Makefile.am

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

diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index 3213a684a95ffbc275d601467111398b32f53700..682366d0b367918001d8b1f1c7160d15d742d0a5 100644 (file)
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -51,7 +51,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        GSList *usb_devices, *devices, *l;
        const char *conn;
 
-       drvc = di->priv;
+       drvc = di->context;
 
        conn = NULL;
        for (l = options; l; l = l->next) {
@@ -90,7 +90,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -100,7 +100,7 @@ static int dev_open(struct sr_dev_inst *sdi)
        struct sr_usb_dev_inst *usb;
        int ret;
 
-       if (!(drvc = di->priv)) {
+       if (!(drvc = di->context)) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -124,7 +124,7 @@ static int dev_close(struct sr_dev_inst *sdi)
        struct sr_dev_driver *di = sdi->driver;
        struct sr_usb_dev_inst *usb;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -148,7 +148,7 @@ static int cleanup(const struct sr_dev_driver *di)
        int ret;
        struct drv_context *drvc;
 
-       if (!(drvc = di->priv))
+       if (!(drvc = di->context))
                /* Can get called on an unused driver, doesn't matter. */
                return SR_OK;
 
@@ -206,7 +206,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -215,18 +215,13 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        ret = SR_OK;
        switch (key) {
        case SR_CONF_DATALOG:
-               if (g_variant_get_boolean(data)) {
-                       /* Start logging. */
+               if (g_variant_get_boolean(data))
                        ret = lascar_start_logging(sdi);
-               } else {
-                       /* Stop logging. */
+               else
                        ret = lascar_stop_logging(sdi);
-               }
                break;
        case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = g_variant_get_uint64(data);
-               sr_dbg("Setting sample limit to %" PRIu64 ".",
-                      devc->limit_samples);
                break;
        default:
                ret = SR_ERR_NA;
@@ -257,7 +252,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        return SR_OK;
 }
 
-static void mark_xfer(struct libusb_transfer *xfer)
+static void LIBUSB_CALL mark_xfer(struct libusb_transfer *xfer)
 {
 
        if (xfer->status == LIBUSB_TRANSFER_COMPLETED)
@@ -305,11 +300,11 @@ static int lascar_proc_config(const struct sr_dev_inst *sdi)
                devc->temp_unit = devc->config[0x2e] | (devc->config[0x2f] << 8);
                if (devc->temp_unit != 0 && devc->temp_unit != 1) {
                        sr_dbg("invalid temperature unit %d", devc->temp_unit);
-                       /* Default to Celcius, we're all adults here. */
+                       /* Default to Celsius, we're all adults here. */
                        devc->temp_unit = 0;
                } else
                        sr_dbg("temperature unit is %s", devc->temp_unit
-                                       ? "Fahrenheit" : "Celcius");
+                                       ? "Fahrenheit" : "Celsius");
                break;
        case LOG_CO:
                devc->sample_size = 2;
@@ -345,12 +340,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
 
-       drvc = di->priv;
+       drvc = di->context;
        devc = sdi->priv;
        usb = sdi->conn;
        devc->cb_data = cb_data;
@@ -395,7 +390,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                ;
 
        libusb_fill_bulk_transfer(xfer_in, usb->devhdl, LASCAR_EP_IN,
-                       resp, sizeof(resp), mark_xfer, 0, 10000);
+                       resp, sizeof(resp), mark_xfer, 0, BULK_XFER_TIMEOUT);
        if (libusb_submit_transfer(xfer_in) != 0) {
                libusb_free_transfer(xfer_in);
                libusb_free_transfer(xfer_out);
@@ -416,7 +411,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        tv.tv_sec = 0;
        tv.tv_usec = 0;
        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);
        }
        if (xfer_in->user_data != GINT_TO_POINTER(1) ||
@@ -438,7 +433,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        usb_source_add(sdi->session, drvc->sr_ctx, 100,
                        lascar_el_usb_handle_events, (void *)sdi);
 
-       buf = g_try_malloc(4096);
+       buf = g_malloc(4096);
        libusb_fill_bulk_transfer(xfer_in, usb->devhdl, LASCAR_EP_IN,
                        buf, 4096, lascar_el_usb_receive_transfer, cb_data, 100);
        if ((ret = libusb_submit_transfer(xfer_in) != 0)) {
@@ -456,7 +451,7 @@ SR_PRIV int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        struct sr_dev_driver *di = sdi->driver;
        (void)cb_data;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -488,5 +483,5 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };