From: Uwe Hermann Date: Wed, 21 Oct 2015 20:23:44 +0000 (+0200) Subject: Add fx2lafw firmware for FX2 devices with sigrok VID/PID. X-Git-Tag: sigrok-firmware-fx2lafw-0.1.3~10 X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-firmware-fx2lafw.git;a=commitdiff_plain;h=4c4035a7b45d6e865fac0a4ac96c83ab6baf7a13 Add fx2lafw firmware for FX2 devices with sigrok VID/PID. The two new firmware images fx2lafw-sigrok-fx2-{8,16}ch.fw can be used on Cypress FX2 devices where one of the two official sigrok fx2lafw USB VID/PID pairs is hardcoded in an external EEPROM. The sigrok project owns USB product IDs allocated via the Openmoko project: http://wiki.openmoko.org/wiki/USB_Product_IDs The following two VID/PID pairs are available for devices that use a Cypress FX2(LP) chip *directly* as 8-channel or 16-channel logic analyzer, and use the respective USB-based protocol. They are *not* meant for other devices which just happen to also have an FX2 (e.g. in addition to an FPGA) and/or devices that use a different USB-based protocol. - 1D50:608C: fx2lafw-sigrok-fx2-8ch.fw - 1D50:608D: fx2lafw-sigrok-fx2-16ch.fw --- diff --git a/configure.ac b/configure.ac index 852cdab6..d460b6b7 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,8 @@ AC_CONFIG_FILES([Makefile hw/cwav-usbeesx/Makefile hw/cypress-fx2/Makefile hw/saleae-logic/Makefile + hw/sigrok-fx2-8ch/Makefile + hw/sigrok-fx2-16ch/Makefile ]) AC_OUTPUT diff --git a/hw/Makefile.am b/hw/Makefile.am index 6f7f5c91..de678b09 100644 --- a/hw/Makefile.am +++ b/hw/Makefile.am @@ -23,5 +23,7 @@ SUBDIRS = braintechnology-usb-lps \ cwav-usbeedx \ cwav-usbeesx \ cypress-fx2 \ - saleae-logic + saleae-logic \ + sigrok-fx2-8ch \ + sigrok-fx2-16ch diff --git a/hw/sigrok-fx2-16ch/Makefile.am b/hw/sigrok-fx2-16ch/Makefile.am new file mode 100644 index 00000000..799f19e9 --- /dev/null +++ b/hw/sigrok-fx2-16ch/Makefile.am @@ -0,0 +1,26 @@ +## +## This file is part of the sigrok-firmware-fx2lafw project. +## +## Copyright (C) 2015 Uwe Hermann +## +## 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 +## + +BASENAME = fx2lafw-sigrok-fx2-16ch + +all-local: $(BASENAME).fw + +include $(srcdir)/../Makefile.inc + diff --git a/hw/sigrok-fx2-16ch/dscr.a51 b/hw/sigrok-fx2-16ch/dscr.a51 new file mode 100644 index 00000000..d63d08c0 --- /dev/null +++ b/hw/sigrok-fx2-16ch/dscr.a51 @@ -0,0 +1,24 @@ +;; +;; This file is part of the sigrok-firmware-fx2lafw project. +;; +;; Copyright (C) 2015 Uwe Hermann +;; +;; 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 = 0x501D ; Manufacturer ID (0x1D50) +PID = 0x8D60 ; Product ID (0x608D) + +.include "dscr.inc" diff --git a/hw/sigrok-fx2-8ch/Makefile.am b/hw/sigrok-fx2-8ch/Makefile.am new file mode 100644 index 00000000..6a3ce9da --- /dev/null +++ b/hw/sigrok-fx2-8ch/Makefile.am @@ -0,0 +1,26 @@ +## +## This file is part of the sigrok-firmware-fx2lafw project. +## +## Copyright (C) 2015 Uwe Hermann +## +## 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 +## + +BASENAME = fx2lafw-sigrok-fx2-8ch + +all-local: $(BASENAME).fw + +include $(srcdir)/../Makefile.inc + diff --git a/hw/sigrok-fx2-8ch/dscr.a51 b/hw/sigrok-fx2-8ch/dscr.a51 new file mode 100644 index 00000000..4eecd9fe --- /dev/null +++ b/hw/sigrok-fx2-8ch/dscr.a51 @@ -0,0 +1,24 @@ +;; +;; This file is part of the sigrok-firmware-fx2lafw project. +;; +;; Copyright (C) 2015 Uwe Hermann +;; +;; 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 = 0x501D ; Manufacturer ID (0x1D50) +PID = 0x8C60 ; Product ID (0x608C) + +.include "dscr.inc"