X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkingst-la2016%2Fapi.c;h=5f536933fe6d8b49d9120a7c19454f8fb724595d;hb=43e6f7a7798f579c97f34f77c586a4962a41c29a;hp=3dee6c862ced9019bb67b4108f5003b3f89ba103;hpb=0fbb464bdf0951228d4430794263bb48bc668821;p=libsigrok.git

diff --git a/src/hardware/kingst-la2016/api.c b/src/hardware/kingst-la2016/api.c
index 3dee6c86..5f536933 100644
--- a/src/hardware/kingst-la2016/api.c
+++ b/src/hardware/kingst-la2016/api.c
@@ -36,6 +36,7 @@
 
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
+	SR_CONF_PROBE_NAMES,
 };
 
 static const uint32_t drvopts[] = {
@@ -87,20 +88,23 @@ static const char *channel_names_pwm[] = {
 };
 
 /*
- * The hardware uses a 100/200/500MHz base clock (model dependent) and
- * a 16bit divider (common across all models). The range from 10kHz to
- * 100/200/500MHz should be applicable to all devices. High rates may
- * suffer from coarse resolution (e.g. in the "500MHz div 2" case) and
- * may not provide the desired 1/2/5 steps. Fortunately this exclusively
- * affects the 500MHz model where 250MHz is used instead of 200MHz and
- * the 166MHz and 125MHz rates are not presented to users. Deep memory
- * of these models and hardware compression reduce the necessity to let
- * users pick from a huge list of possible rates.
+ * The devices have an upper samplerate limit of 100/200/500 MHz each.
+ * But their hardware uses different base clocks (100/200/800MHz, this
+ * is _not_ a typo) and a 16bit divider. Which results in per-model ranges
+ * of supported rates which not only differ in the upper boundary, but
+ * also at the lower boundary. It's assumed that the 10kHz rate is not
+ * useful enough to provide by all means. Starting at 20kHz for all models
+ * simplfies the implementation of the config API routines, and eliminates
+ * redundancy in these samplerates tables.
  *
+ * Streaming mode is constrained by the channel count and samplerate
+ * product (the bits per second which need to travel the USB connection
+ * while the acquisition is executing). Because streaming mode does not
+ * compress the capture data, a later implementation may desire a finer
+ * resolution. For now let's just stick with the 1/2/5 steps.
  */
 
 static const uint64_t rates_500mhz[] = {
-	SR_KHZ(10),
 	SR_KHZ(20),
 	SR_KHZ(50),
 	SR_KHZ(100),
@@ -113,12 +117,11 @@ static const uint64_t rates_500mhz[] = {
 	SR_MHZ(20),
 	SR_MHZ(50),
 	SR_MHZ(100),
-	SR_MHZ(250),
+	SR_MHZ(200),
 	SR_MHZ(500),
 };
 
 static const uint64_t rates_200mhz[] = {
-	SR_KHZ(10),
 	SR_KHZ(20),
 	SR_KHZ(50),
 	SR_KHZ(100),
@@ -135,7 +138,6 @@ static const uint64_t rates_200mhz[] = {
 };
 
 static const uint64_t rates_100mhz[] = {
-	SR_KHZ(10),
 	SR_KHZ(20),
 	SR_KHZ(50),
 	SR_KHZ(100),
@@ -429,6 +431,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	uint8_t bus, addr;
 	uint16_t pid;
 	const char *conn;
+	const char *probe_names;
 	char conn_id[64];
 	int ret;
 	size_t ch_off, ch_max;
@@ -440,12 +443,16 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 	conn = NULL;
 	conn_devices = NULL;
+	probe_names = NULL;
 	for (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_PROBE_NAMES:
+			probe_names = g_variant_get_string(src->data, NULL);
+			break;
 		}
 	}
 	if (conn)
@@ -594,12 +601,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		ch_max = ARRAY_SIZE(channel_names_logic);
 		if (ch_max > devc->model->channel_count)
 			ch_max = devc->model->channel_count;
+		devc->channel_names_logic = sr_parse_probe_names(probe_names,
+			channel_names_logic, ch_max, ch_max, &ch_max);
 		cg = sr_channel_group_new(sdi, "Logic", NULL);
 		devc->cg_logic = cg;
 		for (ch_idx = 0; ch_idx < ch_max; ch_idx++) {
 			ch = sr_channel_new(sdi, ch_off,
 				SR_CHANNEL_LOGIC, TRUE,
-				channel_names_logic[ch_idx]);
+				devc->channel_names_logic[ch_idx]);
 			ch_off++;
 			cg->channels = g_slist_append(cg->channels, ch);
 		}
@@ -1026,7 +1035,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct drv_context *drvc;
 	struct sr_context *ctx;
 	struct dev_context *devc;
-	size_t unitsize;
+	size_t unitsize, xfersize, repsize, seqsize;
 	double voltage;
 	int ret;
 
@@ -1036,21 +1045,35 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	devc = sdi->priv;
 
 	if (!devc->feed_queue) {
-		if (devc->model->channel_count == 32)
+		/*
+		 * TODO
+		 * Move this into protocol.c which concentrates the
+		 * wire format. The api.c source should not bother.
+		 */
+		if (devc->model->channel_count == 32) {
 			unitsize = sizeof(uint32_t);
-		else if (devc->model->channel_count == 16)
+			repsize = sizeof(uint8_t);
+			seqsize = 2 * sizeof(uint8_t);
+			xfersize = 32;
+		} else if (devc->model->channel_count == 16) {
 			unitsize = sizeof(uint16_t);
-		else
+			repsize = sizeof(uint8_t);
+			seqsize = 1 * sizeof(uint8_t);
+			xfersize = 16;
+		} else {
 			return SR_ERR_ARG;
+		}
 		devc->feed_queue = feed_queue_logic_alloc(sdi,
 			LA2016_CONVBUFFER_SIZE, unitsize);
 		if (!devc->feed_queue) {
 			sr_err("Cannot allocate buffer for session feed.");
 			return SR_ERR_MALLOC;
 		}
-		devc->packets_per_chunk = TRANSFER_PACKET_LENGTH;
-		devc->packets_per_chunk--;
-		devc->packets_per_chunk /= unitsize + sizeof(uint8_t);
+		devc->transfer_size = xfersize;
+		devc->sequence_size = seqsize;
+		devc->packets_per_chunk = xfersize;
+		devc->packets_per_chunk -= seqsize;
+		devc->packets_per_chunk /= unitsize + repsize;
 	}
 
 	sr_sw_limits_acquisition_start(&devc->sw_limits);