link-mso19: Add logic_threshold config option

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index 9636aea4c985c14cc8e90a43c84243babf657499..8ede55075514e6ae1ce87f4ce571ca3165792279 100644 (file)
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -49,6 +49,7 @@ static const uint32_t devopts_cg_analog[] = {
 
 static const uint32_t devopts_cg_digital[] = {
        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_LOGIC_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 static const char *coupling[] = {
@@ -92,6 +93,25 @@ static const int32_t trigger_matches[] = {
        SR_TRIGGER_ONE,
 };
 
+static const char *logic_thresholds[] = {
+       "1.2V Logic",
+       "1.5V Logic",
+       "1.8V Logic",
+       "2.5V Logic",
+       "3.0V Logic",
+       "3.3V/5.0V Logic",
+};
+
+/* Values taken from USB wireshark capture */
+static const uint16_t logic_threshold_values[] = {
+       0x600,
+       0x770,
+       0x8ff,
+       0xc70,
+       0xeff,
+       0xfff,
+};
+
 static void mso_update_trigger_slope(struct dev_context *devc)
 {
        switch (devc->trigger_source) {
@@ -157,6 +177,11 @@ static void mso_update_trigger_pos(struct dev_context *devc)
                devc->ctltrig_pos |= sign_bit;
 }
 
+static void mso_update_logic_threshold_value(struct dev_context *devc)
+{
+       devc->logic_threshold_value = logic_threshold_values[devc->logic_threshold];
+}
+
 static GSList* scan_handle_port(GSList *devices, struct sp_port *port)
 {
        int usb_vid, usb_pid;
@@ -204,6 +229,8 @@ static GSList* scan_handle_port(GSList *devices, struct sp_port *port)
        devc->cur_rate = SR_KHZ(10);
        devc->dso_probe_factor = 10;
        devc->limit_samples = MSO_NUM_SAMPLES;
+       devc->logic_threshold = ARRAY_SIZE(logic_thresholds) - 1; // 3.3V/5V
+       mso_update_logic_threshold_value(devc);
 
        devc->protocol_trigger.spimode = 0;
        for (i = 0; i < ARRAY_SIZE(devc->protocol_trigger.word); i++) {
@@ -359,6 +386,11 @@ static int config_get(uint32_t key, GVariant **data,
        case SR_CONF_HORIZ_TRIGGERPOS:
                *data = g_variant_new_double(devc->horiz_triggerpos);
                break;
+       case SR_CONF_LOGIC_THRESHOLD:
+               if (!cg_is_digital(cg))
+                       return SR_ERR_ARG;
+               *data = g_variant_new_string(logic_thresholds[devc->logic_threshold]);
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -452,6 +484,15 @@ static int config_set(uint32_t key, GVariant *data,
                devc->dso_probe_factor = tmp_u64;
                mso_limit_trigger_level(devc);
                break;
+       case SR_CONF_LOGIC_THRESHOLD:
+               if (!cg_is_digital(cg))
+                       return SR_ERR_ARG;
+               idx = std_str_idx(data, ARRAY_AND_SIZE(logic_thresholds));
+               if (idx < 0)
+                       return SR_ERR_ARG;
+               devc->logic_threshold = idx;
+               mso_update_logic_threshold_value(devc);
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -496,6 +537,11 @@ static int config_list(uint32_t key, GVariant **data,
        case SR_CONF_TRIGGER_MATCH:
                *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
                break;
+       case SR_CONF_LOGIC_THRESHOLD:
+               if (!cg_is_digital(cg))
+                       return SR_ERR_ARG;
+               *data = g_variant_new_strv(ARRAY_AND_SIZE(logic_thresholds));
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -531,7 +577,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                return ret;
 
        /* set dac offset */
-       ret = mso_dac_out(sdi, devc->dac_offset);
+       ret = mso_dac_out(sdi, DAC_SELECT_DSO | devc->dac_offset);
        if (ret != SR_OK)
                return ret;
 

diff --git a/src/hardware/link-mso19/protocol.c b/src/hardware/link-mso19/protocol.c
index c2fdf5c549eebec61600aa58165712c7a646146e..538d00b80d96051729ee955758d3d1bfe3906baa 100644 (file)
--- a/src/hardware/link-mso19/protocol.c
+++ b/src/hardware/link-mso19/protocol.c
@@ -116,7 +116,7 @@ SR_PRIV int mso_configure_threshold_level(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc = sdi->priv;
 
-       return mso_dac_out(sdi, la_threshold_map[devc->la_threshold]);
+       return mso_dac_out(sdi, DAC_SELECT_LA | devc->logic_threshold_value);
 }
 
 SR_PRIV int mso_read_buffer(struct sr_dev_inst *sdi)
@@ -157,8 +157,8 @@ SR_PRIV int mso_dac_out(const struct sr_dev_inst *sdi, uint16_t val)
 {
        struct dev_context *devc = sdi->priv;
        uint16_t ops[] = {
-               mso_trans(REG_DAC1, (val >> 8) & 0xff),
-               mso_trans(REG_DAC2, val & 0xff),
+               mso_trans(REG_DAC_MSB, (val >> 8) & 0xff),
+               mso_trans(REG_DAC_LSB, val & 0xff),
                mso_trans(REG_CTL1, devc->ctlbase1 | BIT_CTL1_LOAD_DAC),
        };
 

diff --git a/src/hardware/link-mso19/protocol.h b/src/hardware/link-mso19/protocol.h
index 0c50ab85eada3afdf97d184634612bd358a1c2ef..db37f6da268636a79d2e8649e44c545f242b0900 100644 (file)
--- a/src/hardware/link-mso19/protocol.h
+++ b/src/hardware/link-mso19/protocol.h
@@ -91,7 +91,8 @@ struct dev_context {
        uint16_t ctltrig_pos;
        uint8_t status;
 
-       uint8_t la_threshold;
+       uint8_t logic_threshold;
+       uint16_t logic_threshold_value;
        uint64_t cur_rate;
        const char *coupling;
        uint16_t dso_probe_factor;
@@ -145,8 +146,8 @@ SR_PRIV void stop_acquisition(const struct sr_dev_inst *sdi);
 #define REG_CLKRATE1           9
 #define REG_CLKRATE2           10
 #define REG_TRIG_WIDTH         11
-#define REG_DAC1               12
-#define REG_DAC2               13
+#define REG_DAC_MSB            12
+#define REG_DAC_LSB            13
 /* possibly bank agnostic: */
 #define REG_CTL1               14
 
@@ -204,6 +205,12 @@ enum {
        TRIG_POS_IS_NEGATIVE =  1 << 15,
 };
 
+/* bits - REG_DAC */
+enum {
+       DAC_SELECT_DSO =        0 << 15,
+       DAC_SELECT_LA =         1 << 15,
+};
+
 /* bits - REG_CTL1 */
 #define BIT_CTL1_RESETFSM              (1 << 0)
 #define BIT_CTL1_ARM                   (1 << 1)
@@ -246,9 +253,4 @@ static const struct rate_map rate_map[] = {
        { SR_HZ(100),  0x9f0f, 0x20 },
 };
 
-/* FIXME: Determine corresponding voltages */
-static const uint16_t la_threshold_map[] = {
-       0x8600, 0x8770, 0x88ff, 0x8c70, 0x8eff, 0x8fff,
-};
-
 #endif