X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flecroy-xstream%2Fapi.c;h=281a3871bf0050d74414fdc381770bf63d7bb15d;hb=e66d1892d0dd16ed166fc8f13493f95de0607362;hp=2d4acf97485f6a16533691b90a76945c2355e2ab;hpb=d2f7c417fdd96a13d8fd86350d2fc13db16f626c;p=libsigrok.git

diff --git a/src/hardware/lecroy-xstream/api.c b/src/hardware/lecroy-xstream/api.c
index 2d4acf97..281a3871 100644
--- a/src/hardware/lecroy-xstream/api.c
+++ b/src/hardware/lecroy-xstream/api.c
@@ -115,53 +115,36 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	return sr_scpi_scan(di->context, options, probe_serial_device);
 }
 
-static void clear_helper(void *priv)
+static void clear_helper(struct dev_context *devc)
 {
-	struct dev_context *devc;
-
-	devc = priv;
-
 	lecroy_xstream_state_free(devc->model_state);
-
 	g_free(devc->analog_groups);
-
-	g_free(devc);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-	return std_dev_clear(di, clear_helper);
+	return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
-	if (sdi->status != SR_ST_ACTIVE && sr_scpi_open(sdi->conn) != SR_OK)
+	if (sr_scpi_open(sdi->conn) != SR_OK)
 		return SR_ERR;
 
 	if (lecroy_xstream_state_get(sdi) != SR_OK)
 		return SR_ERR;
 
-	sdi->status = SR_ST_ACTIVE;
-
 	return SR_OK;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-	if (sdi->status == SR_ST_INACTIVE)
-		return SR_OK;
-
-	sr_scpi_close(sdi->conn);
-
-	sdi->status = SR_ST_INACTIVE;
-
-	return SR_OK;
+	return sr_scpi_close(sdi->conn);
 }
 
 static int config_get(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	int ret;
 	unsigned int i;
 	struct dev_context *devc;
 	const struct scope_config *model;
@@ -172,7 +155,6 @@ static int config_get(uint32_t key, GVariant **data,
 
 	devc = sdi->priv;
 
-	ret = SR_ERR_NA;
 	model = devc->model_config;
 	state = devc->model_state;
 	*data = NULL;
@@ -180,20 +162,17 @@ static int config_get(uint32_t key, GVariant **data,
 	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].p,
 				model->timebases[state->timebase].q);
-		ret = SR_OK;
 		break;
 	case SR_CONF_NUM_VDIV:
 		for (i = 0; i < model->analog_channels; i++) {
 			if (cg != devc->analog_groups[i])
 				continue;
 			*data = g_variant_new_int32(model->num_ydivs);
-			ret = SR_OK;
 		}
 		break;
 	case SR_CONF_VDIV:
@@ -203,42 +182,35 @@ static int config_get(uint32_t key, GVariant **data,
 			*data = g_variant_new("(tt)",
 				model->vdivs[state->analog_channels[i].vdiv].p,
 				model->vdivs[state->analog_channels[i].vdiv].q);
-			ret = SR_OK;
 		}
 		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:
 		for (i = 0; i < model->analog_channels; i++) {
 			if (cg != devc->analog_groups[i])
 				continue;
 			*data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]);
-			ret = SR_OK;
 		}
 		break;
 	case SR_CONF_SAMPLERATE:
 		*data = g_variant_new_uint64(state->sample_rate);
-		ret = SR_OK;
 		break;
 	case SR_CONF_ENABLED:
 		*data = g_variant_new_boolean(FALSE);
-		ret = SR_OK;
 		break;
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static GVariant *build_tuples(const struct sr_rational *array, unsigned int n)
@@ -416,41 +388,18 @@ static int config_set(uint32_t key, GVariant *data,
 static int config_list(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	struct dev_context *devc = NULL;
-	const struct scope_config *model = NULL;
-
-	(void)cg;
-
-	/* SR_CONF_SCAN_OPTIONS is always valid, regardless of sdi or channel group. */
-	if (key == SR_CONF_SCAN_OPTIONS) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-		return SR_OK;
-	}
-
-	/* If sdi is NULL, nothing except SR_CONF_DEVICE_OPTIONS can be provided. */
-	if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-		return SR_OK;
-	}
-
-        /* Every other option requires a valid device instance. */
-        if (!sdi)
-                return SR_ERR_ARG;
+	struct dev_context *devc;
+	const struct scope_config *model;
 
-	devc = sdi->priv;
-	model = devc->model_config;
+	devc = (sdi) ? sdi->priv : NULL;
+	model = (devc) ? devc->model_config : NULL;
 
 	switch (key) {
+	case SR_CONF_SCAN_OPTIONS:
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, NULL, NULL);
 	case SR_CONF_DEVICE_OPTIONS:
-		if (!cg) {
-			/* If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not
-			 * specific to a channel group must be returned. */
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-                        return SR_OK;
-		}
+		if (!cg)
+			return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 			analog_devopts, ARRAY_SIZE(analog_devopts),
 			sizeof(uint32_t));
@@ -553,9 +502,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	int ret;
 	struct sr_scpi_dev_inst *scpi;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 	scpi = sdi->conn;
 	/* Preset empty results. */