#define DEFAULT_OUTPUT_FORMAT "bits:width=64"
+static struct sr_context *sr_ctx = NULL;
+
static uint64_t limit_samples = 0;
static uint64_t limit_frames = 0;
static struct sr_output_format *output_format = NULL;
static int default_output_format = FALSE;
static char *output_format_param = NULL;
static GHashTable *pd_ann_visible = NULL;
-static struct sr_datastore *singleds = NULL;
+static GByteArray *savebuf;
static gboolean opt_version = FALSE;
static gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
};
-/* Convert driver options hash to GSList of struct sr_hwopt. */
+/* Convert driver options hash to GSList of struct sr_config. */
static GSList *hash_to_hwopt(GHashTable *hash)
{
- const struct sr_hwcap_option *hwo;
- struct sr_hwopt *hwopt;
+ const struct sr_config_info *srci;
+ struct sr_config *src;
GList *gl, *keys;
GSList *opts;
char *key, *value;
opts = NULL;
for (gl = keys; gl; gl = gl->next) {
key = gl->data;
- if (!(hwo = sr_drvopt_name_get(key))) {
+ if (!(srci = sr_drvopt_name_get(key))) {
g_critical("Unknown option %s", key);
return NULL;
}
- hwopt = g_try_malloc(sizeof(struct sr_hwopt));
- hwopt->hwopt = hwo->hwcap;
+ src = g_try_malloc(sizeof(struct sr_config));
+ src->key = srci->key;
value = g_hash_table_lookup(hash, key);
- hwopt->value = g_strdup(value);
- opts = g_slist_append(opts, hwopt);
+ src->value = g_strdup(value);
+ opts = g_slist_append(opts, src);
}
g_list_free(keys);
return opts;
}
+static void free_drvopts(struct sr_config *src)
+{
+ g_free((void *)src->value);
+ g_free(src);
+}
+
static GSList *device_scan(void)
{
struct sr_dev_driver **drivers, *driver;
return NULL;
}
g_free(drvname);
- if (sr_driver_init(driver) != SR_OK) {
+ if (sr_driver_init(sr_ctx, driver) != SR_OK) {
g_critical("Failed to initialize driver.");
return NULL;
}
/* Unknown options, already logged. */
return NULL;
devices = sr_driver_scan(driver, drvopts);
+ g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
} else {
/* No driver specified, let them all scan on their own. */
devices = NULL;
drivers = sr_driver_list();
for (i = 0; drivers[i]; i++) {
driver = drivers[i];
- if (sr_driver_init(driver) != SR_OK) {
+ if (sr_driver_init(sr_ctx, driver) != SR_OK) {
g_critical("Failed to initialize driver.");
return NULL;
}
static void show_version(void)
{
- GSList *l;
+ const GSList *l;
struct sr_dev_driver **drivers;
struct sr_input_format **inputs;
struct sr_output_format **outputs;
static void show_dev_detail(void)
{
struct sr_dev_inst *sdi;
- const struct sr_hwcap_option *hwo;
+ const struct sr_config_info *srci;
const struct sr_samplerates *samplerates;
struct sr_rational *rationals;
GSList *devices;
NULL) == SR_OK) && hwopts) {
printf("Supported driver options:\n");
for (i = 0; hwopts[i]; i++) {
- if (!(hwo = sr_drvopt_get(hwopts[i])))
+ if (!(srci = sr_drvopt_get(hwopts[i])))
continue;
- printf(" %s\n", hwo->shortname);
+ printf(" %s\n", srci->id);
}
}
return;
for (cap = 0; hwcaps[cap]; cap++) {
- if (!(hwo = sr_devopt_get(hwcaps[cap])))
+ if (!(srci = sr_devopt_get(hwcaps[cap])))
continue;
if (title) {
title = NULL;
}
- if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) {
+ if (srci->key == SR_HWCAP_PATTERN_MODE) {
/* Pattern generator modes */
- printf(" %s", hwo->shortname);
+ printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_PATTERNS,
(const void **)&stropts, sdi) == SR_OK) {
printf(" - supported patterns:\n");
printf("\n");
}
- } else if (hwo->hwcap == SR_HWCAP_SAMPLERATE) {
+ } else if (srci->key == SR_HWCAP_SAMPLERATE) {
/* Supported samplerates */
- printf(" %s", hwo->shortname);
+ printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES,
(const void **)&samplerates, sdi) != SR_OK) {
printf("\n");
printf(" %s\n", sr_samplerate_string(samplerates->list[i]));
}
- } else if (hwo->hwcap == SR_HWCAP_BUFFERSIZE) {
+ } else if (srci->key == SR_HWCAP_BUFFERSIZE) {
/* Supported buffer sizes */
- printf(" %s", hwo->shortname);
+ printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_BUFFERSIZES,
(const void **)&integers, sdi) != SR_OK) {
printf("\n");
for (i = 0; integers[i]; i++)
printf(" %"PRIu64"\n", integers[i]);
- } else if (hwo->hwcap == SR_HWCAP_TIMEBASE) {
+ } else if (srci->key == SR_HWCAP_TIMEBASE) {
/* Supported time bases */
- printf(" %s", hwo->shortname);
+ printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_TIMEBASES,
(const void **)&rationals, sdi) != SR_OK) {
printf("\n");
printf(" %s\n", sr_period_string(
rationals[i].p * rationals[i].q));
- } else if (hwo->hwcap == SR_HWCAP_TRIGGER_SOURCE) {
+ } else if (srci->key == SR_HWCAP_TRIGGER_SOURCE) {
/* Supported trigger sources */
- printf(" %s", hwo->shortname);
+ printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_TRIGGER_SOURCES,
(const void **)&stropts, sdi) != SR_OK) {
printf("\n");
for (i = 0; stropts[i]; i++)
printf(" %s\n", stropts[i]);
- } else if (hwo->hwcap == SR_HWCAP_FILTER) {
- /* Supported trigger sources */
- printf(" %s", hwo->shortname);
+ } else if (srci->key == SR_HWCAP_FILTER) {
+ /* Supported filters */
+ printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_FILTERS,
(const void **)&stropts, sdi) != SR_OK) {
printf("\n");
for (i = 0; stropts[i]; i++)
printf(" %s\n", stropts[i]);
- } else if (hwo->hwcap == SR_HWCAP_VDIV) {
+ } else if (srci->key == SR_HWCAP_VDIV) {
/* Supported volts/div values */
- printf(" %s", hwo->shortname);
+ printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_VDIVS,
(const void **)&rationals, sdi) != SR_OK) {
printf("\n");
for (i = 0; rationals[i].p && rationals[i].q; i++)
printf(" %s\n", sr_voltage_string( &rationals[i]));
- } else if (hwo->hwcap == SR_HWCAP_COUPLING) {
+ } else if (srci->key == SR_HWCAP_COUPLING) {
/* Supported coupling settings */
- printf(" %s", hwo->shortname);
+ printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_COUPLING,
(const void **)&stropts, sdi) != SR_OK) {
printf("\n");
} else {
/* Everything else */
- printf(" %s\n", hwo->shortname);
+ printf(" %s\n", srci->id);
}
}
g_strfreev(pdtokens);
}
+static GArray *get_enabled_logic_probes(const struct sr_dev_inst *sdi)
+{
+ struct sr_probe *probe;
+ GArray *probes;
+ GSList *l;
+
+ probes = g_array_new(FALSE, FALSE, sizeof(int));
+ for (l = sdi->probes; l; l = l->next) {
+ probe = l->data;
+ if (probe->type != SR_PROBE_LOGIC)
+ continue;
+ if (probe->enabled != TRUE)
+ continue;
+ g_array_append_val(probes, probe->index);
+ }
+
+ return probes;
+}
+
static void datafeed_in(const struct sr_dev_inst *sdi,
- struct sr_datafeed_packet *packet)
+ const struct sr_datafeed_packet *packet)
{
+ const struct sr_datafeed_meta *meta;
+ const struct sr_datafeed_logic *logic;
+ const struct sr_datafeed_analog *analog;
+ struct sr_config *src;
static struct sr_output *o = NULL;
- static int logic_probelist[SR_MAX_NUM_PROBES] = { -1 };
- static struct sr_probe *analog_probelist[SR_MAX_NUM_PROBES];
+ static GArray *logic_probelist = NULL;
static uint64_t received_samples = 0;
static int unitsize = 0;
static int triggered = 0;
static FILE *outfile = NULL;
- static int num_analog_probes = 0;
- struct sr_probe *probe;
- struct sr_datafeed_logic *logic;
- struct sr_datafeed_meta_logic *meta_logic;
- struct sr_datafeed_analog *analog;
- struct sr_datafeed_meta_analog *meta_analog;
- static int num_enabled_analog_probes = 0;
- int num_enabled_probes, sample_size, ret, i;
- uint64_t output_len, filter_out_len;
+ int sample_size, ret;
+ uint64_t *samplerate, output_len, filter_out_len;
uint8_t *output_buf, *filter_out;
GString *out;
+ GSList *l;
/* If the first packet to come in isn't a header, don't even try. */
if (packet->type != SR_DF_HEADER && o == NULL)
exit(1);
}
}
+
+ /* Prepare non-stdout output. */
+ outfile = stdout;
+ if (opt_output_file) {
+ if (default_output_format) {
+ /* output file is in session format, so we'll
+ * keep a copy of everything as it comes in
+ * and save from there after the session. */
+ outfile = NULL;
+ savebuf = g_byte_array_new();
+ } else {
+ /* saving to a file in whatever format was set
+ * with --format, so all we need is a filehandle */
+ outfile = g_fopen(opt_output_file, "wb");
+ }
+ }
+
+ /* Prepare for logic data. */
+ logic_probelist = get_enabled_logic_probes(sdi);
+ /* How many bytes we need to store the packed samples. */
+ unitsize = (logic_probelist->len + 7) / 8;
+
+ if (opt_pds && logic_probelist->len) {
+ if (sr_info_get(sdi->driver, SR_DI_CUR_SAMPLERATE,
+ (const void **)&samplerate, sdi) != SR_OK) {
+ g_critical("Unable to initialize protocol "
+ "decoders: no samplerate found.");
+ break;
+ }
+ srd_session_start(logic_probelist->len, unitsize,
+ *samplerate);
+ }
break;
case SR_DF_END:
if (opt_continuous)
g_warning("Device stopped after %" PRIu64 " samples.",
received_samples);
+
if (outfile && outfile != stdout)
fclose(outfile);
+ if (opt_output_file && default_output_format) {
+ if (sr_session_save(opt_output_file, sdi, savebuf->data,
+ unitsize, savebuf->len / unitsize) != SR_OK)
+ g_critical("Failed to save session.");
+ g_byte_array_free(savebuf, FALSE);
+ }
+
+ g_array_free(logic_probelist, TRUE);
if (o->format->cleanup)
o->format->cleanup(o);
g_free(o);
o = NULL;
break;
+ case SR_DF_META:
+ g_debug("cli: received SR_DF_META");
+ meta = packet->payload;
+ for (l = meta->config; l; l = l->next) {
+ src = l->data;
+ switch (src->key) {
+ case SR_HWCAP_SAMPLERATE:
+ samplerate = (uint64_t *)src->value;
+ g_debug("cli: got samplerate %"PRIu64, *samplerate);
+ break;
+ default:
+ /* Unknown metadata is not an error. */
+ break;
+ }
+ }
+ break;
+
case SR_DF_TRIGGER:
g_debug("cli: received SR_DF_TRIGGER");
if (o->format->event)
triggered = 1;
break;
- case SR_DF_META_LOGIC:
- g_message("cli: Received SR_DF_META_LOGIC");
- meta_logic = packet->payload;
- num_enabled_probes = 0;
- for (i = 0; i < meta_logic->num_probes; i++) {
- probe = g_slist_nth_data(sdi->probes, i);
- if (probe->enabled)
- logic_probelist[num_enabled_probes++] = probe->index;
- }
- logic_probelist[num_enabled_probes] = -1;
- /* How many bytes we need to store num_enabled_probes bits */
- unitsize = (num_enabled_probes + 7) / 8;
-
- outfile = stdout;
- if (opt_output_file) {
- if (default_output_format) {
- /* output file is in session format, which means we'll
- * dump everything in the datastore as it comes in,
- * and save from there after the session. */
- outfile = NULL;
- ret = sr_datastore_new(unitsize, &singleds);
- if (ret != SR_OK) {
- g_critical("Failed to create datastore.");
- exit(1);
- }
- } else {
- /* saving to a file in whatever format was set
- * with --format, so all we need is a filehandle */
- outfile = g_fopen(opt_output_file, "wb");
- }
- }
- if (opt_pds)
- srd_session_start(num_enabled_probes, unitsize,
- meta_logic->samplerate);
- break;
-
case SR_DF_LOGIC:
logic = packet->payload;
g_message("cli: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length);
if (ret != SR_OK)
break;
- /* what comes out of the filter is guaranteed to be packed into the
+ /* What comes out of the filter is guaranteed to be packed into the
* minimum size needed to support the number of samples at this sample
* size. however, the driver may have submitted too much -- cut off
* the buffer of the last packet according to the sample limit.
limit_samples * sample_size))
filter_out_len = limit_samples * sample_size - received_samples;
- if (singleds)
- sr_datastore_put(singleds, filter_out,
- filter_out_len, sample_size, logic_probelist);
-
- if (opt_output_file && default_output_format)
- /* saving to a session file, don't need to do anything else
- * to this data for now. */
- goto cleanup;
-
- if (opt_pds) {
- if (srd_session_send(received_samples, (uint8_t*)filter_out,
- filter_out_len) != SRD_OK)
- sr_session_stop();
+ if (opt_output_file && default_output_format) {
+ /* Saving to a session file. */
+ g_byte_array_append(savebuf, filter_out, filter_out_len);
} else {
- output_len = 0;
- if (o->format->data && packet->type == o->format->df_type)
- o->format->data(o, filter_out, filter_out_len, &output_buf, &output_len);
- if (output_buf) {
- fwrite(output_buf, 1, output_len, outfile);
- fflush(outfile);
- g_free(output_buf);
+ if (opt_pds) {
+ if (srd_session_send(received_samples, (uint8_t*)filter_out,
+ filter_out_len) != SRD_OK)
+ sr_session_stop();
+ } else {
+ output_len = 0;
+ if (o->format->data && packet->type == o->format->df_type)
+ o->format->data(o, filter_out, filter_out_len,
+ &output_buf, &output_len);
+ if (output_buf) {
+ fwrite(output_buf, 1, output_len, outfile);
+ fflush(outfile);
+ g_free(output_buf);
+ }
}
}
-
- cleanup:
g_free(filter_out);
- received_samples += logic->length / sample_size;
- break;
-
- case SR_DF_META_ANALOG:
- g_message("cli: Received SR_DF_META_ANALOG");
- meta_analog = packet->payload;
- num_analog_probes = meta_analog->num_probes;
- num_enabled_analog_probes = 0;
- for (i = 0; i < num_analog_probes; i++) {
- probe = g_slist_nth_data(sdi->probes, i);
- if (probe->enabled)
- analog_probelist[num_enabled_analog_probes++] = probe;
- }
- outfile = stdout;
- if (opt_output_file) {
- if (default_output_format) {
- /* output file is in session format, which means we'll
- * dump everything in the datastore as it comes in,
- * and save from there after the session. */
- outfile = NULL;
- ret = sr_datastore_new(unitsize, &singleds);
- if (ret != SR_OK) {
- g_critical("Failed to create datastore.");
- exit(1);
- }
- } else {
- /* saving to a file in whatever format was set
- * with --format, so all we need is a filehandle */
- outfile = g_fopen(opt_output_file, "wb");
- }
- }
+ received_samples += logic->length / sample_size;
break;
case SR_DF_ANALOG:
break;
default:
- g_message("received unknown packet type %d", packet->type);
+ break;
}
if (o && o->format->recv) {
int ret;
char **pdtokens, **pdtok, *pd_name;
- /* Avoid compiler warnings. */
(void)dev;
ret = 0;
}
if (select_probes(in->sdi) > 0)
- return;
+ return;
sr_session_new();
sr_session_datafeed_callback_add(datafeed_in);
}
input_format->loadfile(in, opt_input_file);
- if (opt_output_file && default_output_format) {
- if (sr_session_save(opt_output_file, in->sdi, singleds) != SR_OK)
- g_critical("Failed to save session.");
- }
+
sr_session_destroy();
if (fmtargs)
static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
{
- const struct sr_hwcap_option *hwo;
+ const struct sr_config_info *srci;
GHashTableIter iter;
gpointer key, value;
int ret;
g_hash_table_iter_init(&iter, args);
while (g_hash_table_iter_next(&iter, &key, &value)) {
- if (!(hwo = sr_devopt_name_get(key))) {
+ if (!(srci = sr_devopt_name_get(key))) {
g_critical("Unknown device option '%s'.", (char *) key);
return SR_ERR;
}
if ((value == NULL) &&
- (hwo->type != SR_T_BOOL)) {
+ (srci->datatype != SR_T_BOOL)) {
g_critical("Option '%s' needs a value.", (char *)key);
return SR_ERR;
}
val = NULL;
- switch (hwo->type) {
+ switch (srci->datatype) {
case SR_T_UINT64:
ret = sr_parse_sizestring(value, &tmp_u64);
if (ret != SR_OK)
ret = SR_ERR;
}
if (val)
- ret = sr_dev_config_set(sdi, hwo->hwcap, val);
+ ret = sr_dev_config_set(sdi, srci->key, val);
if (ret != SR_OK) {
g_critical("Failed to set device option '%s'.", (char *)key);
return ret;
}
- else
- break;
}
return SR_OK;
if (opt_continuous)
clear_anykey();
- if (opt_output_file && default_output_format) {
- if (sr_session_save(opt_output_file, sdi, singleds) != SR_OK)
- g_critical("Failed to save session.");
- }
sr_session_destroy();
g_slist_free(devices);
static void logger(const gchar *log_domain, GLogLevelFlags log_level,
const gchar *message, gpointer cb_data)
{
- /* Avoid compiler warnings. */
(void)log_domain;
(void)cb_data;
int main(int argc, char **argv)
{
+ int ret = 1;
GOptionContext *context;
GError *error;
if (!g_option_context_parse(context, &argc, &argv, &error)) {
g_critical("%s", error->message);
- return 1;
+ goto done;
}
/* Set the loglevel (amount of messages to output) for libsigrok. */
if (sr_log_loglevel_set(opt_loglevel) != SR_OK)
- return 1;
+ goto done;
/* Set the loglevel (amount of messages to output) for libsigrokdecode. */
if (srd_log_loglevel_set(opt_loglevel) != SRD_OK)
- return 1;
+ goto done;
- if (sr_init() != SR_OK)
- return 1;
+ if (sr_init(&sr_ctx) != SR_OK)
+ goto done;
if (opt_pds) {
if (srd_init(NULL) != SRD_OK)
- return 1;
+ goto done;
if (register_pds(NULL, opt_pds) != 0)
- return 1;
+ goto done;
if (srd_pd_output_callback_add(SRD_OUTPUT_ANN,
show_pd_annotations, NULL) != SRD_OK)
- return 1;
+ goto done;
if (setup_pd_stack() != 0)
- return 1;
+ goto done;
if (setup_pd_annotations() != 0)
- return 1;
+ goto done;
}
if (setup_output_format() != 0)
- return 1;
+ goto done;
if (opt_version)
show_version();
if (opt_pds)
srd_exit();
- sr_exit();
+ ret = 0;
+
+done:
+ if (sr_ctx)
+ sr_exit(sr_ctx);
+
g_option_context_free(context);
- return 0;
+ return ret;
}
projects / sigrok-cli.git / blobdiff