hantek-dso: Support config_get(SR_CONF_CONN)

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

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index c5540b7458c709be3fefb522a8de1f3417e50e9e..9e5629ee2d4ad4ad3d6a7d703cc6683e83de30d4 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -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(devc->usb);
-               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)
@@ -317,7 +302,7 @@ static GSList *hw_scan(GSList *options)
                                        sr_err("Firmware upload failed for "
                                               "device %d.", devcnt);
                                /* Dummy USB address of 0xff will get overwritten later. */
-                               devc->usb = sr_usb_dev_inst_new(
+                               sdi->conn = sr_usb_dev_inst_new(
                                                libusb_get_bus_number(devlist[i]), 0xff, NULL);
                                devcnt++;
                                break;
@@ -330,7 +315,8 @@ static GSList *hw_scan(GSList *options)
                                sdi->status = SR_ST_INACTIVE;
                                devices = g_slist_append(devices, sdi);
                                devc = sdi->priv;
-                               devc->usb = sr_usb_dev_inst_new(
+                               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);
                                devcnt++;
@@ -354,10 +340,12 @@ static GSList *hw_dev_list(void)
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       struct sr_usb_dev_inst *usb;
        int64_t timediff_us, timediff_ms;
        int err;
 
        devc = sdi->priv;
+       usb = sdi->conn;
 
        /*
         * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
@@ -387,7 +375,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       err = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE);
+       err = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
        if (err != 0) {
                sr_err("Unable to claim interface: %s.",
                       libusb_error_name(err));
@@ -418,10 +406,23 @@ static int hw_cleanup(void)
 
 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;
+               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;
@@ -429,7 +430,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
                *data = g_variant_new_int32(NUM_VDIV);
                break;
        default:
-               return SR_ERR_ARG;
+               return SR_ERR_NA;
        }
 
        return SR_OK;
@@ -555,7 +556,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
                        ret = SR_ERR_ARG;
                break;
        default:
-               ret = SR_ERR_ARG;
+               ret = SR_ERR_NA;
                break;
        }
 
@@ -576,6 +577,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));
@@ -616,7 +621,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
                                ARRAY_SIZE(trigger_sources));
                break;
        default:
-               return SR_ERR_ARG;
+               return SR_ERR_NA;
        }
 
        return SR_OK;
@@ -814,11 +819,11 @@ static int handle_event(int fd, int revents, void *cb_data)
 
        /* TODO: ugh */
        if (devc->dev_state == NEW_CAPTURE) {
-               if (dso_capture_start(devc) != SR_OK)
+               if (dso_capture_start(sdi) != SR_OK)
                        return TRUE;
-               if (dso_enable_trigger(devc) != SR_OK)
+               if (dso_enable_trigger(sdi) != SR_OK)
                        return TRUE;
-//             if (dso_force_trigger(devc) != SR_OK)
+//             if (dso_force_trigger(sdi) != SR_OK)
 //                     return TRUE;
                sr_dbg("Successfully requested next chunk.");
                devc->dev_state = CAPTURE;
@@ -827,7 +832,7 @@ static int handle_event(int fd, int revents, void *cb_data)
        if (devc->dev_state != CAPTURE)
                return TRUE;
 
-       if ((dso_get_capturestate(devc, &capturestate, &trigger_offset)) != SR_OK)
+       if ((dso_get_capturestate(sdi, &capturestate, &trigger_offset)) != SR_OK)
                return TRUE;
 
        sr_dbg("Capturestate %d.", capturestate);
@@ -836,11 +841,11 @@ static int handle_event(int fd, int revents, void *cb_data)
        case CAPTURE_EMPTY:
                if (++devc->capture_empty_count >= MAX_CAPTURE_EMPTY) {
                        devc->capture_empty_count = 0;
-                       if (dso_capture_start(devc) != SR_OK)
+                       if (dso_capture_start(sdi) != SR_OK)
                                break;
-                       if (dso_enable_trigger(devc) != SR_OK)
+                       if (dso_enable_trigger(sdi) != SR_OK)
                                break;
-//                     if (dso_force_trigger(devc) != SR_OK)
+//                     if (dso_force_trigger(sdi) != SR_OK)
 //                             break;
                        sr_dbg("Successfully requested next chunk.");
                }
@@ -905,10 +910,10 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                return SR_ERR;
        }
 
-       if (dso_init(devc) != SR_OK)
+       if (dso_init(sdi) != SR_OK)
                return SR_ERR;
 
-       if (dso_capture_start(devc) != SR_OK)
+       if (dso_capture_start(sdi) != SR_OK)
                return SR_ERR;
 
        devc->dev_state = CAPTURE;