extern struct sr_hwcap_option sr_hwcap_options[];
-static gboolean debug = 0;
static uint64_t limit_samples = 0;
static struct sr_output_format *output_format = NULL;
static int default_output_format = FALSE;
sample_size = -1;
switch (packet->type) {
case SR_DF_HEADER:
- g_message("cli: Received SR_DF_HEADER");
+ g_debug("cli: Received SR_DF_HEADER");
/* Initialize the output module. */
if (!(o = g_try_malloc(sizeof(struct sr_output)))) {
- printf("Output module malloc failed.\n");
+ g_critical("Output module malloc failed.");
exit(1);
}
o->format = output_format;
o->param = output_format_param;
if (o->format->init) {
if (o->format->init(o) != SR_OK) {
- printf("Output format initialization failed.\n");
+ g_critical("Output format initialization failed.");
exit(1);
}
}
outfile = NULL;
ret = sr_datastore_new(unitsize, &(dev->datastore));
if (ret != SR_OK) {
- printf("Failed to create datastore.\n");
+ g_critical("Failed to create datastore.");
exit(1);
}
} else {
header->samplerate);
break;
case SR_DF_END:
- g_message("cli: Received SR_DF_END");
+ g_debug("cli: Received SR_DF_END");
if (!o) {
- g_message("cli: double end!");
+ g_debug("cli: double end!");
break;
}
if (o->format->event) {
}
}
if (limit_samples && received_samples < limit_samples)
- printf("Device only sent %" PRIu64 " samples.\n",
+ g_warning("Device only sent %" PRIu64 " samples.",
received_samples);
if (opt_continuous)
- printf("Device stopped after %" PRIu64 " samples.\n",
+ g_warning("Device stopped after %" PRIu64 " samples.",
received_samples);
sr_session_halt();
if (outfile && outfile != stdout)
o = NULL;
break;
case SR_DF_TRIGGER:
- g_message("cli: received SR_DF_TRIGGER");
+ g_debug("cli: received SR_DF_TRIGGER");
if (o->format->event)
o->format->event(o, SR_DF_TRIGGER, &output_buf,
&output_len);
for (pdtok = pdtokens; *pdtok; pdtok++) {
if (!(pd_opthash = parse_generic_arg(*pdtok))) {
- fprintf(stderr, "Invalid protocol decoder option '%s'.\n", *pdtok);
+ g_critical("Invalid protocol decoder option '%s'.", *pdtok);
goto err_out;
}
pd_name = g_strdup(g_hash_table_lookup(pd_opthash, "sigrok_key"));
g_hash_table_remove(pd_opthash, "sigrok_key");
if (srd_decoder_load(pd_name) != SRD_OK) {
- fprintf(stderr, "Failed to load protocol decoder %s\n", pd_name);
+ g_critical("Failed to load protocol decoder %s.", pd_name);
goto err_out;
}
if (!(di = srd_inst_new(pd_name, pd_opthash))) {
- fprintf(stderr, "Failed to instantiate protocol decoder %s\n", pd_name);
+ g_critical("Failed to instantiate protocol decoder %s.", pd_name);
goto err_out;
}
g_datalist_set_data(&pd_ann_visible, di->inst_id, pd_name);
/* If there are no input formats, return NULL right away. */
inputs = sr_input_list();
if (!inputs) {
- fprintf(stderr, "cli: %s: no supported input formats "
- "available", __func__);
+ g_critical("No supported input formats available.");
return NULL;
}
for (i = 0; inputs[i]; i++) {
if (strcasecmp(inputs[i]->id, opt_input_format))
continue;
- printf("Using user-specified input file format"
- " '%s'.\n", inputs[i]->id);
+ g_debug("Using user-specified input file format '%s'.",
+ inputs[i]->id);
return inputs[i];
}
/* The user specified an unknown input format, return NULL. */
- fprintf(stderr, "Error: Specified input file format '%s' is "
- "unknown.\n", opt_input_format);
+ g_critical("Error: specified input file format '%s' is "
+ "unknown.", opt_input_format);
return NULL;
}
/* Return NULL if no input module wanted to touch this. */
if (!inputs[i]) {
- fprintf(stderr, "Error: No matching input module found.\n");
+ g_critical("Error: no matching input module found.");
return NULL;
}
- printf("Using input file format '%s'.\n", inputs[i]->id);
return inputs[i];
}
struct sr_input *in;
struct sr_input_format *input_format;
- input_format = determine_input_file_format(opt_input_file,
- opt_input_format);
- if (!input_format) {
- fprintf(stderr, "Error: Couldn't detect input file format.\n");
+ if (!(input_format = determine_input_file_format(opt_input_file,
+ opt_input_format)))
+ /* The exact cause was already logged. */
return;
- }
if (stat(opt_input_file, &st) == -1) {
- printf("Failed to load %s: %s\n", opt_input_file,
+ g_critical("Failed to load %s: %s", opt_input_file,
strerror(errno));
exit(1);
}
/* Initialize the input module. */
if (!(in = g_try_malloc(sizeof(struct sr_input)))) {
- printf("Failed to allocate input module.\n");
+ g_critical("Failed to allocate input module.");
exit(1);
}
in->format = input_format;
in->param = input_format_param;
if (in->format->init) {
if (in->format->init(in) != SR_OK) {
- printf("Input format init failed.\n");
+ g_critical("Input format init failed.");
exit(1);
}
}
sr_session_new();
sr_session_datafeed_callback_add(datafeed_in);
if (sr_session_dev_add(in->vdev) != SR_OK) {
- printf("Failed to use device.\n");
+ g_critical("Failed to use device.");
sr_session_destroy();
return;
}
input_format->loadfile(in, opt_input_file);
if (opt_output_file && default_output_format) {
if (sr_session_save(opt_output_file) != SR_OK)
- printf("Failed to save session.\n");
+ g_critical("Failed to save session.");
}
sr_session_destroy();
}
continue;
if ((value == NULL) &&
(sr_hwcap_options[i].type != SR_T_BOOL)) {
- printf("Option '%s' needs a value.\n", (char *)key);
+ g_critical("Option '%s' needs a value.", (char *)key);
return SR_ERR;
}
found = TRUE;
}
if (ret != SR_OK) {
- printf("Failed to set device option '%s'.\n", (char *)key);
+ g_critical("Failed to set device option '%s'.", (char *)key);
return ret;
}
else
break;
}
if (!found) {
- printf("Unknown device option '%s'.\n", (char *) key);
+ g_critical("Unknown device option '%s'.", (char *) key);
return SR_ERR;
}
}
devspec = g_hash_table_lookup(devargs, "sigrok_key");
dev = parse_devstring(devspec);
if (!dev) {
- g_warning("Device not found.");
+ g_critical("Device not found.");
return;
}
g_hash_table_remove(devargs, "sigrok_key");
devargs = NULL;
dev = parse_devstring("0");
} else if (num_devs == 0) {
- printf("No devices found.\n");
+ g_critical("No devices found.");
return;
} else {
- printf("%d devices found, please select one.\n", num_devs);
+ g_critical("%d devices found, please select one.", num_devs);
return;
}
}
sr_session_datafeed_callback_add(datafeed_in);
if (sr_session_dev_add(dev) != SR_OK) {
- printf("Failed to use device.\n");
+ g_critical("Failed to use device.");
sr_session_destroy();
return;
}
if (opt_continuous) {
if (!sr_driver_hwcap_exists(dev->driver, SR_HWCAP_CONTINUOUS)) {
- printf("This device does not support continuous sampling.");
+ g_critical("This device does not support continuous sampling.");
sr_session_destroy();
return;
}
if (opt_time) {
time_msec = sr_parse_timestring(opt_time);
if (time_msec == 0) {
- printf("Invalid time '%s'\n", opt_time);
+ g_critical("Invalid time '%s'", opt_time);
sr_session_destroy();
return;
}
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");
+ g_critical("Failed to configure time limit.");
sr_session_destroy();
return;
}
limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
}
if (limit_samples == 0) {
- printf("Not enough time at this samplerate.\n");
+ g_critical("Not enough time at this samplerate.");
sr_session_destroy();
return;
}
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");
+ g_critical("Failed to configure time-based sample limit.");
sr_session_destroy();
return;
}
if ((sr_parse_sizestring(opt_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");
+ g_critical("Failed to configure sample limit.");
sr_session_destroy();
return;
}
if (dev->driver->dev_config_set(dev->driver_index,
SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) {
- printf("Failed to configure probes.\n");
+ g_critical("Failed to configure probes.");
sr_session_destroy();
return;
}
if (sr_session_start() != SR_OK) {
- printf("Failed to start session.\n");
+ g_critical("Failed to start session.");
sr_session_destroy();
return;
}
if (opt_output_file && default_output_format) {
if (sr_session_save(opt_output_file) != SR_OK)
- printf("Failed to save session.\n");
+ g_critical("Failed to save session.");
}
sr_session_destroy();
}
* All messages, warnings, errors etc. go to stderr (not stdout) in
* order to not mess up the CLI tool data output, e.g. VCD output.
*/
- if (log_level & (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_WARNING)) {
+ if (log_level & (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_WARNING)
+ || opt_loglevel > SR_LOG_WARN) {
fprintf(stderr, "%s\n", message);
fflush(stderr);
- } else {
- if ((log_level & G_LOG_LEVEL_MESSAGE && debug == 1)
- || debug == 2) {
- printf("%s\n", message);
- fflush(stderr);
- }
}
}
char *fmtspec, **pds;
g_log_set_default_handler(logger, NULL);
- if (getenv("SIGROK_DEBUG"))
- debug = strtol(getenv("SIGROK_DEBUG"), NULL, 10);
error = NULL;
context = g_option_context_new(NULL);
g_option_context_add_main_entries(context, optargs, NULL);
if (!g_option_context_parse(context, &argc, &argv, &error)) {
- g_warning("%s", error->message);
+ g_critical("%s", error->message);
return 1;
}
/* Set the loglevel (amount of messages to output) for libsigrok. */
if (sr_log_loglevel_set(opt_loglevel) != SR_OK) {
- fprintf(stderr, "cli: %s: sr_log_loglevel_set(%d) failed\n",
- __func__, opt_loglevel);
+ g_critical("sr_log_loglevel_set(%d) failed.", opt_loglevel);
return 1;
}
/* Set the loglevel (amount of messages to output) for libsigrokdecode. */
if (srd_log_loglevel_set(opt_loglevel) != SRD_OK) {
- fprintf(stderr, "cli: %s: srd_log_loglevel_set(%d) failed\n",
- __func__, opt_loglevel);
+ g_critical("srd_log_loglevel_set(%d) failed.", opt_loglevel);
return 1;
}
if (opt_pds) {
if (srd_init(NULL) != SRD_OK) {
- printf("Failed to initialize sigrokdecode\n");
+ g_critical("Failed to initialize sigrokdecode.");
return 1;
}
if (register_pds(NULL, opt_pds) != 0) {
- printf("Failed to register protocol decoders\n");
+ g_critical("Failed to register protocol decoders.");
return 1;
}
if (srd_pd_output_callback_add(SRD_OUTPUT_ANN,
show_pd_annotation, NULL) != SRD_OK) {
- printf("Failed to register protocol decoder callback\n");
+ g_critical("Failed to register protocol decoder callback.");
return 1;
}
- }
- if (opt_pd_stack) {
- pds = g_strsplit(opt_pd_stack, ",", 0);
- if (g_strv_length(pds) < 2) {
- printf("Specify at least two protocol decoders to stack.\n");
- return 1;
- }
+ pds = g_strsplit(opt_pds, ",", 0);
+ if (g_strv_length(pds) > 1) {
+ if (opt_pd_stack) {
+ /* A stack setup was specified, use that. */
+ g_strfreev(pds);
+ pds = g_strsplit(opt_pd_stack, ",", 0);
+ if (g_strv_length(pds) < 2) {
+ g_strfreev(pds);
+ g_critical("Specify at least two protocol decoders to stack.");
+ return 1;
+ }
+ }
- if (!(di_from = srd_inst_find_by_id(pds[0]))) {
- printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[0]);
- return 1;
- }
- for (i = 1; pds[i]; i++) {
- if (!(di_to = srd_inst_find_by_id(pds[i]))) {
- printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[i]);
+ if (!(di_from = srd_inst_find_by_id(pds[0]))) {
+ g_critical("Cannot stack protocol decoder '%s': "
+ "instance not found.", pds[0]);
return 1;
}
- if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK)
- return ret;
+ for (i = 1; pds[i]; i++) {
+ if (!(di_to = srd_inst_find_by_id(pds[i]))) {
+ g_critical("Cannot stack protocol decoder '%s': "
+ "instance not found.", pds[i]);
+ return 1;
+ }
+ if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK)
+ return ret;
- /* Don't show annotation from this PD. Only the last PD in
- * the stack will be left on the annotation list.
- */
- g_datalist_remove_data(&pd_ann_visible, di_from->inst_id);
+ /* Don't show annotation from this PD. Only the last PD in
+ * the stack will be left on the annotation list.
+ */
+ g_datalist_remove_data(&pd_ann_visible, di_from->inst_id);
- di_from = di_to;
+ di_from = di_to;
+ }
}
g_strfreev(pds);
}
fmtargs = parse_generic_arg(opt_output_format);
fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
if (!fmtspec) {
- printf("Invalid output format.\n");
+ g_critical("Invalid output format.");
return 1;
}
outputs = sr_output_list();
break;
}
if (!output_format) {
- printf("invalid output format %s\n", opt_output_format);
+ g_critical("Invalid output format %s.", opt_output_format);
return 1;
}
projects / sigrok-cli.git / blobdiff