Consistently use 'cg' for channel group variables.

[libsigrok.git] / hardware / zeroplus-logic-cube / api.c

diff --git a/hardware/zeroplus-logic-cube/api.c b/hardware/zeroplus-logic-cube/api.c
index 84f830a6f96e4b5036729b524a1c692a213c5025..63b2efd9a9edd3b7ef3f3d0ed5dd183284ba9599 100644 (file)
--- a/hardware/zeroplus-logic-cube/api.c
+++ b/hardware/zeroplus-logic-cube/api.c
@@ -57,6 +57,7 @@ static const int32_t hwcaps[] = {
        SR_CONF_LOGIC_ANALYZER,
        SR_CONF_SAMPLERATE,
        SR_CONF_CAPTURE_RATIO,
+       SR_CONF_VOLTAGE_THRESHOLD,
        SR_CONF_LIMIT_SAMPLES,
 };
 
@@ -238,11 +239,6 @@ SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate)
        return SR_OK;
 }
 
-static int dev_clear(void)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int init(struct sr_context *sr_ctx)
 {
        return std_init(sr_ctx, di, LOG_PREFIX);
@@ -439,6 +435,9 @@ static int dev_open(struct sr_dev_inst *sdi)
                devc->cur_samplerate = SR_MHZ(1);
        }
 
+       if (devc->cur_threshold == 0)
+               set_voltage_threshold(devc, 1.5);
+
        return SR_OK;
 }
 
@@ -464,15 +463,15 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-       return dev_clear();
+       return std_dev_clear(di, NULL);
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
-       (void)probe_group;
+       (void)cg;
 
        switch (id) {
        case SR_CONF_SAMPLERATE:
@@ -482,14 +481,24 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
                        sr_spew("Returning samplerate: %" PRIu64 "Hz.",
                                devc->cur_samplerate);
                } else
-                       return SR_ERR;
+                       return SR_ERR_ARG;
                break;
        case SR_CONF_CAPTURE_RATIO:
                if (sdi) {
                        devc = sdi->priv;
                        *data = g_variant_new_uint64(devc->capture_ratio);
                } else
-                       return SR_ERR;
+                       return SR_ERR_ARG;
+               break;
+       case SR_CONF_VOLTAGE_THRESHOLD:
+               if (sdi) {
+                       GVariant *range[2];
+                       devc = sdi->priv;
+                       range[0] = g_variant_new_double(devc->cur_threshold);
+                       range[1] = g_variant_new_double(devc->cur_threshold);
+                       *data = g_variant_new_tuple(range, 2);
+               } else
+                       return SR_ERR_ARG;
                break;
        default:
                return SR_ERR_NA;
@@ -499,11 +508,12 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
+       gdouble low, high;
 
-       (void)probe_group;
+       (void)cg;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -520,6 +530,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
                return set_limit_samples(devc, g_variant_get_uint64(data));
        case SR_CONF_CAPTURE_RATIO:
                return set_capture_ratio(devc, g_variant_get_uint64(data));
+       case SR_CONF_VOLTAGE_THRESHOLD:
+               g_variant_get(data, "(dd)", &low, &high);
+               return set_voltage_threshold(devc, (low + high) / 2.0);
        default:
                return SR_ERR_NA;
        }
@@ -528,13 +541,15 @@ 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,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
-       GVariant *gvar;
+       GVariant *gvar, *grange[2];
        GVariantBuilder gvb;
+       double v;
+       GVariant *range[2];
 
-       (void)probe_group;
+       (void)cg;
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
@@ -563,6 +578,24 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
        case SR_CONF_TRIGGER_TYPE:
                *data = g_variant_new_string(TRIGGER_TYPE);
                break;
+       case SR_CONF_VOLTAGE_THRESHOLD:
+               g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+               for (v = -6.0; v <= 6.0; v += 0.1) {
+                       range[0] = g_variant_new_double(v);
+                       range[1] = g_variant_new_double(v);
+                       gvar = g_variant_new_tuple(range, 2);
+                       g_variant_builder_add_value(&gvb, gvar);
+               }
+               *data = g_variant_builder_end(&gvb);
+               break;
+       case SR_CONF_LIMIT_SAMPLES:
+               if (!sdi)
+                       return SR_ERR_ARG;
+               devc = sdi->priv;
+               grange[0] = g_variant_new_uint64(0);
+               grange[1] = g_variant_new_uint64(devc->max_sample_depth);
+               *data = g_variant_new_tuple(grange, 2);
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -789,7 +822,7 @@ SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
        .cleanup = cleanup,
        .scan = scan,
        .dev_list = dev_list,
-       .dev_clear = dev_clear,
+       .dev_clear = NULL,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,