hantek-dso: Store USB connection in sr_dev_inst

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

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index dc0332eb2701d10c36cb59836ac2c54975bba3ef..05e95c60573df8af837ddb27d60d4dc9eb53cce3 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -37,6 +37,9 @@
 /* TODO tune this properly */
 #define TICK 1
 
+#define NUM_TIMEBASE  10
+#define NUM_VDIV      8
+
 static const int32_t devopts[] = {
        SR_CONF_OSCILLOSCOPE,
        SR_CONF_LIMIT_FRAMES,
@@ -49,6 +52,8 @@ static const int32_t devopts[] = {
        SR_CONF_FILTER,
        SR_CONF_VDIV,
        SR_CONF_COUPLING,
+       SR_CONF_NUM_TIMEBASE,
+       SR_CONF_NUM_VDIV,
 };
 
 static const char *probe_names[] = {
@@ -246,7 +251,7 @@ static int clear_instances(void)
                        continue;
                }
                dso_close(sdi);
-               sr_usb_dev_inst_free(devc->usb);
+               sr_usb_dev_inst_free(sdi->conn);
                g_free(devc->triggersource);
                g_slist_free(devc->enabled_probes);
 
@@ -312,7 +317,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;
@@ -325,7 +330,7 @@ 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->conn = sr_usb_dev_inst_new(
                                                libusb_get_bus_number(devlist[i]),
                                                libusb_get_device_address(devlist[i]), NULL);
                                devcnt++;
@@ -349,10 +354,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
@@ -382,7 +389,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));
@@ -411,6 +418,25 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
+{
+
+       (void)sdi;
+
+       switch (id) {
+       case SR_CONF_NUM_TIMEBASE:
+               *data = g_variant_new_int32(NUM_TIMEBASE);
+               break;
+       case SR_CONF_NUM_VDIV:
+               *data = g_variant_new_int32(NUM_VDIV);
+               break;
+       default:
+               return SR_ERR_NA;
+       }
+
+       return SR_OK;
+}
+
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -531,7 +557,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;
        }
 
@@ -541,6 +567,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       GVariant *tuple, *rational[2];
+       GVariantBuilder gvb;
+       unsigned int i;
 
        (void)sdi;
 
@@ -561,23 +590,35 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
                *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
                break;
        case SR_CONF_VDIV:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
-                               vdivs, ARRAY_SIZE(vdivs) * 2, sizeof(uint64_t));
+               g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+               for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
+                       rational[0] = g_variant_new_uint64(vdivs[i][0]);
+                       rational[1] = g_variant_new_uint64(vdivs[i][1]);
+                       tuple = g_variant_new_tuple(rational, 2);
+                       g_variant_builder_add_value(&gvb, tuple);
+               }
+               *data = g_variant_builder_end(&gvb);
                break;
        case SR_CONF_FILTER:
                *data = g_variant_new_strv(filter_targets,
                                ARRAY_SIZE(filter_targets));
                break;
        case SR_CONF_TIMEBASE:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
-                               timebases, ARRAY_SIZE(timebases) * 2, sizeof(uint64_t));
+               g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+               for (i = 0; i < ARRAY_SIZE(timebases); i++) {
+                       rational[0] = g_variant_new_uint64(timebases[i][0]);
+                       rational[1] = g_variant_new_uint64(timebases[i][1]);
+                       tuple = g_variant_new_tuple(rational, 2);
+                       g_variant_builder_add_value(&gvb, tuple);
+               }
+               *data = g_variant_builder_end(&gvb);
                break;
        case SR_CONF_TRIGGER_SOURCE:
                *data = g_variant_new_strv(trigger_sources,
                                ARRAY_SIZE(trigger_sources));
                break;
        default:
-               return SR_ERR_ARG;
+               return SR_ERR_NA;
        }
 
        return SR_OK;
@@ -775,11 +816,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;
@@ -788,7 +829,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);
@@ -797,11 +838,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.");
                }
@@ -866,10 +907,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;
@@ -909,7 +950,7 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = NULL,
+       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,