Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12510/core
Modified Files:
pcm_memory.c
Log Message:
fixed the buffer id confliction in the case of CONTINUOUS or ISA buffers.
Index: pcm_memory.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_memory.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pcm_memory.c 7 Apr 2004 17:48:11 -0000 1.26
+++ pcm_memory.c 13 May 2004 18:37:10 -0000 1.27
@@ -224,9 +224,13 @@
*/
static inline void setup_pcm_id(snd_pcm_substream_t *subs)
{
- if (! subs->dma_device.id)
+ if (! subs->dma_device.id) {
subs->dma_device.id = subs->pcm->device << 16 |
subs->stream << 8 | (subs->number + 1);
+ if (subs->dma_device.type == SNDRV_DMA_TYPE_CONTINUOUS ||
+ subs->dma_device.dev == NULL)
+ subs->dma_device.id |= (subs->pcm->card->number + 1) << 24;
+ }
}
/**
-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
