#include <errno.h>
#include <glib.h>
#include <glib/gstdio.h>
-#include <sigrok.h>
+#include <libsigrok/libsigrok.h>
#include "sigrok-cli.h"
#include "config.h"
#define DEFAULT_OUTPUT_FORMAT "bits:width=64"
+extern struct sr_hwcap_option sr_drvopts[];
extern struct sr_hwcap_option sr_hwcap_options[];
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 char *input_format_param = NULL;
static GHashTable *pd_ann_visible = NULL;
+static struct sr_datastore *singleds = NULL;
static gboolean opt_version = FALSE;
static gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
static gboolean opt_wait_trigger = FALSE;
static gchar *opt_input_file = NULL;
static gchar *opt_output_file = NULL;
+static gchar *opt_drv = NULL;
static gchar *opt_dev = NULL;
static gchar *opt_probes = NULL;
static gchar *opt_triggers = NULL;
static gchar *opt_pd_annotations = NULL;
static gchar *opt_input_format = NULL;
static gchar *opt_output_format = NULL;
+static gchar *opt_show = NULL;
static gchar *opt_time = NULL;
static gchar *opt_samples = NULL;
+static gchar *opt_frames = NULL;
static gchar *opt_continuous = NULL;
static GOptionEntry optargs[] = {
"Set libsigrok/libsigrokdecode loglevel", NULL},
{"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devs,
"Scan for devices", NULL},
+ {"driver", 0, 0, G_OPTION_ARG_STRING, &opt_drv,
+ "Use only this driver", 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,
"Protocol decoder stack", NULL},
{"protocol-decoder-annotations", 'A', 0, G_OPTION_ARG_STRING, &opt_pd_annotations,
"Protocol decoder annotation(s) to show", NULL},
+ {"show", 0, 0, G_OPTION_ARG_NONE, &opt_show,
+ "Show device detail", 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},
+ {"frames", 0, 0, G_OPTION_ARG_STRING, &opt_frames,
+ "Number of frames to acquire", NULL},
{"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous,
"Sample continuously", NULL},
{NULL, 0, 0, 0, NULL, NULL, NULL}
};
+
+/* Convert driver options hash to GSList of struct sr_hwopt. */
+static GSList *hash_to_hwopt(GHashTable *hash)
+{
+ struct sr_hwcap_option *ho;
+ struct sr_hwopt *hwopt;
+ GList *gl, *keys;
+ GSList *opts;
+ char *key, *value;
+
+ keys = g_hash_table_get_keys(hash);
+ opts = NULL;
+ for (gl = keys; gl; gl = gl->next) {
+ key = gl->data;
+ for (ho = sr_drvopts; ho->shortname; ho++) {
+ if (!strcmp(key, ho->shortname)) {
+ hwopt = g_try_malloc(sizeof(struct sr_hwopt));
+ hwopt->hwopt = ho->hwcap;
+ value = g_hash_table_lookup(hash, key);
+ hwopt->value = g_strdup(value);
+ opts = g_slist_append(opts, hwopt);
+ break;
+ }
+ }
+ if (!ho->shortname) {
+ g_critical("Unknown option %s", key);
+ return NULL;
+ }
+ }
+ g_list_free(keys);
+
+ return opts;
+}
+
+static GSList *device_scan(void)
+{
+ struct sr_dev_driver **drivers, *driver;
+ GHashTable *drvargs;
+ GSList *drvopts, *devices, *tmpdevs, *l;
+ int i;
+ char *drvname;
+
+ if (opt_drv) {
+ drvargs = parse_generic_arg(opt_drv, TRUE);
+ drvname = g_strdup(g_hash_table_lookup(drvargs, "sigrok_key"));
+ g_hash_table_remove(drvargs, "sigrok_key");
+ driver = NULL;
+ drivers = sr_driver_list();
+ for (i = 0; drivers[i]; i++) {
+ if (strcmp(drivers[i]->name, drvname))
+ continue;
+ driver = drivers[i];
+ }
+ if (!driver) {
+ g_critical("Driver %s not found.", drvname);
+ return NULL;
+ }
+ g_free(drvname);
+ if (sr_driver_init(driver) != SR_OK) {
+ g_critical("Failed to initialize driver.");
+ return NULL;
+ }
+ drvopts = NULL;
+ if (g_hash_table_size(drvargs) > 0)
+ if (!(drvopts = hash_to_hwopt(drvargs)))
+ /* Unknown options, already logged. */
+ return NULL;
+ devices = sr_driver_scan(driver, 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) {
+ g_critical("Failed to initialize driver.");
+ return NULL;
+ }
+ tmpdevs = sr_driver_scan(driver, NULL);
+ for (l = tmpdevs; l; l = l->next)
+ devices = g_slist_append(devices, l->data);
+ g_slist_free(tmpdevs);
+ }
+ }
+
+ return devices;
+}
+
static void show_version(void)
{
GSList *l;
printf("\n");
}
-static void print_dev_line(const struct sr_dev *dev)
+static void print_dev_line(const struct sr_dev_inst *sdi)
{
- const struct sr_dev_inst *sdi;
-
- sr_dev_info_get(dev, SR_DI_INST, (const void **)&sdi);
if (sdi->vendor && sdi->vendor[0])
printf("%s ", sdi->vendor);
printf("%s ", sdi->model);
if (sdi->version && sdi->version[0])
printf("%s ", sdi->version);
- if (dev->probes)
- printf("with %d probes", g_slist_length(dev->probes));
+ if (sdi->probes)
+ printf("with %d probes", g_slist_length(sdi->probes));
printf("\n");
}
static void show_dev_list(void)
{
- struct sr_dev *dev, *demo_dev;
- GSList *devs, *l;
- int devcnt;
+ struct sr_dev_inst *sdi;
+ GSList *devices, *l;
- devcnt = 0;
- devs = sr_dev_list();
-
- if (g_slist_length(devs) == 0)
+ if (!(devices = device_scan()))
return;
- printf("The following devices were found:\nID Device\n");
- demo_dev = NULL;
- for (l = devs; l; l = l->next) {
- dev = l->data;
- if (sr_dev_has_hwcap(dev, SR_HWCAP_DEMO_DEV)) {
- demo_dev = dev;
- continue;
- }
- printf("%-3d ", devcnt++);
- print_dev_line(dev);
- }
- if (demo_dev) {
- printf("demo ");
- print_dev_line(demo_dev);
+ printf("The following devices were found:\n");
+ for (l = devices; l; l = l->next) {
+ sdi = l->data;
+ print_dev_line(sdi);
}
+ g_slist_free(devices);
+
}
static void show_dev_detail(void)
{
- struct sr_dev *dev;
- struct sr_hwcap_option *hwo;
+ struct sr_dev_inst *sdi;
+ const struct sr_hwcap_option *hwo;
const struct sr_samplerates *samplerates;
- int cap, *hwcaps, i;
+ struct sr_rational *rationals;
+ GSList *devices;
+ uint64_t *integers;
+ const int *hwopts, *hwcaps;
+ int cap, num_devices, n, i;
char *s, *title;
const char *charopts, **stropts;
- dev = parse_devstring(opt_dev);
- if (!dev) {
- printf("No such device. Use -D to list all devices.\n");
+ if (!(devices = device_scan())) {
+ g_critical("No devices found.");
return;
}
- print_dev_line(dev);
+ num_devices = g_slist_length(devices);
+ if (num_devices > 1) {
+ if (!opt_dev) {
+ g_critical("%d devices found. Use --list-devices to show them, "
+ "and --device to select one.", num_devices);
+ return;
+ }
+ /* opt_dev is NULL if not specified, which is fine. */
+ n = strtol(opt_dev, NULL, 10);
+ if (n >= num_devices) {
+ g_critical("%d devices found, numbered starting from 0.",
+ num_devices);
+ return;
+ }
+ sdi = g_slist_nth_data(devices, n);
+ } else
+ sdi = g_slist_nth_data(devices, 0);
+
+ print_dev_line(sdi);
- if (sr_dev_info_get(dev, SR_DI_TRIGGER_TYPES,
- (const void **)&charopts) == SR_OK) {
+ if (sr_info_get(sdi->driver, SR_DI_TRIGGER_TYPES, (const void **)&charopts,
+ sdi) == SR_OK && charopts) {
printf("Supported triggers: ");
while (*charopts) {
printf("%c ", *charopts);
printf("\n");
}
- title = "Supported options:\n";
- hwcaps = dev->driver->hwcap_get_all();
+ if ((sr_info_get(sdi->driver, SR_DI_HWOPTS, (const void **)&hwopts,
+ NULL) == SR_OK) && hwopts) {
+ printf("Supported driver options:\n");
+ for (i = 0; hwopts[i]; i++) {
+ if (!(hwo = sr_drvopt_get(hwopts[i])))
+ continue;
+ printf(" %s\n", hwo->shortname);
+ }
+ }
+
+ title = "Supported device options:\n";
+ if ((sr_info_get(sdi->driver, SR_DI_HWCAPS, (const void **)&hwcaps,
+ NULL) != SR_OK) || !hwcaps)
+ /* Driver supports no device instance options. */
+ return;
+
for (cap = 0; hwcaps[cap]; cap++) {
- if (!(hwo = sr_hw_hwcap_get(hwcaps[cap])))
+ if (!(hwo = sr_devopt_get(hwcaps[cap])))
continue;
if (title) {
}
if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) {
+ /* Pattern generator modes */
printf(" %s", hwo->shortname);
- if (sr_dev_info_get(dev, SR_DI_PATTERNS,
- (const void **)&stropts) == SR_OK) {
+ if (sr_info_get(sdi->driver, SR_DI_PATTERNS,
+ (const void **)&stropts, sdi) == SR_OK) {
printf(" - supported patterns:\n");
for (i = 0; stropts[i]; i++)
printf(" %s\n", stropts[i]);
} else {
printf("\n");
}
+
} else if (hwo->hwcap == SR_HWCAP_SAMPLERATE) {
- printf(" %s", hwo->shortname);
/* Supported samplerates */
- if (sr_dev_info_get(dev, SR_DI_SAMPLERATES,
- (const void **)&samplerates) != SR_OK) {
+ printf(" %s", hwo->shortname);
+ if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES,
+ (const void **)&samplerates, sdi) != SR_OK) {
printf("\n");
continue;
}
-
if (samplerates->step) {
/* low */
if (!(s = sr_samplerate_string(samplerates->low)))
g_free(s);
} else {
printf(" - supported samplerates:\n");
- for (i = 0; samplerates->list[i]; i++) {
+ for (i = 0; samplerates->list[i]; i++)
printf(" %s\n", sr_samplerate_string(samplerates->list[i]));
- }
}
+
+ } else if (hwo->hwcap == SR_HWCAP_BUFFERSIZE) {
+ /* Supported buffer sizes */
+ printf(" %s", hwo->shortname);
+ if (sr_info_get(sdi->driver, SR_DI_BUFFERSIZES,
+ (const void **)&integers, sdi) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported buffer sizes:\n");
+ for (i = 0; integers[i]; i++)
+ printf(" %"PRIu64"\n", integers[i]);
+
+ } else if (hwo->hwcap == SR_HWCAP_TIMEBASE) {
+ /* Supported time bases */
+ printf(" %s", hwo->shortname);
+ if (sr_info_get(sdi->driver, SR_DI_TIMEBASES,
+ (const void **)&rationals, sdi) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported time bases:\n");
+ for (i = 0; rationals[i].p && rationals[i].q; i++)
+ printf(" %s\n", sr_period_string(
+ rationals[i].p * rationals[i].q));
+
+ } else if (hwo->hwcap == SR_HWCAP_TRIGGER_SOURCE) {
+ /* Supported trigger sources */
+ printf(" %s", hwo->shortname);
+ if (sr_info_get(sdi->driver, SR_DI_TRIGGER_SOURCES,
+ (const void **)&stropts, sdi) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported trigger sources:\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);
+ if (sr_info_get(sdi->driver, SR_DI_FILTERS,
+ (const void **)&stropts, sdi) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported filter targets:\n");
+ for (i = 0; stropts[i]; i++)
+ printf(" %s\n", stropts[i]);
+
+ } else if (hwo->hwcap == SR_HWCAP_VDIV) {
+ /* Supported volts/div values */
+ printf(" %s", hwo->shortname);
+ if (sr_info_get(sdi->driver, SR_DI_VDIVS,
+ (const void **)&rationals, sdi) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported volts/div:\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) {
+ /* Supported coupling settings */
+ printf(" %s", hwo->shortname);
+ if (sr_info_get(sdi->driver, SR_DI_COUPLING,
+ (const void **)&stropts, sdi) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported coupling options:\n");
+ for (i = 0; stropts[i]; i++)
+ printf(" %s\n", stropts[i]);
+
} else {
+ /* Everything else */
printf(" %s\n", hwo->shortname);
}
}
+
}
static void show_pd_detail(void)
pdtokens = g_strsplit(opt_pds, ",", -1);
for (pdtok = pdtokens; *pdtok; pdtok++) {
if (!(dec = srd_decoder_get_by_id(*pdtok))) {
- printf("Protocol decoder %s not found.\n", *pdtok);
+ g_critical("Protocol decoder %s not found.", *pdtok);
return;
}
printf("ID: %s\nName: %s\nLong name: %s\nDescription: %s\n",
g_strfreev(pdtokens);
}
-static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
+static void datafeed_in(const struct sr_dev_inst *sdi,
+ struct sr_datafeed_packet *packet)
{
static struct sr_output *o = NULL;
- static int logic_probelist[SR_MAX_NUM_PROBES] = { 0 };
- static int analog_probelist[SR_MAX_NUM_PROBES] = { 0 };
+ static int logic_probelist[SR_MAX_NUM_PROBES] = { -1 };
+ static struct sr_probe *analog_probelist[SR_MAX_NUM_PROBES];
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_header *header;
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;
uint8_t *output_buf, *filter_out;
- float asample1, asample2;
/* 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);
}
o->format = output_format;
- o->dev = dev;
+ o->sdi = (struct sr_dev_inst *)sdi;
o->param = output_format_param;
if (o->format->init) {
if (o->format->init(o) != SR_OK) {
}
if (o->format->event) {
o->format->event(o, SR_DF_END, &output_buf, &output_len);
- if (output_len) {
+ if (output_buf) {
if (outfile)
fwrite(output_buf, 1, output_len, outfile);
g_free(output_buf);
if (opt_continuous)
g_warning("Device stopped after %" PRIu64 " samples.",
received_samples);
- sr_session_halt();
if (outfile && outfile != stdout)
fclose(outfile);
g_free(o);
meta_logic = packet->payload;
num_enabled_probes = 0;
for (i = 0; i < meta_logic->num_probes; i++) {
- probe = g_slist_nth_data(dev->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;
* dump everything in the datastore as it comes in,
* and save from there after the session. */
outfile = NULL;
- ret = sr_datastore_new(unitsize, &(dev->datastore));
+ ret = sr_datastore_new(unitsize, &singleds);
if (ret != SR_OK) {
- printf("Failed to create datastore.\n");
+ g_critical("Failed to create datastore.");
exit(1);
}
} else {
break;
ret = sr_filter_probes(sample_size, unitsize, logic_probelist,
- logic->data, logic->length,
- &filter_out, &filter_out_len);
+ logic->data, logic->length,
+ &filter_out, &filter_out_len);
if (ret != SR_OK)
break;
limit_samples * sample_size))
filter_out_len = limit_samples * sample_size - received_samples;
- if (dev->datastore)
- sr_datastore_put(dev->datastore, filter_out,
- filter_out_len, sample_size, logic_probelist);
+ 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
if (opt_pds) {
if (srd_session_send(received_samples, (uint8_t*)filter_out,
filter_out_len) != SRD_OK)
- sr_session_halt();
+ 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_len) {
+ if (output_buf) {
fwrite(output_buf, 1, output_len, outfile);
+ fflush(outfile);
g_free(output_buf);
}
}
g_message("cli: Received SR_DF_META_ANALOG");
meta_analog = packet->payload;
num_analog_probes = meta_analog->num_probes;
- num_enabled_probes = 0;
+ num_enabled_analog_probes = 0;
for (i = 0; i < num_analog_probes; i++) {
- probe = g_slist_nth_data(dev->probes, i);
+ probe = g_slist_nth_data(sdi->probes, i);
if (probe->enabled)
- analog_probelist[num_enabled_probes++] = probe->index;
+ analog_probelist[num_enabled_analog_probes++] = probe;
}
outfile = stdout;
* dump everything in the datastore as it comes in,
* and save from there after the session. */
outfile = NULL;
- ret = sr_datastore_new(unitsize, &(dev->datastore));
+ ret = sr_datastore_new(unitsize, &singleds);
if (ret != SR_OK) {
- printf("Failed to create datastore.\n");
+ g_critical("Failed to create datastore.");
exit(1);
}
} else {
outfile = g_fopen(opt_output_file, "wb");
}
}
-// if (opt_pds)
-// srd_session_start(num_enabled_probes, unitsize,
-// meta_logic->samplerate);
break;
case SR_DF_ANALOG:
if (limit_samples && received_samples >= limit_samples)
break;
- for (i = 0; i < analog->num_samples; i++) {
- asample1 = analog->data[i * num_analog_probes];
- asample2 = analog->data[i * num_analog_probes + 1];
- printf("CH1 %f CH2 %f\n", asample1, asample2);
-// write(STDOUT_FILENO, &asample1, sizeof(float));
+ if (o->format->data && packet->type == o->format->df_type) {
+ o->format->data(o, (const uint8_t *)analog->data,
+ analog->num_samples * sizeof(float),
+ &output_buf, &output_len);
+ if (output_buf) {
+ fwrite(output_buf, 1, output_len, outfile);
+ fflush(outfile);
+ g_free(output_buf);
+ }
}
-// 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);
-
received_samples += analog->num_samples;
+ break;
+
+ case SR_DF_FRAME_BEGIN:
+ g_debug("cli: received SR_DF_FRAME_BEGIN");
+ if (o->format->event) {
+ o->format->event(o, SR_DF_FRAME_BEGIN, &output_buf,
+ &output_len);
+ if (output_buf) {
+ fwrite(output_buf, 1, output_len, outfile);
+ fflush(outfile);
+ g_free(output_buf);
+ }
+ }
+ break;
+
+ case SR_DF_FRAME_END:
+ g_debug("cli: received SR_DF_FRAME_END");
+ if (o->format->event) {
+ o->format->event(o, SR_DF_FRAME_END, &output_buf,
+ &output_len);
+ if (output_buf) {
+ fwrite(output_buf, 1, output_len, outfile);
+ fflush(outfile);
+ g_free(output_buf);
+ }
+ }
+ break;
default:
g_message("received unknown packet type %d", packet->type);
pd_opthash = NULL;
pdtokens = g_strsplit(pdstring, ",", 0);
for (pdtok = pdtokens; *pdtok; pdtok++) {
- if (!(pd_opthash = parse_generic_arg(*pdtok))) {
+ if (!(pd_opthash = parse_generic_arg(*pdtok, TRUE))) {
g_critical("Invalid protocol decoder option '%s'.", *pdtok);
goto err_out;
}
{
struct srd_decoder_inst *di_from, *di_to;
int ret, i;
- char **pds;
+ char **pds, **ids;
/* Set up the protocol decoder stack. */
pds = g_strsplit(opt_pds, ",", 0);
}
}
- if (!(di_from = srd_inst_find_by_id(pds[0]))) {
+ /* First PD goes at the bottom of the stack. */
+ ids = g_strsplit(pds[0], ":", 0);
+ if (!(di_from = srd_inst_find_by_id(ids[0]))) {
+ g_strfreev(ids);
g_critical("Cannot stack protocol decoder '%s': "
"instance not found.", pds[0]);
return 1;
}
+ g_strfreev(ids);
+
+ /* Every subsequent PD goes on top. */
for (i = 1; pds[i]; i++) {
- if (!(di_to = srd_inst_find_by_id(pds[i]))) {
+ ids = g_strsplit(pds[i], ":", 0);
+ if (!(di_to = srd_inst_find_by_id(ids[0]))) {
+ g_strfreev(ids);
g_critical("Cannot stack protocol decoder '%s': "
"instance not found.", pds[i]);
return 1;
}
+ g_strfreev(ids);
if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK)
return 1;
*/
default_output_format = TRUE;
}
- fmtargs = parse_generic_arg(opt_output_format);
+
+ fmtargs = parse_generic_arg(opt_output_format, TRUE);
fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
if (!fmtspec) {
g_critical("Invalid output format.");
for (i = 0; annotations[i]; i++)
printf("\"%s\" ", annotations[i]);
printf("\n");
+ fflush(stdout);
}
-static int select_probes(struct sr_dev *dev)
+static int select_probes(struct sr_dev_inst *sdi)
{
- struct sr_probe *probe;
char **probelist;
int max_probes, i;
* This only works because a device by default initializes
* and enables all its probes.
*/
- max_probes = g_slist_length(dev->probes);
+ max_probes = g_slist_length(sdi->probes);
probelist = parse_probestring(max_probes, opt_probes);
if (!probelist) {
return SR_ERR;
for (i = 0; i < max_probes; i++) {
if (probelist[i]) {
- sr_dev_probe_name_set(dev, i + 1, probelist[i]);
+ sr_dev_probe_name_set(sdi, i, probelist[i]);
g_free(probelist[i]);
} else {
- probe = sr_dev_probe_find(dev, i + 1);
- probe->enabled = FALSE;
+ sr_dev_probe_enable(sdi, i, FALSE);
}
}
g_free(probelist);
/* If the user specified -I / --input-format, use that one. */
if (opt) {
for (i = 0; inputs[i]; i++) {
- if (strcasecmp(inputs[i]->id, opt_input_format))
+ if (strcasecmp(inputs[i]->id, opt))
continue;
g_debug("Using user-specified input file format '%s'.",
inputs[i]->id);
/* The user specified an unknown input format, return NULL. */
g_critical("Error: specified input file format '%s' is "
- "unknown.", opt_input_format);
+ "unknown.", opt);
return NULL;
}
static void load_input_file_format(void)
{
+ GHashTable *fmtargs = NULL;
struct stat st;
struct sr_input *in;
struct sr_input_format *input_format;
+ char *fmtspec = NULL;
+
+ if (opt_input_format) {
+ fmtargs = parse_generic_arg(opt_input_format, TRUE);
+ fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
+ }
if (!(input_format = determine_input_file_format(opt_input_file,
- opt_input_format)))
+ fmtspec))) {
/* The exact cause was already logged. */
return;
+ }
+
+ if (fmtargs)
+ g_hash_table_remove(fmtargs, "sigrok_key");
if (stat(opt_input_file, &st) == -1) {
g_critical("Failed to load %s: %s", opt_input_file,
exit(1);
}
in->format = input_format;
- in->param = input_format_param;
+ in->param = fmtargs;
if (in->format->init) {
if (in->format->init(in) != SR_OK) {
g_critical("Input format init failed.");
}
}
- if (select_probes(in->vdev) > 0)
+ if (select_probes(in->sdi) > 0)
return;
sr_session_new();
sr_session_datafeed_callback_add(datafeed_in);
- if (sr_session_dev_add(in->vdev) != SR_OK) {
+ if (sr_session_dev_add(in->sdi) != SR_OK) {
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)
+ if (sr_session_save(opt_output_file, in->sdi, singleds) != SR_OK)
g_critical("Failed to save session.");
}
sr_session_destroy();
+
+ if (fmtargs)
+ g_hash_table_destroy(fmtargs);
}
static void load_input_file(void)
}
}
-int num_real_devs(void)
-{
- struct sr_dev *dev;
- GSList *devs, *l;
- int num_devs;
-
- num_devs = 0;
- devs = sr_dev_list();
- for (l = devs; l; l = l->next) {
- dev = l->data;
- if (!sr_dev_has_hwcap(dev, SR_HWCAP_DEMO_DEV))
- num_devs++;
- }
-
- return num_devs;
-}
-
-static int set_dev_options(struct sr_dev *dev, GHashTable *args)
+static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
{
GHashTableIter iter;
gpointer key, value;
int ret, i;
+ float tmp_float;
uint64_t tmp_u64;
- gboolean found;
+ struct sr_rational tmp_rat;
gboolean tmp_bool;
+ gboolean found;
+ void *val;
g_hash_table_iter_init(&iter, args);
while (g_hash_table_iter_next(&iter, &key, &value)) {
return SR_ERR;
}
found = TRUE;
+ val = NULL;
switch (sr_hwcap_options[i].type) {
case SR_T_UINT64:
ret = sr_parse_sizestring(value, &tmp_u64);
if (ret != SR_OK)
break;
- ret = dev->driver->dev_config_set(dev->driver_index,
- sr_hwcap_options[i].hwcap, &tmp_u64);
+ val = &tmp_u64;
break;
case SR_T_CHAR:
- ret = dev->driver->dev_config_set(dev->driver_index,
- sr_hwcap_options[i].hwcap, value);
+ val = value;
break;
case SR_T_BOOL:
if (!value)
tmp_bool = TRUE;
else
tmp_bool = sr_parse_boolstring(value);
- ret = dev->driver->dev_config_set(dev->driver_index,
- sr_hwcap_options[i].hwcap,
- GINT_TO_POINTER(tmp_bool));
+ val = &tmp_bool;
+ break;
+ case SR_T_FLOAT:
+ tmp_float = strtof(value, NULL);
+ val = &tmp_float;
+ break;
+ case SR_T_RATIONAL_PERIOD:
+ if ((ret = sr_parse_period(value, &tmp_rat)) != SR_OK)
+ break;
+ val = &tmp_rat;
+ break;
+ case SR_T_RATIONAL_VOLT:
+ if ((ret = sr_parse_voltage(value, &tmp_rat)) != SR_OK)
+ break;
+ val = &tmp_rat;
break;
default:
ret = SR_ERR;
}
-
+ if (val)
+ ret = sdi->driver->dev_config_set(sdi,
+ sr_hwcap_options[i].hwcap, val);
if (ret != SR_OK) {
g_critical("Failed to set device option '%s'.", (char *)key);
return ret;
return SR_OK;
}
-static void run_session(void)
+static int set_limit_time(const struct sr_dev_inst *sdi)
{
- struct sr_dev *dev;
- GHashTable *devargs;
- int num_devs, max_probes, i;
uint64_t time_msec;
- char **probelist, *devspec;
+ uint64_t *samplerate;
- devargs = NULL;
- if (opt_dev) {
- devargs = parse_generic_arg(opt_dev);
- devspec = g_hash_table_lookup(devargs, "sigrok_key");
- dev = parse_devstring(devspec);
- if (!dev) {
- g_critical("Device not found.");
- return;
+ time_msec = sr_parse_timestring(opt_time);
+ if (time_msec == 0) {
+ g_critical("Invalid time '%s'", opt_time);
+ sr_session_destroy();
+ return SR_ERR;
+ }
+
+ if (sr_driver_hwcap_exists(sdi->driver, SR_HWCAP_LIMIT_MSEC)) {
+ if (sdi->driver->dev_config_set(sdi,
+ SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
+ g_critical("Failed to configure time limit.");
+ sr_session_destroy();
+ return SR_ERR;
}
- g_hash_table_remove(devargs, "sigrok_key");
- } else {
- num_devs = num_real_devs();
- if (num_devs == 1) {
- /* No device specified, but there is only one. */
- devargs = NULL;
- dev = parse_devstring("0");
- } else if (num_devs == 0) {
- g_critical("No devices found.");
- return;
- } else {
- g_critical("%d devices found, please select one.", num_devs);
- return;
+ }
+ else {
+ /* time limit set, but device doesn't support this...
+ * convert to samples based on the samplerate.
+ */
+ limit_samples = 0;
+ if (sr_dev_has_hwcap(sdi, SR_HWCAP_SAMPLERATE)) {
+ sr_info_get(sdi->driver, SR_DI_CUR_SAMPLERATE,
+ (const void **)&samplerate, sdi);
+ limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
}
+ if (limit_samples == 0) {
+ g_critical("Not enough time at this samplerate.");
+ sr_session_destroy();
+ return SR_ERR;
+ }
+
+ if (sdi->driver->dev_config_set(sdi,
+ SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
+ g_critical("Failed to configure time-based sample limit.");
+ sr_session_destroy();
+ return SR_ERR;
+ }
+ }
+
+ return SR_OK;
+}
+
+static void run_session(void)
+{
+ GSList *devices;
+ GHashTable *devargs;
+ struct sr_dev_inst *sdi;
+ int max_probes, i;
+ char **triggerlist;
+
+ devices = device_scan();
+ if (!devices) {
+ g_critical("No devices found.");
+ return;
}
+ if (g_slist_length(devices) > 1) {
+ g_critical("sigrok-cli only supports one device for capturing.");
+ return;
+ }
+ sdi = devices->data;
sr_session_new();
sr_session_datafeed_callback_add(datafeed_in);
- if (sr_session_dev_add(dev) != SR_OK) {
+ if (opt_dev) {
+ if ((devargs = parse_generic_arg(opt_dev, FALSE))) {
+ if (set_dev_options(sdi, devargs) != SR_OK)
+ return;
+ g_hash_table_destroy(devargs);
+ }
+ }
+
+ if (sr_session_dev_add(sdi) != SR_OK) {
g_critical("Failed to use device.");
sr_session_destroy();
return;
}
- if (devargs) {
- if (set_dev_options(dev, devargs) != SR_OK) {
+ if (select_probes(sdi) != SR_OK) {
+ g_critical("Failed to set probes.");
+ sr_session_destroy();
+ return;
+ }
+
+ if (opt_triggers) {
+ if (!(triggerlist = sr_parse_triggerstring(sdi, opt_triggers))) {
sr_session_destroy();
return;
}
- g_hash_table_destroy(devargs);
+ max_probes = g_slist_length(sdi->probes);
+ for (i = 0; i < max_probes; i++) {
+ if (triggerlist[i]) {
+ sr_dev_trigger_set(sdi, i, triggerlist[i]);
+ g_free(triggerlist[i]);
+ }
+ }
+ g_free(triggerlist);
}
- if (select_probes(dev) != SR_OK)
- return;
+ if (sdi->driver->dev_config_set(sdi, SR_HWCAP_PROBECONFIG,
+ (char *)sdi->probes) != SR_OK) {
+ g_critical("Failed to configure probes.");
+ sr_session_destroy();
+ return;
+ }
if (opt_continuous) {
- if (!sr_driver_hwcap_exists(dev->driver, SR_HWCAP_CONTINUOUS)) {
+ if (!sr_driver_hwcap_exists(sdi->driver, SR_HWCAP_CONTINUOUS)) {
g_critical("This device does not support continuous sampling.");
sr_session_destroy();
return;
}
}
- if (opt_triggers) {
- probelist = sr_parse_triggerstring(dev, opt_triggers);
- if (!probelist) {
- sr_session_destroy();
- return;
- }
-
- max_probes = g_slist_length(dev->probes);
- for (i = 0; i < max_probes; i++) {
- if (probelist[i]) {
- sr_dev_trigger_set(dev, i + 1, probelist[i]);
- g_free(probelist[i]);
- }
- }
- g_free(probelist);
- }
-
if (opt_time) {
- time_msec = sr_parse_timestring(opt_time);
- if (time_msec == 0) {
- g_critical("Invalid time '%s'", opt_time);
+ if (set_limit_time(sdi) != SR_OK) {
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) {
- g_critical("Failed to configure time limit.");
- sr_session_destroy();
- return;
- }
- }
- else {
- /* time limit set, but device doesn't support this...
- * convert to samples based on the samplerate.
- */
- limit_samples = 0;
- if (sr_dev_has_hwcap(dev, SR_HWCAP_SAMPLERATE)) {
- const uint64_t *samplerate;
-
- sr_dev_info_get(dev, SR_DI_CUR_SAMPLERATE,
- (const void **)&samplerate);
- limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
- }
- if (limit_samples == 0) {
- 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) {
- g_critical("Failed to configure time-based sample limit.");
- sr_session_destroy();
- return;
- }
- }
}
if (opt_samples) {
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)) {
+ || (sdi->driver->dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
+ &limit_samples) != SR_OK)) {
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) {
- g_critical("Failed to configure probes.");
- sr_session_destroy();
- return;
+ if (opt_frames) {
+ if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)
+ || (sdi->driver->dev_config_set(sdi,
+ SR_HWCAP_LIMIT_FRAMES, &limit_frames) != SR_OK)) {
+ g_critical("Failed to configure frame limit.");
+ sr_session_destroy();
+ return;
+ }
}
if (sr_session_start() != SR_OK) {
clear_anykey();
if (opt_output_file && default_output_format) {
- if (sr_session_save(opt_output_file) != SR_OK)
+ 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,
show_version();
else if (opt_list_devs)
show_dev_list();
- else if (opt_input_file)
- load_input_file();
- else if (opt_samples || opt_time || opt_continuous)
- run_session();
- else if (opt_dev)
+ else if (opt_show)
show_dev_detail();
else if (opt_pds)
show_pd_detail();
+ else if (opt_input_file)
+ load_input_file();
+ else if (opt_samples || opt_time || opt_frames || opt_continuous)
+ run_session();
else
printf("%s", g_option_context_get_help(context, TRUE, NULL));