Sound core broken on sparc64 (2.6.4+bk)

Sound core broken on sparc64 (2.6.4+bk)

[Meelis Roos]

This is today's (20040315) BK snapshot. Sound core is broken on sparc64:

sound/core/memalloc.c: In function `snd_mem_proc_read':
sound/core/memalloc.c:793: error: `sbus' undeclared (first use in this function)
sound/core/memalloc.c:793: error: (Each undeclared identifier is reported only once
sound/core/memalloc.c:793: error: for each function it appears in.)
sound/core/memalloc.c:792: warning: unused variable `sdev'

-- 
Meelis Roos (mroos@linux.ee)

Re: Sound core broken on sparc64 (2.6.4+bk)

[Takashi Iwai]

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

At Mon, 15 Mar 2004 15:46:51 +0200 (EET),
Meelis Roos wrote:
> 
> This is today's (20040315) BK snapshot. Sound core is broken on sparc64:
> 
> sound/core/memalloc.c: In function `snd_mem_proc_read':
> sound/core/memalloc.c:793: error: `sbus' undeclared (first use in this function)
> sound/core/memalloc.c:793: error: (Each undeclared identifier is reported only once
> sound/core/memalloc.c:793: error: for each function it appears in.)
> sound/core/memalloc.c:792: warning: unused variable `sdev'

the attached patch should fix.


--
Takashi Iwai <tiwai@suse.de>		ALSA Developer - www.alsa-project.org

[-- Attachment #2: Type: text/plain, Size: 383 bytes --]

--- linux/sound/core/memalloc.c	6 Mar 2004 16:46:57 -0000	1.28
+++ linux/sound/core/memalloc.c	15 Mar 2004 18:08:32 -0000
@@ -790,7 +790,7 @@
 		case SNDRV_DMA_TYPE_SBUS:
 			{
 				struct sbus_dev *sdev = (struct sbus_dev *)(mem->dev.dev);
-				len += sprintf(page + len, "SBUS [%x]", sbus->slot);
+				len += sprintf(page + len, "SBUS [%x]", sdev->slot);
 			}
 			break;
 #endif

Re: Sound core broken on sparc64 (2.6.4+bk)

[Meelis Roos]

> the attached patch should fix.

Yes, thanks! This is also fixed in mainline by now.

Ths leads me to the next error:

sound/sparc/cs4231.c: In function `snd_cs4231_pcm':
sound/sparc/cs4231.c:1573: error: `SNDRV_DMA_TYPE_PCI' undeclared (first use in this function)
sound/sparc/cs4231.c:1573: error: (Each undeclared identifier is reported only once
sound/sparc/cs4231.c:1573: error: for each function it appears in.)
sound/sparc/cs4231.c:1575: error: parse error before numeric constant

SNDRV_DMA_TYPE_PCI used to be defined in <sound/memalloc.h> but is now
gone.

-- 
Meelis Roos (mroos@linux.ee)

Re: Sound core broken on sparc64 (2.6.4+bk)

[Takashi Iwai]

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

At Tue, 16 Mar 2004 15:28:00 +0200 (EET),
Meelis Roos wrote:
> 
> > the attached patch should fix.
> 
> Yes, thanks! This is also fixed in mainline by now.
> 
> Ths leads me to the next error:
> 
> sound/sparc/cs4231.c: In function `snd_cs4231_pcm':
> sound/sparc/cs4231.c:1573: error: `SNDRV_DMA_TYPE_PCI' undeclared (first use in this function)
> sound/sparc/cs4231.c:1573: error: (Each undeclared identifier is reported only once
> sound/sparc/cs4231.c:1573: error: for each function it appears in.)
> sound/sparc/cs4231.c:1575: error: parse error before numeric constant
> 
> SNDRV_DMA_TYPE_PCI used to be defined in <sound/memalloc.h> but is now
> gone.

grrr, it's a typo of SNDRV_DMA_TYPE_DEV.
thanks for the report.


Takashi

[-- Attachment #2: Type: text/plain, Size: 429 bytes --]

--- linux/sound/sparc/cs4231.c	6 Mar 2004 17:30:24 -0000	1.10
+++ linux/sound/sparc/cs4231.c	16 Mar 2004 13:40:15 -0000
@@ -1570,7 +1570,7 @@
 
 #ifdef EBUS_SUPPORT
 	if (chip->flags & CS4231_FLAG_EBUS) {
-		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
+		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
 						      snd_dma_pci_data(chip->dev_u.pdev)
 						      64*1024, 128*1024);
 	} else {

Re: Sound core broken on sparc64 (2.6.4+bk)

[Meelis Roos]

> grrr, it's a typo of SNDRV_DMA_TYPE_DEV.

There's als a missing comma at the end of the next line. With this too
fixed, it finally compiles.

-- 
Meelis Roos (mroos@linux.ee)