Store DSPvolume only if board has DSP feature enabled

Author: hifiberry

buildroot/package/hifiberry-tools/restore-volume

@@ -7,13 +7,20 @@ fi
 
 alsactl -f $STORE restore
 
-dsptoolkit --timeout=5 set-volume `cat /etc/dspvolume.store`
-
 . /etc/hifiberry.state
+DSP=`echo $CURRENT_FEATURES | grep -i dsp`
+if [ "$DSP" != "" ]; then
+ dsptoolkit --timeout=5 set-volume `cat /etc/dspvolume.store`
+fi
+
 if [ "$CURRENT_MIXER_CONTROL" != "Softvol" ]; then
-	amixer sset Softvol 100%
+ if [ -f "/etc/softvol.limit" ]; then 
+  amixer sset Softvol `cat /etc/softvol.limit`
+ else
+  amixer sset Softvol 100%
+ fi
 fi
 
 if [ -f /opt/hifiberry/bin/fix-dacadcpro-mixer ]; then
-        /opt/hifiberry/bin/fix-dacadcpro-mixer
+ /opt/hifiberry/bin/fix-dacadcpro-mixer
 fi

buildroot/package/hifiberry-tools/store-volume

@@ -12,8 +12,11 @@ if [ "$1" == "" ]; then
   cp $TMP $STORE
  fi
 
- DSPVOL=`dsptoolkit get-volume | awk '{print $2}'`
- DSPVOL_PREV=`cat /etc/dspvolume.store`
+ DSP=`grep FEATURES /etc/hifiberry.state | grep -i dsp`
+ if [ "$DSP" != "" ]; then
+  DSPVOL=`dsptoolkit get-volume | awk '{print $2}'`
+  DSPVOL_PREV=`cat /etc/dspvolume.store`
+ fi 
  if [ "$DSPVOL" != "$DSPVOL_PREV" ]; then 
    echo "Storing DSP Volume..."
    echo $DSPVOL > /etc/dspvolume.store