if (msg)
fprintf(stderr, "%s\n", msg);
- printf("Usage: runtc [-dPpoiOf]\n");
- printf(" -d Debug\n");
- printf(" -P
<protocol decoder>\n");
- printf(" -p <channelname=channelnum> (optional)\n");
- printf(" -o <channeloption=value> (optional)\n");
+ printf("Usage: runtc [-dPpoiOfcS]\n");
+ printf(" -d (enables debug output)\n");
+ printf(" -P <protocol decoder>\n");
+ printf(" -p <channelname=channelnum> (optional)\n");
+ printf(" -o <channeloption=value> (optional)\n");
printf(" -i <input file>\n");
printf(" -O <output-pd:output-type[:output-class]>\n");
printf(" -f <output file> (optional)\n");
printf(" -c <coverage report> (optional)\n");
+ printf(" -S (enables statistics)\n");
exit(msg ? 1 : 0);
}
GString *out;
char *s;
- DBG("Python output from %s", pdata->pdo->di->inst_id);
+ DBG("Python output from %s", pdata->pdo->di->decoder->id);
op = cb_data;
pydata = pdata->data;
DBG("ptr %p", pydata);
- if (strcmp(pdata->pdo->di->inst_id, op->pd))
+ if (strcmp(pdata->pdo->di->decoder->id, op->pd))
/* This is not the PD selected for output. */
return;
out = g_string_sized_new(128);
g_string_printf(out, "%" PRIu64 "-%" PRIu64 " %s: %s\n",
pdata->start_sample, pdata->end_sample,
- pdata->pdo->di->inst_id, s);
+ pdata->pdo->di->decoder->id, s);
g_free(s);
if (write(op->outfd, out->str, out->len) == -1)
ERR("SRD_OUTPUT_PYTHON callback write failure!");
GString *out;
unsigned int i;
- DBG("Binary output from %s", pdata->pdo->di->inst_id);
+ DBG("Binary output from %s", pdata->pdo->di->decoder->id);
op = cb_data;
pdb = pdata->data;
- if (strcmp(pdata->pdo->di->inst_id, op->pd))
+ if (strcmp(pdata->pdo->di->decoder->id, op->pd))
/* This is not the PD selected for output. */
return;
out = g_string_sized_new(128);
g_string_printf(out, "%" PRIu64 "-%" PRIu64 " %s:",
pdata->start_sample, pdata->end_sample,
- pdata->pdo->di->inst_id);
+ pdata->pdo->di->decoder->id);
for (i = 0; i < pdb->size; i++) {
g_string_append_printf(out, " %.2x", pdb->data[i]);
}
int i;
char **dec_ann;
- DBG("Annotation output from %s", pdata->pdo->di->inst_id);
+ DBG("Annotation output from %s", pdata->pdo->di->decoder->id);
op = cb_data;
pda = pdata->data;
dec = pdata->pdo->di->decoder;
- if (strcmp(pdata->pdo->di->inst_id, op->pd))
+ if (strcmp(pdata->pdo->di->decoder->id, op->pd))
/* This is not the PD selected for output. */
return;
line = g_string_sized_new(256);
g_string_printf(line, "%" PRIu64 "-%" PRIu64 " %s: %s:",
pdata->start_sample, pdata->end_sample,
- pdata->pdo->di->inst_id, dec_ann[0]);
+ pdata->pdo->di->decoder->id, dec_ann[0]);
for (i = 0; pda->ann_text[i]; i++)
g_string_append_printf(line, " \"%s\"", pda->ann_text[i]);
g_string_append(line, "\n");
static void sr_cb(const struct sr_dev_inst *sdi,
const struct sr_datafeed_packet *packet, void *cb_data)
{
+ static int samplecnt = 0;
const struct sr_datafeed_logic *logic;
struct srd_session *sess;
GVariant *gvar;
uint64_t samplerate;
int num_samples;
- static int samplecnt = 0;
struct sr_dev_driver *driver;
sess = cb_data;
DBG("Received SR_DF_LOGIC (%"PRIu64" bytes, unitsize = %d).",
logic->length, logic->unitsize);
srd_session_send(sess, samplecnt, samplecnt + num_samples,
- logic->data, logic->length);
- samplecnt += logic->length / logic->unitsize;
+ logic->data, logic->length, logic->unitsize);
+ samplecnt += num_samples;
break;
case SR_DF_END:
DBG("Received SR_DF_END");
struct sr_session *sr_sess;
gboolean is_number;
const char *s;
- struct sr_dev_inst *sdi;
- uint64_t unitsize;
- struct sr_dev_driver *driver;
if (op->outfile) {
if ((op->outfd = open(op->outfile, O_CREAT|O_WRONLY, 0600)) == -1) {
ERR("Unable to open %s for writing: %s", op->outfile,
- strerror(errno));
+ g_strerror(errno));
return FALSE;
}
}
return FALSE;
sr_session_dev_list(sr_sess, &devices);
- sdi = devices->data;
- driver = sr_dev_inst_driver_get(sdi);
- sr_config_get(driver, sdi, NULL, SR_CONF_CAPTURE_UNITSIZE, &gvar);
- unitsize = g_variant_get_uint64(gvar);
- g_variant_unref(gvar);
if (srd_session_new(&sess) != SRD_OK)
return FALSE;
g_hash_table_insert(channels, channel->name, gvar);
}
- if (srd_inst_channel_set_all(di, channels, unitsize) != SRD_OK)
+ if (srd_inst_channel_set_all(di, channels) != SRD_OK)
return FALSE;
g_hash_table_destroy(channels);
}
if (!strcmp(decoder_class[0], op->class)) {
op->class_idx = idx;
break;
- } else
- idx++;
+ }
+ idx++;
l = l->next;
}
if (op->class_idx == -1) {
ERR("Output class '%s' not found in decoder %s.",
op->class, pd->name);
return FALSE;
- } else
- DBG("Class %s index is %d", op->class, op->class_idx);
+ }
+ DBG("Class %s index is %d", op->class, op->class_idx);
}
sr_session_start(sr_sess);
if (c == 'p') {
channel = malloc(sizeof(struct channel));
channel->name = g_strdup(kv[0]);
- channel->channel = strtoul(kv[1], 0, 10);
+ channel->channel = strtoul(kv[1], NULL, 10);
/* Apply to last PD. */
pd->channels = g_slist_append(pd->channels, channel);
} else {
option = malloc(sizeof(struct option));
option->key = g_strdup(kv[0]);
option->value = g_variant_new_string(kv[1]);
- g_variant_ref_sink(option->value);
+ g_variant_ref_sink(option->value);
/* Apply to last PD. */
pd->options = g_slist_append(pd->options, option);
}
projects / sigrok-test.git / blobdiff