Support older Cypress FX2 (not FX2LP) too.

The Cypress FX2 chip is an older version of the FX2LP chip with a few
differences that might be relevant for fx2lafw, the major one being
that is has less internal SRAM.

We adapt the linking step to work for both FX2 and FX2LP, thus
keeping only one set of *.fw files for both chip versions.

Changes to the fx2lafw driver in libsigrok are not required.

Some logic analyzer devices such as older USBee SX versions or more recent
devices which use a "fake" FX2LP (which is actually an FX2) need this.

This closes bug #3.

diff --git a/NEWS b/NEWS
index e373f0e532e24296ca79e19682a4be2f31fbbb43..34ab80e0c95dfb39a6938f8ab5d1d06aded1f9eb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@
  * Add support for the USBee DX. Only digital sampling is supported (as is
    the case for all other supported devices so far). Analog data acquisition
    is currently not implemented.
+ * Add support for devices with the older Cypress CY7C68013 (FX2) chip
+   instead of the more recent Cypress CY7C68013A (FX2LP). See also:
+   http://sigrok.org/wiki/Fx2lafw#Cypress_FX2_vs._FX2LP
  * Convert to a standard autotools based build/configuration system.
    Installation is now: ./configure && make && make install
  * README: Update status, website URLs, requirements, etc.

diff --git a/configure.ac b/configure.ac
index 41b657cfa647072ca892bd1e24a73d10698149a6..999b5c92df199ab98a979b290e5a628f754a4db9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AM_COND_IF([FOUND_MAKEBIN], [AC_SUBST(FOUND_MAKEBIN, "yes")])
 # Older sdcc: asx8051
 AC_CHECK_PROGS([SDAS8051], [sdas8051 sdcc-sdas8051 asx8051])
 
-AC_SUBST(SDCC_FLAGS, "--code-size 0x3c00 --xram-size 0x0200 --xram-loc 0x3c00 -Wl\"-b DSCR_AREA=0x3e00\" -Wl\"-b INT2JT=0x3f00\"")
+AC_SUBST(SDCC_FLAGS, "--code-size 0x1c00 --xram-size 0x0200 --xram-loc 0x1c00 -Wl\"-b DSCR_AREA=0x1e00\" -Wl\"-b INT2JT=0x1f00\"")
 AC_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware")
 AC_SUBST(MAKEFLAGS, '--no-print-directory')