X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=7c66659614d7c7673b41b54af44c8f2c115a2e2d;hb=4bf77ec67e693aa08f5b72b71fff9943df8a65e7;hp=7b2aaf4a304dbb611ded1c26304ad7a2b58c08c2;hpb=b4d72c27b716b729a35e5d985f11f69ef5e2fa8e;p=sigrok-cli.git diff --git a/session.c b/session.c index 7b2aaf4..7c66659 100644 --- a/session.c +++ b/session.c @@ -28,16 +28,6 @@ static int default_output_format = FALSE; static uint64_t limit_samples = 0; static uint64_t limit_frames = 0; -extern gchar *opt_output_file; -extern gchar *opt_output_format; -extern gchar *opt_pds; -extern gboolean opt_wait_trigger; -extern gchar *opt_time; -extern gchar *opt_samples; -extern gchar *opt_frames; -extern gchar *opt_continuous; -extern gchar *opt_config; -extern gchar *opt_triggers; #ifdef HAVE_SRD extern struct srd_session *srd_sess; #endif @@ -131,6 +121,7 @@ void datafeed_in(const struct sr_dev_inst *sdi, const struct sr_datafeed_meta *meta; const struct sr_datafeed_logic *logic; const struct sr_datafeed_analog *analog; + struct sr_session *session; struct sr_config *src; struct sr_channel *ch; static struct sr_output *o = NULL; @@ -147,15 +138,14 @@ void datafeed_in(const struct sr_dev_inst *sdi, int i; char **channels; - (void) cb_data; - /* If the first packet to come in isn't a header, don't even try. */ if (packet->type != SR_DF_HEADER && o == NULL) return; + session = cb_data; switch (packet->type) { case SR_DF_HEADER: - g_debug("cli: Received SR_DF_HEADER"); + g_debug("cli: Received SR_DF_HEADER."); o = setup_output_format(sdi); /* Prepare non-stdout output. */ @@ -195,14 +185,14 @@ void datafeed_in(const struct sr_dev_inst *sdi, break; case SR_DF_META: - g_debug("cli: received 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_CONF_SAMPLERATE: samplerate = g_variant_get_uint64(src->data); - g_debug("cli: got samplerate %"PRIu64" Hz", samplerate); + g_debug("cli: Got samplerate %"PRIu64" Hz.", samplerate); #ifdef HAVE_SRD if (opt_pds) { if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE, @@ -214,7 +204,7 @@ void datafeed_in(const struct sr_dev_inst *sdi, break; case SR_CONF_SAMPLE_INTERVAL: samplerate = g_variant_get_uint64(src->data); - g_debug("cli: got sample interval %"PRIu64" ms", samplerate); + g_debug("cli: Got sample interval %"PRIu64" ms.", samplerate); break; default: /* Unknown metadata is not an error. */ @@ -224,13 +214,14 @@ void datafeed_in(const struct sr_dev_inst *sdi, break; case SR_DF_TRIGGER: - g_debug("cli: received SR_DF_TRIGGER"); + g_debug("cli: Received SR_DF_TRIGGER."); triggered = 1; break; case SR_DF_LOGIC: logic = packet->payload; - g_message("cli: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length); + g_message("cli: Received SR_DF_LOGIC (%"PRIu64" bytes, unitsize = %d).", + logic->length, logic->unitsize); if (logic->length == 0) break; @@ -258,17 +249,17 @@ void datafeed_in(const struct sr_dev_inst *sdi, channels[i++] = ch->name; } channels[i] = NULL; - sr_session_save_init(opt_output_file, samplerate, - channels); + sr_session_save_init(session, opt_output_file, + samplerate, channels); g_free(channels); } - save_chunk_logic(logic->data, input_len, logic->unitsize); + save_chunk_logic(session, logic->data, input_len, logic->unitsize); } else { if (opt_pds) { #ifdef HAVE_SRD if (srd_session_send(srd_sess, rcvd_samples_logic, end_sample, logic->data, input_len) != SRD_OK) - sr_session_stop(); + sr_session_stop(session); #endif } } @@ -278,7 +269,7 @@ void datafeed_in(const struct sr_dev_inst *sdi, case SR_DF_ANALOG: analog = packet->payload; - g_message("cli: received SR_DF_ANALOG, %d samples", analog->num_samples); + g_message("cli: Received SR_DF_ANALOG (%d samples).", analog->num_samples); if (analog->num_samples == 0) break; @@ -289,18 +280,18 @@ void datafeed_in(const struct sr_dev_inst *sdi, break; case SR_DF_FRAME_BEGIN: - g_debug("cli: received SR_DF_FRAME_BEGIN"); + g_debug("cli: Received SR_DF_FRAME_BEGIN."); break; case SR_DF_FRAME_END: - g_debug("cli: received SR_DF_FRAME_END"); + g_debug("cli: Received SR_DF_FRAME_END."); break; default: break; } - if (o && !opt_pds) { + if (o && outfile && !opt_pds) { if (sr_output_send(o, packet, &out) == SR_OK && out) { fwrite(out->str, 1, out->len, outfile); fflush(outfile); @@ -311,7 +302,7 @@ void datafeed_in(const struct sr_dev_inst *sdi, /* SR_DF_END needs to be handled after the output module's receive() * is called, so it can properly clean up that module. */ if (packet->type == SR_DF_END) { - g_debug("cli: Received SR_DF_END"); + g_debug("cli: Received SR_DF_END."); if (o) sr_output_free(o); @@ -322,7 +313,7 @@ void datafeed_in(const struct sr_dev_inst *sdi, if (opt_output_file && default_output_format) /* Flush whatever is left out to the session file. */ - save_chunk_logic(NULL, 0, 0); + save_chunk_logic(session, NULL, 0, 0); if (limit_samples) { if (rcvd_samples_logic > 0 && rcvd_samples_logic < limit_samples) @@ -371,7 +362,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src) break; src->data = g_variant_new_int32(tmp_u64); break; - case SR_T_CHAR: + case SR_T_STRING: src->data = g_variant_new_string(value); break; case SR_T_BOOL: @@ -454,10 +445,10 @@ void run_session(void) GSList *devices; GHashTable *devargs; GVariant *gvar; + struct sr_session *session; + struct sr_trigger *trigger; struct sr_dev_inst *sdi; uint64_t min_samples, max_samples; - int max_channels, i; - char **triggerlist; devices = device_scan(); if (!devices) { @@ -470,17 +461,17 @@ void run_session(void) } sdi = devices->data; - sr_session_new(); - sr_session_datafeed_callback_add(datafeed_in, NULL); + sr_session_new(&session); + sr_session_datafeed_callback_add(session, datafeed_in, NULL); if (sr_dev_open(sdi) != SR_OK) { g_critical("Failed to open device."); return; } - if (sr_session_dev_add(sdi) != SR_OK) { + if (sr_session_dev_add(session, sdi) != SR_OK) { g_critical("Failed to add device to session."); - sr_session_destroy(); + sr_session_destroy(session); return; } @@ -494,36 +485,32 @@ void run_session(void) if (select_channels(sdi) != SR_OK) { g_critical("Failed to set channels."); - sr_session_destroy(); + sr_session_destroy(session); return; } if (opt_triggers) { - if (!(triggerlist = sr_parse_triggerstring(sdi, opt_triggers))) { - sr_session_destroy(); + if (!parse_triggerstring(sdi, opt_triggers, &trigger)) { + sr_session_destroy(session); return; } - 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]); - } + if (sr_session_trigger_set(session, trigger) != SR_OK) { + sr_session_destroy(session); + return; } - g_free(triggerlist); } if (opt_continuous) { if (!sr_dev_has_option(sdi, SR_CONF_CONTINUOUS)) { g_critical("This device does not support continuous sampling."); - sr_session_destroy(); + sr_session_destroy(session); return; } } if (opt_time) { if (set_limit_time(sdi) != SR_OK) { - sr_session_destroy(); + sr_session_destroy(session); return; } } @@ -531,7 +518,7 @@ void run_session(void) if (opt_samples) { if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)) { g_critical("Invalid sample limit '%s'.", opt_samples); - sr_session_destroy(); + sr_session_destroy(session); return; } if (sr_config_list(sdi->driver, sdi, NULL, @@ -552,7 +539,7 @@ void run_session(void) gvar = g_variant_new_uint64(limit_samples); if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) { g_critical("Failed to configure sample limit."); - sr_session_destroy(); + sr_session_destroy(session); return; } } @@ -560,38 +547,39 @@ void run_session(void) if (opt_frames) { if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)) { g_critical("Invalid sample limit '%s'.", opt_samples); - sr_session_destroy(); + sr_session_destroy(session); return; } gvar = g_variant_new_uint64(limit_frames); if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) { g_critical("Failed to configure frame limit."); - sr_session_destroy(); + sr_session_destroy(session); return; } } - if (sr_session_start() != SR_OK) { + if (sr_session_start(session) != SR_OK) { g_critical("Failed to start session."); - sr_session_destroy(); + sr_session_destroy(session); return; } if (opt_continuous) - add_anykey(); + add_anykey(session); - sr_session_run(); + sr_session_run(session); if (opt_continuous) clear_anykey(); - sr_session_datafeed_callback_remove_all(); - sr_session_destroy(); + sr_session_datafeed_callback_remove_all(session); + sr_session_destroy(session); g_slist_free(devices); } -void save_chunk_logic(uint8_t *data, uint64_t data_len, int unitsize) +void save_chunk_logic(struct sr_session *session, uint8_t *data, + uint64_t data_len, int unitsize) { static uint8_t *buf = NULL; static int buf_len = 0; @@ -604,13 +592,13 @@ void save_chunk_logic(uint8_t *data, uint64_t data_len, int unitsize) 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, + sr_session_append(session, 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 && last_unitsize != 0) { /* End of data, flush the buffer out. */ - sr_session_append(opt_output_file, buf, last_unitsize, + sr_session_append(session, opt_output_file, buf, last_unitsize, buf_len / last_unitsize); } else { /* Buffer chunk. */