X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=f11d233dece73a2fee376dbaa9c98b7794245b9a;hb=584560f142e1b17b9f4ef9069bd3724f2f77e750;hp=dab949e37436d96a86636928797971271b742b89;hpb=562b7ae513ed755ee93f233d6a460259cea535de;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index dab949e3..f11d233d 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -29,12 +29,12 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-static const int32_t hwopts[] = {
+static const uint32_t hwopts[] = {
 	SR_CONF_CONN,
 	SR_CONF_SERIALCOMM
 };
 
-static const int32_t hwcaps[] = {
+static const uint32_t hwcaps[] = {
 	SR_CONF_OSCILLOSCOPE,
 	SR_CONF_TIMEBASE,
 	SR_CONF_TRIGGER_SOURCE,
@@ -45,7 +45,7 @@ static const int32_t hwcaps[] = {
 	SR_CONF_SAMPLERATE,
 };
 
-static const int32_t analog_hwcaps[] = {
+static const uint32_t analog_hwcaps[] = {
 	SR_CONF_NUM_VDIV,
 	SR_CONF_VDIV,
 	SR_CONF_COUPLING,
@@ -237,12 +237,13 @@ 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_free(devc->analog_groups);
@@ -356,7 +357,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	if (devc->model->has_digital) {
 		devc->digital_group = g_malloc0(sizeof(struct sr_channel_group*));
 
-		for (i = 0; i < 16; i++) {
+		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);
@@ -488,7 +489,7 @@ static int digital_frame_size(const struct sr_dev_inst *sdi)
 	}
 }
 
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
@@ -520,7 +521,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 		}
 	}
 
-	switch (id) {
+	switch (key) {
 	case SR_CONF_NUM_TIMEBASE:
 		*data = g_variant_new_int32(devc->model->series->num_horizontal_divs);
 		break;
@@ -608,7 +609,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
@@ -632,7 +633,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 	}
 
 	ret = SR_OK;
-	switch (id) {
+	switch (key) {
 	case SR_CONF_LIMIT_FRAMES:
 		devc->limit_frames = g_variant_get_uint64(data);
 		break;
@@ -702,7 +703,7 @@ 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++) {
+		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)
@@ -723,7 +724,7 @@ 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++) {
+		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])) {
@@ -758,7 +759,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 	return ret;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
 	GVariant *tuple, *rational[2];
@@ -770,12 +771,12 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		devc = sdi->priv;
 
 	if (key == SR_CONF_SCAN_OPTIONS) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-				hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t));
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+				hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
 		return SR_OK;
 	} else if (key == SR_CONF_DEVICE_OPTIONS && cg == NULL) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-			hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+			hwcaps, ARRAY_SIZE(hwcaps), sizeof(uint32_t));
 		return SR_OK;
 	}
 
@@ -785,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;
 		}
@@ -799,14 +802,14 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 			return SR_ERR_CHANNEL_GROUP;
 		}
 		if (cg == devc->digital_group) {
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-				NULL, 0, sizeof(int32_t));
+			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+				NULL, 0, sizeof(uint32_t));
 			return SR_OK;
 		} else {
-			for (i = 0; i < 2; 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));
+					*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+						analog_hwcaps, ARRAY_SIZE(analog_hwcaps), sizeof(uint32_t));
 					return SR_OK;
 				}
 			}