From: Joel Holdsworth <redacted>
Date: Wed, 18 Apr 2012 21:25:15 +0000 (+0100)
Subject: Added support for Default Cypress FX2 without EEPROM
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.0~30
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=572ac4c4c2e04fc12cf11dc1d60d528209f9919c;p=sigrok-firmware-fx2lafw.git

Added support for Default Cypress FX2 without EEPROM
---

diff --git a/Makefile b/Makefile
index 06c8ebb1..af2301ce 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-all: saleae-logic cwav-usbeeax cwav-usbeesx
+all: saleae-logic cwav-usbeeax cwav-usbeesx cypress-fx2
 
 saleae-logic:
 	$(MAKE) -C hw/saleae-logic
@@ -29,10 +29,14 @@ cwav-usbeeax:
 cwav-usbeesx:
 	$(MAKE) -C hw/cwav-usbeesx
 
+cypress-fx2:
+	$(MAKE) -C hw/cypress-fx2
+
 clean:
 	rm -rf hw/saleae-logic/build
 	rm -rf hw/cwav-usbeeax/build
 	rm -rf hw/cwav-usbeesx/build
+	rm -rf hw/cypress-fx2/build
 
-.PHONY: saleae-logic cwav-usbeeax cwav-usbeesx
+.PHONY: saleae-logic cwav-usbeeax cwav-usbeesx cypress-fx2
 
diff --git a/hw/cypress-fx2/Makefile b/hw/cypress-fx2/Makefile
new file mode 100644
index 00000000..e55beda4
--- /dev/null
+++ b/hw/cypress-fx2/Makefile
@@ -0,0 +1,27 @@
+##
+## This file is part of the fx2lafw project.
+##
+## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+##
+## 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 = cypress-fx2
+
+include ../../Makefile.include
diff --git a/hw/cypress-fx2/dscr.a51 b/hw/cypress-fx2/dscr.a51
new file mode 100644
index 00000000..540642a4
--- /dev/null
+++ b/hw/cypress-fx2/dscr.a51
@@ -0,0 +1,25 @@
+;;
+;; This file is part of the fx2lafw project.
+;;
+;; Copyright (C) 2011-2012 Uwe Hermann <uwe@hermann-uwe.de>
+;; Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+;;
+;; 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 = 0xB404	; Manufacturer ID (0x04B4)
+PID = 0x1386	; Product ID (0x8613)
+
+.include "../../../include/dscr.inc"