Remove unnecessary call to libusb_get_device_descriptor().

[libsigrok.git] / src / hardware / hantek-dso / api.c

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 2b039ed22b60e32e499141fbb45fdf29e573a3ff..4e8ac83fcac5804a9cb599cf6c114cffc1842e94 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -29,7 +30,7 @@
 #include <inttypes.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "dso.h"
 
@@ -40,6 +41,8 @@
 #define NUM_TIMEBASE  10
 #define NUM_VDIV      8
 
+#define NUM_BUFFER_SIZES 2
+
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
@@ -206,7 +209,7 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
        devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
        devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
        sdi->priv = devc;
-       drvc = hantek_dso_driver_info.priv;
+       drvc = hantek_dso_driver_info.context;
        drvc->instances = g_slist_append(drvc->instances, sdi);
 
        return sdi;
@@ -271,7 +274,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        const char *conn;
        char connection_id[64];
 
-       drvc = di->priv;
+       drvc = di->context;
 
        devices = 0;
 
@@ -361,7 +364,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)
@@ -392,7 +395,7 @@ static int dev_open(struct sr_dev_inst *sdi)
                        timediff_ms = timediff_us / 1000;
                        sr_spew("Waited %" PRIi64 " ms.", timediff_ms);
                }
-               sr_info("Device came back after %d ms.", timediff_ms);
+               sr_info("Device came back after %" PRIi64 " ms.", timediff_ms);
        } else {
                err = dso_open(sdi);
        }
@@ -470,10 +473,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                        *data = g_variant_new_string(devc->triggersource);
                        break;
                case SR_CONF_TRIGGER_SLOPE:
-                       if (devc->triggerslope == SLOPE_POSITIVE)
-                               s = "r";
-                       else
-                               s = "f";
+                       s = (devc->triggerslope == SLOPE_POSITIVE) ? "r" : "f";
                        *data = g_variant_new_string(s);
                        break;
                case SR_CONF_HORIZ_TRIGGERPOS:
@@ -543,13 +543,13 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                        break;
                case SR_CONF_BUFFERSIZE:
                        tmp_u64 = g_variant_get_uint64(data);
-                       for (i = 0; i < 2; i++) {
+                       for (i = 0; i < NUM_BUFFER_SIZES; i++) {
                                if (devc->profile->buffersizes[i] == tmp_u64) {
                                        devc->framesize = tmp_u64;
                                        break;
                                }
                        }
-                       if (i == 2)
+                       if (i == NUM_BUFFER_SIZES)
                                ret = SR_ERR_ARG;
                        break;
                case SR_CONF_TIMEBASE:
@@ -658,7 +658,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                                return SR_ERR_ARG;
                        devc = sdi->priv;
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
-                                       devc->profile->buffersizes, 2, sizeof(uint64_t));
+                                       devc->profile->buffersizes, NUM_BUFFER_SIZES, sizeof(uint64_t));
                        break;
                case SR_CONF_TIMEBASE:
                        g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
@@ -759,6 +759,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
                }
        }
        sr_session_send(devc->cb_data, &packet);
+       g_free(analog.data);
 }
 
 /*
@@ -767,7 +768,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
  * queued up beforehand, so this just needs to chuck the incoming data onto
  * the libsigrok session bus.
  */
-static void receive_transfer(struct libusb_transfer *transfer)
+static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 {
        struct sr_datafeed_packet packet;
        struct sr_dev_inst *sdi;
@@ -874,7 +875,7 @@ static int handle_event(int fd, int revents, void *cb_data)
 
        sdi = cb_data;
        di = sdi->driver;
-       drvc = di->priv;
+       drvc = di->context;
        devc = sdi->priv;
        if (devc->dev_state == STOPPING) {
                /* We've been told to wind up the acquisition. */
@@ -974,7 +975,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
        struct dev_context *devc;
        struct sr_dev_driver *di = sdi->driver;
-       struct drv_context *drvc = di->priv;
+       struct drv_context *drvc = di->context;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -1033,5 +1034,5 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };