From patchwork Tue Jun 26 09:24:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 10488417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BC436602D8 for ; Tue, 26 Jun 2018 09:25:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B56962884E for ; Tue, 26 Jun 2018 09:25:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A65B728868; Tue, 26 Jun 2018 09:25:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF8802884E for ; Tue, 26 Jun 2018 09:25:06 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E4E0D2678BF; Tue, 26 Jun 2018 11:24:55 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id ECA4626784B; Tue, 26 Jun 2018 11:24:51 +0200 (CEST) Received: from osg.samsung.com (osg.samsung.com [64.30.133.232]) by alsa0.perex.cz (Postfix) with ESMTP id 3E0A2267875 for ; Tue, 26 Jun 2018 11:24:48 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by osg.samsung.com (Postfix) with ESMTP id 37AB030B40; Tue, 26 Jun 2018 02:24:47 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at dev.s-opensource.com X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from osg.samsung.com ([127.0.0.1]) by localhost (localhost [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C-32Gz-CQSbt; Tue, 26 Jun 2018 02:24:46 -0700 (PDT) Received: from smtp.s-opensource.com (177.41.130.70.dynamic.adsl.gvt.net.br [177.41.130.70]) by osg.samsung.com (Postfix) with ESMTPSA id CA1C330B28; Tue, 26 Jun 2018 02:24:44 -0700 (PDT) Received: from mchehab by smtp.s-opensource.com with local (Exim 4.91) (envelope-from ) id 1fXkDK-0000Xc-1B; Tue, 26 Jun 2018 06:24:42 -0300 From: Mauro Carvalho Chehab To: Takashi Iwai Date: Tue, 26 Jun 2018 06:24:38 -0300 Message-Id: <23ff79af9b3a8bf1f1a5a19508b735fc620c0a13.1530004939.git.mchehab+samsung@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Cc: alsa-devel@alsa-project.org, Jonathan Corbet , Linux Doc Mailing List , linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , Mauro Carvalho Chehab Subject: [alsa-devel] [PATCH 2/4] alsa: multisound.sh: fix script to make it build with modern tools X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Documentation/sound/cards/multisound.sh | 30 +++++++++++++------------ 1 file 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 +#include #include #include #include @@ -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 #include #include -#include #include +#include 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 +#include #include #include #include @@ -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