X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds1xx2%2Fapi.c;h=ce5d57c57ac1db34cccd30e6de0c2465f56f4381;hb=3d3a601e803d4fe10e2f633b5f0e06104dcf9017;hp=40865950e9545f763b867684148aff055addadc0;hpb=5150ef336b69bfece769eef746f522270d6de90b;p=libsigrok.git

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 40865950..ce5d57c5 100644
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -146,7 +146,30 @@ static void clear_helper(void *priv)
 {
 	struct dev_context *devc;
 
-	devc = priv;
+	for (l = drvc->instances; l; l = l->next) {
+		if (!(sdi = l->data))
+			continue;
+
+		if (sdi->conn)
+			sr_serial_dev_inst_free(sdi->conn);
+
+		g_slist_free(sdi->probe_groups);
+
+		if (!(devc = sdi->priv))
+			continue;
+
+		g_free(devc->device);
+		g_free(devc->coupling[0]);
+		g_free(devc->coupling[1]);
+		g_free(devc->trigger_source);
+		g_free(devc->trigger_slope);
+		g_slist_free(devc->analog_groups[0].probes);
+		g_slist_free(devc->analog_groups[1].probes);
+		g_slist_free(devc->digital_group.probes);
+		close(devc->fd);
+
+		sr_dev_inst_free(sdi);
+	}
 
 	g_free(devc->coupling[0]);
 	g_free(devc->coupling[1]);
@@ -260,10 +283,14 @@ static int probe_port(const char *port, GSList **devices)
 	devc->has_digital = has_digital;
 
 	for (i = 0; i < 2; i++) {
-		if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE,
-				i == 0 ? "CH1" : "CH2")))
+		channel_name = (i == 0 ? "CH1" : "CH2");
+		if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, channel_name)))
 			return SR_ERR_MALLOC;
 		sdi->probes = g_slist_append(sdi->probes, probe);
+		devc->analog_groups[i].name = channel_name;
+		devc->analog_groups[i].probes = g_slist_append(NULL, probe);
+		sdi->probe_groups = g_slist_append(sdi->probe_groups,
+				&devc->analog_groups[i]);
 	}
 
 	if (devc->has_digital) {
@@ -275,6 +302,11 @@ static int probe_port(const char *port, GSList **devices)
 			if (!probe)
 				return SR_ERR_MALLOC;
 			sdi->probes = g_slist_append(sdi->probes, probe);
+			devc->digital_group.probes = g_slist_append(
+					devc->digital_group.probes, probe);
+			devc->digital_group.name = "LA";
+			sdi->probe_groups = g_slist_append(sdi->probe_groups,
+					&devc->digital_group);
 		}
 	}
 	sdi->priv = devc;