fx2lafw: Say if chip is old FX2 or FX2LP

[libsigrok.git] / hardware / fx2lafw / fx2lafw.c

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 488365cd7ff486aa5fe8ce9595c046da5d383e17..19f079b8d69775e527610b8cec1e1bb04c0076d5 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -92,22 +92,8 @@ static const int hwcaps[] = {
 };
 
 static const char *probe_names[] = {
-       "0",
-       "1",
-       "2",
-       "3",
-       "4",
-       "5",
-       "6",
-       "7",
-       "8",
-       "9",
-       "10",
-       "11",
-       "12",
-       "13",
-       "14",
-       "15",
+       "0",  "1",  "2",  "3",  "4",  "5",  "6",  "7",
+       "8",  "9", "10", "11", "12", "13", "14", "15",
        NULL,
 };
 
@@ -281,9 +267,12 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi)
 
                sdi->status = SR_ST_ACTIVE;
                sr_info("Opened device %d on %d.%d, "
-                       "interface %d, firmware %d.%d, REVID %d.",
+                       "interface %d, firmware %d.%d.",
                        sdi->index, devc->usb->bus, devc->usb->address,
-                       USB_INTERFACE, vi.major, vi.minor, revid);
+                       USB_INTERFACE, vi.major, vi.minor);
+
+               sr_info("Detected REVID=%d, it's a Cypress CY7C68013%s.",
+                       revid, (revid != 1) ? " (FX2)" : "A (FX2LP)");
 
                break;
        }
@@ -538,8 +527,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
                        sr_err("Device failed to renumerate.");
                        return SR_ERR;
                }
-               sr_info("Device came back after %dms.",
-                       timediff_ms);
+               sr_info("Device came back after %" PRIi64 "ms.", timediff_ms);
        } else {
                sr_info("Firmware upload was not needed.");
                ret = fx2lafw_dev_open(sdi);