From: Uwe Hermann <redacted>
Date: Tue, 12 Jul 2016 21:48:13 +0000 (+0200)
Subject: Add CWAV USBee ZX firmware support.
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.4~25
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=66255d9cae682fe637319bd59678ddf03595e466;p=sigrok-firmware-fx2lafw.git

Add CWAV USBee ZX firmware support.

This fixes bug #764.
---

diff --git a/Makefile.am b/Makefile.am
index e2109642..1659723c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,7 @@ dirstamps = \
 	hw/cwav-usbeeax/$(dirstamp) \
 	hw/cwav-usbeedx/$(dirstamp) \
 	hw/cwav-usbeesx/$(dirstamp) \
+	hw/cwav-usbeezx/$(dirstamp) \
 	hw/cypress-fx2/$(dirstamp) \
 	hw/saleae-logic/$(dirstamp) \
 	hw/sigrok-fx2-8ch/$(dirstamp) \
@@ -57,6 +58,7 @@ firmware_binaries = \
 	hw/cwav-usbeeax/fx2lafw-cwav-usbeeax.fw \
 	hw/cwav-usbeedx/fx2lafw-cwav-usbeedx.fw \
 	hw/cwav-usbeesx/fx2lafw-cwav-usbeesx.fw \
+	hw/cwav-usbeezx/fx2lafw-cwav-usbeezx.fw \
 	hw/cypress-fx2/fx2lafw-cypress-fx2.fw \
 	hw/saleae-logic/fx2lafw-saleae-logic.fw \
 	hw/sigrok-fx2-8ch/fx2lafw-sigrok-fx2-8ch.fw \
@@ -223,6 +225,7 @@ hw_sources = \
 	hw/cwav-usbeeax/dscr.a51 \
 	hw/cwav-usbeedx/dscr.a51 \
 	hw/cwav-usbeesx/dscr.a51 \
+	hw/cwav-usbeezx/dscr.a51 \
 	hw/cypress-fx2/dscr.a51 \
 	hw/saleae-logic/dscr.a51 \
 	hw/sigrok-fx2-8ch/dscr.a51 \
@@ -293,6 +296,7 @@ hw/braintechnology-usb-lps/dscr.rel: hw/braintechnology-usb-lps/$(dirstamp) incl
 hw/cwav-usbeeax/dscr.rel: hw/cwav-usbeeax/$(dirstamp) include/dscr.inc
 hw/cwav-usbeedx/dscr.rel: hw/cwav-usbeedx/$(dirstamp) include/dscr.inc
 hw/cwav-usbeesx/dscr.rel: hw/cwav-usbeesx/$(dirstamp) include/dscr.inc
+hw/cwav-usbeezx/dscr.rel: hw/cwav-usbeezx/$(dirstamp) include/dscr.inc
 hw/cypress-fx2/dscr.rel: hw/cypress-fx2/$(dirstamp) include/dscr.inc
 hw/saleae-logic/dscr.rel: hw/saleae-logic/$(dirstamp) include/dscr.inc
 hw/sigrok-fx2-8ch/dscr.rel: hw/sigrok-fx2-8ch/$(dirstamp) include/dscr.inc
@@ -326,6 +330,9 @@ hw/cwav-usbeedx/fx2lafw-cwav-usbeedx.ihx: hw/cwav-usbeedx/dscr.rel $(fx2lafw_obj
 hw/cwav-usbeesx/fx2lafw-cwav-usbeesx.ihx: hw/cwav-usbeesx/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
 	$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS) -o $@ hw/cwav-usbeesx/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
 
+hw/cwav-usbeezx/fx2lafw-cwav-usbeezx.ihx: hw/cwav-usbeezx/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
+	$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS) -o $@ hw/cwav-usbeezx/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
+
 hw/cypress-fx2/fx2lafw-cypress-fx2.ihx: hw/cypress-fx2/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
 	$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS) -o $@ hw/cypress-fx2/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
 
diff --git a/hw/cwav-usbeezx/dscr.a51 b/hw/cwav-usbeezx/dscr.a51
new file mode 100644
index 00000000..2cfd73b7
--- /dev/null
+++ b/hw/cwav-usbeezx/dscr.a51
@@ -0,0 +1,24 @@
+;;
+;; This file is part of the sigrok-firmware-fx2lafw project.
+;;
+;; Copyright (C) 2016 Uwe Hermann <uwe@hermann-uwe.de>
+;;
+;; 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 = 0x0500	; Product ID (0x0005)
+
+.include "dscr.inc"