output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / hardware / rdtech-tc / api.c

diff --git a/src/hardware/rdtech-tc/api.c b/src/hardware/rdtech-tc/api.c
index 0ceff987cfcc27fbba851c5e57c1e5c57e30c31b..ae86fccf5c4bb74bbeba8881afa2ea41b2a9d87b 100644 (file)
--- a/src/hardware/rdtech-tc/api.c
+++ b/src/hardware/rdtech-tc/api.c
@@ -42,8 +42,8 @@ static const uint32_t drvopts[] = {
 
 static const uint32_t devopts[] = {
        SR_CONF_CONTINUOUS,
-       SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
-       SR_CONF_LIMIT_MSEC | SR_CONF_SET,
+       SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
 };
 
 static GSList *rdtech_tc_scan(struct sr_dev_driver *di,
@@ -54,6 +54,9 @@ static GSList *rdtech_tc_scan(struct sr_dev_driver *di,
        struct dev_context *devc;
        struct sr_dev_inst *sdi;
        size_t i;
+       const struct rdtech_tc_channel_desc *pch;
+       struct sr_channel *ch;
+       struct feed_queue_analog *feed;
 
        serial = sr_serial_dev_inst_new(conn, serialcomm);
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
@@ -77,9 +80,14 @@ static GSList *rdtech_tc_scan(struct sr_dev_driver *di,
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
 
-       for (i = 0; devc->channels[i].name; i++) {
-               sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE,
-                       devc->channels[i].name);
+       devc->feeds = g_malloc0(devc->channel_count * sizeof(devc->feeds[0]));
+       for (i = 0; i < devc->channel_count; i++) {
+               pch = &devc->channels[i];
+               ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, pch->name);
+               feed = feed_queue_analog_alloc(sdi, 1, pch->digits, ch);
+               feed_queue_analog_mq_unit(feed, pch->mq, 0, pch->unit);
+               feed_queue_analog_scale_offset(feed, &pch->scale, NULL);
+               devc->feeds[i] = feed;
        }
 
        devices = g_slist_append(NULL, sdi);
@@ -98,31 +106,51 @@ err_out:
        return NULL;
 }
 
+static void clear_helper(struct dev_context *devc)
+{
+       size_t idx;
+
+       if (!devc)
+               return;
+
+       if (devc->feeds) {
+               for (idx = 0; idx < devc->channel_count; idx++)
+                       feed_queue_analog_free(devc->feeds[idx]);
+               g_free(devc->feeds);
+       }
+}
+
+static int dev_clear(const struct sr_dev_driver *driver)
+{
+       return std_dev_clear_with_callback(driver, (std_dev_clear_callback)clear_helper);
+}
+
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-       struct sr_config *src;
        const char *conn;
        const char *serialcomm;
 
        conn = NULL;
        serialcomm = RDTECH_TC_SERIALCOMM;
-       for (GSList *l = options; l; l = l->next) {
-               src = l->data;
-               switch (src->key) {
-               case SR_CONF_CONN:
-                       conn = g_variant_get_string(src->data, NULL);
-                       break;
-               case SR_CONF_SERIALCOMM:
-                       serialcomm = g_variant_get_string(src->data, NULL);
-                       break;
-               }
-       }
+       (void)sr_serial_extract_options(options, &conn, &serialcomm);
        if (!conn)
                return NULL;
 
        return rdtech_tc_scan(di, conn, serialcomm);
 }
 
+static int config_get(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+{
+       struct dev_context *devc;
+
+       (void)cg;
+
+       devc = sdi->priv;
+
+       return sr_sw_limits_config_get(&devc->limits, key, data);
+}
+
 static int config_set(uint32_t key, GVariant *data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
@@ -154,7 +182,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        serial_source_add(sdi->session, serial, G_IO_IN, 50,
                rdtech_tc_receive_data, (void *)sdi);
 
-       return rdtech_tc_poll(sdi);
+       return rdtech_tc_poll(sdi, TRUE);
 }
 
 static struct sr_dev_driver rdtech_tc_driver_info = {
@@ -165,8 +193,8 @@ static struct sr_dev_driver rdtech_tc_driver_info = {
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
-       .dev_clear = std_dev_clear,
-       .config_get = NULL,
+       .dev_clear = dev_clear,
+       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = std_serial_dev_open,