X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=9eae9508fd7af9500fc9b45645bbdaf92ed848e7;hb=9a5693a5acf677c47285307235b9d47bcc3b932e;hp=a9bc899e1e88a9277abf0c05f34eeaed873b1e48;hpb=b36e715395d220b7542b6038af3742e85e7bab92;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index a9bc899e..9eae9508 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -93,7 +93,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", NULL,
+	"8",  "9", "10", "11", "12", "13", "14", "15",
+	NULL,
 };
 
 static const uint64_t supported_samplerates[] = {
@@ -266,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;
 	}
@@ -608,18 +612,6 @@ static int hw_info_get(int info_id, const void **data,
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
-	case SR_DI_NUM_PROBES:
-		if (sdi) {
-			devc = sdi->priv;
-			*data = GINT_TO_POINTER(
-				(devc->profile->dev_caps & DEV_CAPS_16BIT) ?
-				16 : 8);
-		} else
-			return SR_ERR;
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = probe_names;
-		break;
 	case SR_DI_SAMPLERATES:
 		*data = &samplerates;
 		break;