Hello community,
here is the log from the commit of package sigrok-firmware-fx2lafw for
openSUSE:Factory checked in at 2019-11-20 10:27:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sigrok-firmware-fx2lafw (Old)
and /work/SRC/openSUSE:Factory/.sigrok-firmware-fx2lafw.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sigrok-firmware-fx2lafw"
Wed Nov 20 10:27:51 2019 rev:5 rq:749682 version:0.1.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.changes
2018-01-30 15:44:32.346225585 +0100
+++
/work/SRC/openSUSE:Factory/.sigrok-firmware-fx2lafw.new.26869/sigrok-firmware-fx2lafw.changes
2019-11-20 10:27:53.862570179 +0100
@@ -1,0 +2,13 @@
+Fri Nov 15 21:17:28 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Update to version 0.1.7, upstream changes:
+ * Add firmware for the YiXingDianZi MDSO (VID/PID: 1D50:608E).
+ * Sainsmart DDS120: Fix the 1kHz reference signal.
+ * Hantek 6022BL: Fix the voltage range selection (bug #1360).
+ * Allow LA captures at 48MHz samplerate (as long as bus conditions permit).
+ * Updated build requirement: sdcc >= 3.4.0 (bug #1326).
+ * Fix a build issue with sdcc >= 3.9.0 (bug #1404).
+ * Bump the firmware version (major.minor) to 1.4. This version is
+ backwards-compatible and doesn't require host-side (libsigrok) changes.
+
+-------------------------------------------------------------------
Old:
----
sigrok-firmware-fx2lafw-0.1.6.tar.gz
New:
----
sigrok-firmware-fx2lafw-0.1.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sigrok-firmware-fx2lafw.spec ++++++
--- /var/tmp/diff_new_pack.vuIFPR/_old 2019-11-20 10:27:54.618570330 +0100
+++ /var/tmp/diff_new_pack.vuIFPR/_new 2019-11-20 10:27:54.618570330 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sigrok-firmware-fx2lafw
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,25 +12,23 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Summary: Firmware for Logic Analyzers based on the Cypress EZ-USB
FX2(LP) Chip
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Hardware/Other
-
Name: sigrok-firmware-fx2lafw
-Version: 0.1.6
+Version: 0.1.7
Release: 0
-BuildArch: noarch
-Url: http://sigrok.org
-Source0:
http://sigrok.org/download/source/sigrok-firmware-fx2lafw/%{name}-%{version}.tar.gz
+URL: https://sigrok.org
+Source0:
https://sigrok.org/download/source/sigrok-firmware-fx2lafw/%{name}-%{version}.tar.gz
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
-BuildRequires: sdcc
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: sdcc >= 3.4.0
+BuildArch: noarch
%description
fx2lafw is a free/libre/open-source firmware for logic analyzers based on
@@ -47,8 +45,8 @@
%make_install
%files
-%defattr(-,root,root,-)
-%doc NEWS README COPYING COPYING.LESSER
+%license COPYING COPYING.LESSER
+%doc NEWS README
%_datadir/sigrok-firmware
%changelog
++++++ sigrok-firmware-fx2lafw-0.1.6.tar.gz ->
sigrok-firmware-fx2lafw-0.1.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/ChangeLog
new/sigrok-firmware-fx2lafw-0.1.7/ChangeLog
--- old/sigrok-firmware-fx2lafw-0.1.6/ChangeLog 2018-01-26 19:33:47.000000000
+0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/ChangeLog 2019-11-14 21:47:01.000000000
+0100
@@ -1,3 +1,91 @@
+commit b6ec4813b592757e39784b9b370f3b12ae876954
+Author: Uwe Hermann <u...@hermann-uwe.de>
+Date: Thu Nov 14 21:45:52 2019 +0100
+
+ configure.ac: Bump package version to 0.1.7.
+
+commit 8da0cd02228bb6890eb5068e6507bf6ce0d2fdd2
+Author: Uwe Hermann <u...@hermann-uwe.de>
+Date: Thu Nov 14 21:45:25 2019 +0100
+
+ Increase FX2LAFW_VERSION_MINOR to 4.
+
+ There have been changes since the last release, but they have been
+ compatible ones that don't require any host-side (libsigrok) changes,
+ thus only increase FX2LAFW_VERSION_MINOR (but not FX2LAFW_VERSION_MAJOR).
+
+commit 24a04d22869658abcc96067349a588845cf9a80c
+Author: Uwe Hermann <u...@hermann-uwe.de>
+Date: Thu Nov 14 21:45:10 2019 +0100
+
+ NEWS: Add list of user-visible changes so far.
+
+commit b283ba837a113c2c5085319aa993e2a70e118734
+Author: Kate J. Temkin <k...@ktemkin.com>
+Date: Wed Aug 21 18:59:55 2019 -0600
+
+ allow captures of up to 48MHz, if bus conditions permit
+
+ We allow the FX2 Waveform to operate using only a single state
+ (and thus at a rate equal to the max IFCLK of 48MHz) by allowing
+ the decision point state to re-execute its operation.
+
+ We accordingly remove the guards preventing operation with
+ zero-duration wait states; allowing waveforms with no wait states
+ to be generated.
+
+commit 4e52e8a1fa6be86fed185389a1455cd20cc81463
+Author: Daniel Trnka <daniel.tr...@gmail.com>
+Date: Sun Sep 15 09:51:26 2019 +0200
+
+ build: use sdar instead of deprecated sdcclib
+
+ This fixes bug #1404
+
+commit 87da1d2ca36220b7e55a80b3825a3cbf96c747b7
+Author: Philip Gottschling <gottschli...@gmail.com>
+Date: Sat Dec 29 14:58:50 2018 +0100
+
+ bugfix in hantek 6022BL voltage range selection
+
+ This fixes bug #1360.
+
+commit 8e269f7bfe3c6934a12f7a33274a6bf249a02610
+Author: Uwe Hermann <u...@hermann-uwe.de>
+Date: Fri Dec 28 13:33:52 2018 +0100
+
+ Makefile.am: Split an overly long line.
+
+commit 7a4d2e556c911dcd4182369fb2fbbd8dc70bf4f3
+Author: majekw <ma...@w7i.pl>
+Date: Sun Dec 2 00:16:28 2018 +0100
+
+ Add YiXingDianZi MDSO firmware support.
+
+commit fac71cc2015cd5ca9fbec4dd19fdf44c8206e246
+Author: Uwe Hermann <u...@hermann-uwe.de>
+Date: Sat Nov 17 20:39:59 2018 +0100
+
+ Bump required sdcc version to >= 3.4.0.
+
+ There is an issue with some sdcc versions that causes problems, e.g. only
+ the first scan for an FX2 device succeeds, the second one yields
+ LIBUSB_ERROR_PIPE (see bug #1326).
+
+ Recent tests have shown that sdcc 3.3.0 produces broken fx2lafw firmware
+ files, and sdcc 3.1.0 errors out during the build. Versions 3.4.0, 3.5.0,
+ 3.6.9, and 3.8.0 (for example) all seem to work fine.
+
+ Thus, increase the minimum required sdcc version to 3.4.0.
+
+ This fixes bug #1326.
+
+commit 14728a53624f000db0fa8388ecdb8b021250322b
+Author: Sergey Alirzaev <zl2...@gmail.com>
+Date: Thu Apr 12 10:20:30 2018 +0300
+
+ sainsmart-dds120: make the "1kHz" reference signal 1kHz
+
commit 0fdc160d822b7ccb23487307a64b1ef6be2acccc
Author: Uwe Hermann <u...@hermann-uwe.de>
Date: Wed Jan 24 19:47:03 2018 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/Makefile.am
new/sigrok-firmware-fx2lafw-0.1.7/Makefile.am
--- old/sigrok-firmware-fx2lafw-0.1.6/Makefile.am 2018-01-26
19:33:33.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/Makefile.am 2019-11-14
21:46:18.000000000 +0100
@@ -49,7 +49,8 @@
hw/sigrok-fx2-16ch/$(dirstamp) \
hw/hantek-6022be/$(dirstamp) \
hw/hantek-6022bl/$(dirstamp) \
- hw/sainsmart-dds120/$(dirstamp)
+ hw/sainsmart-dds120/$(dirstamp) \
+ hw/yixingdianzi-mdso/$(dirstamp)
# Final firmware files
firmware_binaries = \
@@ -64,7 +65,8 @@
hw/sigrok-fx2-16ch/fx2lafw-sigrok-fx2-16ch.fw \
hw/hantek-6022be/fx2lafw-hantek-6022be.fw \
hw/hantek-6022bl/fx2lafw-hantek-6022bl.fw \
- hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.fw
+ hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.fw \
+ hw/yixingdianzi-mdso/fx2lafw-yixingdianzi-mdso.fw
fx2lafw_headers = \
include/command.h \
@@ -98,6 +100,10 @@
sainsmart_dds120_sources = hw/sainsmart-dds120/fw.c
sainsmart_dds120_objects = hw/sainsmart-dds120/fw.rel
+yixingdianzi_mdso_headers = $(scope_headers)
+yixingdianzi_mdso_sources = hw/yixingdianzi-mdso/fw.c
+yixingdianzi_mdso_objects = hw/yixingdianzi-mdso/fw.rel
+
fx2lib_headers = \
fx2lib/include/autovector.h \
fx2lib/include/delay.h \
@@ -238,12 +244,19 @@
hw/sigrok-fx2-16ch/dscr.a51 \
hw/hantek-6022be/dscr.a51 \
hw/hantek-6022bl/dscr.a51 \
- hw/sainsmart-dds120/dscr.a51
+ hw/sainsmart-dds120/dscr.a51 \
+ hw/yixingdianzi-mdso/dscr.a51
firmwaredir = $(datadir)/sigrok-firmware
firmware_DATA = $(firmware_binaries)
-dist_noinst_DATA = $(fx2lafw_headers) $(fx2lafw_sources)
$(hantek_6022be_headers) $(hantek_6022be_sources) $(hantek_6022bl_headers)
$(hantek_6022bl_sources) $(sainsmart_dds120_sources)
$(sainsmart_dds120_headers) $(fx2lib_headers) $(fx2lib_sources)
$(fx2lib_ints_sources) $(hw_sources)
+dist_noinst_DATA = \
+ $(fx2lafw_headers) $(fx2lafw_sources) \
+ $(hantek_6022be_headers) $(hantek_6022be_sources) \
+ $(hantek_6022bl_headers) $(hantek_6022bl_sources) \
+ $(sainsmart_dds120_sources) $(sainsmart_dds120_headers) \
+ $(yixingdianzi_mdso_sources) $(yixingdianzi_mdso_headers) \
+ $(fx2lib_headers) $(fx2lib_sources) $(fx2lib_ints_sources) $(hw_sources)
dist_noinst_SCRIPTS = autogen.sh
MOSTLYCLEANFILES = *.asm fx2lib/lib/*.asm hw/**/*.asm fx2lib/lib/*.lib
fx2lib/lib/interrupts/*.asm fx2lib/lib/interrupts/*.lib
@@ -311,6 +324,7 @@
hw/hantek-6022be/dscr.rel: hw/hantek-6022be/$(dirstamp) include/dscr_scope.inc
hw/hantek-6022bl/dscr.rel: hw/hantek-6022bl/$(dirstamp) include/dscr_scope.inc
hw/sainsmart-dds120/dscr.rel: hw/sainsmart-dds120/$(dirstamp)
include/dscr_scope.inc
+hw/yixingdianzi-mdso/dscr.rel: hw/yixingdianzi-mdso/$(dirstamp)
include/dscr_scope.inc
# Create build subdirectories
@@ -320,11 +334,11 @@
fx2lib/lib/fx2.lib: $(fx2lib_objects)
-$(AM_V_at)rm -f $@
- $(AM_V_GEN)$(SDCCLIB) $@ $(fx2lib_objects)
+ $(AM_V_GEN)$(SDAR) -rc $@ $(fx2lib_objects)
fx2lib/lib/interrupts/ints.lib: $(fx2lib_ints_objects)
-$(AM_V_at)rm -f $@
- $(AM_V_GEN)$(SDCCLIB) $@ $(fx2lib_ints_objects)
+ $(AM_V_GEN)$(SDAR) -rc $@ $(fx2lib_ints_objects)
hw/braintechnology-usb-lps/fx2lafw-braintechnology-usb-lps.ihx:
hw/braintechnology-usb-lps/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS) -o $@
hw/braintechnology-usb-lps/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
@@ -362,6 +376,9 @@
hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.ihx: hw/sainsmart-dds120/dscr.rel
$(sainsmart_dds120_objects) $(fx2lib_libs)
$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@
hw/sainsmart-dds120/dscr.rel $(sainsmart_dds120_objects) $(fx2lib_libs)
+hw/yixingdianzi-mdso/fx2lafw-yixingdianzi-mdso.ihx:
hw/yixingdianzi-mdso/dscr.rel $(yixingdianzi_mdso_objects) $(fx2lib_libs)
+ $(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@
hw/yixingdianzi-mdso/dscr.rel $(yixingdianzi_mdso_objects) $(fx2lib_libs)
+
.a51.rel:
$(SF_V_SDAS)$(SDAS8051) -glos $(as_includes) $@ $<
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/Makefile.in
new/sigrok-firmware-fx2lafw-0.1.7/Makefile.in
--- old/sigrok-firmware-fx2lafw-0.1.6/Makefile.in 2018-01-26
19:33:38.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/Makefile.in 2019-11-14
21:46:23.000000000 +0100
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -205,9 +205,9 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+SDAR = @SDAR@
SDAS8051 = @SDAS8051@
SDCC = @SDCC@
-SDCCLIB = @SDCCLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -282,7 +282,8 @@
hw/sigrok-fx2-16ch/$(dirstamp) \
hw/hantek-6022be/$(dirstamp) \
hw/hantek-6022bl/$(dirstamp) \
- hw/sainsmart-dds120/$(dirstamp)
+ hw/sainsmart-dds120/$(dirstamp) \
+ hw/yixingdianzi-mdso/$(dirstamp)
# Final firmware files
@@ -298,7 +299,8 @@
hw/sigrok-fx2-16ch/fx2lafw-sigrok-fx2-16ch.fw \
hw/hantek-6022be/fx2lafw-hantek-6022be.fw \
hw/hantek-6022bl/fx2lafw-hantek-6022bl.fw \
- hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.fw
+ hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.fw \
+ hw/yixingdianzi-mdso/fx2lafw-yixingdianzi-mdso.fw
fx2lafw_headers = \
include/command.h \
@@ -329,6 +331,9 @@
sainsmart_dds120_headers = $(scope_headers)
sainsmart_dds120_sources = hw/sainsmart-dds120/fw.c
sainsmart_dds120_objects = hw/sainsmart-dds120/fw.rel
+yixingdianzi_mdso_headers = $(scope_headers)
+yixingdianzi_mdso_sources = hw/yixingdianzi-mdso/fw.c
+yixingdianzi_mdso_objects = hw/yixingdianzi-mdso/fw.rel
fx2lib_headers = \
fx2lib/include/autovector.h \
fx2lib/include/delay.h \
@@ -469,11 +474,19 @@
hw/sigrok-fx2-16ch/dscr.a51 \
hw/hantek-6022be/dscr.a51 \
hw/hantek-6022bl/dscr.a51 \
- hw/sainsmart-dds120/dscr.a51
+ hw/sainsmart-dds120/dscr.a51 \
+ hw/yixingdianzi-mdso/dscr.a51
firmwaredir = $(datadir)/sigrok-firmware
firmware_DATA = $(firmware_binaries)
-dist_noinst_DATA = $(fx2lafw_headers) $(fx2lafw_sources)
$(hantek_6022be_headers) $(hantek_6022be_sources) $(hantek_6022bl_headers)
$(hantek_6022bl_sources) $(sainsmart_dds120_sources)
$(sainsmart_dds120_headers) $(fx2lib_headers) $(fx2lib_sources)
$(fx2lib_ints_sources) $(hw_sources)
+dist_noinst_DATA = \
+ $(fx2lafw_headers) $(fx2lafw_sources) \
+ $(hantek_6022be_headers) $(hantek_6022be_sources) \
+ $(hantek_6022bl_headers) $(hantek_6022bl_sources) \
+ $(sainsmart_dds120_sources) $(sainsmart_dds120_headers) \
+ $(yixingdianzi_mdso_sources) $(yixingdianzi_mdso_headers) \
+ $(fx2lib_headers) $(fx2lib_sources) $(fx2lib_ints_sources) $(hw_sources)
+
dist_noinst_SCRIPTS = autogen.sh
MOSTLYCLEANFILES = *.asm fx2lib/lib/*.asm hw/**/*.asm fx2lib/lib/*.lib
fx2lib/lib/interrupts/*.asm fx2lib/lib/interrupts/*.lib
CLEANFILES = $(firmware_binaries)
@@ -513,8 +526,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@
$(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@
$(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@
$(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@
$(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
@@ -553,7 +566,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@case `sed 15q $(srcdir)/NEWS` in \
*"$(VERSION)"*) : ;; \
*) \
@@ -904,6 +920,7 @@
hw/hantek-6022be/dscr.rel: hw/hantek-6022be/$(dirstamp) include/dscr_scope.inc
hw/hantek-6022bl/dscr.rel: hw/hantek-6022bl/$(dirstamp) include/dscr_scope.inc
hw/sainsmart-dds120/dscr.rel: hw/sainsmart-dds120/$(dirstamp)
include/dscr_scope.inc
+hw/yixingdianzi-mdso/dscr.rel: hw/yixingdianzi-mdso/$(dirstamp)
include/dscr_scope.inc
# Create build subdirectories
$(dirstamps):
@@ -912,11 +929,11 @@
fx2lib/lib/fx2.lib: $(fx2lib_objects)
-$(AM_V_at)rm -f $@
- $(AM_V_GEN)$(SDCCLIB) $@ $(fx2lib_objects)
+ $(AM_V_GEN)$(SDAR) -rc $@ $(fx2lib_objects)
fx2lib/lib/interrupts/ints.lib: $(fx2lib_ints_objects)
-$(AM_V_at)rm -f $@
- $(AM_V_GEN)$(SDCCLIB) $@ $(fx2lib_ints_objects)
+ $(AM_V_GEN)$(SDAR) -rc $@ $(fx2lib_ints_objects)
hw/braintechnology-usb-lps/fx2lafw-braintechnology-usb-lps.ihx:
hw/braintechnology-usb-lps/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS) -o $@
hw/braintechnology-usb-lps/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
@@ -954,6 +971,9 @@
hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.ihx: hw/sainsmart-dds120/dscr.rel
$(sainsmart_dds120_objects) $(fx2lib_libs)
$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@
hw/sainsmart-dds120/dscr.rel $(sainsmart_dds120_objects) $(fx2lib_libs)
+hw/yixingdianzi-mdso/fx2lafw-yixingdianzi-mdso.ihx:
hw/yixingdianzi-mdso/dscr.rel $(yixingdianzi_mdso_objects) $(fx2lib_libs)
+ $(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@
hw/yixingdianzi-mdso/dscr.rel $(yixingdianzi_mdso_objects) $(fx2lib_libs)
+
.a51.rel:
$(SF_V_SDAS)$(SDAS8051) -glos $(as_includes) $@ $<
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/NEWS
new/sigrok-firmware-fx2lafw-0.1.7/NEWS
--- old/sigrok-firmware-fx2lafw-0.1.6/NEWS 2018-01-26 19:33:33.000000000
+0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/NEWS 2019-11-14 21:46:18.000000000
+0100
@@ -1,3 +1,15 @@
+0.1.7 (2019-11-14)
+------------------
+
+ * Add firmware for the YiXingDianZi MDSO (VID/PID: 1D50:608E).
+ * Sainsmart DDS120: Fix the 1kHz reference signal.
+ * Hantek 6022BL: Fix the voltage range selection (bug #1360).
+ * Allow LA captures at 48MHz samplerate (as long as bus conditions permit).
+ * Updated build requirement: sdcc >= 3.4.0 (bug #1326).
+ * Fix a build issue with sdcc >= 3.9.0 (bug #1404).
+ * Bump the firmware version (major.minor) to 1.4. This version is
+ backwards-compatible and doesn't require host-side (libsigrok) changes.
+
0.1.6 (2018-01-26)
------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/README
new/sigrok-firmware-fx2lafw-0.1.7/README
--- old/sigrok-firmware-fx2lafw-0.1.6/README 2018-01-26 19:33:33.000000000
+0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/README 2019-11-14 21:46:18.000000000
+0100
@@ -25,16 +25,7 @@
- make
- autoconf >= 2.63
- automake >= 1.11
- - sdcc (>= 2.9.0)
-
-Notes:
-
- - In order to build fx2lafw you need the 'sdcc' compiler (>= 2.9.0).
- On Debian you can install it via:
-
- $ apt-get install sdcc
-
- This project has been tested to work with sdcc 2.9 and 3.x.
+ - sdcc (>= 3.4.0)
Building and installing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/aclocal.m4
new/sigrok-firmware-fx2lafw-0.1.7/aclocal.m4
--- old/sigrok-firmware-fx2lafw-0.1.6/aclocal.m4 2018-01-26
19:33:37.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/aclocal.m4 2019-11-14
21:46:22.000000000 +0100
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically
'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -143,7 +143,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -230,8 +230,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -298,7 +298,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -340,7 +340,7 @@
done
echo "timestamp for $_am_arg"
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -361,7 +361,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -382,7 +382,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -421,7 +421,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -452,7 +452,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -533,7 +533,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -593,7 +593,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -621,7 +621,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -640,7 +640,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/autostuff/install-sh
new/sigrok-firmware-fx2lafw-0.1.7/autostuff/install-sh
--- old/sigrok-firmware-fx2lafw-0.1.6/autostuff/install-sh 2018-01-26
19:33:38.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/autostuff/install-sh 2019-11-14
21:46:23.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2014-09-12.12; # UTC
+scriptversion=2018-03-11.20; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,15 +271,18 @@
fi
dst=$dst_arg
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
+ # If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
- dst=$dstdir/`basename "$src"`
+ dstbase=`basename "$src"`
+ case $dst in
+ */) dst=$dst$dstbase;;
+ *) dst=$dst/$dstbase;;
+ esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
@@ -288,6 +291,11 @@
fi
fi
+ case $dstdir in
+ */) dstdirslash=$dstdir;;
+ *) dstdirslash=$dstdir/;;
+ esac
+
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
@@ -324,14 +332,16 @@
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
- # $RANDOM is not portable (e.g. dash); use it when possible to
- # lower collision chance
+ # Note that $RANDOM variable is not portable (e.g. dash); Use it
+ # here however when possible just to lower collision chance.
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
2>/dev/null; exit $ret' 0
- # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
- # create the $tmpdir first (and fail if unsuccessful) to make sure
- # that nobody tries to guess the $tmpdir name.
+ # Because "mkdir -p" follows existing symlinks and we likely work
+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directory is successfully created first before we actually test
+ # 'mkdir -p' feature.
if (umask $mkdir_umask &&
$mkdirprog $mkdir_mode "$tmpdir" &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null
2>&1
@@ -434,8 +444,8 @@
else
# Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
+ dsttmp=${dstdirslash}_inst.$$_
+ rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@@ -500,9 +510,9 @@
done
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/autostuff/missing
new/sigrok-firmware-fx2lafw-0.1.7/autostuff/missing
--- old/sigrok-firmware-fx2lafw-0.1.6/autostuff/missing 2018-01-26
19:33:38.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/autostuff/missing 2019-11-14
21:46:23.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# 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, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/configure
new/sigrok-firmware-fx2lafw-0.1.7/configure
--- old/sigrok-firmware-fx2lafw-0.1.6/configure 2018-01-26 19:33:38.000000000
+0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/configure 2019-11-14 21:46:23.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sigrok-firmware-fx2lafw 0.1.6.
+# Generated by GNU Autoconf 2.69 for sigrok-firmware-fx2lafw 0.1.7.
#
# Report bugs to <sigrok-de...@lists.sourceforge.net>.
#
@@ -639,8 +639,8 @@
# Identity of this package.
PACKAGE_NAME='sigrok-firmware-fx2lafw'
PACKAGE_TARNAME='sigrok-firmware-fx2lafw'
-PACKAGE_VERSION='0.1.6'
-PACKAGE_STRING='sigrok-firmware-fx2lafw 0.1.6'
+PACKAGE_VERSION='0.1.7'
+PACKAGE_STRING='sigrok-firmware-fx2lafw 0.1.7'
PACKAGE_BUGREPORT='sigrok-de...@lists.sourceforge.net'
PACKAGE_URL='http://www.sigrok.org'
@@ -653,7 +653,7 @@
FOUND_OBJCOPY_TRUE
MAKEBIN
OBJCOPY
-SDCCLIB
+SDAR
SDCC
LN_S
AM_BACKSLASH
@@ -1280,7 +1280,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sigrok-firmware-fx2lafw 0.1.6 to adapt to many kinds
of systems.
+\`configure' configures sigrok-firmware-fx2lafw 0.1.7 to adapt to many kinds
of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1348,7 +1348,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sigrok-firmware-fx2lafw
0.1.6:";;
+ short | recursive ) echo "Configuration of sigrok-firmware-fx2lafw
0.1.7:";;
esac
cat <<\_ACEOF
@@ -1423,7 +1423,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sigrok-firmware-fx2lafw configure 0.1.6
+sigrok-firmware-fx2lafw configure 0.1.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1440,7 +1440,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sigrok-firmware-fx2lafw $as_me 0.1.6, which was
+It was created by sigrok-firmware-fx2lafw $as_me 0.1.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1819,7 +1819,7 @@
# We require at least automake 1.11 (needed for 'silent rules').
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2305,7 +2305,7 @@
# Define the identity of the package.
PACKAGE='sigrok-firmware-fx2lafw'
- VERSION='0.1.6'
+ VERSION='0.1.7'
# Some tools Automake needs.
@@ -2326,8 +2326,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -2378,7 +2378,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -2489,17 +2489,17 @@
as_fn_error $? "cannot find sdcc." "$LINENO" 5
fi
-for ac_prog in sdcclib sdcc-sdcclib
+for ac_prog in sdar sdcc-sdar
do
# Extract the first word of "$ac_prog", so it can be a program name with
args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_SDCCLIB+:} false; then :
+if ${ac_cv_prog_SDAR+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$SDCCLIB"; then
- ac_cv_prog_SDCCLIB="$SDCCLIB" # Let the user override the test.
+ if test -n "$SDAR"; then
+ ac_cv_prog_SDAR="$SDAR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2508,7 +2508,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_SDCCLIB="$ac_prog"
+ ac_cv_prog_SDAR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext"
>&5
break 2
fi
@@ -2518,30 +2518,30 @@
fi
fi
-SDCCLIB=$ac_cv_prog_SDCCLIB
-if test -n "$SDCCLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDCCLIB" >&5
-$as_echo "$SDCCLIB" >&6; }
+SDAR=$ac_cv_prog_SDAR
+if test -n "$SDAR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDAR" >&5
+$as_echo "$SDAR" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$SDCCLIB" && break
+ test -n "$SDAR" && break
done
-if test "x$SDCCLIB" = x; then :
- as_fn_error $? "cannot find sdcclib." "$LINENO" 5
+if test "x$SDAR" = x; then :
+ as_fn_error $? "cannot find sdar." "$LINENO" 5
fi
sf_sdcc_version=`$SDCC --version | sed -n 's/.*
\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\) .*/\1/p;q' 2>&5`
as_arg_v1=$sf_sdcc_version
-as_arg_v2=2.9.0
+as_arg_v2=3.4.0
awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
case $? in #(
1) :
- as_fn_error $? "At least version 2.9.0 of sdcc is required." "$LINENO" 5
;; #(
+ as_fn_error $? "At least version 3.4.0 of sdcc is required." "$LINENO" 5
;; #(
0) :
;; #(
2) :
@@ -3266,7 +3266,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sigrok-firmware-fx2lafw $as_me 0.1.6, which was
+This file was extended by sigrok-firmware-fx2lafw $as_me 0.1.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3320,7 +3320,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-sigrok-firmware-fx2lafw config.status 0.1.6
+sigrok-firmware-fx2lafw config.status 0.1.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/configure.ac
new/sigrok-firmware-fx2lafw-0.1.7/configure.ac
--- old/sigrok-firmware-fx2lafw-0.1.6/configure.ac 2018-01-26
19:33:33.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/configure.ac 2019-11-14
21:46:18.000000000 +0100
@@ -20,7 +20,7 @@
# We require at least autoconf 2.63 (AC_INIT format changed there).
AC_PREREQ([2.63])
-AC_INIT([sigrok-firmware-fx2lafw], [0.1.6],
+AC_INIT([sigrok-firmware-fx2lafw], [0.1.7],
[sigrok-de...@lists.sourceforge.net],
[sigrok-firmware-fx2lafw], [http://www.sigrok.org])
AC_CONFIG_AUX_DIR([autostuff])
@@ -37,13 +37,13 @@
AS_IF([test "x$SDCC" = x],
[AC_MSG_ERROR([cannot find sdcc.])])
-AC_CHECK_PROGS([SDCCLIB], [sdcclib sdcc-sdcclib])
-AS_IF([test "x$SDCCLIB" = x],
- [AC_MSG_ERROR([cannot find sdcclib.])])
+AC_CHECK_PROGS([SDAR], [sdar sdcc-sdar])
+AS_IF([test "x$SDAR" = x],
+ [AC_MSG_ERROR([cannot find sdar.])])
sf_sdcc_version=`$SDCC --version | sed -n 's/.*
\([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\) .*/\1/p;q'
2>&AS_MESSAGE_LOG_FD`
-AS_VERSION_COMPARE([$sf_sdcc_version], [2.9.0],
- [AC_MSG_ERROR([At least version 2.9.0 of sdcc is required.])])
+AS_VERSION_COMPARE([$sf_sdcc_version], [3.4.0],
+ [AC_MSG_ERROR([At least version 3.4.0 of sdcc is required.])])
AC_CHECK_PROGS([OBJCOPY], [objcopy])
AC_CHECK_PROGS([MAKEBIN], [makebin sdcc-makebin])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/gpif-acquisition.c
new/sigrok-firmware-fx2lafw-0.1.7/gpif-acquisition.c
--- old/sigrok-firmware-fx2lafw-0.1.6/gpif-acquisition.c 2018-01-26
19:33:33.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/gpif-acquisition.c 2019-11-14
21:46:18.000000000 +0100
@@ -161,7 +161,7 @@
* BRANCH
* Branch to IDLE if condition is true, back to S0 otherwise.
*/
- pSTATE[0] = (7 << 3) | (0 << 0);
+ pSTATE[0] = (1 << 7) | (7 << 3) | (0 << 0);
/*
* OPCODE
@@ -208,8 +208,7 @@
}
/* Populate delay states. */
- if ((cmd->sample_delay_h == 0 && cmd->sample_delay_l == 0) ||
- cmd->sample_delay_h >= 6)
+ if (cmd->sample_delay_h >= 6)
return false;
if (cmd->flags & CMD_START_FLAGS_CLK_CTL2) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/hw/hantek-6022bl/fw.c
new/sigrok-firmware-fx2lafw-0.1.7/hw/hantek-6022bl/fw.c
--- old/sigrok-firmware-fx2lafw-0.1.6/hw/hantek-6022bl/fw.c 2018-01-26
19:33:33.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/hw/hantek-6022bl/fw.c 2019-11-14
21:46:18.000000000 +0100
@@ -100,7 +100,7 @@
return FALSE;
}
- bits = bits << (channel ? 1 : 4);
+ bits = bits << (channel ? 4 : 1);
mask = (channel) ? 0x70 : 0x0e;
IOA = (IOA & ~mask) | (bits & mask);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sigrok-firmware-fx2lafw-0.1.6/hw/sainsmart-dds120/fw.c
new/sigrok-firmware-fx2lafw-0.1.7/hw/sainsmart-dds120/fw.c
--- old/sigrok-firmware-fx2lafw-0.1.6/hw/sainsmart-dds120/fw.c 2018-01-26
19:33:33.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/hw/sainsmart-dds120/fw.c 2019-11-14
21:46:18.000000000 +0100
@@ -37,7 +37,7 @@
#define LED_GREEN() NOP
#define LED_RED() NOP
-#define TIMER2_VAL 1000
+#define TIMER2_VAL 500
/* CTLx pin index (IFCLK, ADC clock input). */
#define CTL_BIT 2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sigrok-firmware-fx2lafw-0.1.6/hw/yixingdianzi-mdso/dscr.a51
new/sigrok-firmware-fx2lafw-0.1.7/hw/yixingdianzi-mdso/dscr.a51
--- old/sigrok-firmware-fx2lafw-0.1.6/hw/yixingdianzi-mdso/dscr.a51
1970-01-01 01:00:00.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/hw/yixingdianzi-mdso/dscr.a51
2019-11-14 21:46:18.000000000 +0100
@@ -0,0 +1,27 @@
+;;
+;; This file is part of the sigrok-firmware-fx2lafw project.
+;;
+;; Copyright (C) 2016 Uwe Hermann <u...@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, see <http://www.gnu.org/licenses/>.
+;;
+
+VID = 0x501d ; Manufacturer ID (0x1d50)
+PID = 0x8e60 ; Product ID (0x608e)
+VER = 0x0400 ; Product "version". 0x0004 == YiXingDianZi MDSO.
+
+.include "dscr_scope.inc"
+string_descriptor_a 3,^"YiXingDianZi MDSO"
+_dev_strings_end:
+ .dw 0x0000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sigrok-firmware-fx2lafw-0.1.6/hw/yixingdianzi-mdso/fw.c
new/sigrok-firmware-fx2lafw-0.1.7/hw/yixingdianzi-mdso/fw.c
--- old/sigrok-firmware-fx2lafw-0.1.6/hw/yixingdianzi-mdso/fw.c 1970-01-01
01:00:00.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/hw/yixingdianzi-mdso/fw.c 2019-11-14
21:46:18.000000000 +0100
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the sigrok-firmware-fx2lafw project.
+ *
+ * Copyright (C) 2009 Ubixum, Inc.
+ * Copyright (C) 2015 Jochen Hoenicke
+ * Copyright (C) 2018 Marek Wodzinski
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <fx2macros.h>
+#include <fx2ints.h>
+#include <autovector.h>
+#include <delay.h>
+#include <setupdat.h>
+
+#define SET_ANALOG_MODE()
+
+#define SET_COUPLING(x)
+
+#define SET_CALIBRATION_PULSE(x)
+
+#define TOGGLE_CALIBRATION_PIN()
+
+#define LED_CLEAR() NOP
+#define LED_GREEN() NOP
+#define LED_RED() NOP
+
+#define TIMER2_VAL 500
+
+/* CTLx pin index (IFCLK, ADC clock input). */
+#define CTL_BIT 0
+
+#define OUT0 ((1 << CTL_BIT) << 4) /* OEx = 1, CTLx = 0 */
+
+static const struct samplerate_info samplerates[] = {
+ { 48, 0x80, 0, 3, 0, 0x00, 0xea },
+ { 30, 0x80, 0, 3, 0, 0x00, 0xaa },
+ { 24, 1, 0, 2, 1, OUT0, 0xca },
+ { 16, 1, 1, 2, 0, OUT0, 0xca },
+ { 12, 2, 1, 2, 0, OUT0, 0xca },
+ { 8, 3, 2, 2, 0, OUT0, 0xca },
+ { 4, 6, 5, 2, 0, OUT0, 0xca },
+ { 2, 12, 11, 2, 0, OUT0, 0xca },
+ { 1, 24, 23, 2, 0, OUT0, 0xca },
+ { 50, 48, 47, 2, 0, OUT0, 0xca },
+ { 20, 120, 119, 2, 0, OUT0, 0xca },
+ { 10, 240, 239, 2, 0, OUT0, 0xca },
+};
+
+/*
+ * This sets three bits for each channel, one channel at a time.
+ * For channel 0 we want to set bits 1, 2 & 3
+ * For channel 1 we want to set bits 4, 5 & 6
+ *
+ * We convert the input values that are strange due to original
+ * firmware code into the value of the three bits as follows:
+ *
+ * val -> bits
+ * 1 -> 010b
+ * 2 -> 001b
+ * 5 -> 000b
+ * 10(16) -> 011b
+ *
+ * The third bit is always zero since there are only four outputs connected
+ * from the 74HC4051 chip.
+ */
+static BOOL set_voltage(BYTE channel, BYTE val)
+{
+ BYTE bits, mask;
+
+ switch (val) {
+ case 1:
+ bits = 0x24;
+ break;
+ case 2:
+ bits = 0x12;
+ break;
+ case 5:
+ bits = 0x00;
+ break;
+ case 10: /* For backward compatibility. */
+ case 16:
+ bits = 0x36;
+ break;
+ default:
+ return FALSE;
+ }
+
+ mask = (channel) ? 0x70 : 0x0e;
+ IOA = (IOA & ~mask) | (bits & mask);
+
+ return TRUE;
+}
+
+#include <scope.inc>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sigrok-firmware-fx2lafw-0.1.6/include/fx2lafw.h
new/sigrok-firmware-fx2lafw-0.1.7/include/fx2lafw.h
--- old/sigrok-firmware-fx2lafw-0.1.6/include/fx2lafw.h 2018-01-26
19:33:33.000000000 +0100
+++ new/sigrok-firmware-fx2lafw-0.1.7/include/fx2lafw.h 2019-11-14
21:46:18.000000000 +0100
@@ -37,7 +37,7 @@
* longer (properly) work with the new fx2lafw firmware.
*/
#define FX2LAFW_VERSION_MAJOR 1
-#define FX2LAFW_VERSION_MINOR 3
+#define FX2LAFW_VERSION_MINOR 4
#define LED_POLARITY 1 /* 1: active-high, 0: active-low */
