X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=firmware%2Fdreamsourcelab-dslogic%2Fsigrok-fwextract-dreamsourcelab-dslogic;h=4e357f31087347365ab3afebf0bb254b8ec01d89;hp=4e8714b5ebd55690de5b06e78c969a2c87545b36;hb=b1181fe12749e653f74285f71edd09dd6fc859ff;hpb=2583d67babec5b84ea8d3770418618dd9430e498

diff --git a/firmware/dreamsourcelab-dslogic/sigrok-fwextract-dreamsourcelab-dslogic b/firmware/dreamsourcelab-dslogic/sigrok-fwextract-dreamsourcelab-dslogic
index 4e8714b..4e357f3 100755
--- a/firmware/dreamsourcelab-dslogic/sigrok-fwextract-dreamsourcelab-dslogic
+++ b/firmware/dreamsourcelab-dslogic/sigrok-fwextract-dreamsourcelab-dslogic
@@ -26,10 +26,9 @@ if [ -z $PREFIX ]; then
 fi
 FWDIR="$PREFIX/share/sigrok-firmware"
 
-# Use the last known-working firmware/bitstream set. Newer versions have
-# incompatible changes that cause issues that need to be investigated.
-# http://sigrok.org/bugzilla/show_bug.cgi?id=886
-FWURL="https://github.com/DreamSourceLab/DSView/raw/4cc02c8d780e17527cd05e0ba7aa45288e49bd8a/DSView/res"
+# Use the upstream 0.97 firmware/bitstream set. This is the only supported
+# set of files in libsigrok >= 20170621.
+FWURL="https://github.com/DreamSourceLab/DSView/raw/886b847c21c606df3138ce7ad8f8e8c363ee758b/DSView/res"
 
 echo "Installing into: $FWDIR"
 
@@ -44,3 +43,9 @@ $WGET $FWURL/DSCope.fw -O $FWDIR/dreamsourcelab-dscope-fx2.fw
 
 $WGET $FWURL/DSLogicPro.bin -O $FWDIR/dreamsourcelab-dslogic-pro-fpga.fw
 $WGET $FWURL/DSLogicPro.fw -O $FWDIR/dreamsourcelab-dslogic-pro-fx2.fw
+
+$WGET $FWURL/DSLogicPlus.bin -O $FWDIR/dreamsourcelab-dslogic-plus-fpga.fw
+$WGET $FWURL/DSLogicPlus.fw -O $FWDIR/dreamsourcelab-dslogic-plus-fx2.fw
+
+$WGET $FWURL/DSLogicBasic.bin -O $FWDIR/dreamsourcelab-dslogic-basic-fpga.fw
+$WGET $FWURL/DSLogicBasic.fw -O $FWDIR/dreamsourcelab-dslogic-basic-fx2.fw