X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fkingst-la2016%2Fprotocol.c;h=e9a8cb0ba5f3b8fc4903a657e28fe9d040d77ee1;hb=f49837a58276890878ffa5e1530aff9a7d404b9b;hp=1207ca2544de1c9a71e77dc14d3aceccc79548fb;hpb=40a0db1ea836ec110191f86d084e7d1ed0630499;p=libsigrok.git

diff --git a/src/hardware/kingst-la2016/protocol.c b/src/hardware/kingst-la2016/protocol.c
index 1207ca25..e9a8cb0b 100644
--- a/src/hardware/kingst-la2016/protocol.c
+++ b/src/hardware/kingst-la2016/protocol.c
@@ -43,18 +43,18 @@
  * TODO Verify the identification of models that were not tested before.
  */
 static const struct kingst_model models[] = {
-	{  2, 1, "LA2016", "la2016a1", SR_MHZ(200), 16, 1, 0, },
-	{  2, 0, "LA2016", "la2016",   SR_MHZ(200), 16, 1, 0, },
-	{  3, 1, "LA1016", "la1016a1", SR_MHZ(100), 16, 1, 0, },
-	{  3, 0, "LA1016", "la1016",   SR_MHZ(100), 16, 1, 0, },
-	{  4, 0, "LA1010", "la1010a0", SR_MHZ(100), 16, 0, SR_MHZ(800), },
-	{  5, 0, "LA5016", "la5016a1", SR_MHZ(500), 16, 2, 0, },
-	{  6, 0, "LA5032", "la5032a0", SR_MHZ(500), 32, 4, 0, },
-	{  7, 0, "LA1010", "la1010a1", SR_MHZ(100), 16, 0, SR_MHZ(800), },
-	{  8, 0, "LA2016", "la2016a1", SR_MHZ(200), 16, 1, 0, },
-	{  9, 0, "LA1016", "la1016a1", SR_MHZ(100), 16, 1, 0, },
-	{ 10, 0, "LA1010", "la1010a2", SR_MHZ(100), 16, 0, SR_MHZ(800), },
-	{ 65, 0, "LA5016", "la5016a1", SR_MHZ(500), 16, 2, 0, },
+	{ 0x02, 0x01, "LA2016", "la2016a1", SR_MHZ(200), 16, 1, 0, },
+	{ 0x02, 0x00, "LA2016", "la2016",   SR_MHZ(200), 16, 1, 0, },
+	{ 0x03, 0x01, "LA1016", "la1016a1", SR_MHZ(100), 16, 1, 0, },
+	{ 0x03, 0x00, "LA1016", "la1016",   SR_MHZ(100), 16, 1, 0, },
+	{ 0x04, 0x00, "LA1010", "la1010a0", SR_MHZ(100), 16, 0, SR_MHZ(800), },
+	{ 0x05, 0x00, "LA5016", "la5016a1", SR_MHZ(500), 16, 2, SR_MHZ(800), },
+	{ 0x06, 0x00, "LA5032", "la5032a0", SR_MHZ(500), 32, 4, SR_MHZ(800), },
+	{ 0x07, 0x00, "LA1010", "la1010a1", SR_MHZ(100), 16, 0, SR_MHZ(800), },
+	{ 0x08, 0x00, "LA2016", "la2016a1", SR_MHZ(200), 16, 1, 0, },
+	{ 0x09, 0x00, "LA1016", "la1016a1", SR_MHZ(100), 16, 1, 0, },
+	{ 0x0a, 0x00, "LA1010", "la1010a2", SR_MHZ(100), 16, 0, SR_MHZ(800), },
+	{ 0x41, 0x00, "LA5016", "la5016a1", SR_MHZ(500), 16, 2, SR_MHZ(800), },
 };
 
 /* USB vendor class control requests, executed by the Cypress FX2 MCU. */
@@ -729,6 +729,13 @@ static int set_sample_config(const struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 
+	/*
+	 * The base clock need not be identical to the maximum samplerate,
+	 * and differs between models. The 500MHz devices even use a base
+	 * clock of 800MHz, and communicate divider 1 to the hardware to
+	 * configure the 500MHz samplerate. This allows them to operate at
+	 * a 200MHz samplerate which uses divider 4.
+	 */
 	if (devc->samplerate > devc->model->samplerate) {
 		sr_err("Too high a sample rate: %" PRIu64 ".",
 			devc->samplerate);
@@ -746,6 +753,8 @@ static int set_sample_config(const struct sr_dev_inst *sdi)
 	}
 	divider_u16 = baseclock / devc->samplerate;
 	eff_samplerate = baseclock / divider_u16;
+	if (eff_samplerate > devc->model->samplerate)
+		eff_samplerate = devc->model->samplerate;
 
 	ret = sr_sw_limits_get_remain(&devc->sw_limits,
 		&limit_samples, NULL, NULL, NULL);
@@ -1800,20 +1809,20 @@ SR_PRIV int la2016_identify_device(const struct sr_dev_inst *sdi,
 		/* Primary copy of magic passes complement check (4 bytes). */
 		magic = buf[0];
 		magic2 = buf[2];
-		sr_dbg("Using primary magic %hhu (%hhu).", magic, magic2);
+		sr_dbg("Using primary magic 0x%hhx (0x%hhx).", magic, magic2);
 	} else if ((buf[4] ^ buf[5]) == 0xff && (buf[6] ^ buf[7]) == 0xff) {
 		/* Backup copy of magic passes complement check (4 bytes). */
 		magic = buf[4];
 		magic2 = buf[6];
-		sr_dbg("Using secondary magic %hhu (%hhu).", magic, magic2);
+		sr_dbg("Using secondary magic 0x%hhx (0x%hhx).", magic, magic2);
 	} else if ((buf[0] ^ buf[1]) == 0xff) {
 		/* Primary copy of magic passes complement check (2 bytes). */
 		magic = buf[0];
-		sr_dbg("Using primary magic %hhu.", magic);
+		sr_dbg("Using primary magic 0x%hhx.", magic);
 	} else if ((buf[4] ^ buf[5]) == 0xff) {
 		/* Backup copy of magic passes complement check (2 bytes). */
 		magic = buf[4];
-		sr_dbg("Using secondary magic %hhu.", magic);
+		sr_dbg("Using secondary magic 0x%hhx.", magic);
 	} else {
 		sr_err("Cannot find consistent device type identification.");
 	}