X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=fee12a695f5d97380223acf1be6fc749ee1106da;hp=4a31c42f13803be8572f36e1a121d4945d612458;hb=dcc5ebf83adcfc8d6d5c0820e0a20d85b421b179;hpb=be781321930917609d92b4446b894a1b8a23ce13 diff --git a/session.c b/session.c index 4a31c42..fee12a6 100644 --- a/session.c +++ b/session.c @@ -21,6 +21,8 @@ #include "config.h" #include #include +#include +#include static struct sr_output_format *output_format = NULL; static int default_output_format = FALSE; @@ -43,26 +45,6 @@ extern gchar *opt_triggers; 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; @@ -165,16 +147,15 @@ void datafeed_in(const struct sr_dev_inst *sdi, const struct sr_datafeed_analog *analog; struct sr_config *src; static struct sr_output *o = NULL; - static GArray *logic_probelist = NULL; static uint64_t received_samples = 0; - static int unitsize = 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 samplerate; + uint64_t end_sample; + uint64_t output_len, input_len; + uint8_t *output_buf; (void) cb_data; @@ -182,7 +163,6 @@ void datafeed_in(const struct sr_dev_inst *sdi, 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"); @@ -216,15 +196,11 @@ void datafeed_in(const struct sr_dev_inst *sdi, 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; + received_samples = 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); @@ -283,7 +259,6 @@ void datafeed_in(const struct sr_dev_inst *sdi, 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; @@ -294,37 +269,26 @@ void datafeed_in(const struct sr_dev_inst *sdi, if (limit_samples && received_samples >= 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 = received_samples + 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 - received_samples) * logic->unitsize; if (opt_output_file && default_output_format) { /* Saving to a session file. */ - g_byte_array_append(savebuf, filter_out, filter_out_len); + g_byte_array_append(savebuf, logic->data, input_len); } 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) + 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); @@ -333,9 +297,8 @@ void datafeed_in(const struct sr_dev_inst *sdi, } } } - g_free(filter_out); - received_samples += logic->length / sample_size; + received_samples = end_sample; break; case SR_DF_ANALOG: @@ -422,8 +385,6 @@ void datafeed_in(const struct sr_dev_inst *sdi, 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); @@ -432,9 +393,11 @@ void datafeed_in(const struct sr_dev_inst *sdi, if (outfile && outfile != stdout) fclose(outfile); - if (opt_output_file && default_output_format && savebuf->len) { + if (opt_output_file && default_output_format && savebuf->len + && received_samples > 0) { if (sr_session_save(opt_output_file, sdi, savebuf->data, - unitsize, savebuf->len / unitsize) != SR_OK) + savebuf->len / received_samples, + received_samples) != SR_OK) g_critical("Failed to save session."); g_byte_array_free(savebuf, TRUE); } @@ -551,7 +514,7 @@ void run_session(void) GHashTable *devargs; GVariant *gvar; struct sr_dev_inst *sdi; - uint64_t max_samples; + uint64_t min_samples, max_samples; int max_probes, i; char **triggerlist; @@ -630,12 +593,16 @@ void run_session(void) 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);