X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds1xx2%2Fapi.c;h=a04fe770dbd3bf1093f309bcd4437429119bca55;hb=29d957ceae3bd9ac5b72cd0e58a5910932bd1768;hp=ea2df6a3c47f7082bf1e2b27344ef61f17ad4937;hpb=e0b7d23ce884f03ecb693943c5bd822879c68d65;p=libsigrok.git

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index ea2df6a3..a04fe770 100644
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -137,6 +137,7 @@ static int clear_instances(void)
 		if (!(devc = sdi->priv))
 			continue;
 
+		g_free(devc->device);
 		close(devc->fd);
 
 		sr_dev_inst_free(sdi);
@@ -170,7 +171,16 @@ static GSList *hw_scan(GSList *options)
 	struct dev_context *devc;
 	struct sr_probe *probe;
 	GSList *devices;
-	int i;
+	GDir *dir;
+	const gchar *dev_name;
+	const gchar *dev_dir = "/dev/";
+	const gchar *prefix = "usbtmc";
+	gchar *device;
+	const gchar *idn_query = "*IDN?";
+	int len, num_tokens, fd, i;
+	const gchar *delimiter = ",";
+	gchar **tokens;
+	char buf[256];
 
 	(void)options;
 
@@ -178,22 +188,64 @@ static GSList *hw_scan(GSList *options)
 	drvc = di->priv;
 	drvc->instances = NULL;
 
-	if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, "Rigol", "DS1xx2", NULL)))
-		return NULL;
-	if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
+	dir = g_dir_open("/sys/class/usb/", 0, NULL);
+
+	if (dir == NULL)
 		return NULL;
 
-	sdi->priv = devc;
-	sdi->driver = di;
+	while ((dev_name = g_dir_read_name(dir)) != NULL) {
+		if (strncmp(dev_name, prefix, strlen(prefix))) 
+			continue;
+
+		device = g_strconcat(dev_dir, dev_name, NULL);
 
-	for (i = 0; i < 2; i++)
-	{
-		if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, i == 0 ? "CH1" : "CH2")))
+		fd = open(device, O_RDWR);
+		len = write(fd, idn_query, strlen(idn_query));
+		len = read(fd, buf, sizeof(buf));
+		close(fd);
+		if (len == 0) {
+			g_free(device);
 			return NULL;
-		sdi->probes = g_slist_append(sdi->probes, probe);
+		}
+
+		buf[len] = 0;
+		tokens = g_strsplit(buf, delimiter, 0);
+		close(fd);
+
+		for (num_tokens = 0; tokens[num_tokens] != NULL; num_tokens++);
+
+		if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, tokens[0],
+		    num_tokens > 1 ? tokens[1] : NULL,
+		    num_tokens > 3 ? tokens[3] : NULL))) {
+			g_strfreev(tokens);
+			g_free(device);
+			return NULL;
+		}
+		g_strfreev(tokens);
+
+		if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+			sr_err("Device context malloc failed.");
+			g_free(device);
+			return NULL;
+		}
+
+		devc->device = device;
+
+		sdi->priv = devc;
+		sdi->driver = di;
+
+		for (i = 0; i < 2; i++) {
+			if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE,
+			    i == 0 ? "CH1" : "CH2")))
+				return NULL;
+			sdi->probes = g_slist_append(sdi->probes, probe);
+		}
+
+		drvc->instances = g_slist_append(drvc->instances, sdi);
+		devices = g_slist_append(devices, sdi);
 	}
-	drvc->instances = g_slist_append(drvc->instances, sdi);
-	devices = g_slist_append(devices, sdi);
+
+	g_dir_close(dir);
 
 	return devices;
 }
@@ -209,12 +261,14 @@ static GSList *hw_dev_list(void)
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-	int fd = open("/dev/usbtmc1", O_RDWR);
+	struct dev_context *devc;
+	int fd;
+
+	devc = sdi->priv;
 
-	if (fd == -1)
+	if ((fd = open(devc->device, O_RDWR)) == -1)
 		return SR_ERR;
 
-	struct dev_context *devc = sdi->priv;
 	devc->fd = fd;
 
 	devc->scale = 1;
@@ -224,7 +278,9 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 
 static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-	struct dev_context *devc = sdi->priv;
+	struct dev_context *devc;
+
+	devc = sdi->priv;
 
 	close(devc->fd);
 
@@ -276,13 +332,15 @@ static int hw_info_get(int info_id, const void **data,
 static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 			     const void *value)
 {
-	struct dev_context *devc = sdi->priv;
+	struct dev_context *devc;
 	uint64_t tmp_u64;
 	float tmp_float;
 	struct sr_rational tmp_rat;
 	int ret, i, j;
 	char *channel;
 
+	devc = sdi->priv;
+
 	if (sdi->status != SR_ST_ACTIVE) {
 		sr_err("Device inactive, can't set config options.");
 		return SR_ERR;
@@ -290,20 +348,22 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 
 	ret = SR_OK;
 	switch (hwcap) {
-    case SR_HWCAP_LIMIT_FRAMES:
+	case SR_HWCAP_LIMIT_FRAMES:
 		devc->limit_frames = *(const uint64_t *)value;
 		break;
 	case SR_HWCAP_TRIGGER_SLOPE:
 		tmp_u64 = *(const int *)value;
-		rigol_ds1xx2_send_data(devc->fd, "TRIG:EDGE:%s\n", tmp_u64 ? "POS" : "NEG");
+		rigol_ds1xx2_send_data(devc->fd, ":TRIG:EDGE:SLOP %s\n",
+				       tmp_u64 ? "POS" : "NEG");
 		break;
 	case SR_HWCAP_HORIZ_TRIGGERPOS:
 		tmp_float = *(const float *)value;
-		rigol_ds1xx2_send_data(devc->fd, "TIM:OFFS %f\n", tmp_float);
+		rigol_ds1xx2_send_data(devc->fd, ":TIM:OFFS %.9f\n", tmp_float);
 		break;
 	case SR_HWCAP_TIMEBASE:
 		tmp_rat = *(const struct sr_rational *)value;
-		rigol_ds1xx2_send_data(devc->fd, "TIM:SCAL %f\n", (float) tmp_rat.p / tmp_rat.q);
+		rigol_ds1xx2_send_data(devc->fd, ":TIM:SCAL %.9f\n",
+				       (float)tmp_rat.p / tmp_rat.q);
 		break;
 	case SR_HWCAP_TRIGGER_SOURCE:
 		if (!strcmp(value, "CH1"))
@@ -314,10 +374,11 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 			channel = "EXT";
 		else if (!strcmp(value, "AC Line"))
 			channel = "ACL";
-		else
+		else {
 			ret = SR_ERR_ARG;
 			break;
-		rigol_ds1xx2_send_data(devc->fd, "TRIG:SOUR %s\n", channel);
+		}
+		rigol_ds1xx2_send_data(devc->fd, ":TRIG:EDGE:SOUR %s\n", channel);
 		break;
 	case SR_HWCAP_VDIV:
 		/* TODO: Not supporting vdiv per channel yet. */
@@ -325,9 +386,10 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		for (i = 0; vdivs[i].p && vdivs[i].q; i++) {
 			if (vdivs[i].p == tmp_rat.p
 					&& vdivs[i].q == tmp_rat.q) {
-				devc->scale = (float) tmp_rat.p / tmp_rat.q;
+				devc->scale = (float)tmp_rat.p / tmp_rat.q;
 				for (j = 0; j < 2; j++)
-					rigol_ds1xx2_send_data(devc->fd, "CHAN%d:SCAL %f\n", j, devc->scale);
+					rigol_ds1xx2_send_data(devc->fd,
+					 ":CHAN%d:SCAL %.3f\n", j, devc->scale);
 				break;
 			}
 		}
@@ -339,7 +401,8 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		for (i = 0; coupling[i]; i++) {
 			if (!strcmp(value, coupling[i])) {
 				for (j = 0; j < 2; j++)
-					rigol_ds1xx2_send_data(devc->fd, "CHAN%d:COUP %s\n", j, coupling[i]);
+					rigol_ds1xx2_send_data(devc->fd,
+					  ":CHAN%d:COUP %s\n", j, coupling[i]);
 				break;
 			}
 		}
@@ -349,6 +412,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	default:
 		sr_err("Unknown hardware capability: %d.", hwcap);
 		ret = SR_ERR_ARG;
+		break;
 	}
 
 	return ret;
@@ -357,14 +421,17 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 				    void *cb_data)
 {
-	struct dev_context *devc = sdi->priv;
+	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
 	struct sr_datafeed_meta_analog meta;
 	char buf[256];
 	int len;
+
 	(void)cb_data;
 
+	devc = sdi->priv;
+
 	devc->num_frames = 0;
 
 	sr_source_add(devc->fd, G_IO_IN, 50, rigol_ds1xx2_receive_data, (void *)sdi);
@@ -386,12 +453,12 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	len = read(devc->fd, buf, sizeof(buf));
 	buf[len] = 0;
 	devc->scale = atof(buf);
-	sr_dbg("scale is %f", devc->scale);
+	sr_dbg("Scale is %.3f.", devc->scale);
 	rigol_ds1xx2_send_data(devc->fd, ":CHAN1:OFFS?\n");
 	len = read(devc->fd, buf, sizeof(buf));
 	buf[len] = 0;
 	devc->offset = atof(buf);
-	sr_dbg("offset is %f", devc->offset);
+	sr_dbg("Offset is %.6f.", devc->offset);
 	rigol_ds1xx2_send_data(devc->fd, ":WAV:DATA?\n");
 
 	return SR_OK;
@@ -399,9 +466,12 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-	struct dev_context *devc = sdi->priv;
+	struct dev_context *devc;
+
 	(void)cb_data;
 
+	devc = sdi->priv;
+
 	if (sdi->status != SR_ST_ACTIVE) {
 		sr_err("Device inactive, can't stop acquisition.");
 		return SR_ERR;