Update of /cvsroot/alsa/alsa-kernel/isa/gus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23362/isa/gus
Modified Files: gus_pcm.c Log Message: - clean up the DMA code again. now only struct device pointer is handled for every BUS type. the pointer must be given via the corresponding macro snd_dma_xxx_data(). - added the hack for dma_alloc_coherent() to accept dev = NULL for ISA buffers. - added the missing include files. Index: gus_pcm.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_pcm.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gus_pcm.c 2 Mar 2004 15:38:14 -0000 1.20 +++ gus_pcm.c 6 Mar 2004 16:51:29 -0000 1.21 @@ -874,8 +874,8 @@ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_gf1_pcm_playback_ops); for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next) - snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_ISA, - snd_pcm_dma_flags(0), + snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV, + snd_dma_isa_data(), 64*1024, gus->gf1.dma1 > 3 ? 128*1024 : 64*1024); pcm->info_flags = 0; @@ -885,7 +885,7 @@ if (gus->gf1.dma2 == gus->gf1.dma1) pcm->info_flags |= SNDRV_PCM_INFO_HALF_DUPLEX; snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream, - SNDRV_DMA_TYPE_ISA, snd_pcm_dma_flags(0), + SNDRV_DMA_TYPE_DEV, snd_dma_isa_data(), 64*1024, gus->gf1.dma2 > 3 ? 128*1024 : 64*1024); } strcpy(pcm->name, pcm->id); ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog