Add basic support for USBee DX and clones

diff --git a/Makefile b/Makefile
index 1170cffeea3b9f7140d5267b60714398ce975219..9116277d19036539974620aaf563b4c9090354e9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ TARBALLBINDIR = sigrok-firmware-fx2lafw-bin-$(VERSION)
 
 all: build-all
 
-build-all: saleae-logic cwav-usbeeax cwav-usbeesx cypress-fx2 braintechnology-usb-lps
+build-all: saleae-logic cwav-usbeeax cwav-usbeedx cwav-usbeesx cypress-fx2 braintechnology-usb-lps
 
 saleae-logic:
        @$(MAKE) -C hw/saleae-logic
@@ -38,6 +38,9 @@ saleae-logic:
 cwav-usbeeax:
        @$(MAKE) -C hw/cwav-usbeeax
 
+cwav-usbeedx:
+       @$(MAKE) -C hw/cwav-usbeedx
+
 cwav-usbeesx:
        @$(MAKE) -C hw/cwav-usbeesx
 
@@ -69,6 +72,7 @@ install: build-all
        @mkdir -p $(DESTDIR)
        @cp hw/saleae-logic/build/*.fw $(DESTDIR)
        @cp hw/cwav-usbeeax/build/*.fw $(DESTDIR)
+       @cp hw/cwav-usbeedx/build/*.fw $(DESTDIR)
        @cp hw/cwav-usbeesx/build/*.fw $(DESTDIR)
        @cp hw/cypress-fx2/build/*.fw $(DESTDIR)
        @cp hw/braintechnology-usb-lps/build/*.fw $(DESTDIR)
@@ -76,10 +80,10 @@ install: build-all
 clean:
        @rm -rf hw/saleae-logic/build
        @rm -rf hw/cwav-usbeeax/build
+       @rm -rf hw/cwav-usbeedx/build
        @rm -rf hw/cwav-usbeesx/build
        @rm -rf hw/cypress-fx2/build
        @rm -rf hw/braintechnology-usb-lps/build
        @$(MAKE) -C fx2lib clean
 
-.PHONY: saleae-logic cwav-usbeeax cwav-usbeesx cypress-fx2 braintechnology-usb-lps
-
+.PHONY: saleae-logic cwav-usbeeax cwav-usbeedx cwav-usbeesx cypress-fx2 braintechnology-usb-lps

diff --git a/hw/cwav-usbeedx/Makefile b/hw/cwav-usbeedx/Makefile
new file mode 100644 (file)
index 0000000..7cc0e9b
--- /dev/null
+++ b/hw/cwav-usbeedx/Makefile
@@ -0,0 +1,25 @@
+##
+## This file is part of the fx2lafw project.
+##
+## Copyright (C) 2012 Ivan Fedorov <oxyum@oxyum.ru>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+SOURCES = ../../fx2lafw.c ../../gpif-acquisition.c
+A51_SOURCES = dscr.a51
+BASENAME = fx2lafw-cwav-usbeedx
+
+include ../../Makefile.include

diff --git a/hw/cwav-usbeedx/dscr.a51 b/hw/cwav-usbeedx/dscr.a51
new file mode 100644 (file)
index 0000000..4326fc0
--- /dev/null
+++ b/hw/cwav-usbeedx/dscr.a51
@@ -0,0 +1,24 @@
+;;
+;; This file is part of the fx2lafw project.
+;;
+;; Copyright (C) 2012 Ivan Fedorov <oxyum@oxyum.ru>
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2 of the License, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+;;
+
+VID = 0xa908   ; Manufacturer ID (0x08a9)
+PID = 0x1500   ; Product ID (0x0015)
+
+.include "../../../include/dscr.inc"