X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=500362be7ebb7526956b996f165837df29beaeff;hb=25f20faf0df4c2f124c4dea0786dc042fcd41ed3;hp=85d25e36217363d46e1b6f452c7eac6fcaad553a;hpb=14e1aa6df0c760d6dacc0d3b225276cf32972ca5;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 85d25e36..500362be 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -237,17 +237,18 @@ static struct sr_dev_driver *di = &rigol_ds_driver_info;
 static void clear_helper(void *priv)
 {
 	struct dev_context *devc;
+	unsigned int i;
 
 	devc = priv;
 	g_free(devc->data);
 	g_free(devc->buffer);
-	g_free(devc->coupling[0]);
-	g_free(devc->coupling[1]);
+	for (i = 0; i < ARRAY_SIZE(devc->coupling); i++)
+		g_free(devc->coupling[i]);
 	g_free(devc->trigger_source);
 	g_free(devc->trigger_slope);
-	g_slist_free(devc->analog_groups[0].channels);
-	g_slist_free(devc->analog_groups[1].channels);
-	g_slist_free(devc->digital_group.channels);
+	g_free(devc->analog_groups);
+	g_free(devc->digital_group);
+	g_free(devc);
 }
 
 static int dev_clear(void)
@@ -336,19 +337,27 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 
 	sr_scpi_hw_info_free(hw_info);
 
+	devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) *
+					model->analog_channels);
+
 	for (i = 0; i < model->analog_channels; i++) {
 		if (!(channel_name = g_strdup_printf("CH%d", i + 1)))
 			return NULL;
 		ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE, channel_name);
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		devc->analog_groups[i].name = channel_name;
-		devc->analog_groups[i].channels = g_slist_append(NULL, ch);
+
+		devc->analog_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
+
+		devc->analog_groups[i]->name = channel_name;
+		devc->analog_groups[i]->channels = g_slist_append(NULL, ch);
 		sdi->channel_groups = g_slist_append(sdi->channel_groups,
-				&devc->analog_groups[i]);
+				devc->analog_groups[i]);
 	}
 
 	if (devc->model->has_digital) {
-		for (i = 0; i < 16; i++) {
+		devc->digital_group = g_malloc0(sizeof(struct sr_channel_group*));
+
+		for (i = 0; i < ARRAY_SIZE(devc->digital_channels); i++) {
 			if (!(channel_name = g_strdup_printf("D%d", i)))
 				return NULL;
 			ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name);
@@ -356,12 +365,12 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 			if (!ch)
 				return NULL;
 			sdi->channels = g_slist_append(sdi->channels, ch);
-			devc->digital_group.channels = g_slist_append(
-					devc->digital_group.channels, ch);
+			devc->digital_group->channels = g_slist_append(
+					devc->digital_group->channels, ch);
 		}
-		devc->digital_group.name = "LA";
+		devc->digital_group->name = g_strdup("LA");
 		sdi->channel_groups = g_slist_append(sdi->channel_groups,
-				&devc->digital_group);
+				devc->digital_group);
 	}
 
 	for (i = 0; i < NUM_TIMEBASE; i++) {
@@ -694,8 +703,8 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 			return SR_ERR_CHANNEL_GROUP;
 		}
 		g_variant_get(data, "(tt)", &p, &q);
-		for (i = 0; i < 2; i++) {
-			if (cg == &devc->analog_groups[i]) {
+		for (i = 0; i < devc->model->analog_channels; i++) {
+			if (cg == devc->analog_groups[i]) {
 				for (j = 0; j < ARRAY_SIZE(vdivs); j++) {
 					if (vdivs[j][0] != p || vdivs[j][1] != q)
 						continue;
@@ -715,8 +724,8 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 			return SR_ERR_CHANNEL_GROUP;
 		}
 		tmp_str = g_variant_get_string(data, NULL);
-		for (i = 0; i < 2; i++) {
-			if (cg == &devc->analog_groups[i]) {
+		for (i = 0; i < devc->model->analog_channels; i++) {
+			if (cg == devc->analog_groups[i]) {
 				for (j = 0; j < ARRAY_SIZE(coupling); j++) {
 					if (!strcmp(tmp_str, coupling[j])) {
 						g_free(devc->coupling[i]);
@@ -777,8 +786,10 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 
 	/* If a channel group is specified, it must be a valid one. */
 	if (cg) {
-		if (cg != &devc->analog_groups[0]
-				&& cg != &devc->analog_groups[1]) {
+		for (i = 0; i < devc->model->analog_channels; i++)
+			if (cg == devc->analog_groups[i])
+				break;
+		if (i >= devc->model->analog_channels) {
 			sr_err("Invalid channel group specified.");
 			return SR_ERR;
 		}
@@ -790,13 +801,13 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 			sr_err("No channel group specified.");
 			return SR_ERR_CHANNEL_GROUP;
 		}
-		if (cg == &devc->digital_group) {
+		if (cg == devc->digital_group) {
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
 				NULL, 0, sizeof(int32_t));
 			return SR_OK;
 		} else {
-			for (i = 0; i < 2; i++) {
-				if (cg == &devc->analog_groups[i]) {
+			for (i = 0; i < devc->model->analog_channels; i++) {
+				if (cg == devc->analog_groups[i]) {
 					*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
 						analog_hwcaps, ARRAY_SIZE(analog_hwcaps), sizeof(int32_t));
 					return SR_OK;