diff --git a/proto.h b/proto.h index 0e9af5a5..e4d667ea 100644 --- a/proto.h +++ b/proto.h @@ -142,8 +142,6 @@ SR_API char *sr_si_string_u64(uint64_t x, const char *unit); SR_API char *sr_samplerate_string(uint64_t samplerate); SR_API char *sr_period_string(uint64_t frequency); SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q); -SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi, - const char *triggerstring); SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size); SR_API uint64_t sr_parse_timestring(const char *timestring); SR_API gboolean sr_parse_boolstring(const char *boolstring); diff --git a/strutil.c b/strutil.c index 47975d20..54dc1f39 100644 --- a/strutil.c +++ b/strutil.c @@ -368,102 +368,6 @@ SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q) return o; } -/** - * Parse a trigger specification string. - * - * @param sdi The device instance for which the trigger specification is - * intended. Must not be NULL. Also, sdi->driver and - * sdi->driver->info_get must not be NULL. - * @param triggerstring The string containing the trigger specification for - * one or more channels of this device. Entries for multiple channels are - * comma-separated. Triggers are specified in the form key=value, - * where the key is a channel number (or channel name) and the value is - * the requested trigger type. Valid trigger types currently - * include 'r' (rising edge), 'f' (falling edge), 'c' (any pin value - * change), '0' (low value), or '1' (high value). - * Example: "1=r,sck=f,miso=0,7=c" - * - * @return Pointer to a list of trigger types (strings), or NULL upon errors. - * The pointer list (if non-NULL) has as many entries as the - * respective device has channels (all physically available channels, - * not just enabled ones). Entries of the list which don't have - * a trigger value set in 'triggerstring' are NULL, the other entries - * contain the respective trigger type which is requested for the - * respective channel (e.g. "r", "c", and so on). - * - * @since 0.2.0 - */ -SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi, - const char *triggerstring) -{ - GSList *l; - GVariant *gvar; - struct sr_channel *ch; - int max_channels, channelnum, i; - char **tokens, **triggerlist, *trigger, *tc; - const char *trigger_types; - gboolean error; - - max_channels = g_slist_length(sdi->channels); - error = FALSE; - - if (!(triggerlist = g_try_malloc0(max_channels * sizeof(char *)))) { - sr_err("%s: triggerlist malloc failed", __func__); - return NULL; - } - - if (sdi->driver->config_list(SR_CONF_TRIGGER_TYPE, - &gvar, sdi, NULL) != SR_OK) { - sr_err("%s: Device doesn't support any triggers.", __func__); - return NULL; - } - trigger_types = g_variant_get_string(gvar, NULL); - - tokens = g_strsplit(triggerstring, ",", max_channels); - for (i = 0; tokens[i]; i++) { - channelnum = -1; - for (l = sdi->channels; l; l = l->next) { - ch = (struct sr_channel *)l->data; - if (ch->enabled - && !strncmp(ch->name, tokens[i], - strlen(ch->name))) { - channelnum = ch->index; - break; - } - } - - if (channelnum < 0 || channelnum >= max_channels) { - sr_err("Invalid channel."); - error = TRUE; - break; - } - - if ((trigger = strchr(tokens[i], '='))) { - for (tc = ++trigger; *tc; tc++) { - if (strchr(trigger_types, *tc) == NULL) { - sr_err("Unsupported trigger " - "type '%c'.", *tc); - error = TRUE; - break; - } - } - if (!error) - triggerlist[channelnum] = g_strdup(trigger); - } - } - g_strfreev(tokens); - g_variant_unref(gvar); - - if (error) { - for (i = 0; i < max_channels; i++) - g_free(triggerlist[i]); - g_free(triggerlist); - triggerlist = NULL; - } - - return triggerlist; -} - /** * Convert a "natural" string representation of a size value to uint64_t. *