X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=65a265389f2d0dba79772b8e3cc3e19810bf12cf;hp=4430b90daa1f631b1aa384d285eac29c941fd336;hb=63bb454cc1cec4a3cfdb7bcf5cb7ea37ea50e93a;hpb=fa7827c587a00a6aebc736bee34380abc7efc525

diff --git a/parsers.c b/parsers.c
index 4430b90..65a2653 100644
--- a/parsers.c
+++ b/parsers.c
@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
+#include <libsigrok/libsigrok.h>
 #include "sigrok-cli.h"
 
 char **parse_probestring(int max_probes, const char *probestring)
@@ -44,8 +44,7 @@ char **parse_probestring(int max_probes, const char *probestring)
 			range = g_strsplit(tokens[i], "-", 2);
 			if (!range[0] || !range[1] || range[2]) {
 				/* Need exactly two arguments. */
-				printf("Invalid probe syntax '%s'.\n",
-				       tokens[i]);
+				g_critical("Invalid probe syntax '%s'.", tokens[i]);
 				error = TRUE;
 				break;
 			}
@@ -53,8 +52,7 @@ char **parse_probestring(int max_probes, const char *probestring)
 			b = strtol(range[0], NULL, 10);
 			e = strtol(range[1], NULL, 10);
 			if (b < 1 || e > max_probes || b >= e) {
-				printf("Invalid probe range '%s'.\n",
-				       tokens[i]);
+				g_critical("Invalid probe range '%s'.", tokens[i]);
 				error = TRUE;
 				break;
 			}
@@ -67,7 +65,7 @@ char **parse_probestring(int max_probes, const char *probestring)
 		} else {
 			tmp = strtol(tokens[i], NULL, 10);
 			if (tmp < 1 || tmp > max_probes) {
-				printf("Invalid probe %d.\n", tmp);
+				g_critical("Invalid probe %d.", tmp);
 				error = TRUE;
 				break;
 			}
@@ -98,7 +96,7 @@ char **parse_probestring(int max_probes, const char *probestring)
 	return probelist;
 }
 
-GHashTable *parse_generic_arg(const char *arg)
+GHashTable *parse_generic_arg(const char *arg, gboolean sep_first)
 {
 	GHashTable *hash;
 	int i;
@@ -107,10 +105,14 @@ GHashTable *parse_generic_arg(const char *arg)
 	if (!arg || !arg[0])
 		return NULL;
 
-	hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+	i = 0;
+	hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+			g_free, g_free);
 	elements = g_strsplit(arg, ":", 0);
-	g_hash_table_insert(hash, g_strdup("sigrok_key"), g_strdup(elements[0]));
-	for (i = 1; elements[i]; i++) {
+	if (sep_first)
+		g_hash_table_insert(hash, g_strdup("sigrok_key"),
+				g_strdup(elements[i++]));
+	for (; elements[i]; i++) {
 		e = strchr(elements[i], '=');
 		if (!e)
 			g_hash_table_insert(hash, g_strdup(elements[i]), NULL);
@@ -124,63 +126,93 @@ GHashTable *parse_generic_arg(const char *arg)
 	return hash;
 }
 
-struct sr_device *parse_devicestring(const char *devicestring)
+struct sr_dev *parse_devstring(const char *devstring)
 {
-	struct sr_device *device, *d;
-	struct sr_device_plugin *plugin;
-	GSList *devices, *plugins, *l, *p;
-	int num_devices, device_num, device_cnt;
+	struct sr_dev *dev, *d;
+	struct sr_dev_driver **drivers;
+	GSList *devs, *l;
+	int i, num_devs, dev_num, dev_cnt;
 	char *tmp;
 
-	if (!devicestring)
+	if (!devstring)
 		return NULL;
 
-	device = NULL;
-	device_num = strtol(devicestring, &tmp, 10);
-	if (tmp != devicestring) {
-		/* argument is numeric, meaning a device ID. Make all driver
-		 * plugins scan for devices.
+	dev = NULL;
+	dev_num = strtol(devstring, &tmp, 10);
+	if (tmp != devstring) {
+		/* argument is numeric, meaning a device ID. Make all drivers
+		 * scan for devices.
 		 */
-		num_devices = num_real_devices();
-		if (device_num < 0 || device_num >= num_devices)
+		num_devs = num_real_devs();
+		if (dev_num < 0 || dev_num >= num_devs)
 			return NULL;
 
-		device_cnt = 0;
-		devices = sr_dev_list();
-		for (l = devices; l; l = l->next) {
+		dev_cnt = 0;
+		devs = sr_dev_list();
+		for (l = devs; l; l = l->next) {
 			d = l->data;
-			if (sr_dev_has_hwcap(d, SR_HWCAP_DEMO_DEVICE))
+			if (sr_dev_has_hwcap(d, SR_HWCAP_DEMO_DEV))
 				continue;
-			if (device_cnt == device_num) {
-				if (device_num == device_cnt) {
-					device = d;
+			if (dev_cnt == dev_num) {
+				if (dev_num == dev_cnt) {
+					dev = d;
 					break;
 				}
 			}
-			device_cnt++;
+			dev_cnt++;
 		}
 	} else {
 		/* select device by driver -- only initialize that driver,
 		 * no need to let them all scan
 		 */
-		device = NULL;
-		plugins = sr_hw_list();
-		for (p = plugins; p; p = p->next) {
-			plugin = p->data;
-			if (strcmp(plugin->name, devicestring))
+		dev = NULL;
+		drivers = sr_driver_list();
+		for (i = 0; drivers[i]; i++) {
+			if (strcmp(drivers[i]->name, devstring))
 				continue;
-			num_devices = sr_hw_init(plugin);
-			if (num_devices == 1) {
-				devices = sr_dev_list();
-				device = devices->data;
-			} else if (num_devices > 1) {
+			num_devs = sr_driver_init(drivers[i]);
+			if (num_devs == 1) {
+				devs = sr_dev_list();
+				dev = devs->data;
+			} else if (num_devs > 1) {
 				printf("driver '%s' found %d devices, select by ID instead.\n",
-						devicestring, num_devices);
+						devstring, num_devs);
 			}
 			/* fall through: selected driver found no devices */
 			break;
 		}
 	}
 
-	return device;
+	return dev;
+}
+
+char *strcanon(const char *str)
+{
+	int p0, p1;
+	char *s;
+
+	/* Returns newly allocated string. */
+	s = g_ascii_strdown(str, -1);
+	for (p0 = p1 = 0; str[p0]; p0++) {
+		if ((s[p0] >= 'a' && s[p0] <= 'z')
+				|| (s[p0] >= '0' && s[p0] <= '9'))
+			s[p1++] = s[p0];
+	}
+	s[p1] = '\0';
+
+	return s;
+}
+
+int canon_cmp(const char *str1, const char *str2)
+{
+	int ret;
+	char *s1, *s2;
+
+	s1 = strcanon(str1);
+	s2 = strcanon(str2);
+	ret = g_ascii_strcasecmp(s1, s2);
+	g_free(s2);
+	g_free(s1);
+
+	return ret;
 }