From: Russ Dill <redacted>
Date: Tue, 3 Dec 2013 05:25:10 +0000 (-0800)
Subject: zeroplus: Support all 32 channels of 32 channel models
X-Git-Tag: libsigrok-0.3.0~347
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=5db0c668fa691f44be6caf173ad64b4765d06a29;p=libsigrok.git

zeroplus: Support all 32 channels of 32 channel models

This will need some additional work when support is added for compression
modes since group D is disabled for RLE compression and C and D are
disabled for "double" compression.

Signed-off-by: Russ Dill <redacted>
---

diff --git a/hardware/zeroplus-logic-cube/api.c b/hardware/zeroplus-logic-cube/api.c
index 2ff8cc93..0f44f1b0 100644
--- a/hardware/zeroplus-logic-cube/api.c
+++ b/hardware/zeroplus-logic-cube/api.c
@@ -45,10 +45,9 @@ 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},
-	/* 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, 0x700b, "LAP-C(32128)",  32, 128,  200},
+	{0x0c12, 0x700c, "LAP-C(321000)", 32, 1024, 200},
+	{0x0c12, 0x700d, "LAP-C(322000)", 32, 2048, 200},
 	{0x0c12, 0x700e, "LAP-C(16032)",  16, 32,   100},
 	{0x0c12, 0x7016, "LAP-C(162000)", 16, 2048, 200},
 	{ 0, 0, 0, 0, 0, 0 }
@@ -68,6 +67,8 @@ static const int32_t hwcaps[] = {
 static const char *probe_names[] = {
 	"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7",
 	"B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7",
+	"C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7",
+	"D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
 	NULL,
 };