X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flcr%2Fes51919.c;h=fad0a3e98f08eb4d2f99fb61b4e5c77ee62d67cb;hb=d03815a0662a905392e428612507ad4de9f2f8b1;hp=fd26fd9e48df23a4f2de7c399cfc50b031aada10;hpb=f670835f1fbc03525e995d6970a5495976ab7c1a;p=libsigrok.git diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c index fd26fd9e..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[]). */ @@ -594,21 +535,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])); } @@ -623,6 +558,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; @@ -650,10 +586,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); @@ -667,10 +604,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); @@ -756,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, @@ -775,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; @@ -865,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, @@ -874,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; @@ -917,10 +849,11 @@ 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); return SR_OK; } + +#endif