link-mso19: Add coupling config option

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index 0c5f466fbcfeffa1a6979dd894f97d8805425079..d2d266100245ff55e12d6e9b24159fb5af27594a 100644 (file)
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -38,7 +38,14 @@ static const uint32_t devopts[] = {
        SR_CONF_TRIGGER_SLOPE | SR_CONF_SET,
        SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET,
        SR_CONF_CAPTURE_RATIO | SR_CONF_SET,
-       SR_CONF_RLE | SR_CONF_SET,
+};
+
+static const uint32_t devopts_cg_analog[] = {
+       SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+};
+
+static const char *coupling[] = {
+       "DC", "AC",
 };
 
 static const uint64_t samplerates[] = {
@@ -89,7 +96,8 @@ static GSList* scan_handle_port(GSList *devices, struct sp_port *port)
                return devices;
        }
        sprintf(hwrev, "r%d", devc->hwrev);
-       devc->ctlbase1 = BIT_CTL1_ADC_ENABLE | BIT_CTL1_DC_COUPLING;
+       devc->ctlbase1 = BIT_CTL1_ADC_ENABLE;
+       devc->coupling = coupling[0];
        devc->cur_rate = SR_KHZ(10);
        devc->dso_probe_attn = 10;
        devc->limit_samples = MSO_NUM_SAMPLES;
@@ -207,8 +215,6 @@ static int config_get(uint32_t key, GVariant **data,
 {
        struct dev_context *devc;
 
-       (void)cg;
-
        if (!sdi)
                return SR_ERR_ARG;
 
@@ -221,6 +227,11 @@ static int config_get(uint32_t key, GVariant **data,
        case SR_CONF_LIMIT_SAMPLES:
                *data = g_variant_new_uint64(devc->limit_samples);
                break;
+       case SR_CONF_COUPLING:
+               if (!cg_is_analog(cg))
+                       return SR_ERR_NA;
+               *data = g_variant_new_string(devc->coupling);
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -238,8 +249,6 @@ static int config_set(uint32_t key, GVariant *data,
        double pos;
        int idx;
 
-       (void)cg;
-
        devc = sdi->priv;
 
        switch (key) {
@@ -270,7 +279,13 @@ static int config_set(uint32_t key, GVariant *data,
                trigger_pos = (int)pos;
                devc->trigger_holdoff[0] = trigger_pos & 0xff;
                break;
-       case SR_CONF_RLE:
+       case SR_CONF_COUPLING:
+               if (!cg_is_analog(cg))
+                       return SR_ERR_ARG;
+               idx = std_str_idx(data, ARRAY_AND_SIZE(coupling));
+               if (idx < 0)
+                       return SR_ERR_ARG;
+               devc->coupling = coupling[idx];
                break;
        default:
                return SR_ERR_NA;
@@ -285,10 +300,23 @@ static int config_list(uint32_t key, GVariant **data,
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
        case SR_CONF_DEVICE_OPTIONS:
-               return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+               if (!cg)
+                       return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+               else if (cg_is_analog(cg))
+                       *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog));
+               else if (cg_is_digital(cg))
+                       *data = std_gvar_array_u32(NULL, 0);
+               else
+                       return SR_ERR_NA;
+               break;
        case SR_CONF_SAMPLERATE:
                *data = std_gvar_samplerates_steps(ARRAY_AND_SIZE(samplerates));
                break;
+       case SR_CONF_COUPLING:
+               if (!cg_is_analog(cg))
+                       return SR_ERR_NA;
+               *data = g_variant_new_strv(ARRAY_AND_SIZE(coupling));
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -313,8 +341,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                return ret;
        }
 
-       /* FIXME: ACDC Mode */
-//      devc->ctlbase1 |= devc->acdcmode;
+       if (devc->coupling[0] == 'D') {
+               devc->ctlbase1 |= BIT_CTL1_DC_COUPLING;
+       } else {
+               devc->ctlbase1 &= ~BIT_CTL1_DC_COUPLING;
+       }
 
        ret = mso_configure_rate(sdi, devc->cur_rate);
        if (ret != SR_OK)

diff --git a/src/hardware/link-mso19/protocol.h b/src/hardware/link-mso19/protocol.h
index 6dbb54fd43ff60565f1a16aa5a283a60ad64ae85..51e8c79efb2b5debf58993fd30aa1cc196374f8e 100644 (file)
--- a/src/hardware/link-mso19/protocol.h
+++ b/src/hardware/link-mso19/protocol.h
@@ -38,6 +38,9 @@
 #define MSO_NUM_SAMPLES                1024
 #define MSO_NUM_LOGIC_CHANNELS 8
 
+#define cg_is_digital(cg) (cg && cg->name[0] == 'L')
+#define cg_is_analog(cg) (cg && cg->name[0] == 'D')
+
 enum trigger_slopes {
        SLOPE_POSITIVE = 0,
        SLOPE_NEGATIVE,
@@ -93,6 +96,7 @@ struct dev_context {
 
        uint8_t la_threshold;
        uint64_t cur_rate;
+       const char *coupling;
        uint8_t dso_probe_attn;
        int8_t use_trigger;
        uint8_t trigger_chan;