static gchar *opt_pds = NULL;
static gchar *opt_pd_stack = NULL;
static gchar *opt_input_format = NULL;
-static gchar *opt_format = NULL;
+static gchar *opt_output_format = NULL;
static gchar *opt_time = NULL;
static gchar *opt_samples = NULL;
static gchar *opt_continuous = NULL;
static GOptionEntry optargs[] = {
{"version", 'V', 0, G_OPTION_ARG_NONE, &opt_version, "Show version and support list", NULL},
- {"loglevel", 'l', 0, G_OPTION_ARG_INT, &opt_loglevel, "Select libsigrok loglevel", NULL},
- {"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devs, "List devices", NULL},
+ {"loglevel", 'l', 0, G_OPTION_ARG_INT, &opt_loglevel, "Select libsigrok/libsigrokdecode loglevel", NULL},
+ {"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devs, "Scan for devices", NULL},
+ {"device", 'd', 0, G_OPTION_ARG_STRING, &opt_dev, "Use specified device", NULL},
{"input-file", 'i', 0, G_OPTION_ARG_FILENAME, &opt_input_file, "Load input from file", NULL},
+ {"input-format", 'I', 0, G_OPTION_ARG_STRING, &opt_input_format, "Input format", NULL},
{"output-file", 'o', 0, G_OPTION_ARG_FILENAME, &opt_output_file, "Save output to file", NULL},
- {"device", 'd', 0, G_OPTION_ARG_STRING, &opt_dev, "Use device ID", NULL},
+ {"output-format", 'O', 0, G_OPTION_ARG_STRING, &opt_output_format, "Output format", NULL},
{"probes", 'p', 0, G_OPTION_ARG_STRING, &opt_probes, "Probes to use", NULL},
{"triggers", 't', 0, G_OPTION_ARG_STRING, &opt_triggers, "Trigger configuration", NULL},
{"wait-trigger", 'w', 0, G_OPTION_ARG_NONE, &opt_wait_trigger, "Wait for trigger", NULL},
- {"protocol-decoders", 'a', 0, G_OPTION_ARG_STRING, &opt_pds, "Protocol decoder sequence", NULL},
+ {"protocol-decoders", 'a', 0, G_OPTION_ARG_STRING, &opt_pds, "Protocol decoders to run", NULL},
{"protocol-decoder-stack", 's', 0, G_OPTION_ARG_STRING, &opt_pd_stack, "Protocol decoder stack", NULL},
- {"input-format", 'I', 0, G_OPTION_ARG_STRING, &opt_input_format, "Input format", NULL},
- {"format", 'f', 0, G_OPTION_ARG_STRING, &opt_format, "Output format", NULL},
{"time", 0, 0, G_OPTION_ARG_STRING, &opt_time, "How long to sample (ms)", NULL},
{"samples", 0, 0, G_OPTION_ARG_STRING, &opt_samples, "Number of samples to acquire", NULL},
{"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous, "Sample continuously", NULL},
static void show_version(void)
{
- GSList *plugins, *p, *l;
- struct sr_dev_plugin *plugin;
+ GSList *l;
+ struct sr_dev_driver **drivers;
struct sr_input_format **inputs;
struct sr_output_format **outputs;
struct srd_decoder *dec;
printf("sigrok-cli %s\n\n", VERSION);
printf("Supported hardware drivers:\n");
- plugins = sr_hw_list();
- for (p = plugins; p; p = p->next) {
- plugin = p->data;
- printf(" %-20s %s\n", plugin->name, plugin->longname);
+ drivers = sr_driver_list();
+ for (i = 0; drivers[i]; i++) {
+ printf(" %-20s %s\n", drivers[i]->name, drivers[i]->longname);
}
printf("\n");
if (srd_init(NULL) == SRD_OK) {
printf("Supported protocol decoders:\n");
- srd_decoders_load_all();
- for (l = srd_decoders_list(); l; l = l->next) {
+ srd_decoder_load_all();
+ for (l = srd_decoder_list(); l; l = l->next) {
dec = l->data;
printf(" %-20s %s\n", dec->id, dec->longname);
}
}
title = "Supported options:\n";
- hwcaps = dev->plugin->hwcap_get_all();
+ hwcaps = dev->driver->hwcap_get_all();
for (cap = 0; hwcaps[cap]; cap++) {
if (!(hwo = sr_hw_hwcap_get(hwcaps[cap])))
continue;
if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) {
printf(" %s", hwo->shortname);
- if (sr_dev_info_get(dev, SR_DI_PATTERNMODES,
+ if (sr_dev_info_get(dev, SR_DI_PATTERNS,
(const void **)&stropts) == SR_OK) {
- printf(" - supported modes:\n");
+ printf(" - supported patterns:\n");
for (i = 0; stropts[i]; i++)
printf(" %s\n", stropts[i]);
} else {
} else {
printf(" - supported samplerates:\n");
for (i = 0; samplerates->list[i]; i++) {
- printf(" %7s\n", sr_samplerate_string(samplerates->list[i]));
+ printf(" %s\n", sr_samplerate_string(samplerates->list[i]));
}
}
} else {
printf("- %s\n %s\n", ann[0], ann[1]);
}
}
- if ((doc = srd_decoder_doc(dec))) {
+ if ((doc = srd_decoder_doc_get(dec))) {
printf("Documentation:\n%s\n", doc[0] == '\n' ? doc+1 : doc);
g_free(doc);
}
}
} else {
/* saving to a file in whatever format was set
- * with --format, so all we need is a filehandle */
+ * with -O, so all we need is a filehandle */
outfile = g_fopen(opt_output_file, "wb");
}
}
goto cleanup;
if (opt_pds) {
- if (srd_session_feed(received_samples, (uint8_t*)filter_out,
+ if (srd_session_send(received_samples, (uint8_t*)filter_out,
filter_out_len) != SRD_OK)
sr_session_halt();
} else {
* is the probe name as specified in the decoder class, and the
* value is the probe number i.e. the order in which the PD's
* incoming samples are arranged. */
- if (srd_inst_probes_set(di, pd_opthash) != SRD_OK)
+ if (srd_inst_probe_set_all(di, pd_opthash) != SRD_OK)
goto err_out;
g_hash_table_destroy(pd_opthash);
pd_opthash = NULL;
return 0;
}
-void show_pd_annotation(struct srd_proto_data *pdata, void *user_data)
+void show_pd_annotation(struct srd_proto_data *pdata, void *cb_data)
{
int i;
char **annotations;
- /* 'user_data' is not used in this specific callback. */
- (void)user_data;
+ /* 'cb_data' is not used in this specific callback. */
+ (void)cb_data;
if (pdata->ann_format != 0) {
/* CLI only shows the default annotation format. */
for (i = 0; i < max_probes; i++) {
if (probelist[i]) {
- sr_dev_probe_name(dev, i + 1, probelist[i]);
+ sr_dev_probe_name_set(dev, i + 1, probelist[i]);
g_free(probelist[i]);
} else {
probe = sr_dev_probe_find(dev, i + 1);
ret = sr_parse_sizestring(value, &tmp_u64);
if (ret != SR_OK)
break;
- ret = dev->plugin->set_configuration(dev->plugin_index,
- sr_hwcap_options[i].hwcap, &tmp_u64);
+ ret = dev->driver->dev_config_set(dev->driver_index,
+ sr_hwcap_options[i].hwcap, &tmp_u64);
break;
case SR_T_CHAR:
- ret = dev->plugin->set_configuration(dev->plugin_index,
- sr_hwcap_options[i].hwcap, value);
+ ret = dev->driver->dev_config_set(dev->driver_index,
+ sr_hwcap_options[i].hwcap, value);
break;
case SR_T_BOOL:
if (!value)
tmp_bool = TRUE;
else
tmp_bool = sr_parse_boolstring(value);
- ret = dev->plugin->set_configuration(dev->plugin_index,
+ ret = dev->driver->dev_config_set(dev->driver_index,
sr_hwcap_options[i].hwcap,
GINT_TO_POINTER(tmp_bool));
break;
return;
if (opt_continuous) {
- if (!sr_hw_has_hwcap(dev->plugin, SR_HWCAP_CONTINUOUS)) {
+ if (!sr_driver_hwcap_exists(dev->driver, SR_HWCAP_CONTINUOUS)) {
printf("This device does not support continuous sampling.");
sr_session_destroy();
return;
return;
}
- if (sr_hw_has_hwcap(dev->plugin, SR_HWCAP_LIMIT_MSEC)) {
- if (dev->plugin->set_configuration(dev->plugin_index,
- SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
+ if (sr_driver_hwcap_exists(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
+ if (dev->driver->dev_config_set(dev->driver_index,
+ SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
printf("Failed to configure time limit.\n");
sr_session_destroy();
return;
return;
}
- if (dev->plugin->set_configuration(dev->plugin_index,
- SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
+ if (dev->driver->dev_config_set(dev->driver_index,
+ SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
printf("Failed to configure time-based sample limit.\n");
sr_session_destroy();
return;
if (opt_samples) {
if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
- || (dev->plugin->set_configuration(dev->plugin_index,
- SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) {
+ || (dev->driver->dev_config_set(dev->driver_index,
+ SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) {
printf("Failed to configure sample limit.\n");
sr_session_destroy();
return;
}
}
- if (dev->plugin->set_configuration(dev->plugin_index,
+ if (dev->driver->dev_config_set(dev->driver_index,
SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) {
printf("Failed to configure probes.\n");
sr_session_destroy();
}
static void logger(const gchar *log_domain, GLogLevelFlags log_level,
- const gchar *message, gpointer user_data)
+ const gchar *message, gpointer cb_data)
{
/* Avoid compiler warnings. */
(void)log_domain;
- (void)user_data;
+ (void)cb_data;
/*
* All messages, warnings, errors etc. go to stderr (not stdout) in
printf("Failed to register protocol decoders\n");
return 1;
}
- if (srd_register_callback(SRD_OUTPUT_ANN,
+ if (srd_pd_output_callback_add(SRD_OUTPUT_ANN,
show_pd_annotation, NULL) != SRD_OK) {
printf("Failed to register protocol decoder callback\n");
return 1;
g_strfreev(pds);
}
- if (!opt_format) {
- opt_format = DEFAULT_OUTPUT_FORMAT;
+ if (!opt_output_format) {
+ opt_output_format = DEFAULT_OUTPUT_FORMAT;
/* we'll need to remember this so when saving to a file
* later, sigrok session format will be used.
*/
default_output_format = TRUE;
}
- fmtargs = parse_generic_arg(opt_format);
+ fmtargs = parse_generic_arg(opt_output_format);
fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
if (!fmtspec) {
printf("Invalid output format.\n");
break;
}
if (!output_format) {
- printf("invalid output format %s\n", opt_format);
+ printf("invalid output format %s\n", opt_output_format);
return 1;
}
projects / sigrok-cli.git / blobdiff