X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flcr%2Fes51919.c;h=fad0a3e98f08eb4d2f99fb61b4e5c77ee62d67cb;hb=d03815a0662a905392e428612507ad4de9f2f8b1;hp=ad36461171902320ab0ff19fb2fefea477ef4305;hpb=1b38775baa3016fb4d613c971dce5a4f26cacb7b;p=libsigrok.git

diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c
index ad364611..fad0a3e9 100644
--- a/src/lcr/es51919.c
+++ b/src/lcr/es51919.c
@@ -27,6 +27,8 @@
 
 #define LOG_PREFIX "es51919"
 
+#ifdef HAVE_SERIAL_COMM
+
 struct dev_buffer {
 	/** Total size of the buffer. */
 	size_t size;
@@ -207,7 +209,7 @@ static int serial_stream_check_buf(struct sr_serial_dev_inst *serial,
 				   uint8_t *buf, size_t buflen,
 				   size_t packet_size,
 				   packet_valid_callback is_valid,
-				   uint64_t timeout_ms, int baudrate)
+				   uint64_t timeout_ms)
 {
 	size_t len, dropped;
 	int ret;
@@ -219,7 +221,7 @@ static int serial_stream_check_buf(struct sr_serial_dev_inst *serial,
 
 	len = buflen;
 	ret = serial_stream_detect(serial, buf, &len, packet_size,
-				   is_valid, timeout_ms, baudrate);
+				   is_valid, timeout_ms);
 
 	serial_close(serial);
 
@@ -243,69 +245,12 @@ static int serial_stream_check_buf(struct sr_serial_dev_inst *serial,
 static int serial_stream_check(struct sr_serial_dev_inst *serial,
 			       size_t packet_size,
 			       packet_valid_callback is_valid,
-			       uint64_t timeout_ms, int baudrate)
+			       uint64_t timeout_ms)
 {
 	uint8_t buf[128];
 
 	return serial_stream_check_buf(serial, buf, sizeof(buf), packet_size,
-				       is_valid, timeout_ms, baudrate);
-}
-
-struct std_opt_desc {
-	const uint32_t *scanopts;
-	const int num_scanopts;
-	const uint32_t *devopts;
-	const int num_devopts;
-};
-
-static int std_config_list(uint32_t key, GVariant **data,
-			   const struct std_opt_desc *d)
-{
-	switch (key) {
-	case SR_CONF_SCAN_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-			d->scanopts, d->num_scanopts, sizeof(uint32_t));
-		break;
-	case SR_CONF_DEVICE_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-			d->devopts, d->num_devopts, sizeof(uint32_t));
-		break;
-	default:
-		return SR_ERR_NA;
-	}
-
-	return SR_OK;
-}
-
-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;
+				       is_valid, timeout_ms);
 }
 
 /*
@@ -413,15 +358,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[]). */
@@ -467,51 +408,53 @@ static int parse_mq(const uint8_t *pkt, int is_secondary, int is_parallel)
 
 	sr_err("Unknown quantity 0x%03x.", is_secondary << 8 | buf[0]);
 
-	return -1;
+	return 0;
 }
 
-static float parse_value(const uint8_t *buf)
+static float parse_value(const uint8_t *buf, int *digits)
 {
-	static const float decimals[] = {
-		1, 1e-1, 1e-2, 1e-3, 1e-4, 1e-5, 1e-6, 1e-7
-	};
+	static const int exponents[] = {0, -1, -2, -3, -4, -5, -6, -7};
+	int exponent;
 	int16_t val;
 
+	exponent = exponents[buf[3] & 7];
+	*digits = -exponent;
 	val = (buf[1] << 8) | buf[2];
-	return (float)val * decimals[buf[3] & 7];
+	return (float)val * powf(10, exponent);
 }
 
 static void parse_measurement(const uint8_t *pkt, float *floatval,
-			      struct sr_datafeed_analog_old *analog,
+			      struct sr_datafeed_analog *analog,
 			      int is_secondary)
 {
 	static const struct {
 		int unit;
-		float mult;
+		int exponent;
 	} units[] = {
-		{ SR_UNIT_UNITLESS, 1 },	/* no unit */
-		{ SR_UNIT_OHM, 1 },		/* Ohm     */
-		{ SR_UNIT_OHM, 1e3 },		/* kOhm    */
-		{ SR_UNIT_OHM, 1e6 },		/* MOhm    */
-		{ -1, 0 },			/* ???     */
-		{ SR_UNIT_HENRY, 1e-6 },	/* uH      */
-		{ SR_UNIT_HENRY, 1e-3 },	/* mH      */
-		{ SR_UNIT_HENRY, 1 },		/* H       */
-		{ SR_UNIT_HENRY, 1e3 },		/* kH      */
-		{ SR_UNIT_FARAD, 1e-12 },	/* pF      */
-		{ SR_UNIT_FARAD, 1e-9 },	/* nF      */
-		{ SR_UNIT_FARAD, 1e-6 },	/* uF      */
-		{ SR_UNIT_FARAD, 1e-3 },	/* mF      */
-		{ SR_UNIT_PERCENTAGE, 1 },	/* %       */
-		{ SR_UNIT_DEGREE, 1 }		/* degree  */
+		{ SR_UNIT_UNITLESS,   0 }, /* no unit */
+		{ SR_UNIT_OHM,        0 }, /* Ohm */
+		{ SR_UNIT_OHM,        3 }, /* kOhm */
+		{ SR_UNIT_OHM,        6 }, /* MOhm */
+		{ -1,                 0 }, /* ??? */
+		{ SR_UNIT_HENRY,     -6 }, /* uH */
+		{ SR_UNIT_HENRY,     -3 }, /* mH */
+		{ SR_UNIT_HENRY,      0 }, /* H */
+		{ SR_UNIT_HENRY,      3 }, /* kH */
+		{ SR_UNIT_FARAD,    -12 }, /* pF */
+		{ SR_UNIT_FARAD,     -9 }, /* nF */
+		{ SR_UNIT_FARAD,     -6 }, /* uF */
+		{ SR_UNIT_FARAD,     -3 }, /* mF */
+		{ SR_UNIT_PERCENTAGE, 0 }, /* % */
+		{ SR_UNIT_DEGREE,     0 }, /* degree */
 	};
 	const uint8_t *buf;
+	int digits, exponent;
 	int state;
 
 	buf = pkt_to_buf(pkt, is_secondary);
 
-	analog->mq = -1;
-	analog->mqflags = 0;
+	analog->meaning->mq = 0;
+	analog->meaning->mqflags = 0;
 
 	state = buf[4] & 0xf;
 
@@ -525,27 +468,30 @@ static void parse_measurement(const uint8_t *pkt, float *floatval,
 
 	if (!is_secondary) {
 		if (pkt[2] & 0x01)
-			analog->mqflags |= SR_MQFLAG_HOLD;
+			analog->meaning->mqflags |= SR_MQFLAG_HOLD;
 		if (pkt[2] & 0x02)
-			analog->mqflags |= SR_MQFLAG_REFERENCE;
+			analog->meaning->mqflags |= SR_MQFLAG_REFERENCE;
 	} else {
 		if (pkt[2] & 0x04)
-			analog->mqflags |= SR_MQFLAG_RELATIVE;
+			analog->meaning->mqflags |= SR_MQFLAG_RELATIVE;
 	}
 
-	if ((analog->mq = parse_mq(pkt, is_secondary, pkt[2] & 0x80)) < 0)
+	if ((analog->meaning->mq = parse_mq(pkt, is_secondary, pkt[2] & 0x80)) == 0)
 		return;
 
 	if ((buf[3] >> 3) >= ARRAY_SIZE(units)) {
 		sr_err("Unknown unit %u.", buf[3] >> 3);
-		analog->mq = -1;
+		analog->meaning->mq = 0;
 		return;
 	}
 
-	analog->unit = units[buf[3] >> 3].unit;
+	analog->meaning->unit = units[buf[3] >> 3].unit;
 
-	*floatval = parse_value(buf);
-	*floatval *= (state == 0) ? units[buf[3] >> 3].mult : INFINITY;
+	exponent = units[buf[3] >> 3].exponent;
+	*floatval = parse_value(buf, &digits);
+	*floatval *= (state == 0) ? powf(10, exponent) : INFINITY;
+	analog->encoding->digits = digits - exponent;
+	analog->spec->spec_digits = digits - exponent;
 }
 
 static unsigned int parse_freq(const uint8_t *pkt)
@@ -589,32 +535,30 @@ 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]));
 }
 
 static void handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)
 {
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog_old analog;
+	struct sr_datafeed_analog analog;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	struct dev_context *devc;
 	unsigned int val;
 	float floatval;
 	gboolean frame;
+	struct sr_channel *channel;
 
 	devc = sdi->priv;
 
@@ -636,45 +580,49 @@ static void handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)
 
 	frame = FALSE;
 
-	memset(&analog, 0, sizeof(analog));
+	/* Note: digits/spec_digits will be overridden later. */
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
 
 	analog.num_samples = 1;
 	analog.data = &floatval;
 
-	analog.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.mq >= 0) {
+	if (analog.meaning->mq != 0 && channel->enabled) {
 		if (!frame) {
 			packet.type = SR_DF_FRAME_BEGIN;
 			sr_session_send(sdi, &packet);
 			frame = TRUE;
 		}
 
-		packet.type = SR_DF_ANALOG_OLD;
+		packet.type = SR_DF_ANALOG;
 		packet.payload = &analog;
 
 		sr_session_send(sdi, &packet);
 	}
 
-	g_slist_free(analog.channels);
-	analog.channels = g_slist_append(NULL, sdi->channels->next->data);
+	g_slist_free(analog.meaning->channels);
+
+	channel = sdi->channels->next->data;
+	analog.meaning->channels = g_slist_append(NULL, channel);
 
 	parse_measurement(pkt, &floatval, &analog, 1);
-	if (analog.mq >= 0) {
+	if (analog.meaning->mq != 0 && channel->enabled) {
 		if (!frame) {
 			packet.type = SR_DF_FRAME_BEGIN;
 			sr_session_send(sdi, &packet);
 			frame = TRUE;
 		}
 
-		packet.type = SR_DF_ANALOG_OLD;
+		packet.type = SR_DF_ANALOG;
 		packet.payload = &analog;
 
 		sr_session_send(sdi, &packet);
 	}
 
-	g_slist_free(analog.channels);
+	g_slist_free(analog.meaning->channels);
 
 	if (frame) {
 		packet.type = SR_DF_FRAME_END;
@@ -722,7 +670,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 
 	if (dev_limit_counter_limit_reached(&devc->frame_count) ||
 	    dev_time_limit_reached(&devc->time_count))
-		sdi->driver->dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 
 	return TRUE;
 }
@@ -732,14 +680,11 @@ static const char *const channel_names[] = { "P1", "P2" };
 static int setup_channels(struct sr_dev_inst *sdi)
 {
 	unsigned int i;
-	int ret;
-
-	ret = SR_ERR_BUG;
 
 	for (i = 0; i < ARRAY_SIZE(channel_names); i++)
 		sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]);
 
-	return ret;
+	return SR_OK;
 }
 
 SR_PRIV void es51919_serial_clean(void *priv)
@@ -750,7 +695,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,
@@ -769,8 +713,7 @@ SR_PRIV struct sr_dev_inst *es51919_serial_scan(GSList *options,
 	if (!(serial = serial_dev_new(options, "9600/8n1/rts=1/dtr=1")))
 		goto scan_cleanup;
 
-	ret = serial_stream_check(serial, PACKET_SIZE, packet_valid,
-				  3000, 9600);
+	ret = serial_stream_check(serial, PACKET_SIZE, packet_valid, 3000);
 	if (ret != SR_OK)
 		goto scan_cleanup;
 
@@ -793,10 +736,8 @@ SR_PRIV struct sr_dev_inst *es51919_serial_scan(GSList *options,
 
 scan_cleanup:
 	es51919_serial_clean(devc);
-	if (sdi)
-		sr_dev_inst_free(sdi);
-	if (serial)
-		sr_serial_dev_inst_free(serial);
+	sr_dev_inst_free(sdi);
+	sr_serial_dev_inst_free(serial);
 
 	return NULL;
 }
@@ -861,8 +802,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,
@@ -870,28 +814,20 @@ static const uint32_t devopts[] = {
 	SR_CONF_EQUIV_CIRCUIT_MODEL | SR_CONF_GET | SR_CONF_LIST,
 };
 
-static const struct std_opt_desc opts = {
-	scanopts, ARRAY_SIZE(scanopts),
-	devopts, ARRAY_SIZE(devopts),
-};
-
 SR_PRIV int es51919_serial_config_list(uint32_t key, GVariant **data,
 				       const struct sr_dev_inst *sdi,
 				       const struct sr_channel_group *cg)
 {
-	(void)sdi;
-	(void)cg;
-
-	if (std_config_list(key, data, &opts) == SR_OK)
-		return SR_OK;
-
 	switch (key) {
+	case SR_CONF_SCAN_OPTIONS:
+	case SR_CONF_DEVICE_OPTIONS:
+		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;
@@ -905,9 +841,6 @@ SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	if (!(devc = sdi->priv))
 		return SR_ERR_BUG;
 
@@ -916,7 +849,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);
@@ -924,7 +856,4 @@ SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV int es51919_serial_acquisition_stop(struct sr_dev_inst *sdi)
-{
-	return std_serial_dev_acquisition_stop(sdi);
-}
+#endif