From: Soeren Apel <redacted>
Date: Sun, 24 Aug 2014 14:54:38 +0000 (+0200)
Subject: hameg-hmo / rigol-ds: Restore compatibility with std_dev_clear()
X-Git-Tag: libsigrok-0.4.0~1128
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=562b7ae513ed755ee93f233d6a460259cea535de;p=libsigrok.git

hameg-hmo / rigol-ds: Restore compatibility with std_dev_clear()
---

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 7f3d5f54..8db1e76a 100644
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -123,23 +123,12 @@ static GSList *dev_list(void)
 
 static void clear_helper(void *priv)
 {
-	unsigned int i;
 	struct dev_context *devc;
-	struct scope_config *model;
 
 	devc = priv;
-	model = devc->model_config;
 
 	hmo_scope_state_free(devc->model_state);
 
-	for (i = 0; i < model->analog_channels; ++i)
-		g_slist_free(devc->analog_groups[i].channels);
-
-	for (i = 0; i < model->digital_pods; ++i) {
-		g_slist_free(devc->digital_groups[i].channels);
-		g_free(devc->digital_groups[i].name);
-	}
-
 	g_free(devc->analog_groups);
 	g_free(devc->digital_groups);
 
@@ -195,11 +184,11 @@ static int check_channel_group(struct dev_context *devc,
 		return CG_NONE;
 
 	for (i = 0; i < model->analog_channels; ++i)
-		if (cg == &devc->analog_groups[i])
+		if (cg == devc->analog_groups[i])
 			return CG_ANALOG;
 
 	for (i = 0; i < model->digital_pods; ++i)
-		if (cg == &devc->digital_groups[i])
+		if (cg == devc->digital_groups[i])
 			return CG_DIGITAL;
 
 	sr_err("Invalid channel group specified.");
@@ -242,7 +231,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 			return SR_ERR_CHANNEL_GROUP;
 		} else if (cg_type == CG_ANALOG) {
 			for (i = 0; i < model->analog_channels; ++i) {
-				if (cg != &devc->analog_groups[i])
+				if (cg != devc->analog_groups[i])
 					continue;
 				*data = g_variant_new_int32(model->num_ydivs);
 				ret = SR_OK;
@@ -259,7 +248,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 			return SR_ERR_CHANNEL_GROUP;
 		} else if (cg_type == CG_ANALOG) {
 			for (i = 0; i < model->analog_channels; ++i) {
-				if (cg != &devc->analog_groups[i])
+				if (cg != devc->analog_groups[i])
 					continue;
 				*data = g_variant_new("(tt)",
 						      (*model->vdivs)[state->analog_channels[i].vdiv][0],
@@ -290,7 +279,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 			return SR_ERR_CHANNEL_GROUP;
 		} else if (cg_type == CG_ANALOG) {
 			for (i = 0; i < model->analog_channels; ++i) {
-				if (cg != &devc->analog_groups[i])
+				if (cg != devc->analog_groups[i])
 					continue;
 				*data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]);
 				ret = SR_OK;
@@ -389,7 +378,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 			    q != (*model->vdivs)[i][1])
 				continue;
 			for (j = 1; j <= model->analog_channels; ++j) {
-				if (cg != &devc->analog_groups[j - 1])
+				if (cg != devc->analog_groups[j - 1])
 					continue;
 				state->analog_channels[j - 1].vdiv = i;
 				g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q);
@@ -471,7 +460,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 			if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
 				continue;
 			for (j = 1; j <= model->analog_channels; ++j) {
-				if (cg != &devc->analog_groups[j - 1])
+				if (cg != devc->analog_groups[j - 1])
 					continue;
 				state->analog_channels[j-1].coupling = i;
 
diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index de23835e..1a788407 100644
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -608,13 +608,11 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 		return SR_ERR_NA;
 	}
 
-	if (!(devc->analog_groups = g_try_malloc0(sizeof(struct sr_channel_group) *
-						  scope_models[model_index].analog_channels)))
-			return SR_ERR_MALLOC;
+	devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) *
+					scope_models[model_index].analog_channels);
 
-	if (!(devc->digital_groups = g_try_malloc0(sizeof(struct sr_channel_group) *
-						   scope_models[model_index].digital_pods)))
-			return SR_ERR_MALLOC;
+	devc->digital_groups = g_malloc0(sizeof(struct sr_channel_group*) *
+					 scope_models[model_index].digital_pods);
 
 	/* Add analog channels. */
 	for (i = 0; i < scope_models[model_index].analog_channels; i++) {
@@ -623,20 +621,25 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 			return SR_ERR_MALLOC;
 		sdi->channels = g_slist_append(sdi->channels, ch);
 
-		devc->analog_groups[i].name =
-			(char *)(*scope_models[model_index].analog_names)[i];
-		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 = g_strdup(
+			(char *)(*scope_models[model_index].analog_names)[i]);
+		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]);
 	}
 
 	/* Add digital channel groups. */
 	for (i = 0; i < scope_models[model_index].digital_pods; ++i) {
 		g_snprintf(tmp, 25, "POD%d", i);
-		devc->digital_groups[i].name = g_strdup(tmp);
+
+		devc->digital_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
+
+		devc->digital_groups[i]->name = g_strdup(tmp);
 		sdi->channel_groups = g_slist_append(sdi->channel_groups,
-				   &devc->digital_groups[i < 8 ? 0 : 1]);
+				   devc->digital_groups[i < 8 ? 0 : 1]);
 	}
 
 	/* Add digital channels. */
@@ -646,8 +649,8 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 			return SR_ERR_MALLOC;
 		sdi->channels = g_slist_append(sdi->channels, ch);
 
-		devc->digital_groups[i < 8 ? 0 : 1].channels = g_slist_append(
-			devc->digital_groups[i < 8 ? 0 : 1].channels, ch);
+		devc->digital_groups[i < 8 ? 0 : 1]->channels = g_slist_append(
+			devc->digital_groups[i < 8 ? 0 : 1]->channels, ch);
 	}
 
 	devc->model_config = &scope_models[model_index];
diff --git a/src/hardware/hameg-hmo/protocol.h b/src/hardware/hameg-hmo/protocol.h
index bdf70fc5..932e3ec3 100644
--- a/src/hardware/hameg-hmo/protocol.h
+++ b/src/hardware/hameg-hmo/protocol.h
@@ -93,8 +93,8 @@ struct dev_context {
 	void *model_config;
 	void *model_state;
 
-	struct sr_channel_group *analog_groups;
-	struct sr_channel_group *digital_groups;
+	struct sr_channel_group **analog_groups;
+	struct sr_channel_group **digital_groups;
 
 	GSList *enabled_channels;
 	GSList *current_channel;
diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 85d25e36..dab949e3 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -245,9 +245,9 @@ static void clear_helper(void *priv)
 	g_free(devc->coupling[1]);
 	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,18 +336,26 @@ 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) {
+		devc->digital_group = g_malloc0(sizeof(struct sr_channel_group*));
+
 		for (i = 0; i < 16; i++) {
 			if (!(channel_name = g_strdup_printf("D%d", i)))
 				return NULL;
@@ -356,12 +364,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++) {
@@ -695,7 +703,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 		}
 		g_variant_get(data, "(tt)", &p, &q);
 		for (i = 0; i < 2; i++) {
-			if (cg == &devc->analog_groups[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;
@@ -716,7 +724,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 		}
 		tmp_str = g_variant_get_string(data, NULL);
 		for (i = 0; i < 2; i++) {
-			if (cg == &devc->analog_groups[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 +785,8 @@ 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]) {
+		if (cg != devc->analog_groups[0]
+				&& cg != devc->analog_groups[1]) {
 			sr_err("Invalid channel group specified.");
 			return SR_ERR;
 		}
@@ -790,13 +798,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]) {
+				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;
diff --git a/src/hardware/rigol-ds/protocol.h b/src/hardware/rigol-ds/protocol.h
index 0117628c..7bdf683d 100644
--- a/src/hardware/rigol-ds/protocol.h
+++ b/src/hardware/rigol-ds/protocol.h
@@ -98,8 +98,8 @@ struct dev_context {
 	uint64_t num_vdivs;
 
 	/* Channel groups */
-	struct sr_channel_group analog_groups[MAX_ANALOG_CHANNELS];
-	struct sr_channel_group digital_group;
+	struct sr_channel_group **analog_groups;
+	struct sr_channel_group *digital_group;
 
 	/* Acquisition settings */
 	GSList *enabled_analog_channels;