hantek-dso: Support conn scan parameter

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

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 05e95c60573df8af837ddb27d60d4dc9eb53cce3..604ae1066440e450e74a96a5b29c1673082d4fc2 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>
  *
@@ -40,6 +40,10 @@
 #define NUM_TIMEBASE  10
 #define NUM_VDIV      8
 
+static const int32_t scanopts[] = {
+       SR_CONF_CONN,
+};
+
 static const int32_t devopts[] = {
        SR_CONF_OSCILLOSCOPE,
        SR_CONF_LIMIT_FRAMES,
@@ -230,38 +234,19 @@ static int configure_probes(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-/* Properly close and free all devices. */
-static int clear_instances(void)
+static void clear_dev_context(void *priv)
 {
-       struct sr_dev_inst *sdi;
-       struct drv_context *drvc;
        struct dev_context *devc;
-       GSList *l;
-
-       drvc = di->priv;
-       for (l = drvc->instances; l; l = l->next) {
-               if (!(sdi = l->data)) {
-                       /* Log error, but continue cleaning up the rest. */
-                       sr_err("%s: sdi was NULL, continuing", __func__);
-                       continue;
-               }
-               if (!(devc = sdi->priv)) {
-                       /* Log error, but continue cleaning up the rest. */
-                       sr_err("%s: sdi->priv was NULL, continuing", __func__);
-                       continue;
-               }
-               dso_close(sdi);
-               sr_usb_dev_inst_free(sdi->conn);
-               g_free(devc->triggersource);
-               g_slist_free(devc->enabled_probes);
 
-               sr_dev_inst_free(sdi);
-       }
+       devc = priv;
+       g_free(devc->triggersource);
+       g_slist_free(devc->enabled_probes);
 
-       g_slist_free(drvc->instances);
-       drvc->instances = NULL;
+}
 
-       return SR_OK;
+static int clear_instances(void)
+{
+       return std_dev_clear(di, clear_dev_context);
 }
 
 static int hw_init(struct sr_context *sr_ctx)
@@ -271,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;
@@ -290,9 +276,36 @@ 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));
@@ -330,6 +343,7 @@ static GSList *hw_scan(GSList *options)
                                sdi->status = SR_ST_INACTIVE;
                                devices = g_slist_append(devices, sdi);
                                devc = sdi->priv;
+                               sdi->inst_type = SR_INST_USB;
                                sdi->conn = sr_usb_dev_inst_new(
                                                libusb_get_bus_number(devlist[i]),
                                                libusb_get_device_address(devlist[i]), NULL);
@@ -420,10 +434,21 @@ static int hw_cleanup(void)
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
 {
-
-       (void)sdi;
+       struct sr_usb_dev_inst *usb;
+       char str[128];
 
        switch (id) {
+       case SR_CONF_CONN:
+               if (!sdi || !sdi->conn)
+                       return SR_ERR_ARG;
+               usb = sdi->conn;
+               if (usb->address == 255)
+                       /* Device still needs to re-enumerate after firmware
+                        * upload, so we don't know its (future) address. */
+                       return SR_ERR;
+               snprintf(str, 128, "%d.%d", usb->bus, usb->address);
+               *data = g_variant_new_string(str);
+               break;
        case SR_CONF_NUM_TIMEBASE:
                *data = g_variant_new_int32(NUM_TIMEBASE);
                break;
@@ -578,6 +603,10 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
        switch (key) {
+       case SR_CONF_SCAN_OPTIONS:
+               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+                               scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t));
+               break;
        case SR_CONF_DEVICE_OPTIONS:
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
                                devopts, ARRAY_SIZE(devopts), sizeof(int32_t));