X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frdtech-tc%2Fapi.c;h=ae86fccf5c4bb74bbeba8881afa2ea41b2a9d87b;hb=HEAD;hp=5c6bb70ea84277d2140b6078557a58523812ce1f;hpb=a82490b6f7ea4a65a45d96e1a55c7bd74a4e49c1;p=libsigrok.git

diff --git a/src/hardware/rdtech-tc/api.c b/src/hardware/rdtech-tc/api.c
index 5c6bb70e..ae86fccf 100644
--- 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,6 +106,25 @@ 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)
 {
 	const char *conn;
@@ -112,6 +139,18 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	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,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,