BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sr: fix sr_parse_triggerstring() to use probe numbers starting from 0

This commit is contained in:
Bert Vermeulen 2012-07-23 02:58:56 +02:00
parent 1907d2c928
commit 31fc1fbce3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
strutil.c
View File

@ -188,14 +188,13 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
return NULL; return NULL;
} }
tokens = g_strsplit(triggerstring, ",", max_probes);
if (sdi->driver->info_get(SR_DI_TRIGGER_TYPES, if (sdi->driver->info_get(SR_DI_TRIGGER_TYPES,
(const void **)&trigger_types, sdi) != SR_OK) { (const void **)&trigger_types, sdi) != SR_OK) {
sr_err("strutil: %s: Device doesn't support any triggers.", __func__); sr_err("strutil: %s: Device doesn't support any triggers.", __func__);
return NULL; return NULL;
} }
tokens = g_strsplit(triggerstring, ",", max_probes);
for (i = 0; tokens[i]; i++) { for (i = 0; tokens[i]; i++) {
if (tokens[i][0] < '0' || tokens[i][0] > '9') { if (tokens[i][0] < '0' || tokens[i][0] > '9') {
/* Named probe */ /* Named probe */
@ -213,7 +212,7 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
probenum = strtol(tokens[i], NULL, 10); probenum = strtol(tokens[i], NULL, 10);
} }
if (probenum < 1 || probenum > max_probes) { if (probenum < 0 || probenum >= max_probes) {
sr_err("strutil: Invalid probe (%d).", probenum); sr_err("strutil: Invalid probe (%d).", probenum);
error = TRUE; error = TRUE;
break; break;
@ -229,7 +228,7 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
} }
} }
if (!error) if (!error)
triggerlist[probenum - 1] = g_strdup(trigger); triggerlist[probenum] = g_strdup(trigger);
} }
} }
g_strfreev(tokens); g_strfreev(tokens);