sr: Fix/document probe names.

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index 80c0e11d4c899f1a810f07646092289ce873fbf5..994183fc1dd20ce16cd60500927f89e76c71cb47 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -48,6 +48,7 @@ static int hwcaps[] = {
        SR_HWCAP_CONTINUOUS,
 };
 
+/* TODO: Which probe names/numbers to use? */
 static const char *probe_names[NUM_PROBES + 1] = {
        "0",
        "1",

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index bb90b41ae507b5e7262864a0c365d0d800f93831..bdb797a013a668303199abfb338ddc5ce3dbec66 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -57,8 +57,12 @@ static uint64_t supported_samplerates[] = {
        0,
 };
 
+/*
+ * Probe numbers seem to go from 1-16, according to this image:
+ * http://tools.asix.net/img/sigma_sigmacab_pins_720.jpg
+ * (the cable has two additional GND pins, and a TI and TO pin)
+ */
 static const char *probe_names[NUM_PROBES + 1] = {
-       "0",
        "1",
        "2",
        "3",
@@ -74,6 +78,7 @@ static const char *probe_names[NUM_PROBES + 1] = {
        "13",
        "14",
        "15",
+       "16",
        NULL,
 };
 

diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c
index da286e78056d1a16a86a6b611616077772addc58..60384a1d15affc822d6639e44ac6d581f086902d 100644 (file)
--- a/hardware/chronovu-la8/chronovu-la8.c
+++ b/hardware/chronovu-la8/chronovu-la8.c
@@ -42,6 +42,7 @@
 
 static GSList *dev_insts = NULL;
 
+/* Probes are numbered 0-7. */
 static const char *probe_names[NUM_PROBES + 1] = {
        "0",
        "1",

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index aa3f57d4a919f8c920aab54864531b0af68c8cca..8a84e8ce65a3d6b7d4f407da0107703f510eb6e2 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -102,6 +102,7 @@ static const char *pattern_strings[] = {
        NULL,
 };
 
+/* We name the probes 0-7 on our demo driver. */
 static const char *probe_names[NUM_PROBES + 1] = {
        "0",
        "1",

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index c3dc19bd934865109902f7d1d39f57a60d646158..5eaf9bd31d23f22d34ff6c6fbba9a47ef138cb5b 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -48,6 +48,11 @@ static int hwcaps[] = {
        0,
 };
 
+/*
+ * Probes are numbered 0 to 7.
+ *
+ * See also: http://www.linkinstruments.com/images/mso19_1113.gif
+ */
 static const char *probe_names[NUM_PROBES + 1] = {
        "0",
        "1",

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 4e38f56b5ab9d169bde6a7d0a2a5f6f4449edc6e..c1deb759e93a5d2bdecebe997187d57ff4ee1339 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -55,6 +55,7 @@ static int hwcaps[] = {
        0,
 };
 
+/* Probes are numbered 0-31 (on the PCB silkscreen). */
 static const char *probe_names[NUM_PROBES + 1] = {
        "0",
        "1",

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index 295582a963c435ed2bb9466f24030fcdb95b8768..b986243b80a8693fe8bfbdb29c584e8e11596e1c 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -46,6 +46,12 @@ static int hwcaps[] = {
        0,
 };
 
+/*
+ * Probes are numbered 1-8.
+ *
+ * TODO: FX2 eval boards with the standard Cypress VID/PID can have 16 pins
+ * or probes in theory, which is not supported by the Saleae Logic firmware.
+ */
 static const char *probe_names[] = {
        "0",
        "1",

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index c3a1f9224360865976f446e70e7d9ca9b5845a07..27ce1dd9607c44d92c25b485327c4708d8f74360 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -74,39 +74,27 @@ static int hwcaps[] = {
        0,
 };
 
+/*
+ * ZEROPLUS LAP-C (16032) numbers the 16 probes A0-A7 and B0-B7.
+ * We currently ignore other untested/unsupported devices here.
+ */
 static const char *probe_names[] = {
-       "0",
-       "1",
-       "2",
-       "3",
-       "4",
-       "5",
-       "6",
-       "7",
-       "8",
-       "9",
-       "10",
-       "11",
-       "12",
-       "13",
-       "14",
-       "15",
-       "16",
-       "17",
-       "18",
-       "19",
-       "20",
-       "21",
-       "22",
-       "23",
-       "24",
-       "25",
-       "26",
-       "27",
-       "28",
-       "29",
-       "30",
-       "31",
+       "A0",
+       "A1",
+       "A2",
+       "A3",
+       "A4",
+       "A5",
+       "A6",
+       "A7",
+       "B0",
+       "B1",
+       "B2",
+       "B3",
+       "B4",
+       "B5",
+       "B6",
+       "B7",
        NULL,
 };