#include "config.h"
#include <glib.h>
#include <glib/gstdio.h>
+#include <string.h>
+#include <stdlib.h>
static struct sr_output_format *output_format = NULL;
static int default_output_format = FALSE;
static char *output_format_param = NULL;
-static GByteArray *savebuf;
static uint64_t limit_samples = 0;
static uint64_t limit_frames = 0;
extern struct srd_session *srd_sess;
#endif
-
-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 int set_limit_time(const struct sr_dev_inst *sdi)
{
GVariant *gvar;
const struct sr_datafeed_logic *logic;
const struct sr_datafeed_analog *analog;
struct sr_config *src;
+ struct sr_channel *ch;
static struct sr_output *o = NULL;
- static GArray *logic_probelist = NULL;
- static uint64_t received_samples = 0;
- static int unitsize = 0;
+ static uint64_t rcvd_samples_logic = 0;
+ static uint64_t rcvd_samples_analog = 0;
+ static uint64_t samplerate = 0;
static int triggered = 0;
static FILE *outfile = NULL;
GSList *l;
GString *out;
- int sample_size, ret;
- uint64_t samplerate, output_len, filter_out_len, end_sample;
- uint8_t *output_buf, *filter_out;
+ uint64_t end_sample;
+ uint64_t output_len, input_len;
+ uint8_t *output_buf;
+ int i;
+ char **channels;
(void) cb_data;
if (packet->type != SR_DF_HEADER && o == NULL)
return;
- sample_size = -1;
switch (packet->type) {
case SR_DF_HEADER:
g_debug("cli: Received SR_DF_HEADER");
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;
+ rcvd_samples_logic = rcvd_samples_analog = 0;
#ifdef HAVE_SRD
- GVariant *gvar;
- if (opt_pds && logic_probelist->len) {
+ if (opt_pds) {
+ GVariant *gvar;
if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE,
&gvar) == SR_OK) {
samplerate = g_variant_get_uint64(gvar);
case SR_DF_LOGIC:
logic = packet->payload;
g_message("cli: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length);
- sample_size = logic->unitsize;
if (logic->length == 0)
break;
if (opt_wait_trigger && !triggered)
break;
- if (limit_samples && received_samples >= limit_samples)
+ if (limit_samples && rcvd_samples_logic >= limit_samples)
break;
- ret = sr_filter_probes(sample_size, unitsize, logic_probelist,
- logic->data, logic->length,
- &filter_out, &filter_out_len);
- if (ret != SR_OK)
- break;
-
- /*
- * 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.
- */
- if (limit_samples && (received_samples + logic->length / sample_size >
- limit_samples * sample_size))
- filter_out_len = limit_samples * sample_size - received_samples;
+ end_sample = rcvd_samples_logic + logic->length / logic->unitsize;
+ /* Cut off last packet according to the sample limit. */
+ if (limit_samples && end_sample > limit_samples)
+ end_sample = limit_samples;
+ input_len = (end_sample - rcvd_samples_logic) * logic->unitsize;
if (opt_output_file && default_output_format) {
/* Saving to a session file. */
- g_byte_array_append(savebuf, filter_out, filter_out_len);
+ 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) {
+ ch = l->data;
+ if (ch->enabled && ch->type == SR_CHANNEL_LOGIC)
+ channels[i++] = ch->name;
+ }
+ channels[i] = NULL;
+ sr_session_save_init(opt_output_file, samplerate,
+ channels);
+ g_free(channels);
+ }
+ save_chunk_logic(logic->data, input_len, logic->unitsize);
} else {
if (opt_pds) {
#ifdef HAVE_SRD
- end_sample = received_samples + filter_out_len / unitsize;
- if (srd_session_send(srd_sess, received_samples, end_sample,
- (uint8_t*)filter_out, filter_out_len) != SRD_OK)
+ if (srd_session_send(srd_sess, rcvd_samples_logic, end_sample,
+ logic->data, input_len) != SRD_OK)
sr_session_stop();
#endif
} else {
output_len = 0;
if (o->format->data && packet->type == o->format->df_type)
- o->format->data(o, filter_out, filter_out_len,
+ o->format->data(o, logic->data, input_len,
&output_buf, &output_len);
if (output_len) {
fwrite(output_buf, 1, output_len, outfile);
}
}
}
- g_free(filter_out);
- received_samples += logic->length / sample_size;
+ rcvd_samples_logic = end_sample;
break;
case SR_DF_ANALOG:
if (analog->num_samples == 0)
break;
- if (limit_samples && received_samples >= limit_samples)
+ if (limit_samples && rcvd_samples_analog >= limit_samples)
break;
if (o->format->data && packet->type == o->format->df_type) {
}
}
- received_samples += analog->num_samples;
+ rcvd_samples_analog += analog->num_samples;
break;
case SR_DF_FRAME_BEGIN:
}
/* SR_DF_END needs to be handled after the output module's receive()
- * is called, so it can properly clean up that module etc. */
+ * is called, so it can properly clean up that module. */
if (packet->type == SR_DF_END) {
g_debug("cli: Received SR_DF_END");
}
}
- if (limit_samples && received_samples < limit_samples)
- g_warning("Device only sent %" PRIu64 " samples.",
- received_samples);
-
- if (opt_continuous)
- g_warning("Device stopped after %" PRIu64 " samples.",
- received_samples);
-
- g_array_free(logic_probelist, TRUE);
-
if (o->format->cleanup)
o->format->cleanup(o);
g_free(o);
if (outfile && outfile != stdout)
fclose(outfile);
- if (opt_output_file && default_output_format && savebuf->len) {
- 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, TRUE);
+ if (opt_output_file && default_output_format)
+ /* Flush whatever is left out to the session file. */
+ save_chunk_logic(NULL, 0, 0);
+
+ if (limit_samples) {
+ if (rcvd_samples_logic > 0 && rcvd_samples_logic < limit_samples)
+ g_warning("Device only sent %" PRIu64 " samples.",
+ rcvd_samples_logic);
+ else if (rcvd_samples_analog > 0 && rcvd_samples_analog < limit_samples)
+ g_warning("Device only sent %" PRIu64 " samples.",
+ rcvd_samples_analog);
}
}
int opt_to_gvar(char *key, char *value, struct sr_config *src)
{
const struct sr_config_info *srci;
- double tmp_double;
+ double tmp_double, dlow, dhigh;
uint64_t tmp_u64, p, q, low, high;
GVariant *rational[2], *range[2];
gboolean tmp_bool;
src->data = g_variant_new_tuple(range, 2);
}
break;
+ case SR_T_DOUBLE_RANGE:
+ if (sscanf(value, "%lf-%lf", &dlow, &dhigh) != 2) {
+ ret = -1;
+ break;
+ } else {
+ range[0] = g_variant_new_double(dlow);
+ range[1] = g_variant_new_double(dhigh);
+ src->data = g_variant_new_tuple(range, 2);
+ }
+ break;
default:
ret = -1;
}
int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
{
struct sr_config src;
- struct sr_probe_group *pg;
+ struct sr_channel_group *cg;
GHashTableIter iter;
gpointer key, value;
int ret;
while (g_hash_table_iter_next(&iter, &key, &value)) {
if ((ret = opt_to_gvar(key, value, &src)) != 0)
return ret;
- pg = select_probe_group(sdi);
- ret = sr_config_set(sdi, pg, src.key, src.data);
+ cg = select_channel_group(sdi);
+ ret = sr_config_set(sdi, cg, src.key, src.data);
if (ret != SR_OK) {
g_critical("Failed to set device option '%s'.", (char *)key);
return ret;
GHashTable *devargs;
GVariant *gvar;
struct sr_dev_inst *sdi;
- uint64_t max_samples;
- int max_probes, i;
+ uint64_t min_samples, max_samples;
+ int max_channels, i;
char **triggerlist;
devices = device_scan();
}
}
- if (select_probes(sdi) != SR_OK) {
- g_critical("Failed to set probes.");
+ if (select_channels(sdi) != SR_OK) {
+ g_critical("Failed to set channels.");
sr_session_destroy();
return;
}
sr_session_destroy();
return;
}
- max_probes = g_slist_length(sdi->probes);
- for (i = 0; i < max_probes; i++) {
+ max_channels = g_slist_length(sdi->channels);
+ for (i = 0; i < max_channels; i++) {
if (triggerlist[i]) {
sr_dev_trigger_set(sdi, i, triggerlist[i]);
g_free(triggerlist[i]);
sr_session_destroy();
return;
}
- if (sr_config_get(sdi->driver, sdi, NULL,
- SR_CONF_MAX_UNCOMPRESSED_SAMPLES, &gvar) == SR_OK) {
+ if (sr_config_list(sdi->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. */
- max_samples = g_variant_get_uint64(gvar);
+ g_variant_get(gvar, "(tt)", &min_samples, &max_samples);
+ g_variant_unref(gvar);
+ if (limit_samples < min_samples) {
+ g_critical("The device stores at least %"PRIu64
+ " samples with the current settings.", min_samples);
+ }
if (limit_samples > max_samples) {
g_critical("The device can store only %"PRIu64
" samples with the current settings.", max_samples);
}
+void save_chunk_logic(uint8_t *data, uint64_t data_len, int unitsize)
+{
+ static uint8_t *buf = NULL;
+ static int buf_len = 0;
+ static int last_unitsize = 0;
+ int max;
+
+ if (!buf)
+ buf = g_malloc(SAVE_CHUNK_SIZE);
+
+ if (buf_len + data_len > SAVE_CHUNK_SIZE) {
+ max = (SAVE_CHUNK_SIZE - buf_len) / unitsize * unitsize;
+ memcpy(buf + buf_len, data, max);
+ sr_session_append(opt_output_file, buf, unitsize,
+ (buf_len + max) / unitsize);
+ memcpy(buf, data + max, data_len - max);
+ buf_len = data_len - max;
+ } else if (data_len == 0) {
+ /* End of data, flush the buffer out. */
+ sr_session_append(opt_output_file, buf, last_unitsize,
+ buf_len / last_unitsize);
+ } else {
+ /* Buffer chunk. */
+ memcpy(buf + buf_len, data, data_len);
+ buf_len += data_len;
+ }
+ last_unitsize = unitsize;
+
+}
projects / sigrok-cli.git / blobdiff