X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flcr%2Fes51919.c;h=7c084f7f19287bd5192ba0d953f94634bba63947;hb=15f96409dc54fd2ef784c59156daedd9acfa78ed;hp=0e8635f6d06556de841cf1f127927d572ce72983;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git
diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c
index 0e8635f6..7c084f7f 100644
--- a/src/lcr/es51919.c
+++ b/src/lcr/es51919.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -406,20 +407,6 @@ static const double frequencies[] = {
100, 120, 1000, 10000, 100000, 0,
};
-enum { QUANT_AUTO = 5, };
-
-static const char *const quantities1[] = {
- "NONE", "INDUCTANCE", "CAPACITANCE", "RESISTANCE", "RESISTANCE", "AUTO",
-};
-
-static const char *const list_quantities1[] = {
- "NONE", "INDUCTANCE", "CAPACITANCE", "RESISTANCE", "AUTO",
-};
-
-static const char *const quantities2[] = {
- "NONE", "DISSIPATION", "QUALITY", "RESISTANCE", "ANGLE", "AUTO",
-};
-
enum { MODEL_NONE, MODEL_PAR, MODEL_SER, MODEL_AUTO, };
static const char *const models[] = {
@@ -428,9 +415,6 @@ static const char *const models[] = {
/** Private, per-device-instance driver context. */
struct dev_context {
- /** Opaque pointer passed in by the frontend. */
- void *cb_data;
-
/** The number of frames. */
struct dev_limit_counter frame_count;
@@ -443,12 +427,6 @@ struct dev_context {
/** The frequency of the test signal (index to frequencies[]). */
unsigned int freq;
- /** Measured primary quantity (index to quantities1[]). */
- unsigned int quant1;
-
- /** Measured secondary quantity (index to quantities2[]). */
- unsigned int quant2;
-
/** Equivalent circuit model (index to models[]). */
unsigned int model;
};
@@ -504,7 +482,7 @@ static float parse_value(const uint8_t *buf)
}
static void parse_measurement(const uint8_t *pkt, float *floatval,
- struct sr_datafeed_analog *analog,
+ struct sr_datafeed_analog_old *analog,
int is_secondary)
{
static const struct {
@@ -584,18 +562,6 @@ static unsigned int parse_freq(const uint8_t *pkt)
return freq;
}
-static unsigned int parse_quant(const uint8_t *pkt, int is_secondary)
-{
- const uint8_t *buf;
-
- if (pkt[2] & 0x20)
- return QUANT_AUTO;
-
- buf = pkt_to_buf(pkt, is_secondary);
-
- return buf[0];
-}
-
static unsigned int parse_model(const uint8_t *pkt)
{
if (pkt[2] & 0x40)
@@ -626,11 +592,7 @@ static gboolean packet_valid(const uint8_t *pkt)
static int do_config_update(struct sr_dev_inst *sdi, uint32_t key,
GVariant *var)
{
- struct dev_context *devc;
-
- devc = sdi->priv;
-
- return send_config_update_key(devc->cb_data, key, var);
+ return send_config_update_key(sdi, key, var);
}
static int send_freq_update(struct sr_dev_inst *sdi, unsigned int freq)
@@ -639,18 +601,6 @@ static int send_freq_update(struct sr_dev_inst *sdi, unsigned int freq)
g_variant_new_double(frequencies[freq]));
}
-static int send_quant1_update(struct sr_dev_inst *sdi, unsigned int quant)
-{
- return do_config_update(sdi, SR_CONF_MEASURED_QUANTITY,
- g_variant_new_string(quantities1[quant]));
-}
-
-static int send_quant2_update(struct sr_dev_inst *sdi, unsigned int quant)
-{
- return do_config_update(sdi, SR_CONF_MEASURED_2ND_QUANTITY,
- g_variant_new_string(quantities2[quant]));
-}
-
static int send_model_update(struct sr_dev_inst *sdi, unsigned int model)
{
return do_config_update(sdi, SR_CONF_EQUIV_CIRCUIT_MODEL,
@@ -660,7 +610,7 @@ static int send_model_update(struct sr_dev_inst *sdi, unsigned int model)
static void handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)
{
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog analog;
+ struct sr_datafeed_analog_old analog;
struct dev_context *devc;
unsigned int val;
float floatval;
@@ -676,22 +626,6 @@ static void handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)
return;
}
- val = parse_quant(pkt, 0);
- if (val != devc->quant1) {
- if (send_quant1_update(sdi, val) == SR_OK)
- devc->quant1 = val;
- else
- return;
- }
-
- val = parse_quant(pkt, 1);
- if (val != devc->quant2) {
- if (send_quant2_update(sdi, val) == SR_OK)
- devc->quant2 = val;
- else
- return;
- }
-
val = parse_model(pkt);
if (val != devc->model) {
if (send_model_update(sdi, val) == SR_OK)
@@ -713,35 +647,38 @@ static void handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)
if (analog.mq >= 0) {
if (!frame) {
packet.type = SR_DF_FRAME_BEGIN;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
frame = TRUE;
}
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
}
+ g_slist_free(analog.channels);
analog.channels = g_slist_append(NULL, sdi->channels->next->data);
parse_measurement(pkt, &floatval, &analog, 1);
if (analog.mq >= 0) {
if (!frame) {
packet.type = SR_DF_FRAME_BEGIN;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
frame = TRUE;
}
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
}
+ g_slist_free(analog.channels);
+
if (frame) {
packet.type = SR_DF_FRAME_END;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
dev_limit_counter_inc(&devc->frame_count);
}
}
@@ -785,7 +722,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, cb_data);
+ sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
@@ -872,24 +809,16 @@ SR_PRIV int es51919_serial_config_get(uint32_t key, GVariant **data,
(void)cg;
- if (!(devc = sdi->priv))
- return SR_ERR_BUG;
+ devc = sdi->priv;
switch (key) {
case SR_CONF_OUTPUT_FREQUENCY:
*data = g_variant_new_double(frequencies[devc->freq]);
break;
- case SR_CONF_MEASURED_QUANTITY:
- *data = g_variant_new_string(quantities1[devc->quant1]);
- break;
- case SR_CONF_MEASURED_2ND_QUANTITY:
- *data = g_variant_new_string(quantities2[devc->quant2]);
- break;
case SR_CONF_EQUIV_CIRCUIT_MODEL:
*data = g_variant_new_string(models[devc->model]);
break;
default:
- sr_spew("%s: Unsupported key %u", __func__, key);
return SR_ERR_NA;
}
@@ -938,8 +867,6 @@ static const uint32_t devopts[] = {
SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
SR_CONF_LIMIT_MSEC | SR_CONF_SET,
SR_CONF_OUTPUT_FREQUENCY | SR_CONF_GET | SR_CONF_LIST,
- SR_CONF_MEASURED_QUANTITY | SR_CONF_GET | SR_CONF_LIST,
- SR_CONF_MEASURED_2ND_QUANTITY | SR_CONF_GET | SR_CONF_LIST,
SR_CONF_EQUIV_CIRCUIT_MODEL | SR_CONF_GET | SR_CONF_LIST,
};
@@ -963,27 +890,17 @@ SR_PRIV int es51919_serial_config_list(uint32_t key, GVariant **data,
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_DOUBLE,
frequencies, ARRAY_SIZE(frequencies), sizeof(double));
break;
- case SR_CONF_MEASURED_QUANTITY:
- *data = g_variant_new_strv(list_quantities1,
- ARRAY_SIZE(list_quantities1));
- break;
- case SR_CONF_MEASURED_2ND_QUANTITY:
- *data = g_variant_new_strv(quantities2,
- ARRAY_SIZE(quantities2));
- break;
case SR_CONF_EQUIV_CIRCUIT_MODEL:
*data = g_variant_new_strv(models, ARRAY_SIZE(models));
break;
default:
- sr_spew("%s: Unsupported key %u", __func__, key);
return SR_ERR_NA;
}
return SR_OK;
}
-SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
@@ -994,13 +911,10 @@ SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi,
if (!(devc = sdi->priv))
return SR_ERR_BUG;
- devc->cb_data = cb_data;
-
dev_limit_counter_start(&devc->frame_count);
dev_time_counter_start(&devc->time_count);
- /* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, LOG_PREFIX);
+ std_session_send_df_header(sdi);
/* Poll every 50ms, or whenever some data comes in. */
serial = sdi->conn;
@@ -1010,9 +924,8 @@ 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,
- void *cb_data)
+SR_PRIV int es51919_serial_acquisition_stop(struct sr_dev_inst *sdi)
{
- return std_serial_dev_acquisition_stop(sdi, cb_data,
- std_serial_dev_close, sdi->conn, LOG_PREFIX);
+ return std_serial_dev_acquisition_stop(sdi,
+ std_serial_dev_close);
}