X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=db6c67df4dfd7755bd3bb40d22c99e7edac68924;hb=692716f5d1aae4ef06c67b57aaf253f46f538c33;hp=f7ec7149b93cc14cbadc2de303ad797bffe0195c;hpb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index f7ec7149..db6c67df 100644
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -47,7 +47,7 @@ enum {
 	CG_DIGITAL,
 };
 
-static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi)
+static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
@@ -96,7 +96,7 @@ fail:
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-	return sr_scpi_scan(di->context, options, hmo_probe_serial_device);
+	return sr_scpi_scan(di->context, options, probe_device);
 }
 
 static void clear_helper(struct dev_context *devc)
@@ -154,7 +154,7 @@ static int check_channel_group(struct dev_context *devc,
 static int config_get(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	int ret, cg_type;
+	int cg_type;
 	unsigned int i;
 	struct dev_context *devc;
 	const struct scope_config *model;
@@ -168,19 +168,16 @@ static int config_get(uint32_t key, GVariant **data,
 	if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
 		return SR_ERR;
 
-	ret = SR_ERR_NA;
 	model = devc->model_config;
 	state = devc->model_state;
 
 	switch (key) {
 	case SR_CONF_NUM_HDIV:
 		*data = g_variant_new_int32(model->num_xdivs);
-		ret = SR_OK;
 		break;
 	case SR_CONF_TIMEBASE:
 		*data = g_variant_new("(tt)", (*model->timebases)[state->timebase][0],
 				      (*model->timebases)[state->timebase][1]);
-		ret = SR_OK;
 		break;
 	case SR_CONF_NUM_VDIV:
 		if (cg_type == CG_NONE) {
@@ -190,12 +187,10 @@ static int config_get(uint32_t key, GVariant **data,
 				if (cg != devc->analog_groups[i])
 					continue;
 				*data = g_variant_new_int32(model->num_ydivs);
-				ret = SR_OK;
 				break;
 			}
-
 		} else {
-			ret = SR_ERR_NA;
+			return SR_ERR_NA;
 		}
 		break;
 	case SR_CONF_VDIV:
@@ -208,25 +203,20 @@ static int config_get(uint32_t key, GVariant **data,
 				*data = g_variant_new("(tt)",
 						      (*model->vdivs)[state->analog_channels[i].vdiv][0],
 						      (*model->vdivs)[state->analog_channels[i].vdiv][1]);
-				ret = SR_OK;
 				break;
 			}
-
 		} else {
-			ret = SR_ERR_NA;
+			return SR_ERR_NA;
 		}
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
 		*data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]);
-		ret = SR_OK;
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
 		*data = g_variant_new_string((*model->trigger_slopes)[state->trigger_slope]);
-		ret = SR_OK;
 		break;
 	case SR_CONF_HORIZ_TRIGGERPOS:
 		*data = g_variant_new_double(state->horiz_triggerpos);
-		ret = SR_OK;
 		break;
 	case SR_CONF_COUPLING:
 		if (cg_type == CG_NONE) {
@@ -236,23 +226,20 @@ static int config_get(uint32_t key, GVariant **data,
 				if (cg != devc->analog_groups[i])
 					continue;
 				*data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]);
-				ret = SR_OK;
 				break;
 			}
-
 		} else {
-			ret = SR_ERR_NA;
+			return SR_ERR_NA;
 		}
 		break;
 	case SR_CONF_SAMPLERATE:
 		*data = g_variant_new_uint64(state->sample_rate);
-		ret = SR_OK;
 		break;
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_set(uint32_t key, GVariant *data,
@@ -289,7 +276,7 @@ static int config_set(uint32_t key, GVariant *data,
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
 		tmp = g_variant_get_string(data, NULL);
-		for (i = 0; (*model->trigger_sources)[i]; i++) {
+		for (i = 0; i < model->num_trigger_sources; i++) {
 			if (g_strcmp0(tmp, (*model->trigger_sources)[i]) != 0)
 				continue;
 			state->trigger_source = i;
@@ -355,7 +342,7 @@ static int config_set(uint32_t key, GVariant *data,
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
 		tmp = g_variant_get_string(data, NULL);
-		for (i = 0; (*model->trigger_slopes)[i]; i++) {
+		for (i = 0; i < model->num_trigger_slopes; i++) {
 			if (g_strcmp0(tmp, (*model->trigger_slopes)[i]) != 0)
 				continue;
 			state->trigger_slope = i;
@@ -373,7 +360,7 @@ static int config_set(uint32_t key, GVariant *data,
 
 		tmp = g_variant_get_string(data, NULL);
 
-		for (i = 0; (*model->coupling_options)[i]; i++) {
+		for (i = 0; i < model->num_coupling_options; i++) {
 			if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
 				continue;
 			for (j = 1; j <= model->analog_channels; j++) {
@@ -443,20 +430,17 @@ static int config_list(uint32_t key, GVariant **data,
 	case SR_CONF_COUPLING:
 		if (cg_type == CG_NONE)
 			return SR_ERR_CHANNEL_GROUP;
-		*data = g_variant_new_strv(*model->coupling_options,
-			   g_strv_length((char **)*model->coupling_options));
+		*data = g_variant_new_strv(*model->coupling_options, model->num_coupling_options);
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
 		if (!model)
 			return SR_ERR_ARG;
-		*data = g_variant_new_strv(*model->trigger_sources,
-			   g_strv_length((char **)*model->trigger_sources));
+		*data = g_variant_new_strv(*model->trigger_sources, model->num_trigger_sources);
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
 		if (!model)
 			return SR_ERR_ARG;
-		*data = g_variant_new_strv(*model->trigger_slopes,
-			   g_strv_length((char **)*model->trigger_slopes));
+		*data = g_variant_new_strv(*model->trigger_slopes, model->num_trigger_slopes);
 		break;
 	case SR_CONF_TIMEBASE:
 		if (!model)