From: Daniel Gröber <redacted>
Date: Sat, 2 May 2015 22:31:49 +0000 (+0200)
Subject: fx2lafw: Add DSLogic Pro and DSCope firmware loading support
X-Git-Tag: libsigrok-0.4.0~484
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=b7c53d48a8170dc07bee1bafb481db3e2ea38e14;p=libsigrok.git

fx2lafw: Add DSLogic Pro and DSCope firmware loading support
---

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index a93b9a41..da560d86 100644
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -45,20 +45,33 @@ static const struct fx2lafw_profile supported_fx2[] = {
 		FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw",
 		0, NULL, NULL},
 
-	/*
-	 * DreamSourceLab DSLogic (before FW upload)
-	 */
+	/* DreamSourceLab DSLogic (before FW upload) */
 	{ 0x2a0e, 0x0001, "DreamSourceLab", "DSLogic", NULL,
 		FIRMWARE_DIR "/dreamsourcelab-dslogic-fx2.fw",
 		DEV_CAPS_16BIT, NULL, NULL},
-
-	/*
-	 * DreamSourceLab DSLogic (after FW upload)
-	 */
+	/* DreamSourceLab DSLogic (after FW upload) */
 	{ 0x2a0e, 0x0001, "DreamSourceLab", "DSLogic", NULL,
 		FIRMWARE_DIR "/dreamsourcelab-dslogic-fx2.fw",
 		DEV_CAPS_16BIT, "DreamSourceLab", "DSLogic"},
 
+	/* DreamSourceLab DSCope (before FW upload) */
+	{ 0x2a0e, 0x0002, "DreamSourceLab", "DSCope", NULL,
+		FIRMWARE_DIR "/dreamsourcelab-dscope-fx2.fw",
+		DEV_CAPS_16BIT, NULL, NULL},
+	/* DreamSourceLab DSCope (after FW upload) */
+	{ 0x2a0e, 0x0002, "DreamSourceLab", "DSCope", NULL,
+		FIRMWARE_DIR "/dreamsourcelab-dscope-fx2.fw",
+		DEV_CAPS_16BIT, "DreamSourceLab", "DSCope"},
+
+	/* DreamSourceLab DSLogic Pro (before FW upload) */
+	{ 0x2a0e, 0x0003, "DreamSourceLab", "DSLogic Pro", NULL,
+		FIRMWARE_DIR "/dreamsourcelab-dslogic-pro-fx2.fw",
+		DEV_CAPS_16BIT, NULL, NULL},
+	/* DreamSourceLab DSLogic Pro (after FW upload) */
+	{ 0x2a0e, 0x0003, "DreamSourceLab", "DSLogic Pro", NULL,
+		FIRMWARE_DIR "/dreamsourcelab-dslogic-pro-fx2.fw",
+		DEV_CAPS_16BIT, "DreamSourceLab", "DSLogic"},
+
 	/*
 	 * Saleae Logic
 	 * EE Electronics ESLA100
@@ -296,18 +309,20 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		drvc->instances = g_slist_append(drvc->instances, sdi);
 		devices = g_slist_append(devices, sdi);
 
-		if (strcmp(prof->model, "DSLogic")) {
+		if (!strcmp(prof->model, "DSLogic")
+				|| !strcmp(prof->model, "DSLogic Pro")
+				|| !strcmp(prof->model, "DSCope")) {
+			devc->dslogic = TRUE;
+			devc->samplerates = dslogic_samplerates;
+			devc->num_samplerates = ARRAY_SIZE(dslogic_samplerates);
+			has_firmware = match_manuf_prod(devlist[i], "DreamSourceLab", "DSLogic")
+					|| match_manuf_prod(devlist[i], "DreamSourceLab", "DSCope");
+		} else {
 			devc->dslogic = FALSE;
 			devc->samplerates = samplerates;
 			devc->num_samplerates = ARRAY_SIZE(samplerates);
 			has_firmware = match_manuf_prod(devlist[i],
 					"sigrok", "fx2lafw");
-		} else {
-			devc->dslogic = TRUE;
-			devc->samplerates = dslogic_samplerates;
-			devc->num_samplerates = ARRAY_SIZE(dslogic_samplerates);
-			has_firmware = match_manuf_prod(devlist[i],
-					"DreamSourceLab", "DSLogic");
 		}
 
 		if (has_firmware) {
@@ -348,6 +363,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 	struct sr_dev_driver *di = sdi->driver;
 	struct sr_usb_dev_inst *usb;
 	struct dev_context *devc;
+	char *fpga_firmware = NULL;
 	int ret;
 	int64_t timediff_us, timediff_ms;
 
@@ -408,8 +424,16 @@ static int dev_open(struct sr_dev_inst *sdi)
 	}
 
 	if (devc->dslogic) {
+		if (!strcmp(devc->profile->model, "DSLogic")) {
+			fpga_firmware = DSLOGIC_FPGA_FIRMWARE;
+		} else if (!strcmp(devc->profile->model, "DSLogic Pro")) {
+			fpga_firmware = DSLOGIC_PRO_FPGA_FIRMWARE;
+		} else if (!strcmp(devc->profile->model, "DSCope")) {
+			fpga_firmware = DSCOPE_FPGA_FIRMWARE;
+		}
+
 		if ((ret = dslogic_fpga_firmware_upload(sdi,
-				DSLOGIC_FPGA_FIRMWARE)) != SR_OK)
+				fpga_firmware)) != SR_OK)
 			return ret;
 	}
 
diff --git a/src/hardware/fx2lafw/protocol.h b/src/hardware/fx2lafw/protocol.h
index c245a7a2..6d723115 100644
--- a/src/hardware/fx2lafw/protocol.h
+++ b/src/hardware/fx2lafw/protocol.h
@@ -52,6 +52,8 @@
 #define DEV_CAPS_16BIT		(1 << DEV_CAPS_16BIT_POS)
 
 #define DSLOGIC_FPGA_FIRMWARE FIRMWARE_DIR "/dreamsourcelab-dslogic-fpga.fw"
+#define DSCOPE_FPGA_FIRMWARE FIRMWARE_DIR "/dreamsourcelab-dscope-fpga.fw"
+#define DSLOGIC_PRO_FPGA_FIRMWARE FIRMWARE_DIR "/dreamsourcelab-dslogic-pro-fpga.fw"
 
 /* Protocol commands */
 #define CMD_GET_FW_VERSION		0xb0