X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=a0e4f08aa1e99f219d7d4825a3d13a3756ac29fc;hp=f13e092a0947adcd0c5cc7c40c043721bcb8269a;hb=943d0c0835811a77261b48e1f77dd0a342fea1d2;hpb=3a06774cf7656481bedcde58e821c68a13a5005d diff --git a/sigrok-cli.c b/sigrok-cli.c index f13e092..a0e4f08 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "sigrok-cli.h" #include "config.h" @@ -43,7 +43,6 @@ 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 gboolean opt_version = FALSE; @@ -436,10 +435,9 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) 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, data_offset, ret, i, j; + int num_enabled_probes, sample_size, ret, i; uint64_t output_len, filter_out_len; uint8_t *output_buf, *filter_out; - float asample; /* If the first packet to come in isn't a header, don't even try. */ if (packet->type != SR_DF_HEADER && o == NULL) @@ -473,7 +471,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) } 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); @@ -486,7 +484,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) if (opt_continuous) g_warning("Device stopped after %" PRIu64 " samples.", received_samples); - sr_session_halt(); + sr_session_stop(); if (outfile && outfile != stdout) fclose(outfile); g_free(o); @@ -577,13 +575,14 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) 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); } } @@ -622,9 +621,6 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) 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: @@ -636,33 +632,44 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) if (limit_samples && received_samples >= limit_samples) break; - data_offset = 0; - for (i = 0; i < analog->num_samples; i++) { - for (j = 0; j < num_enabled_analog_probes; j++) { - asample = analog->data[data_offset++]; - printf("%s: %f\n", analog_probelist[j]->name, asample); + 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); } -// asample1 = asample2 = 0.0; -// asample1 = analog->data[data_offset++]; -// asample2 = analog->data[i * num_analog_probes + 1]; -// printf("%d\t%f\t%f\n", received_samples+i+1, asample1, asample2); } -// 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: - /* TODO */ - printf("BEGIN\n"); + 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: - /* TODO */ - printf("END\n"); + 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: @@ -745,7 +752,7 @@ int setup_pd_stack(void) { 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); @@ -761,17 +768,26 @@ int setup_pd_stack(void) } } - 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; @@ -851,6 +867,7 @@ int setup_output_format(void) */ default_output_format = TRUE; } + fmtargs = parse_generic_arg(opt_output_format); fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key"); if (!fmtspec) { @@ -909,6 +926,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) for (i = 0; annotations[i]; i++) printf("\"%s\" ", annotations[i]); printf("\n"); + fflush(stdout); } static int select_probes(struct sr_dev *dev) @@ -972,7 +990,7 @@ static struct sr_input_format *determine_input_file_format( /* 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); @@ -981,7 +999,7 @@ static struct sr_input_format *determine_input_file_format( /* 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; } @@ -1005,14 +1023,25 @@ static struct sr_input_format *determine_input_file_format( 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); + 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, @@ -1026,7 +1055,7 @@ static void load_input_file_format(void) 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."); @@ -1051,6 +1080,9 @@ static void load_input_file_format(void) g_critical("Failed to save session."); } sr_session_destroy(); + + if (fmtargs) + g_hash_table_destroy(fmtargs); } static void load_input_file(void)