GVariant *gvar;
uint64_t time_msec;
uint64_t samplerate;
+ struct sr_dev_driver *driver;
+
+ driver = sr_dev_inst_driver_get(sdi);
if (!(time_msec = sr_parse_timestring(opt_time))) {
g_critical("Invalid time '%s'", opt_time);
}
} else if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) {
/* Convert to samples based on the samplerate. */
- sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
+ sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
samplerate = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
limit_samples = (samplerate) * time_msec / (uint64_t)1000;
return SR_OK;
}
-GHashTable *generic_arg_to_opt(const struct sr_option *opts, GHashTable *genargs)
-{
- GHashTable *hash;
- GVariant *gvar;
- const struct sr_option *opt;
- char *s;
-
- hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
- (GDestroyNotify)g_variant_unref);
- for (opt = opts; opt->id && opt->def; opt++) {
- if (!(s = g_hash_table_lookup(genargs, opt->id)))
- continue;
- if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_UINT32)) {
- gvar = g_variant_new_uint32(strtoul(s, NULL, 10));
- g_hash_table_insert(hash, g_strdup(opt->id),
- g_variant_ref_sink(gvar));
- printf("opt %s value %s\n", opt->id, s);
- } else {
- g_critical("Don't know how to convert option '%s' to %s!",
- opt->id, g_variant_get_type_string(opt->def));
- }
- }
-
- return hash;
-}
-
const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
{
const struct sr_output_module *omod;
- const struct sr_option *opts;
+ const struct sr_option **options;
const struct sr_output *o;
GHashTable *fmtargs, *fmtopts;
char *fmtspec;
if (!fmtspec)
g_critical("Invalid output format.");
if (!(omod = sr_output_find(fmtspec)))
- g_critical("Unknown output format '%s'.", fmtspec);
+ g_critical("Unknown output module '%s'.", fmtspec);
g_hash_table_remove(fmtargs, "sigrok_key");
- if ((opts = sr_output_options_get(omod))) {
- fmtopts = generic_arg_to_opt(opts, fmtargs);
- sr_output_options_free(omod);
+ if ((options = sr_output_options_get(omod))) {
+ fmtopts = generic_arg_to_opt(options, fmtargs);
+ sr_output_options_free(options);
} else
fmtopts = NULL;
o = sr_output_new(omod, fmtopts, sdi);
static uint64_t samplerate = 0;
static int triggered = 0;
static FILE *outfile = NULL;
- GSList *l;
+ GSList *l, *channels_sdi;
GString *out;
GVariant *gvar;
uint64_t end_sample;
uint64_t input_len;
int i;
char **channels;
+ struct sr_dev_driver *driver;
+
+ driver = sr_dev_inst_driver_get(sdi);
+ channels_sdi = sr_dev_inst_channels_get(sdi);
/* If the first packet to come in isn't a header, don't even try. */
if (packet->type != SR_DF_HEADER && o == NULL)
switch (packet->type) {
case SR_DF_HEADER:
g_debug("cli: Received SR_DF_HEADER.");
- o = setup_output_format(sdi);
+ if (!(o = setup_output_format(sdi)))
+ g_critical("Failed to initialize output module.");
/* Set up backup analog output module. */
oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
}
rcvd_samples_logic = rcvd_samples_analog = 0;
- if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE,
+ if (sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE,
&gvar) == SR_OK) {
samplerate = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
/* Saving to a session file. */
if (rcvd_samples_logic == 0) {
/* First packet with logic data, init session file. */
- channels = g_malloc(sizeof(char *) * g_slist_length(sdi->channels));
- for (i = 0, l = sdi->channels; l; l = l->next) {
+ channels = g_malloc(sizeof(char *) * g_slist_length(channels_sdi));
+ for (i = 0, l = channels_sdi; l; l = l->next) {
ch = l->data;
- if (ch->enabled && ch->type == SR_CHANNEL_LOGIC)
+ if (ch->type == SR_CHANNEL_LOGIC)
channels[i++] = ch->name;
}
channels[i] = NULL;
void run_session(void)
{
- GSList *devices;
+ GSList *devices, *real_devices, *sd;
GHashTable *devargs;
GVariant *gvar;
struct sr_session *session;
struct sr_trigger *trigger;
struct sr_dev_inst *sdi;
uint64_t min_samples, max_samples;
+ gsize n_elements, i;
+ const uint32_t *dev_opts;
+ int is_demo_dev;
+ struct sr_dev_driver *driver;
devices = device_scan();
if (!devices) {
g_critical("No devices found.");
return;
}
+
+ real_devices = NULL;
+ for (sd = devices; sd; sd = sd->next) {
+ sdi = sd->data;
+
+ driver = sr_dev_inst_driver_get(sdi);
+
+ if (sr_config_list(driver, sdi, NULL, SR_CONF_DEVICE_OPTIONS, &gvar) != SR_OK) {
+ g_critical("Failed to query sr_config_list(SR_CONF_DEVICE_OPTIONS).");
+ return;
+ }
+
+ dev_opts = g_variant_get_fixed_array(gvar, &n_elements, sizeof(uint32_t));
+
+ is_demo_dev = 0;
+ for (i = 0; i < n_elements; i++) {
+ if (dev_opts[i] == SR_CONF_DEMO_DEV)
+ is_demo_dev = 1;
+ }
+
+ g_variant_unref(gvar);
+
+ if (!is_demo_dev)
+ real_devices = g_slist_append(real_devices, sdi);
+ }
+
if (g_slist_length(devices) > 1) {
- g_critical("sigrok-cli only supports one device for capturing.");
- g_slist_free(devices);
- return;
+ if (g_slist_length(real_devices) != 1) {
+ g_critical("sigrok-cli only supports one device for capturing.");
+ return;
+ } else {
+ /* We only have one non-demo device. */
+ g_slist_free(devices);
+ devices = real_devices;
+ real_devices = NULL;
+ }
}
+
sdi = devices->data;
g_slist_free(devices);
+ g_slist_free(real_devices);
sr_session_new(&session);
sr_session_datafeed_callback_add(session, datafeed_in, NULL);
sr_session_destroy(session);
return;
}
- if (sr_config_list(sdi->driver, sdi, NULL,
+ if (sr_config_list(driver, sdi, NULL,
SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK) {
/* The device has no compression, or compression is turned
* off, and publishes its sample memory size. */
projects / sigrok-cli.git / blobdiff