[PATCH] Update SX1 audio to current ALSA typenames

[PATCH] Update SX1 audio to current ALSA typenames

[andrzej zaborowski]

[-- Attachment #1: Type: text/plain, Size: 109 bytes --]

Update to newer ALSA structs in order to fix building.

Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>

[-- Attachment #2: 0008-ARM-OMAP-Update-SX1-audio-to-current-ALSA-typenames.txt --]
[-- Type: text/plain, Size: 1493 bytes --]

From 307d4ea30f8731a275494a97e5d7b7555a6e209c Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <balrog@zabor.org>
Date: Thu, 7 Jun 2007 05:28:24 +0200
Subject: [PATCH] ARM: OMAP: Update SX1 audio to current ALSA typenames.

---
 sound/arm/omap/omap-alsa-sx1.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/arm/omap/omap-alsa-sx1.c b/sound/arm/omap/omap-alsa-sx1.c
index eadae68..c4691cd 100644
--- a/sound/arm/omap/omap-alsa-sx1.c
+++ b/sound/arm/omap/omap-alsa-sx1.c
@@ -82,13 +82,13 @@ static unsigned int rates[] = {
 	 32000, 44100, 48000,
 };
 
-static snd_pcm_hw_constraint_list_t egold_hw_constraints_rates = {
+static struct snd_pcm_hw_constraint_list egold_hw_constraints_rates = {
 	.count	= ARRAY_SIZE(rates),
 	.list	= rates,
 	.mask	= 0,
 };
 
-static snd_pcm_hardware_t egold_snd_omap_alsa_playback = {
+static struct snd_pcm_hardware egold_snd_omap_alsa_playback = {
 	.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
 		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
 	.formats = (SNDRV_PCM_FMTBIT_S16_LE),
@@ -109,7 +109,7 @@ static snd_pcm_hardware_t egold_snd_omap_alsa_playback = {
 	.fifo_size		= 0,
 };
 
-static snd_pcm_hardware_t egold_snd_omap_alsa_capture = {
+static struct snd_pcm_hardware egold_snd_omap_alsa_capture = {
 	.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
 		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
 	.formats = (SNDRV_PCM_FMTBIT_S16_LE),
-- 
1.4.4.3


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] Update SX1 audio to current ALSA typenames

[Dirk Behme]

andrzej zaborowski wrote:
> Update to newer ALSA structs in order to fix building.
> 
> Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
> 
> 
> ------------------------------------------------------------------------
> 
> From 307d4ea30f8731a275494a97e5d7b7555a6e209c Mon Sep 17 00:00:00 2001
> From: Andrzej Zaborowski <balrog@zabor.org>
> Date: Thu, 7 Jun 2007 05:28:24 +0200
> Subject: [PATCH] ARM: OMAP: Update SX1 audio to current ALSA typenames.
> 
> ---
>  sound/arm/omap/omap-alsa-sx1.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/arm/omap/omap-alsa-sx1.c b/sound/arm/omap/omap-alsa-sx1.c
> index eadae68..c4691cd 100644
> --- a/sound/arm/omap/omap-alsa-sx1.c
> +++ b/sound/arm/omap/omap-alsa-sx1.c
> @@ -82,13 +82,13 @@ static unsigned int rates[] = {
>  	 32000, 44100, 48000,
>  };
>  
> -static snd_pcm_hw_constraint_list_t egold_hw_constraints_rates = {
> +static struct snd_pcm_hw_constraint_list egold_hw_constraints_rates = {
>  	.count	= ARRAY_SIZE(rates),
>  	.list	= rates,
>  	.mask	= 0,
>  };
>  
> -static snd_pcm_hardware_t egold_snd_omap_alsa_playback = {
> +static struct snd_pcm_hardware egold_snd_omap_alsa_playback = {
>  	.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
>  		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
>  	.formats = (SNDRV_PCM_FMTBIT_S16_LE),
> @@ -109,7 +109,7 @@ static snd_pcm_hardware_t egold_snd_omap_alsa_playback = {
>  	.fifo_size		= 0,
>  };
>  
> -static snd_pcm_hardware_t egold_snd_omap_alsa_capture = {
> +static struct snd_pcm_hardware egold_snd_omap_alsa_capture = {
>  	.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
>  		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
>  	.formats = (SNDRV_PCM_FMTBIT_S16_LE),

What's wrong with

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff;h=2ce53a2061d29405b35e30fafcc70c63fdbf98b7

?

Do you work on recent git tree?

Dirk

Re: [PATCH] Update SX1 audio to current ALSA typenames

[andrzej zaborowski]

On 07/06/07, Dirk Behme <dirk.behme@googlemail.com> wrote:
> andrzej zaborowski wrote:
> > Update to newer ALSA structs in order to fix building.
...
>
> What's wrong with
>
> http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff;h=2ce53a2061d29405b35e30fafcc70c63fdbf98b7
>
> ?
>
> Do you work on recent git tree?

Oops, turns out I hadn't updated. Please ignore the mail.

Regards,
Andrzej