X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=50fec3997874014b395f262e3f5a822342c13580;hp=33d8ebbedb5f979cf02f557a8c230e8ed566a860;hb=bed505259f5027000028d5ee69a93f1b6231eb6d;hpb=ca07c71183a88c7f6eeb47c0d11399f0145562a1

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 33d8ebb..50fec39 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 <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
  * 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
@@ -119,18 +119,18 @@ static void show_version(void)
 	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);
+		printf("  %-20s %s\n", dec->id, dec->longname);
 	}
 	printf("\n");
 
 	srd_exit();
 }
 
-static void print_device_line(struct sr_device *device)
+static void print_device_line(const struct sr_device *device)
 {
-	struct sr_device_instance *sdi;
+	const struct sr_device_instance *sdi;
 
-	sdi = device->plugin->get_device_info(device->plugin_index, SR_DI_INSTANCE);
+	sr_device_get_info(device, SR_DI_INSTANCE, (const void **) &sdi);
 
 	if (sdi->vendor && sdi->vendor[0])
 		printf("%s ", sdi->vendor);
@@ -159,7 +159,7 @@ static void show_device_list(void)
 	demo_device = NULL;
 	for (l = devices; l; l = l->next) {
 		device = l->data;
-		if (strstr(device->plugin->name, "demo")) {
+		if (sr_device_has_hwcap(device, SR_HWCAP_DEMO_DEVICE)) {
 			demo_device = device;
 			continue;
 		}
@@ -176,9 +176,10 @@ static void show_device_detail(void)
 {
 	struct sr_device *device;
 	struct sr_hwcap_option *hwo;
-	struct sr_samplerates *samplerates;
+	const struct sr_samplerates *samplerates;
 	int cap, *capabilities, i;
-	char *s, *title, *charopts, **stropts;
+	char *s, *title;
+	const char *charopts, **stropts;
 
 	device = parse_devicestring(opt_device);
 	if (!device) {
@@ -188,8 +189,8 @@ static void show_device_detail(void)
 
 	print_device_line(device);
 
-	if ((charopts = (char *)device->plugin->get_device_info(
-			device->plugin_index, SR_DI_TRIGGER_TYPES))) {
+	if (sr_device_get_info(device, SR_DI_TRIGGER_TYPES,
+						   (const void **) &charopts) == SR_OK) {
 		printf("Supported triggers: ");
 		while (*charopts) {
 			printf("%c ", *charopts);
@@ -211,21 +212,19 @@ static void show_device_detail(void)
 
 		if (hwo->capability == 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_device_get_info(device, SR_DI_PATTERNMODES,
+								   (const void **) &stropts) == SR_OK) {
+				printf(" - supported modes:\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) {
 			printf("    %s", hwo->shortname);
 			/* Supported samplerates */
-			samplerates = device->plugin->get_device_info(
-				device->plugin_index, SR_DI_SAMPLERATES);
-			if (!samplerates) {
+			if (sr_device_get_info(device, SR_DI_SAMPLERATES,
+								   (const void **) &samplerates) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -258,6 +257,38 @@ static void show_device_detail(void)
 	}
 }
 
+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_get_decoder_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_device *device, struct sr_datafeed_packet *packet)
 {
 	static struct sr_output *o = NULL;
@@ -356,8 +387,7 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac
 		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);
@@ -366,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;
 	}
 
@@ -412,9 +438,9 @@ 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_feed(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)
@@ -438,51 +464,48 @@ cleanup:
  */
 static int register_pds(struct sr_device *device, const char *pdstring)
 {
-	gpointer dummy;
-	char **pdtokens, **pdtok;
+	GHashTable *pd_opthash;
+	struct srd_decoder_instance *di;
+	char **pdtokens, **pdtok, *pd_name;
 
 	/* Avoid compiler warnings. */
 	(void)device;
 
 	g_datalist_init(&pd_ann_visible);
 	pdtokens = g_strsplit(pdstring, ",", -1);
+	pd_opthash = NULL;
+	pd_name = NULL;
 
-	/* anything, but not NULL */
-	dummy = register_pds;
 	for (pdtok = pdtokens; *pdtok; pdtok++) {
-		struct srd_decoder_instance *di;
-
-		/* Configure probes from command line */
-		char **optokens, **optok;
-		optokens = g_strsplit(*pdtok, ":", -1);
-		di = srd_instance_new(optokens[0], NULL);
-		if(!di) {
-			fprintf(stderr, "Failed to instantiate PD: %s\n",
-					optokens[0]);
-			g_strfreev(optokens);
-			g_strfreev(pdtokens);
-			return -1;
-		}
-		g_datalist_set_data(&pd_ann_visible, optokens[0], dummy);
-		for (optok = optokens+1; *optok; optok++) {
-			char probe[strlen(*optok)];
-			int num;
-			if (sscanf(*optok, "%[^=]=%d", probe, &num) == 2) {
-				printf("Setting probe '%s' to %d\n", probe, num);
-				srd_instance_set_probe(di, probe, num);
-			} else {
-				fprintf(stderr, "Error: Couldn't parse decoder "
-					"options correctly! Aborting.\n");
-				/* FIXME: Better error handling. */
-				exit(EXIT_FAILURE);
-			}
+		if (!(pd_opthash = parse_generic_arg(*pdtok))) {
+			fprintf(stderr, "Invalid protocol decoder option '%s'.\n", *pdtok);
+			goto err_out;
 		}
-		g_strfreev(optokens);
 
-		/* TODO: Handle errors. */
+		pd_name = g_strdup(g_hash_table_lookup(pd_opthash, "sigrok_key"));
+		g_hash_table_remove(pd_opthash, "sigrok_key");
+		if (!(di = srd_instance_new(pd_name, pd_opthash))) {
+			fprintf(stderr, "Failed to instantiate PD %s\n", pd_name);
+			goto err_out;
+		}
+		g_datalist_set_data(&pd_ann_visible, di->instance_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_instance_set_probes(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;
 }
@@ -492,17 +515,19 @@ void show_pd_annotation(struct srd_proto_data *pdata)
 	int i;
 	char **annotations;
 
-	annotations = pdata->data;
 	if (pdata->ann_format != 0) {
-		/* CLI only shows the default annotation format */
+		/* CLI only shows the default annotation format. */
 		return;
 	}
 
-	if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->proto_id)) {
-		/* not in the list of PDs whose annotations we're showing */
+	if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->di->instance_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]);
@@ -681,7 +706,7 @@ int num_real_devices(void)
 	devices = sr_device_list();
 	for (l = devices; l; l = l->next) {
 		device = l->data;
-		if (!strstr(device->plugin->name, "demo"))
+		if (!sr_device_has_hwcap(device, SR_HWCAP_DEMO_DEVICE))
 			num_devices++;
 	}
 
@@ -755,7 +780,7 @@ static void run_session(void)
 	struct sr_device *device;
 	GHashTable *devargs;
 	int num_devices, max_probes, *capabilities, i;
-	uint64_t tmp_u64, time_msec;
+	uint64_t time_msec;
 	char **probelist, *devspec;
 
 	devargs = NULL;
@@ -852,9 +877,11 @@ static void run_session(void)
 			 */
 			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;
+				const uint64_t *samplerate;
+
+				sr_device_get_info(device, 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");
@@ -959,15 +986,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_set_loglevel(opt_loglevel) != SRD_OK) {
-		fprintf(stderr, "cli: %s: srd_set_loglevel(%d) failed\n",
+	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;
 	}
@@ -992,18 +1019,18 @@ int main(int argc, char **argv)
 	}
 
 	if (opt_pd_stack) {
-		pds = g_strsplit(opt_pd_stack, ":", 0);
+		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_instance_find(pds[0]))) {
+		if (!(di_from = srd_instance_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_instance_find(pds[i]))) {
+			if (!(di_to = srd_instance_find_by_id(pds[i]))) {
 				printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[i]);
 				return 1;
 			}
@@ -1063,6 +1090,8 @@ int main(int argc, char **argv)
 		run_session();
 	else if (opt_device)
 		show_device_detail();
+	else if (opt_pds)
+		show_pd_detail();
 	else
 		printf("%s", g_option_context_get_help(context, TRUE, NULL));