X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=1bf6c7d801d40770f99f1d075ed0d251925abf5e;hp=73f0a13f8f575ef0ffd52fd1fb0ea7a6a5d28ca4;hb=67ce0d2757835e1c23967277631dac87a61a3f82;hpb=838285aa2e112b526f944b81070d5525de9b634a

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 73f0a13..1bf6c7d 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
@@ -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;
 		}
@@ -446,7 +446,7 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac
 	if (opt_pds) {
 		if (srd_session_feed(received_samples, (uint8_t*)filter_out,
 				filter_out_len) != SRD_OK)
-			abort();
+			sr_session_halt();
 	} else {
 		output_len = 0;
 		if (o->format->data && packet->type == o->format->df_type)
@@ -470,51 +470,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;
+		if (!(pd_opthash = parse_generic_arg(*pdtok))) {
+			fprintf(stderr, "Invalid protocol decoder option '%s'.\n", *pdtok);
+			goto err_out;
 		}
-		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);
-			}
-		}
-		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;
 }
@@ -524,17 +521,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]);
@@ -713,7 +712,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++;
 	}
 
@@ -1024,18 +1023,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;
 			}