X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flcr%2Fes51919.c;h=474602b41ee72bd888ade1c5e0e4750c578c4bc4;hb=7d1a4a52392a048c24ec25459f462a0126c9ad2c;hp=7947431e6d32275ea08b7b70866d35c5aee829f0;hpb=e66d1892d0dd16ed166fc8f13493f95de0607362;p=libsigrok.git

diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c
index 7947431e..474602b4 100644
--- a/src/lcr/es51919.c
+++ b/src/lcr/es51919.c
@@ -251,37 +251,6 @@ static int serial_stream_check(struct sr_serial_dev_inst *serial,
 				       is_valid, timeout_ms, baudrate);
 }
 
-static int send_config_update(struct sr_dev_inst *sdi, struct sr_config *cfg)
-{
-	struct sr_datafeed_packet packet;
-	struct sr_datafeed_meta meta;
-
-	memset(&meta, 0, sizeof(meta));
-
-	packet.type = SR_DF_META;
-	packet.payload = &meta;
-
-	meta.config = g_slist_append(meta.config, cfg);
-
-	return sr_session_send(sdi, &packet);
-}
-
-static int send_config_update_key(struct sr_dev_inst *sdi, uint32_t key,
-				  GVariant *var)
-{
-	struct sr_config *cfg;
-	int ret;
-
-	cfg = sr_config_new(key, var);
-	if (!cfg)
-		return SR_ERR;
-
-	ret = send_config_update(sdi, cfg);
-	sr_config_free(cfg);
-
-	return ret;
-}
-
 /*
  * Cyrustek ES51919 LCR chipset host protocol.
  *
@@ -387,15 +356,11 @@ static const char *const models[] = {
 	"NONE", "PARALLEL", "SERIES", "AUTO",
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
-	/** The number of frames. */
 	struct dev_limit_counter frame_count;
 
-	/** The time limit counter. */
 	struct dev_time_counter time_count;
 
-	/** Data buffer. */
 	struct dev_buffer *buf;
 
 	/** The frequency of the test signal (index to frequencies[]). */
@@ -568,21 +533,15 @@ static gboolean packet_valid(const uint8_t *pkt)
 	return FALSE;
 }
 
-static int do_config_update(struct sr_dev_inst *sdi, uint32_t key,
-			    GVariant *var)
-{
-	return send_config_update_key(sdi, key, var);
-}
-
 static int send_freq_update(struct sr_dev_inst *sdi, unsigned int freq)
 {
-	return do_config_update(sdi, SR_CONF_OUTPUT_FREQUENCY,
+	return sr_session_send_meta(sdi, SR_CONF_OUTPUT_FREQUENCY,
 				g_variant_new_double(frequencies[freq]));
 }
 
 static int send_model_update(struct sr_dev_inst *sdi, unsigned int model)
 {
-	return do_config_update(sdi, SR_CONF_EQUIV_CIRCUIT_MODEL,
+	return sr_session_send_meta(sdi, SR_CONF_EQUIV_CIRCUIT_MODEL,
 				g_variant_new_string(models[model]));
 }
 
@@ -597,6 +556,7 @@ static void handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)
 	unsigned int val;
 	float floatval;
 	gboolean frame;
+	struct sr_channel *channel;
 
 	devc = sdi->priv;
 
@@ -624,10 +584,11 @@ static void handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)
 	analog.num_samples = 1;
 	analog.data = &floatval;
 
-	analog.meaning->channels = g_slist_append(NULL, sdi->channels->data);
+	channel = sdi->channels->data;
+	analog.meaning->channels = g_slist_append(NULL, channel);
 
 	parse_measurement(pkt, &floatval, &analog, 0);
-	if (analog.meaning->mq != 0) {
+	if (analog.meaning->mq != 0 && channel->enabled) {
 		if (!frame) {
 			packet.type = SR_DF_FRAME_BEGIN;
 			sr_session_send(sdi, &packet);
@@ -641,10 +602,12 @@ static void handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)
 	}
 
 	g_slist_free(analog.meaning->channels);
-	analog.meaning->channels = g_slist_append(NULL, sdi->channels->next->data);
+
+	channel = sdi->channels->next->data;
+	analog.meaning->channels = g_slist_append(NULL, channel);
 
 	parse_measurement(pkt, &floatval, &analog, 1);
-	if (analog.meaning->mq != 0) {
+	if (analog.meaning->mq != 0 && channel->enabled) {
 		if (!frame) {
 			packet.type = SR_DF_FRAME_BEGIN;
 			sr_session_send(sdi, &packet);
@@ -730,7 +693,6 @@ SR_PRIV void es51919_serial_clean(void *priv)
 		return;
 
 	dev_buffer_destroy(devc->buf);
-	g_free(devc);
 }
 
 SR_PRIV struct sr_dev_inst *es51919_serial_scan(GSList *options,
@@ -839,8 +801,11 @@ static const uint32_t scanopts[] = {
 	SR_CONF_SERIALCOMM,
 };
 
-static const uint32_t devopts[] = {
+static const uint32_t drvopts[] = {
 	SR_CONF_LCRMETER,
+};
+
+static const uint32_t devopts[] = {
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_SET,
@@ -855,13 +820,13 @@ SR_PRIV int es51919_serial_config_list(uint32_t key, GVariant **data,
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
 	case SR_CONF_DEVICE_OPTIONS:
-		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, NULL, devopts);
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 	case SR_CONF_OUTPUT_FREQUENCY:
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_DOUBLE,
-			frequencies, ARRAY_SIZE(frequencies), sizeof(double));
+			ARRAY_AND_SIZE(frequencies), sizeof(double));
 		break;
 	case SR_CONF_EQUIV_CIRCUIT_MODEL:
-		*data = g_variant_new_strv(models, ARRAY_SIZE(models));
+		*data = g_variant_new_strv(ARRAY_AND_SIZE(models));
 		break;
 	default:
 		return SR_ERR_NA;
@@ -883,7 +848,6 @@ SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi)
 
 	std_session_send_df_header(sdi);
 
-	/* Poll every 50ms, or whenever some data comes in. */
 	serial = sdi->conn;
 	serial_source_add(sdi->session, serial, G_IO_IN, 50,
 			  receive_data, (void *)sdi);