Enforce open device before config_set()/dev_acquisition_start()

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

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 9e5629ee2d4ad4ad3d6a7d703cc6683e83de30d4..e7d9f60b618910febce8225181785f1d3e0507f0 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
@@ -256,16 +256,17 @@ static int hw_init(struct sr_context *sr_ctx)
 
 static GSList *hw_scan(GSList *options)
 {
-       struct sr_dev_inst *sdi;
-       const struct dso_profile *prof;
        struct drv_context *drvc;
        struct dev_context *devc;
-       GSList *devices;
+       struct sr_dev_inst *sdi;
+       struct sr_usb_dev_inst *usb;
+       struct sr_config *src;
+       const struct dso_profile *prof;
+       GSList *l, *devices, *conn_devices;
        struct libusb_device_descriptor des;
        libusb_device **devlist;
        int devcnt, ret, i, j;
-
-       (void)options;
+       const char *conn;
 
        drvc = di->priv;
        drvc->instances = NULL;
@@ -275,12 +276,39 @@ static GSList *hw_scan(GSList *options)
 
        clear_instances();
 
+       conn = NULL;
+       for (l = options; l; l = l->next) {
+               src = l->data;
+               if (src->key == SR_CONF_CONN) {
+                       conn = g_variant_get_string(src->data, NULL);
+                       break;
+               }
+       }
+       if (conn)
+               conn_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn);
+       else
+               conn_devices = NULL;
+
        /* Find all Hantek DSO devices and upload firmware to all of them. */
        libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
        for (i = 0; devlist[i]; i++) {
+               if (conn) {
+                       usb = NULL;
+                       for (l = conn_devices; l; l = l->next) {
+                               usb = l->data;
+                               if (usb->bus == libusb_get_bus_number(devlist[i])
+                                       && usb->address == libusb_get_device_address(devlist[i]))
+                                       break;
+                       }
+                       if (!l)
+                               /* This device matched none of the ones that
+                                * matched the conn specification. */
+                               continue;
+               }
+
                if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
                        sr_err("Failed to get device descriptor: %s.",
-                              libusb_error_name(ret));
+                                       libusb_error_name(ret));
                        continue;
                }
 
@@ -300,7 +328,7 @@ static GSList *hw_scan(GSList *options)
                                        devc->fw_updated = g_get_monotonic_time();
                                else
                                        sr_err("Firmware upload failed for "
-                                              "device %d.", devcnt);
+                                               "device %d.", devcnt);
                                /* Dummy USB address of 0xff will get overwritten later. */
                                sdi->conn = sr_usb_dev_inst_new(
                                                libusb_get_bus_number(devlist[i]), 0xff, NULL);
@@ -378,7 +406,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
        err = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
        if (err != 0) {
                sr_err("Unable to claim interface: %s.",
-                      libusb_error_name(err));
+                          libusb_error_name(err));
                return SR_ERR;
        }
 
@@ -409,12 +437,10 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
        struct sr_usb_dev_inst *usb;
        char str[128];
 
-       (void)sdi;
-
        switch (id) {
        case SR_CONF_CONN:
                if (!sdi || !sdi->conn)
-                       return SR_ERR;
+                       return SR_ERR_ARG;
                usb = sdi->conn;
                if (usb->address == 255)
                        /* Device still needs to re-enumerate after firmware
@@ -447,7 +473,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
        char **targets;
 
        if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR;
+               return SR_ERR_DEV_CLOSED;
 
        ret = SR_OK;
        devc = sdi->priv;
@@ -695,7 +721,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
        sdi = transfer->user_data;
        devc = sdi->priv;
        sr_spew("receive_transfer(): status %d received %d bytes.",
-              transfer->status, transfer->actual_length);
+                  transfer->status, transfer->actual_length);
 
        if (transfer->actual_length == 0)
                /* Nothing to send to the bus. */
@@ -704,7 +730,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
        num_samples = transfer->actual_length / 2;
 
        sr_spew("Got %d-%d/%d samples in frame.", devc->samp_received + 1,
-              devc->samp_received + num_samples, devc->framesize);
+                  devc->samp_received + num_samples, devc->framesize);
 
        /*
         * The device always sends a full frame, but the beginning of the frame
@@ -735,7 +761,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
 
                        /* The rest of this chunk starts with the trigger point. */
                        sr_dbg("Reached trigger point, %d samples buffered.",
-                              devc->samp_buffered);
+                                  devc->samp_buffered);
 
                        /* Avoid the corner case where the chunk ended at
                         * exactly the trigger point. */
@@ -760,7 +786,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
                /* That was the last chunk in this frame. Send the buffered
                 * pre-trigger samples out now, in one big chunk. */
                sr_dbg("End of frame, sending %d pre-trigger buffered samples.",
-                      devc->samp_buffered);
+                          devc->samp_buffered);
                send_chunk(sdi, devc->framebuf, devc->samp_buffered);
 
                /* Mark the end of this frame. */
@@ -892,7 +918,7 @@ static int handle_event(int fd, int revents, void *cb_data)
 }
 
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
-                                   void *cb_data)
+                                       void *cb_data)
 {
        const struct libusb_pollfd **lupfd;
        struct dev_context *devc;
@@ -900,7 +926,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        int i;
 
        if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR;
+               return SR_ERR_DEV_CLOSED;
 
        devc = sdi->priv;
        devc->cb_data = cb_data;
@@ -920,7 +946,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
        for (i = 0; lupfd[i]; i++)
                sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK,
-                             handle_event, (void *)sdi);
+                               handle_event, (void *)sdi);
        free(lupfd);
 
        /* Send header packet to the session bus. */