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

diff --git a/src/hardware/lecroy-xstream/api.c b/src/hardware/lecroy-xstream/api.c
index f3b4c903..281a3871 100644
--- a/src/hardware/lecroy-xstream/api.c
+++ b/src/hardware/lecroy-xstream/api.c
@@ -32,6 +32,26 @@ static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 };
 
+static const uint32_t drvopts[] = {
+	SR_CONF_OSCILLOSCOPE,
+};
+
+static const uint32_t devopts[] = {
+	SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_SAMPLERATE | SR_CONF_GET,
+	SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_NUM_HDIV | SR_CONF_GET,
+	SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+};
+
+static const uint32_t analog_devopts[] = {
+	SR_CONF_NUM_VDIV | SR_CONF_GET,
+	SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+};
+
 static int check_manufacturer(const char *manufacturer)
 {
 	unsigned int i;
@@ -84,8 +104,7 @@ static struct sr_dev_inst *probe_serial_device(struct sr_scpi_dev_inst *scpi)
 
 fail:
 	sr_scpi_hw_info_free(hw_info);
-	if (sdi)
-		sr_dev_inst_free(sdi);
+	sr_dev_inst_free(sdi);
 	g_free(devc);
 
 	return NULL;
@@ -96,54 +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)
+	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;
@@ -154,27 +155,24 @@ 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;
+
 	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;
+				model->timebases[state->timebase].p,
+				model->timebases[state->timebase].q);
 		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:
@@ -182,45 +180,37 @@ static int config_get(uint32_t key, GVariant **data,
 			if (cg != devc->analog_groups[i])
 				continue;
 			*data = g_variant_new("(tt)",
-				      model->vdivs[state->analog_channels[i].vdiv].p,
-				      model->vdivs[state->analog_channels[i].vdiv].q);
-			ret = SR_OK;
+				model->vdivs[state->analog_channels[i].vdiv].p,
+				model->vdivs[state->analog_channels[i].vdiv].q);
 		}
 		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]) {
+			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)
@@ -242,8 +232,8 @@ static GVariant *build_tuples(const struct sr_rational *array, unsigned int n)
 	return g_variant_builder_end(&gvb);
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-		      const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	int ret;
 	unsigned int i, j;
@@ -358,7 +348,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		}
 		break;
 	case SR_CONF_COUPLING:
-
 		tmp = g_variant_get_string(data, NULL);
 
 		for (i = 0; (*model->coupling_options)[i]; i++) {
@@ -367,7 +356,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 			for (j = 1; j <= model->analog_channels; j++) {
 				if (cg != devc->analog_groups[j - 1])
 					continue;
-				state->analog_channels[j-1].coupling = i;
+				state->analog_channels[j - 1].coupling = i;
 
 				g_snprintf(command, sizeof(command),
 						"C%d:COUPLING %s", j, tmp);
@@ -396,35 +385,24 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	return ret;
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		       const struct sr_channel_group *cg)
+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;
+	struct dev_context *devc;
+	const struct scope_config *model;
 
-	if (sdi) {
-		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:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-		break;
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, NULL, NULL);
 	case SR_CONF_DEVICE_OPTIONS:
-		if (!cg) {
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-							  model->devopts,
-							  model->num_devopts,
-							  sizeof(uint32_t));
-			break;
-		}
+		if (!cg)
+			return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-						  model->analog_devopts,
-						  model->num_analog_devopts,
-						  sizeof(uint32_t));
+			analog_devopts, ARRAY_SIZE(analog_devopts),
+			sizeof(uint32_t));
 		break;
 	case SR_CONF_COUPLING:
 		*data = g_variant_new_strv(*model->coupling_options,
@@ -472,11 +450,11 @@ SR_PRIV int lecroy_xstream_request_data(const struct sr_dev_inst *sdi)
 		return SR_ERR;
 
 	g_snprintf(command, sizeof(command),
-			"COMM_FORMAT DEF9,WORD,BIN;C%d:WAVEFORM?", ch->index+1);
+		"COMM_FORMAT DEF9,WORD,BIN;C%d:WAVEFORM?", ch->index + 1);
 	return sr_scpi_send(sdi->conn, command);
 }
 
-static int lecroy_setup_channels(const struct sr_dev_inst *sdi)
+static int setup_channels(const struct sr_dev_inst *sdi)
 {
 	GSList *l;
 	gboolean setup_changed;
@@ -498,7 +476,7 @@ static int lecroy_setup_channels(const struct sr_dev_inst *sdi)
 			if (ch->enabled == state->analog_channels[ch->index].state)
 				break;
 			g_snprintf(command, sizeof(command), "C%d:TRACE %s",
-				   ch->index+1, ch->enabled ? "ON" : "OFF");
+				   ch->index + 1, ch->enabled ? "ON" : "OFF");
 
 			if (sr_scpi_send(scpi, command) != SR_OK)
 				return SR_ERR;
@@ -524,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. */
@@ -554,7 +529,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	 * Configure the analog channels and the
 	 * corresponding digital pods.
 	 */
-	if (lecroy_setup_channels(sdi) != SR_OK) {
+	if (setup_channels(sdi) != SR_OK) {
 		sr_err("Failed to setup channel configuration!");
 		ret = SR_ERR;
 		goto free_enabled;
@@ -576,6 +551,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 free_enabled:
 	g_slist_free(devc->enabled_channels);
 	devc->enabled_channels = NULL;
+
 	return ret;
 }
 
@@ -586,9 +562,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 	std_session_send_df_end(sdi);
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 
 	devc->num_frames = 0;