X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fapi.c;h=2ff8cc932ef70f73dd8c21a494569ff5db6b3cfa;hb=bb9d6116f828c4790334d98c65414dcef660d169;hp=3fb156efba41b72cea4683376004507462c5e372;hpb=8f996b89481670219c7576e2c68b128a0a2ce026;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/api.c b/hardware/zeroplus-logic-cube/api.c
index 3fb156ef..2ff8cc93 100644
--- a/hardware/zeroplus-logic-cube/api.c
+++ b/hardware/zeroplus-logic-cube/api.c
@@ -45,11 +45,10 @@ static const struct zp_model zeroplus_models[] = {
 	{0x0c12, 0x7002, "LAP-16128U",    16, 128,  200},
 	{0x0c12, 0x7009, "LAP-C(16064)",  16, 64,   100},
 	{0x0c12, 0x700a, "LAP-C(16128)",  16, 128,  200},
-	/* TODO: We don't know anything about these.
-	{0x0c12, 0x700b, "LAP-C(32128)",  32, 128,  200},
-	{0x0c12, 0x700c, "LAP-C(321000)", 32, 1024, 200},
-	{0x0c12, 0x700d, "LAP-C(322000)", 32, 2048, 200},
-	*/
+	/* We don't yet support 32 probes */
+	{0x0c12, 0x700b, "LAP-C(32128)",  16, 128,  200},
+	{0x0c12, 0x700c, "LAP-C(321000)", 16, 1024, 200},
+	{0x0c12, 0x700d, "LAP-C(322000)", 16, 2048, 200},
 	{0x0c12, 0x700e, "LAP-C(16032)",  16, 32,   100},
 	{0x0c12, 0x7016, "LAP-C(162000)", 16, 2048, 200},
 	{ 0, 0, 0, 0, 0, 0 }
@@ -308,10 +307,10 @@ static GSList *scan(GSList *options)
 		devc->prof = prof;
 		devc->num_channels = prof->channels;
 #ifdef ZP_EXPERIMENTAL
-		devc->max_memory_size = 128 * 1024;
+		devc->max_sample_depth = 128 * 1024;
 		devc->max_samplerate = 200;
 #else
-		devc->max_memory_size = prof->sample_depth * 1024;
+		devc->max_sample_depth = prof->sample_depth * 1024;
 		devc->max_samplerate = prof->max_sampling_freq;
 #endif
 		devc->max_samplerate *= SR_MHZ(1);
@@ -618,8 +617,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	analyzer_read_start(usb->devhdl);
 	/* Send the incoming transfer to the session bus. */
 	n = get_memory_size(devc->memory_size);
-	if (devc->max_memory_size * 4 < n)
-		n = devc->max_memory_size * 4;
+	if (devc->max_sample_depth * 4 < n)
+		n = devc->max_sample_depth * 4;
 	for (packet_num = 0; packet_num < n / PACKET_SIZE; packet_num++) {
 		res = analyzer_read_data(usb->devhdl, buf, PACKET_SIZE);
 		sr_info("Tried to read %d bytes, actually read %d bytes.",