dslogic: Add support for external clock edge selection.

[libsigrok.git] / src / hardware / fx2lafw / api.c

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index 6e8eff4e5aa8c7a8b91089fde584aff2eed6ffaa..17ae297c9f3f37544c7d659ec1757c5eaad5361c 100644 (file)
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -143,6 +143,7 @@ static const uint32_t dslogic_devopts[] = {
        SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
        SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_EXTERNAL_CLOCK | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_CLOCK_EDGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST
 };
 
 static const int32_t soft_trigger_matches[] = {
@@ -153,6 +154,13 @@ static const int32_t soft_trigger_matches[] = {
        SR_TRIGGER_EDGE,
 };
 
+/* Names assigned to available edge slope choices.
+ */
+static const char *const signal_edge_names[] = {
+       [DS_EDGE_RISING] = "rising",
+       [DS_EDGE_FALLING] = "falling",
+};
+
 static const struct {
        int range;
        gdouble low;
@@ -574,6 +582,12 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        case SR_CONF_CONTINUOUS:
                *data = g_variant_new_boolean(devc->dslogic_continuous_mode);
                break;
+       case SR_CONF_CLOCK_EDGE:
+               i = devc->dslogic_clock_edge;
+               if (i >= ARRAY_SIZE(signal_edge_names))
+                       return SR_ERR_BUG;
+               *data = g_variant_new_string(signal_edge_names[0]);//idx]);
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -581,6 +595,28 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        return SR_OK;
 }
 
+
+/* Helper for mapping a string-typed configuration value to an index
+ * within a table of possible values.
+ */
+static int lookup_index(GVariant *value, const char *const *table, int len)
+{
+       const char *entry;
+       int i;
+
+       entry = g_variant_get_string(value, NULL);
+       if (!entry)
+               return -1;
+
+       /* Linear search is fine for very small tables. */
+       for (i = 0; i < len; i++) {
+               if (strcmp(entry, table[i]) == 0)
+                       return i;
+       }
+
+       return -1;
+}
+
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
@@ -645,6 +681,13 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        case SR_CONF_CONTINUOUS:
                devc->dslogic_continuous_mode = g_variant_get_boolean(data);
                break;
+       case SR_CONF_CLOCK_EDGE:
+               i = lookup_index(data, signal_edge_names,
+                                  ARRAY_SIZE(signal_edge_names));
+               if (i < 0)
+                       return SR_ERR_ARG;
+               devc->dslogic_clock_edge = i;
+               break;          
        default:
                ret = SR_ERR_NA;
        }
@@ -709,6 +752,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                                soft_trigger_matches, ARRAY_SIZE(soft_trigger_matches),
                                sizeof(int32_t));
                break;
+       case SR_CONF_CLOCK_EDGE:
+               *data = g_variant_new_strv(signal_edge_names,
+                       ARRAY_SIZE(signal_edge_names));
+               break;
        default:
                return SR_ERR_NA;
        }