X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=ea2afef621867ed774703497f7588e961ee6b48e;hb=a299a95413594201b4bb58d7d345e1933ebca5ae;hp=0abc722cda4fe9e053af0480d0d4309a814671a5;hpb=612336970dcf03c07a826e90cc562bb506edd029;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 0abc722c..ea2afef6 100644
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -176,28 +176,24 @@ static int config_get(uint32_t key, GVariant **data,
 				      (*model->timebases)[state->timebase][1]);
 		break;
 	case SR_CONF_NUM_VDIV:
-		if (!cg) {
+		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
-		} else if (cg_type == CG_ANALOG) {
-			if (std_cg_idx(cg, devc->analog_groups, model->analog_channels) < 0)
-				return SR_ERR_ARG;
-			*data = g_variant_new_int32(model->num_ydivs);
-		} else {
+		if (cg_type != CG_ANALOG)
 			return SR_ERR_NA;
-		}
+		if (std_cg_idx(cg, devc->analog_groups, model->analog_channels) < 0)
+			return SR_ERR_ARG;
+		*data = g_variant_new_int32(model->num_ydivs);
 		break;
 	case SR_CONF_VDIV:
-		if (!cg) {
+		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
-		} else if (cg_type == CG_ANALOG) {
-			if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
-				return SR_ERR_ARG;
-			*data = g_variant_new("(tt)",
-					      (*model->vdivs)[state->analog_channels[idx].vdiv][0],
-					      (*model->vdivs)[state->analog_channels[idx].vdiv][1]);
-		} else {
+		if (cg_type != CG_ANALOG)
 			return SR_ERR_NA;
-		}
+		if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+			return SR_ERR_ARG;
+		*data = g_variant_new("(tt)",
+				      (*model->vdivs)[state->analog_channels[idx].vdiv][0],
+				      (*model->vdivs)[state->analog_channels[idx].vdiv][1]);
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
 		*data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]);
@@ -209,15 +205,13 @@ static int config_get(uint32_t key, GVariant **data,
 		*data = g_variant_new_double(state->horiz_triggerpos);
 		break;
 	case SR_CONF_COUPLING:
-		if (!cg) {
+		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
-		} else if (cg_type == CG_ANALOG) {
-			if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
-				return SR_ERR_ARG;
-			*data = g_variant_new_string((*model->coupling_options)[state->analog_channels[idx].coupling]);
-		} else {
+		if (cg_type != CG_ANALOG)
 			return SR_ERR_NA;
-		}
+		if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+			return SR_ERR_ARG;
+		*data = g_variant_new_string((*model->coupling_options)[state->analog_channels[idx].coupling]);
 		break;
 	case SR_CONF_SAMPLERATE:
 		*data = g_variant_new_uint64(state->sample_rate);
@@ -252,8 +246,6 @@ static int config_set(uint32_t key, GVariant *data,
 	state = devc->model_state;
 	update_sample_rate = FALSE;
 
-	ret = SR_ERR_NA;
-
 	switch (key) {
 	case SR_CONF_LIMIT_FRAMES:
 		devc->frame_limit = g_variant_get_uint64(data);
@@ -386,6 +378,8 @@ static int config_list(uint32_t key, GVariant **data,
 	case SR_CONF_COUPLING:
 		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
+		if (!model)
+			return SR_ERR_ARG;
 		*data = g_variant_new_strv(*model->coupling_options, model->num_coupling_options);
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
@@ -406,6 +400,8 @@ static int config_list(uint32_t key, GVariant **data,
 	case SR_CONF_VDIV:
 		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
+		if (!model)
+			return SR_ERR_ARG;
 		*data = std_gvar_tuple_array(*model->vdivs, model->num_vdivs);
 		break;
 	default:
@@ -558,6 +554,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
 			setup_changed = TRUE;
 			break;
 		default:
+			g_free(pod_enabled);
 			return SR_ERR;
 		}
 	}