From patchwork Tue Mar 31 09:10:34 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Philipp Zabel
X-Patchwork-Id: 6128241
Return-Path:
X-Original-To: patchwork-alsa-devel@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.29.136])
by patchwork2.web.kernel.org (Postfix) with ESMTP id 24405BF4A6
for ;
Tue, 31 Mar 2015 09:11:01 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
by mail.kernel.org (Postfix) with ESMTP id E4FF22011E
for ;
Tue, 31 Mar 2015 09:11:00 +0000 (UTC)
Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243])
by mail.kernel.org (Postfix) with ESMTP id AE3F82012D
for ;
Tue, 31 Mar 2015 09:10:59 +0000 (UTC)
Received: by alsa0.perex.cz (Postfix, from userid 1000)
id 4AC0426163C; Tue, 31 Mar 2015 11:10:58 +0200 (CEST)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Spam-Level:
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY
autolearn=unavailable version=3.3.1
Received: from alsa0.perex.cz (localhost [IPv6:::1])
by alsa0.perex.cz (Postfix) with ESMTP id F2A3326065A;
Tue, 31 Mar 2015 11:10:47 +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 6C09C2612D3; Tue, 31 Mar 2015 11:10:44 +0200 (CEST)
Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de
[92.198.50.35]) by alsa0.perex.cz (Postfix) with ESMTP id 910AB260621
for ;
Tue, 31 Mar 2015 11:10:37 +0200 (CEST)
Received: from paszta.hi.pengutronix.de
([2001:67c:670:100:96de:80ff:fec2:9969] helo=paszta)
by metis.ext.pengutronix.de with esmtp (Exim 4.72)
(envelope-from )
id 1YcsBx-00079N-9Y; Tue, 31 Mar 2015 11:10:37 +0200
Message-ID: <1427793034.2969.17.camel@pengutronix.de>
From: Philipp Zabel
To: Russell King
Date: Tue, 31 Mar 2015 11:10:34 +0200
In-Reply-To:
References: <20150330193911.GM24899@n2100.arm.linux.org.uk>
X-Mailer: Evolution 3.12.9-1+b1
Mime-Version: 1.0
X-SA-Exim-Connect-IP: 2001:67c:670:100:96de:80ff:fec2:9969
X-SA-Exim-Mail-From: p.zabel@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de);
SAEximRunCond expanded to false
X-PTX-Original-Recipient: alsa-devel@alsa-project.org
Cc: Fabio Estevam , alsa-devel@alsa-project.org,
Takashi Iwai , dri-devel@lists.freedesktop.org,
Mark Brown , Yakir Yang ,
linux-arm-kernel@lists.infradead.org
Subject: Re: [alsa-devel] [PATCH RFC 09/11] sound/core: add IEC958 channel
status helper
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: ,
Errors-To: alsa-devel-bounces@alsa-project.org
Sender: alsa-devel-bounces@alsa-project.org
X-Virus-Scanned: ClamAV using ClamSMTP
Hi,
Am Montag, den 30.03.2015, 20:40 +0100 schrieb Russell King:
> Add a helper to create the IEC958 channel status from an ALSA
> snd_pcm_runtime structure, taking account of the sample rate.
>
> Signed-off-by: Russell King
> ---
> include/sound/pcm_iec958.h | 9 ++++++
> sound/core/Kconfig | 3 ++
> sound/core/Makefile | 2 ++
> sound/core/pcm_iec958.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 84 insertions(+)
> create mode 100644 include/sound/pcm_iec958.h
> create mode 100644 sound/core/pcm_iec958.c
>
> diff --git a/include/sound/pcm_iec958.h b/include/sound/pcm_iec958.h
> new file mode 100644
> index 000000000000..0eed397aca8e
> --- /dev/null
> +++ b/include/sound/pcm_iec958.h
> @@ -0,0 +1,9 @@
> +#ifndef __SOUND_PCM_IEC958_H
> +#define __SOUND_PCM_IEC958_H
> +
> +#include
> +
> +int snd_pcm_create_iec958_consumer(struct snd_pcm_runtime *runtime, u8 *cs,
> + size_t len);
> +
> +#endif
> diff --git a/sound/core/Kconfig b/sound/core/Kconfig
> index b534c8a6046b..1507469425ec 100644
> --- a/sound/core/Kconfig
> +++ b/sound/core/Kconfig
> @@ -9,6 +9,9 @@ config SND_PCM
> config SND_PCM_ELD
> bool
>
> +config SND_PCM_IEC958
> + bool
> +
> config SND_DMAENGINE_PCM
> tristate
>
> diff --git a/sound/core/Makefile b/sound/core/Makefile
> index 591b49157b4d..70ea06712ec2 100644
> --- a/sound/core/Makefile
> +++ b/sound/core/Makefile
> @@ -14,10 +14,12 @@ snd-pcm-y := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
> pcm_memory.o memalloc.o
> snd-pcm-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o
> snd-pcm-$(CONFIG_SND_PCM_ELD) += pcm_drm_eld.o
> +snd-pcm-$(CONFIG_SND_PCM_IEC958) += snd-pcm-iec958.o
>
> # for trace-points
> CFLAGS_pcm_lib.o := -I$(src)
>
> +snd-pcm-iec958-objs := pcm_iec958.o
> snd-pcm-dmaengine-objs := pcm_dmaengine.o
This fails to build for me on 4.0-rc6:
make[2]: *** No rule to make target 'sound/core/snd-pcm-iec958.o', needed by 'sound/core/snd-pcm.o'. Stop.
scripts/Makefile.build:403: recipe for target 'sound/core' failed
unless I change it to either:
regards
Philipp
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -14,7 +14,8 @@ snd-pcm-y := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
pcm_memory.o memalloc.o
snd-pcm-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o
snd-pcm-$(CONFIG_SND_PCM_ELD) += pcm_drm_eld.o
-snd-pcm-$(CONFIG_SND_PCM_IEC958) += snd-pcm-iec958.o
+
+obj-$(CONFIG_SND_PCM_IEC958) += snd-pcm-iec958.o
# for trace-points
CFLAGS_pcm_lib.o := -I$(src)
or:
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -14,12 +14,11 @@ snd-pcm-y := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
pcm_memory.o memalloc.o
snd-pcm-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o
snd-pcm-$(CONFIG_SND_PCM_ELD) += pcm_drm_eld.o
-snd-pcm-$(CONFIG_SND_PCM_IEC958) += snd-pcm-iec958.o
+snd-pcm-$(CONFIG_SND_PCM_IEC958) += pcm_iec958.o
# for trace-points
CFLAGS_pcm_lib.o := -I$(src)
-snd-pcm-iec958-objs := pcm_iec958.o
snd-pcm-dmaengine-objs := pcm_dmaengine.o
snd-rawmidi-objs := rawmidi.o