Update of /cvsroot/alsa/alsa-driver/usb/usx2y
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-driver/usb/usx2y
Modified Files:
usbusx2yaudio.c
Log Message:
Big DMA cleanup originated by Russell King <[EMAIL PROTECTED]>
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: usbusx2yaudio.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/usb/usx2y/usbusx2yaudio.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- usbusx2yaudio.c 19 Jan 2004 18:43:28 -0000 1.7
+++ usbusx2yaudio.c 2 Mar 2004 15:32:35 -0000 1.8
@@ -1236,10 +1236,15 @@
sprintf(pcm->name, NAME_ALLCAPS" Audio #%d", usX2Y(card)->chip.pcm_devs);
- if (0 > (err =
snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream,
64*1024, 128*1024, GFP_KERNEL)) ||
+ if (0 > (err =
snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream,
+ SNDRV_DMA_TYPE_CONTINUOUS,
+ snd_pcm_dma_flags(GFP_KERNEL),
+ 64*1024, 128*1024)) ||
0 > (err =
snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream,
-
usX2Y_capt_substream->endpoints * 64*1024,
-
usX2Y_capt_substream->endpoints * 128*1024, GFP_KERNEL)) ||
+ SNDRV_DMA_TYPE_CONTINUOUS,
+ snd_pcm_dma_flags(GFP_KERNEL),
+ usX2Y_capt_substream->endpoints *
64*1024,
+ usX2Y_capt_substream->endpoints *
128*1024)) ||
(usX2Y(card)->chip.dev->descriptor.idProduct == USB_ID_US428 &&
0 > (err = usX2Y_rate_set(usX2Y_stream, 44100)))) { // Lets us428
recognize output-volume settings, disturbs us122.
snd_usX2Y_audio_stream_free(usX2Y_stream);
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
