X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=01002f7bdbea7c46c3cc4a9e943bf3aa6cea418a;hp=1ca2c090eea331bba58938c489cbdbf121c4d3f8;hb=30f1c93ffd20a73d9f13c995bdbd55ea76052e75;hpb=43e5747a59ed92243c217f7e36da2ac35bbcd80d diff --git a/sigrok-cli.c b/sigrok-cli.c index 1ca2c09..01002f7 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2010 Bert Vermeulen + * Copyright (C) 2012 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -38,42 +38,45 @@ extern struct sr_hwcap_option sr_hwcap_options[]; -gboolean debug = 0; -uint64_t limit_samples = 0; -struct sr_output_format *output_format = NULL; -int default_output_format = FALSE; -char *output_format_param = NULL; -char *input_format_param = NULL; +static gboolean debug = 0; +static uint64_t limit_samples = 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 GData *pd_ann_visible = NULL; static gboolean opt_version = FALSE; static gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */ -static gboolean opt_list_devices = FALSE; +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_device = NULL; +static gchar *opt_dev = NULL; static gchar *opt_probes = NULL; static gchar *opt_triggers = NULL; static gchar *opt_pds = NULL; +static gchar *opt_pd_stack = NULL; static gchar *opt_input_format = NULL; -static gchar *opt_format = NULL; +static gchar *opt_output_format = NULL; static gchar *opt_time = NULL; static gchar *opt_samples = NULL; static gchar *opt_continuous = NULL; static GOptionEntry optargs[] = { {"version", 'V', 0, G_OPTION_ARG_NONE, &opt_version, "Show version and support list", NULL}, - {"loglevel", 'l', 0, G_OPTION_ARG_INT, &opt_loglevel, "Select libsigrok loglevel", NULL}, - {"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devices, "List devices", NULL}, + {"loglevel", 'l', 0, G_OPTION_ARG_INT, &opt_loglevel, "Select libsigrok/libsigrokdecode loglevel", NULL}, + {"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devs, "Scan for devices", 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, "Load input from file", NULL}, + {"input-format", 'I', 0, G_OPTION_ARG_STRING, &opt_input_format, "Input format", NULL}, {"output-file", 'o', 0, G_OPTION_ARG_FILENAME, &opt_output_file, "Save output to file", NULL}, - {"device", 'd', 0, G_OPTION_ARG_STRING, &opt_device, "Use device ID", NULL}, + {"output-format", 'O', 0, G_OPTION_ARG_STRING, &opt_output_format, "Output format", NULL}, {"probes", 'p', 0, G_OPTION_ARG_STRING, &opt_probes, "Probes to use", NULL}, {"triggers", 't', 0, G_OPTION_ARG_STRING, &opt_triggers, "Trigger configuration", NULL}, {"wait-trigger", 'w', 0, G_OPTION_ARG_NONE, &opt_wait_trigger, "Wait for trigger", NULL}, - {"protocol-decoders", 'a', 0, G_OPTION_ARG_STRING, &opt_pds, "Protocol decoder sequence", NULL}, - {"input-format", 'I', 0, G_OPTION_ARG_STRING, &opt_input_format, "Input format", NULL}, - {"format", 'f', 0, G_OPTION_ARG_STRING, &opt_format, "Output format", NULL}, + {"protocol-decoders", 'a', 0, G_OPTION_ARG_STRING, &opt_pds, "Protocol decoders to run", NULL}, + {"protocol-decoder-stack", 's', 0, G_OPTION_ARG_STRING, &opt_pd_stack, "Protocol decoder stack", NULL}, {"time", 0, 0, G_OPTION_ARG_STRING, &opt_time, "How long to sample (ms)", NULL}, {"samples", 0, 0, G_OPTION_ARG_STRING, &opt_samples, "Number of samples to acquire", NULL}, {"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous, "Sample continuously", NULL}, @@ -82,19 +85,19 @@ static GOptionEntry optargs[] = { static void show_version(void) { - GSList *plugins, *p, *l; - struct sr_device_plugin *plugin; + GSList *l; + struct sr_dev_driver **drivers; struct sr_input_format **inputs; struct sr_output_format **outputs; struct srd_decoder *dec; int i; printf("sigrok-cli %s\n\n", VERSION); + printf("Supported hardware drivers:\n"); - plugins = sr_list_hwplugins(); - for (p = plugins; p; p = p->next) { - plugin = p->data; - printf(" %-20s %s\n", plugin->name, plugin->longname); + drivers = sr_driver_list(); + for (i = 0; drivers[i]; i++) { + printf(" %-20s %s\n", drivers[i]->name, drivers[i]->longname); } printf("\n"); @@ -110,24 +113,24 @@ static void show_version(void) printf(" %-20s %s\n", outputs[i]->id, outputs[i]->description); printf("\n"); - /* TODO: Error handling. */ - srd_init(); - - printf("Supported protocol decoders:\n"); - for (l = srd_list_decoders(); l; l = l->next) { - dec = l->data; - printf(" %-20s %s\n", dec->id, dec->desc); + if (srd_init(NULL) == SRD_OK) { + printf("Supported protocol decoders:\n"); + srd_decoder_load_all(); + for (l = srd_decoder_list(); l; l = l->next) { + dec = l->data; + printf(" %-20s %s\n", dec->id, dec->longname); + } + srd_exit(); } printf("\n"); - srd_exit(); } -static void print_device_line(struct sr_device *device) +static void print_dev_line(const struct sr_dev *dev) { - struct sr_device_instance *sdi; + const struct sr_dev_inst *sdi; - sdi = device->plugin->get_device_info(device->plugin_index, SR_DI_INSTANCE); + sr_dev_info_get(dev, SR_DI_INST, (const void **)&sdi); if (sdi->vendor && sdi->vendor[0]) printf("%s ", sdi->vendor); @@ -135,58 +138,59 @@ static void print_device_line(struct sr_device *device) printf("%s ", sdi->model); if (sdi->version && sdi->version[0]) printf("%s ", sdi->version); - if (device->probes) - printf("with %d probes", g_slist_length(device->probes)); + if (dev->probes) + printf("with %d probes", g_slist_length(dev->probes)); printf("\n"); } -static void show_device_list(void) +static void show_dev_list(void) { - struct sr_device *device, *demo_device; - GSList *devices, *l; + struct sr_dev *dev, *demo_dev; + GSList *devs, *l; int devcnt; devcnt = 0; - devices = sr_device_list(); + devs = sr_dev_list(); - if (g_slist_length(devices) == 0) + if (g_slist_length(devs) == 0) return; printf("The following devices were found:\nID Device\n"); - demo_device = NULL; - for (l = devices; l; l = l->next) { - device = l->data; - if (strstr(device->plugin->name, "demo")) { - demo_device = device; + demo_dev = NULL; + for (l = devs; l; l = l->next) { + dev = l->data; + if (sr_dev_has_hwcap(dev, SR_HWCAP_DEMO_DEV)) { + demo_dev = dev; continue; } printf("%-3d ", devcnt++); - print_device_line(device); + print_dev_line(dev); } - if (demo_device) { + if (demo_dev) { printf("demo "); - print_device_line(demo_device); + print_dev_line(demo_dev); } } -static void show_device_detail(void) +static void show_dev_detail(void) { - struct sr_device *device; + struct sr_dev *dev; struct sr_hwcap_option *hwo; - struct sr_samplerates *samplerates; - int cap, *capabilities, i; - char *s, *title, *charopts, **stropts; + const struct sr_samplerates *samplerates; + int cap, *hwcaps, i; + char *s, *title; + const char *charopts, **stropts; - device = parse_devicestring(opt_device); - if (!device) { + dev = parse_devstring(opt_dev); + if (!dev) { printf("No such device. Use -D to list all devices.\n"); return; } - print_device_line(device); + print_dev_line(dev); - if ((charopts = (char *)device->plugin->get_device_info( - device->plugin_index, SR_DI_TRIGGER_TYPES))) { + if (sr_dev_info_get(dev, SR_DI_TRIGGER_TYPES, + (const void **)&charopts) == SR_OK) { printf("Supported triggers: "); while (*charopts) { printf("%c ", *charopts); @@ -196,9 +200,9 @@ static void show_device_detail(void) } title = "Supported options:\n"; - capabilities = device->plugin->get_capabilities(); - for (cap = 0; capabilities[cap]; cap++) { - if (!(hwo = sr_find_hwcap_option(capabilities[cap]))) + hwcaps = dev->driver->hwcap_get_all(); + for (cap = 0; hwcaps[cap]; cap++) { + if (!(hwo = sr_hw_hwcap_get(hwcaps[cap]))) continue; if (title) { @@ -206,23 +210,21 @@ static void show_device_detail(void) title = NULL; } - if (hwo->capability == SR_HWCAP_PATTERN_MODE) { + if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) { printf(" %s", hwo->shortname); - stropts = (char **)device->plugin->get_device_info( - device->plugin_index, SR_DI_PATTERNMODES); - if (!stropts) { + if (sr_dev_info_get(dev, SR_DI_PATTERNS, + (const void **)&stropts) == SR_OK) { + printf(" - supported patterns:\n"); + for (i = 0; stropts[i]; i++) + printf(" %s\n", stropts[i]); + } else { printf("\n"); - continue; } - printf(" - supported modes:\n"); - for (i = 0; stropts[i]; i++) - printf(" %s\n", stropts[i]); - } else if (hwo->capability == SR_HWCAP_SAMPLERATE) { + } else if (hwo->hwcap == SR_HWCAP_SAMPLERATE) { printf(" %s", hwo->shortname); /* Supported samplerates */ - samplerates = device->plugin->get_device_info( - device->plugin_index, SR_DI_SAMPLERATES); - if (!samplerates) { + if (sr_dev_info_get(dev, SR_DI_SAMPLERATES, + (const void **)&samplerates) != SR_OK) { printf("\n"); continue; } @@ -232,21 +234,21 @@ static void show_device_detail(void) if (!(s = sr_samplerate_string(samplerates->low))) continue; printf(" (%s", s); - free(s); + g_free(s); /* high */ if (!(s = sr_samplerate_string(samplerates->high))) continue; printf(" - %s", s); - free(s); + g_free(s); /* step */ if (!(s = sr_samplerate_string(samplerates->step))) continue; printf(" in steps of %s)\n", s); - free(s); + g_free(s); } else { printf(" - supported samplerates:\n"); for (i = 0; samplerates->list[i]; i++) { - printf(" %7s\n", sr_samplerate_string(samplerates->list[i])); + printf(" %s\n", sr_samplerate_string(samplerates->list[i])); } } } else { @@ -255,10 +257,42 @@ static void show_device_detail(void) } } -static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *packet) +static void show_pd_detail(void) +{ + GSList *l; + struct srd_decoder *dec; + char **pdtokens, **pdtok, **ann, *doc; + + pdtokens = g_strsplit(opt_pds, ",", -1); + for (pdtok = pdtokens; *pdtok; pdtok++) { + if (!(dec = srd_decoder_get_by_id(*pdtok))) { + printf("Protocol decoder %s not found.", *pdtok); + return; + } + printf("ID: %s\nName: %s\nLong name: %s\nDescription: %s\n", + dec->id, dec->name, dec->longname, dec->desc); + printf("License: %s\n", dec->license); + if (dec->annotations) { + printf("Annotations:\n"); + for (l = dec->annotations; l; l = l->next) { + ann = l->data; + printf("- %s\n %s\n", ann[0], ann[1]); + } + } + if ((doc = srd_decoder_doc(dec))) { + printf("Documentation:\n%s\n", doc[0] == '\n' ? doc+1 : doc); + g_free(doc); + } + } + + g_strfreev(pdtokens); + +} + +static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) { static struct sr_output *o = NULL; - static int probelist[65] = { 0 }; + static int probelist[SR_MAX_NUM_PROBES] = { 0 }; static uint64_t received_samples = 0; static int unitsize = 0; static int triggered = 0; @@ -279,12 +313,12 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac case SR_DF_HEADER: g_message("cli: Received SR_DF_HEADER"); /* Initialize the output module. */ - if (!(o = malloc(sizeof(struct sr_output)))) { + if (!(o = g_try_malloc(sizeof(struct sr_output)))) { printf("Output module malloc failed.\n"); exit(1); } o->format = output_format; - o->device = device; + o->dev = dev; o->param = output_format_param; if (o->format->init) { if (o->format->init(o) != SR_OK) { @@ -296,7 +330,7 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac header = packet->payload; num_enabled_probes = 0; for (i = 0; i < header->num_logic_probes; i++) { - probe = g_slist_nth_data(device->probes, i); + probe = g_slist_nth_data(dev->probes, i); if (probe->enabled) probelist[num_enabled_probes++] = probe->index; } @@ -310,20 +344,20 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac * dump everything in the datastore as it comes in, * and save from there after the session. */ outfile = NULL; - ret = sr_datastore_new(unitsize, &(device->datastore)); + ret = sr_datastore_new(unitsize, &(dev->datastore)); if (ret != SR_OK) { printf("Failed to create datastore.\n"); exit(1); } } else { /* saving to a file in whatever format was set - * with --format, so all we need is a filehandle */ + * with -O, so all we need is a filehandle */ outfile = g_fopen(opt_output_file, "wb"); } } if (opt_pds) - srd_session_start(device->plugin->name, unitsize, - time(NULL), header->samplerate); + srd_session_start(num_enabled_probes, unitsize, + header->samplerate); break; case SR_DF_END: g_message("cli: Received SR_DF_END"); @@ -336,7 +370,7 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac if (output_len) { if (outfile) fwrite(output_buf, 1, output_len, outfile); - free(output_buf); + g_free(output_buf); output_len = 0; } } @@ -349,12 +383,11 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac sr_session_halt(); if (outfile && outfile != stdout) fclose(outfile); - free(o); + g_free(o); o = NULL; break; case SR_DF_TRIGGER: - g_message("cli: received SR_DF_TRIGGER at %"PRIu64" ms", - packet->timeoffset / 1000000); + g_message("cli: received SR_DF_TRIGGER"); if (o->format->event) o->format->event(o, SR_DF_TRIGGER, &output_buf, &output_len); @@ -363,11 +396,7 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac case SR_DF_LOGIC: logic = packet->payload; sample_size = logic->unitsize; - g_message("cli: received SR_DF_LOGIC at %f ms duration %f ms, %"PRIu64" bytes", - packet->timeoffset / 1000000.0, packet->duration / 1000000.0, - logic->length); - break; - case SR_DF_ANALOG: + g_message("cli: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length); break; } @@ -399,8 +428,8 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac limit_samples * sample_size)) filter_out_len = limit_samples * sample_size - received_samples; - if (device->datastore) - sr_datastore_put(device->datastore, filter_out, + if (dev->datastore) + sr_datastore_put(dev->datastore, filter_out, filter_out_len, sample_size, probelist); if (opt_output_file && default_output_format) @@ -409,16 +438,16 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac goto cleanup; if (opt_pds) { - if (srd_session_feed(packet->timeoffset, packet->duration, - (uint8_t*)filter_out, filter_out_len) != SRD_OK) - abort(); + if (srd_session_send(received_samples, (uint8_t*)filter_out, + filter_out_len) != SRD_OK) + sr_session_halt(); } 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) { fwrite(output_buf, 1, output_len, outfile); - free(output_buf); + g_free(output_buf); } } @@ -428,54 +457,92 @@ cleanup: } -/* Register the given PDs for this session. */ -/* Accepts a string of the form: "spi:sck=3:sdata=4,spi:sck=3:sdata=5" +/* Register the given PDs for this session. + * Accepts a string of the form: "spi:sck=3:sdata=4,spi:sck=3:sdata=5" * That will instantiate two SPI decoders on the clock but different data * lines. */ -/* TODO: Support both serial PDs and nested PDs. Parallel PDs even? */ -/* TODO: Only register here, run in streaming fashion later/elsewhere. */ -static int register_pds(struct sr_device *device, const char *pdstring) +static int register_pds(struct sr_dev *dev, const char *pdstring) { - char **pdtokens, **pdtok; + GHashTable *pd_opthash; + struct srd_decoder_inst *di; + char **pdtokens, **pdtok, *pd_name; /* Avoid compiler warnings. */ - (void)device; + (void)dev; + g_datalist_init(&pd_ann_visible); pdtokens = g_strsplit(pdstring, ",", -1); + pd_opthash = NULL; + pd_name = NULL; for (pdtok = pdtokens; *pdtok; pdtok++) { - struct srd_decoder_instance *di; + if (!(pd_opthash = parse_generic_arg(*pdtok))) { + fprintf(stderr, "Invalid protocol decoder option '%s'.\n", *pdtok); + goto err_out; + } - /* Configure probes from command line */ - char **optokens, **optok; - optokens = g_strsplit(*pdtok, ":", -1); - di = srd_instance_new(optokens[0]); - if(!di) { - fprintf(stderr, "Failed to instantiate PD: %s\n", - optokens[0]); - g_strfreev(optokens); - g_strfreev(pdtokens); - return -1; + pd_name = g_strdup(g_hash_table_lookup(pd_opthash, "sigrok_key")); + g_hash_table_remove(pd_opthash, "sigrok_key"); + if (srd_decoder_load(pd_name) != SRD_OK) { + fprintf(stderr, "Failed to load protocol decoder %s\n", pd_name); + goto err_out; } - for (optok = optokens+1; *optok; optok++) { - char probe[strlen(*optok)]; - int num; - if(sscanf(*optok, "%[^=]=%d", probe, &num) == 2) - srd_instance_set_probe(di, probe, num); - /* TODO: else fail somehow */ + if (!(di = srd_inst_new(pd_name, pd_opthash))) { + fprintf(stderr, "Failed to instantiate protocol decoder %s\n", pd_name); + goto err_out; } - g_strfreev(optokens); - - /* TODO: Handle errors. */ + g_datalist_set_data(&pd_ann_visible, di->inst_id, pd_name); + + /* Any keys left in the options hash are probes, where the key + * is the probe name as specified in the decoder class, and the + * value is the probe number i.e. the order in which the PD's + * incoming samples are arranged. */ + if (srd_inst_probes_set(di, pd_opthash) != SRD_OK) + goto err_out; + g_hash_table_destroy(pd_opthash); + pd_opthash = NULL; } +err_out: g_strfreev(pdtokens); + if (pd_opthash) + g_hash_table_destroy(pd_opthash); + if (pd_name) + g_free(pd_name); return 0; } -static int select_probes(struct sr_device *device) +void show_pd_annotation(struct srd_proto_data *pdata, void *cb_data) +{ + int i; + char **annotations; + + /* 'cb_data' is not used in this specific callback. */ + (void)cb_data; + + if (pdata->ann_format != 0) { + /* CLI only shows the default annotation format. */ + return; + } + + if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->di->inst_id)) { + /* Not in the list of PDs whose annotations we're showing. */ + return; + } + + annotations = pdata->data; + if (opt_loglevel > SR_LOG_WARN) + printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample); + printf("%s: ", pdata->pdo->proto_id); + for (i = 0; annotations[i]; i++) + printf("\"%s\" ", annotations[i]); + printf("\n"); + +} + +static int select_probes(struct sr_dev *dev) { struct sr_probe *probe; char **probelist; @@ -488,7 +555,7 @@ static int select_probes(struct sr_device *device) * This only works because a device by default initializes * and enables all its probes. */ - max_probes = g_slist_length(device->probes); + max_probes = g_slist_length(dev->probes); probelist = parse_probestring(max_probes, opt_probes); if (!probelist) { return SR_ERR; @@ -496,10 +563,10 @@ static int select_probes(struct sr_device *device) for (i = 0; i < max_probes; i++) { if (probelist[i]) { - sr_device_probe_name(device, i + 1, probelist[i]); + sr_dev_probe_name_set(dev, i + 1, probelist[i]); g_free(probelist[i]); } else { - probe = sr_device_probe_find(device, i + 1); + probe = sr_dev_probe_find(dev, i + 1); probe->enabled = FALSE; } } @@ -586,7 +653,7 @@ static void load_input_file_format(void) } /* Initialize the input module. */ - if (!(in = malloc(sizeof(struct sr_input)))) { + if (!(in = g_try_malloc(sizeof(struct sr_input)))) { printf("Failed to allocate input module.\n"); exit(1); } @@ -599,12 +666,12 @@ static void load_input_file_format(void) } } - if (select_probes(in->vdevice) > 0) + if (select_probes(in->vdev) > 0) return; sr_session_new(); sr_session_datafeed_callback_add(datafeed_in); - if (sr_session_device_add(in->vdevice) != SR_OK) { + if (sr_session_dev_add(in->vdev) != SR_OK) { printf("Failed to use device.\n"); sr_session_destroy(); return; @@ -636,24 +703,24 @@ static void load_input_file(void) } -int num_real_devices(void) +int num_real_devs(void) { - struct sr_device *device; - GSList *devices, *l; - int num_devices; - - num_devices = 0; - devices = sr_device_list(); - for (l = devices; l; l = l->next) { - device = l->data; - if (!strstr(device->plugin->name, "demo")) - num_devices++; + struct sr_dev *dev; + GSList *devs, *l; + int num_devs; + + num_devs = 0; + devs = sr_dev_list(); + for (l = devs; l; l = l->next) { + dev = l->data; + if (!sr_dev_has_hwcap(dev, SR_HWCAP_DEMO_DEV)) + num_devs++; } - return num_devices; + return num_devs; } -int set_device_options(struct sr_device *device, GHashTable *args) +static int set_dev_options(struct sr_dev *dev, GHashTable *args) { GHashTableIter iter; gpointer key, value; @@ -665,7 +732,7 @@ int set_device_options(struct sr_device *device, GHashTable *args) g_hash_table_iter_init(&iter, args); while (g_hash_table_iter_next(&iter, &key, &value)) { found = FALSE; - for (i = 0; sr_hwcap_options[i].capability; i++) { + for (i = 0; sr_hwcap_options[i].hwcap; i++) { if (strcmp(sr_hwcap_options[i].shortname, key)) continue; if ((value == NULL) && @@ -679,20 +746,20 @@ int set_device_options(struct sr_device *device, GHashTable *args) ret = sr_parse_sizestring(value, &tmp_u64); if (ret != SR_OK) break; - ret = device->plugin-> set_configuration(device-> plugin_index, - sr_hwcap_options[i]. capability, &tmp_u64); + ret = dev->driver->dev_config_set(dev->driver_index, + sr_hwcap_options[i].hwcap, &tmp_u64); break; case SR_T_CHAR: - ret = device->plugin-> set_configuration(device-> plugin_index, - sr_hwcap_options[i]. capability, value); + ret = dev->driver->dev_config_set(dev->driver_index, + sr_hwcap_options[i].hwcap, value); break; case SR_T_BOOL: if (!value) tmp_bool = TRUE; else tmp_bool = sr_parse_boolstring(value); - ret = device->plugin-> set_configuration(device-> plugin_index, - sr_hwcap_options[i]. capability, + ret = dev->driver->dev_config_set(dev->driver_index, + sr_hwcap_options[i].hwcap, GINT_TO_POINTER(tmp_bool)); break; default: @@ -717,33 +784,33 @@ int set_device_options(struct sr_device *device, GHashTable *args) static void run_session(void) { - struct sr_device *device; + struct sr_dev *dev; GHashTable *devargs; - int num_devices, max_probes, *capabilities, i; - uint64_t tmp_u64, time_msec; + int num_devs, max_probes, i; + uint64_t time_msec; char **probelist, *devspec; devargs = NULL; - if (opt_device) { - devargs = parse_generic_arg(opt_device); + if (opt_dev) { + devargs = parse_generic_arg(opt_dev); devspec = g_hash_table_lookup(devargs, "sigrok_key"); - device = parse_devicestring(devspec); - if (!device) { + dev = parse_devstring(devspec); + if (!dev) { g_warning("Device not found."); return; } g_hash_table_remove(devargs, "sigrok_key"); } else { - num_devices = num_real_devices(); - if (num_devices == 1) { + num_devs = num_real_devs(); + if (num_devs == 1) { /* No device specified, but there is only one. */ devargs = NULL; - device = parse_devicestring("0"); - } else if (num_devices == 0) { + dev = parse_devstring("0"); + } else if (num_devs == 0) { printf("No devices found.\n"); return; } else { - printf("%d devices found, please select one.\n", num_devices); + printf("%d devices found, please select one.\n", num_devs); return; } } @@ -751,26 +818,25 @@ static void run_session(void) sr_session_new(); sr_session_datafeed_callback_add(datafeed_in); - if (sr_session_device_add(device) != SR_OK) { + if (sr_session_dev_add(dev) != SR_OK) { printf("Failed to use device.\n"); sr_session_destroy(); return; } if (devargs) { - if (set_device_options(device, devargs) != SR_OK) { + if (set_dev_options(dev, devargs) != SR_OK) { sr_session_destroy(); return; } g_hash_table_destroy(devargs); } - if (select_probes(device) != SR_OK) + if (select_probes(dev) != SR_OK) return; if (opt_continuous) { - capabilities = device->plugin->get_capabilities(); - if (!sr_find_hwcap(capabilities, SR_HWCAP_CONTINUOUS)) { + if (!sr_driver_hwcap_exists(dev->driver, SR_HWCAP_CONTINUOUS)) { printf("This device does not support continuous sampling."); sr_session_destroy(); return; @@ -778,16 +844,16 @@ static void run_session(void) } if (opt_triggers) { - probelist = sr_parse_triggerstring(device, opt_triggers); + probelist = sr_parse_triggerstring(dev, opt_triggers); if (!probelist) { sr_session_destroy(); return; } - max_probes = g_slist_length(device->probes); + max_probes = g_slist_length(dev->probes); for (i = 0; i < max_probes; i++) { if (probelist[i]) { - sr_device_trigger_set(device, i + 1, probelist[i]); + sr_dev_trigger_set(dev, i + 1, probelist[i]); g_free(probelist[i]); } } @@ -802,10 +868,9 @@ static void run_session(void) return; } - capabilities = device->plugin->get_capabilities(); - if (sr_find_hwcap(capabilities, SR_HWCAP_LIMIT_MSEC)) { - if (device->plugin->set_configuration(device->plugin_index, - SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) { + if (sr_driver_hwcap_exists(dev->driver, SR_HWCAP_LIMIT_MSEC)) { + if (dev->driver->dev_config_set(dev->driver_index, + SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) { printf("Failed to configure time limit.\n"); sr_session_destroy(); return; @@ -816,10 +881,12 @@ static void run_session(void) * convert to samples based on the samplerate. */ limit_samples = 0; - if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) { - tmp_u64 = *((uint64_t *) device->plugin->get_device_info( - device->plugin_index, SR_DI_CUR_SAMPLERATE)); - limit_samples = tmp_u64 * time_msec / (uint64_t) 1000; + if (sr_dev_has_hwcap(dev, SR_HWCAP_SAMPLERATE)) { + const uint64_t *samplerate; + + sr_dev_info_get(dev, SR_DI_CUR_SAMPLERATE, + (const void **)&samplerate); + limit_samples = (*samplerate) * time_msec / (uint64_t)1000; } if (limit_samples == 0) { printf("Not enough time at this samplerate.\n"); @@ -827,8 +894,8 @@ static void run_session(void) return; } - if (device->plugin->set_configuration(device->plugin_index, - SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) { + if (dev->driver->dev_config_set(dev->driver_index, + SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) { printf("Failed to configure time-based sample limit.\n"); sr_session_destroy(); return; @@ -838,16 +905,16 @@ static void run_session(void) if (opt_samples) { if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK) - || (device->plugin->set_configuration(device->plugin_index, - SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) { + || (dev->driver->dev_config_set(dev->driver_index, + SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) { printf("Failed to configure sample limit.\n"); sr_session_destroy(); return; } } - if (device->plugin->set_configuration(device->plugin_index, - SR_HWCAP_PROBECONFIG, (char *)device->probes) != SR_OK) { + if (dev->driver->dev_config_set(dev->driver_index, + SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) { printf("Failed to configure probes.\n"); sr_session_destroy(); return; @@ -876,11 +943,11 @@ static void run_session(void) } static void logger(const gchar *log_domain, GLogLevelFlags log_level, - const gchar *message, gpointer user_data) + const gchar *message, gpointer cb_data) { /* Avoid compiler warnings. */ (void)log_domain; - (void)user_data; + (void)cb_data; /* * All messages, warnings, errors etc. go to stderr (not stdout) in @@ -900,14 +967,15 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level, int main(int argc, char **argv) { - struct sr_output_format **outputs; GOptionContext *context; GError *error; GHashTable *fmtargs; GHashTableIter iter; gpointer key, value; - int i; - char *fmtspec; + struct sr_output_format **outputs; + struct srd_decoder_inst *di_from, *di_to; + int i, ret; + char *fmtspec, **pds; g_log_set_default_handler(logger, NULL); if (getenv("SIGROK_DEBUG")) @@ -923,8 +991,15 @@ int main(int argc, char **argv) } /* Set the loglevel (amount of messages to output) for libsigrok. */ - if (sr_set_loglevel(opt_loglevel) != SR_OK) { - fprintf(stderr, "cli: %s: sr_set_loglevel(%d) failed\n", + if (sr_log_loglevel_set(opt_loglevel) != SR_OK) { + fprintf(stderr, "cli: %s: sr_log_loglevel_set(%d) failed\n", + __func__, opt_loglevel); + return 1; + } + + /* Set the loglevel (amount of messages to output) for libsigrokdecode. */ + if (srd_log_loglevel_set(opt_loglevel) != SRD_OK) { + fprintf(stderr, "cli: %s: srd_log_loglevel_set(%d) failed\n", __func__, opt_loglevel); return 1; } @@ -933,19 +1008,58 @@ int main(int argc, char **argv) return 1; if (opt_pds) { - /* TODO: Error handling. */ - srd_init(); - register_pds(NULL, opt_pds); + if (srd_init(NULL) != SRD_OK) { + printf("Failed to initialize sigrokdecode\n"); + return 1; + } + if (register_pds(NULL, opt_pds) != 0) { + printf("Failed to register protocol decoders\n"); + return 1; + } + if (srd_register_callback(SRD_OUTPUT_ANN, + show_pd_annotation, NULL) != SRD_OK) { + printf("Failed to register protocol decoder callback\n"); + return 1; + } + } + + if (opt_pd_stack) { + pds = g_strsplit(opt_pd_stack, ",", 0); + if (g_strv_length(pds) < 2) { + printf("Specify at least two protocol decoders to stack.\n"); + return 1; + } + + if (!(di_from = srd_inst_find_by_id(pds[0]))) { + printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[0]); + return 1; + } + for (i = 1; pds[i]; i++) { + if (!(di_to = srd_inst_find_by_id(pds[i]))) { + printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[i]); + return 1; + } + if ((ret = srd_inst_stack(di_from, di_to) != SRD_OK)) + return ret; + + /* Don't show annotation from this PD. Only the last PD in + * the stack will be left on the annotation list. + */ + g_datalist_remove_data(&pd_ann_visible, di_from->inst_id); + + di_from = di_to; + } + g_strfreev(pds); } - if (!opt_format) { - opt_format = DEFAULT_OUTPUT_FORMAT; - /* we'll need to remember this, so when saving to an file + if (!opt_output_format) { + opt_output_format = DEFAULT_OUTPUT_FORMAT; + /* we'll need to remember this so when saving to a file * later, sigrok session format will be used. */ default_output_format = TRUE; } - fmtargs = parse_generic_arg(opt_format); + fmtargs = parse_generic_arg(opt_output_format); fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key"); if (!fmtspec) { printf("Invalid output format.\n"); @@ -967,20 +1081,22 @@ int main(int argc, char **argv) break; } if (!output_format) { - printf("invalid output format %s\n", opt_format); + printf("invalid output format %s\n", opt_output_format); return 1; } if (opt_version) show_version(); - else if (opt_list_devices) - show_device_list(); + else if (opt_list_devs) + show_dev_list(); else if (opt_input_file) load_input_file(); else if (opt_samples || opt_time || opt_continuous) run_session(); - else if (opt_device) - show_device_detail(); + else if (opt_dev) + show_dev_detail(); + else if (opt_pds) + show_pd_detail(); else printf("%s", g_option_context_get_help(context, TRUE, NULL));