summaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-06-26 11:24:38 +0200
committerTakashi Iwai <tiwai@suse.de>2018-06-26 17:44:54 +0200
commit06501a6d2d2912b9e357702327c0249a5ecd7c9e (patch)
treeae17ccbcca9f33512b5641f07d7eee0872f8ee41 /Documentation/sound
parentsound: restore MultiSound script (diff)
downloadlinux-06501a6d2d2912b9e357702327c0249a5ecd7c9e.tar.xz
linux-06501a6d2d2912b9e357702327c0249a5ecd7c9e.zip
ALSA:: multisound.sh: fix script to make it build with modern tools
The script is old and produce some warnings and errors, because it lacks including stdlib.h and io.h is at sys/io.h. Fix it to run with the tools found on modern Linux distros. Tested building it on Fedora 28. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation/sound')
-rwxr-xr-xDocumentation/sound/cards/multisound.sh30
1 files changed, 16 insertions, 14 deletions
diff --git a/Documentation/sound/cards/multisound.sh b/Documentation/sound/cards/multisound.sh
index 7a7a88256dfd..0e0cb029421b 100755
--- a/Documentation/sound/cards/multisound.sh
+++ b/Documentation/sound/cards/multisound.sh
@@ -381,11 +381,11 @@
# This shar contains:
# length mode name
# ------ ---------- ------------------------------------------
-# 2046 -rw-rw-r-- MultiSound.d/setdigital.c
-# 10235 -rw-rw-r-- MultiSound.d/pinnaclecfg.c
+# 2064 -rw-rw-r-- MultiSound.d/setdigital.c
+# 10224 -rw-rw-r-- MultiSound.d/pinnaclecfg.c
# 106 -rw-rw-r-- MultiSound.d/Makefile
-# 141 -rw-rw-r-- MultiSound.d/conv.l
-# 1472 -rw-rw-r-- MultiSound.d/msndreset.c
+# 146 -rw-rw-r-- MultiSound.d/conv.l
+# 1491 -rw-rw-r-- MultiSound.d/msndreset.c
#
save_IFS="${IFS}"
IFS="${IFS}:"
@@ -471,6 +471,7 @@ X *
X ********************************************************************/
X
#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
@@ -538,8 +539,8 @@ e87217fc3e71288102ba41fd81f71ec4 MultiSound.d/setdigital.c
SHAR_EOF
else
shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'MultiSound.d/setdigital.c'`"
- test 2046 -eq "$shar_count" ||
- $echo 'MultiSound.d/setdigital.c:' 'original size' '2046,' 'current size' "$shar_count!"
+ test 2064 -eq "$shar_count" ||
+ $echo 'MultiSound.d/setdigital.c:' 'original size' '2064,' 'current size' "$shar_count!"
fi
fi
# ============= MultiSound.d/pinnaclecfg.c ==============
@@ -581,8 +582,8 @@ X
#include <string.h>
#include <errno.h>
#include <unistd.h>
-#include <asm/io.h>
#include <asm/types.h>
+#include <sys/io.h>
X
#define IREG_LOGDEVICE 0x07
#define IREG_ACTIVATE 0x30
@@ -992,8 +993,8 @@ SHAR_EOF
SHAR_EOF
else
shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'MultiSound.d/pinnaclecfg.c'`"
- test 10235 -eq "$shar_count" ||
- $echo 'MultiSound.d/pinnaclecfg.c:' 'original size' '10235,' 'current size' "$shar_count!"
+ test 10224 -eq "$shar_count" ||
+ $echo 'MultiSound.d/pinnaclecfg.c:' 'original size' '10224,' 'current size' "$shar_count!"
fi
fi
# ============= MultiSound.d/Makefile ==============
@@ -1039,7 +1040,7 @@ DB
[0-9A-Fa-f]+H { int n; sscanf(yytext, "%xH", &n); printf("%c", n); }
%%
int yywrap() { return 1; }
-main() { yylex(); }
+void main() { yylex(); }
SHAR_EOF
$shar_touch -am 0828231798 'MultiSound.d/conv.l' &&
chmod 0664 'MultiSound.d/conv.l' ||
@@ -1052,8 +1053,8 @@ d2411fc32cd71a00dcdc1f009e858dd2 MultiSound.d/conv.l
SHAR_EOF
else
shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'MultiSound.d/conv.l'`"
- test 141 -eq "$shar_count" ||
- $echo 'MultiSound.d/conv.l:' 'original size' '141,' 'current size' "$shar_count!"
+ test 146 -eq "$shar_count" ||
+ $echo 'MultiSound.d/conv.l:' 'original size' '146,' 'current size' "$shar_count!"
fi
fi
# ============= MultiSound.d/msndreset.c ==============
@@ -1085,6 +1086,7 @@ X *
X ********************************************************************/
X
#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
@@ -1129,8 +1131,8 @@ c52f876521084e8eb25e12e01dcccb8a MultiSound.d/msndreset.c
SHAR_EOF
else
shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'MultiSound.d/msndreset.c'`"
- test 1472 -eq "$shar_count" ||
- $echo 'MultiSound.d/msndreset.c:' 'original size' '1472,' 'current size' "$shar_count!"
+ test 1491 -eq "$shar_count" ||
+ $echo 'MultiSound.d/msndreset.c:' 'original size' '1491,' 'current size' "$shar_count!"
fi
fi
rm -fr _sh01426