X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=28443cee3011427a760054c36cd0c3a31fb5631a;hp=a67b6a3be61ed219309744fd48a9529bafb418cc;hb=9e2e414fdd6ddb554524f8f6873a13ec8172a8aa;hpb=d3f829a1c4bce7d3947df93d5367602a0eb7e01f diff --git a/sigrok-cli.c b/sigrok-cli.c index a67b6a3..28443ce 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -30,12 +30,13 @@ #include #include #include -#include +#include #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; @@ -43,7 +44,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; @@ -52,6 +52,7 @@ static gboolean opt_list_devs = FALSE; 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; @@ -72,6 +73,8 @@ 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, @@ -105,6 +108,94 @@ static GOptionEntry optargs[] = { {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; @@ -436,10 +527,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) @@ -486,7 +576,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 +667,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_buf) { fwrite(output_buf, 1, output_len, outfile); + fflush(outfile); g_free(output_buf); } } @@ -622,9 +713,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 +724,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: @@ -693,7 +792,7 @@ static int register_pds(struct sr_dev *dev, const char *pdstring) 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; } @@ -860,7 +959,8 @@ int setup_output_format(void) */ 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."); @@ -918,6 +1018,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) @@ -981,7 +1082,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); @@ -990,7 +1091,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; } @@ -1014,14 +1115,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, @@ -1035,7 +1147,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."); @@ -1060,6 +1172,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)