From: Ivan Fedorov <redacted>
Date: Tue, 31 Jul 2012 20:11:33 +0000 (+0400)
Subject: sr: fx2lafw: Add basic support for USBee DX and clones
X-Git-Tag: dsupstream~856
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=c9166745f23889e1c5abb010513733c829c00d1b;p=libsigrok.git

sr: fx2lafw: Add basic support for USBee DX and clones
---

diff --git a/NEWS b/NEWS
index c90c058e..a2b5c678 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@
 ------------------
 
  * TODO
+ * fx2lafw driver:
+   - Add support for the USBee DX and clones. This requires the latest
+     version of the fx2lafw firmware files.
 
 0.1.1 (2012-05-30)
 ------------------
diff --git a/contrib/z60_libsigrok.rules b/contrib/z60_libsigrok.rules
index 2ba14c64..dcfb4c3b 100644
--- a/contrib/z60_libsigrok.rules
+++ b/contrib/z60_libsigrok.rules
@@ -64,6 +64,14 @@ ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", MODE="664", GROUP="plugdev"
 # lsusb: "08a9:0014" (no string for the vendor name available)
 ATTRS{idVendor}=="08a9", ATTRS{idProduct}=="0014", MODE="664", GROUP="plugdev"
 
+# CWAV USBee DX
+# http://www.usbee.com/dx.html
+# lsusb: "08a9:0015" (no string for the vendor name available)
+#
+# XZL Studio DX (clone of the CWAV USBee DX)
+# lsusb: "08a9:0015" (no string for the vendor name available)
+ATTRS{idVendor}=="08a9", ATTRS{idProduct}=="0015", MODE="664", GROUP="plugdev"
+
 # CWAV USBee SX
 # http://www.usbee.com/sx.html
 # lsusb: "08a9:0009" (no string for the vendor name available)
diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 334a1109..7142a35d 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -30,6 +30,13 @@
 #include "command.h"
 
 static const struct fx2lafw_profile supported_fx2[] = {
+	/*
+	 * CWAV USBee DX
+	 * XZL Studio DX
+	 */
+	{ 0x08a9, 0x0015, "CWAV", "USBee DX", NULL,
+		FIRMWARE_DIR "/fx2lafw-cwav-usbeedx.fw",
+		0 },
 	/*
 	 * CWAV USBee AX
 	 * EE Electronics ESLA201A