Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23362/isa
Modified Files:
cmi8330.c es18xx.c sscape.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: cmi8330.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/cmi8330.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cmi8330.c 2 Mar 2004 15:38:14 -0000 1.27
+++ cmi8330.c 6 Mar 2004 16:51:29 -0000 1.28
@@ -438,8 +438,8 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
&chip->streams[SNDRV_PCM_STREAM_PLAYBACK].ops);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
&chip->streams[SNDRV_PCM_STREAM_CAPTURE].ops);
- snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA,
- snd_pcm_dma_flags(0),
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+ snd_dma_isa_data(),
64*1024, 128*1024);
chip->pcm = pcm;
Index: es18xx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- es18xx.c 2 Mar 2004 15:38:14 -0000 1.42
+++ es18xx.c 6 Mar 2004 16:51:29 -0000 1.43
@@ -1598,8 +1598,8 @@
sprintf(pcm->name, "ESS AudioDrive ES%x", chip->version);
chip->pcm = pcm;
- snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA,
- snd_pcm_dma_flags(0),
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+ snd_dma_isa_data(),
64*1024,
chip->dma1 > 3 || chip->dma2 > 3 ?
128*1024 : 64*1024);
Index: sscape.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sscape.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sscape.c 2 Mar 2004 15:32:36 -0000 1.10
+++ sscape.c 6 Mar 2004 16:51:29 -0000 1.11
@@ -178,8 +178,8 @@
if (buf) {
struct snd_dma_device dev;
memset(&dev, 0, sizeof(dev));
- dev.type = SNDRV_DMA_TYPE_ISA;
- dev.dev.flags = GFP_DMA|GFP_ATOMIC;
+ dev.type = SNDRV_DMA_TYPE_DEV;
+ dev.dev = snd_dma_isa_data();
if (snd_dma_alloc_pages_fallback(&dev, size, buf) < 0) {
snd_printk(KERN_ERR "sscape: Failed to allocate %lu bytes for
DMA\n", size);
return NULL;
@@ -197,8 +197,8 @@
if (buf && buf->area) {
struct snd_dma_device dev;
memset(&dev, 0, sizeof(dev));
- dev.type = SNDRV_DMA_TYPE_ISA;
- dev.dev.flags = GFP_DMA|GFP_ATOMIC;
+ dev.type = SNDRV_DMA_TYPE_DEV;
+ dev.dev = snd_dma_isa_data();
snd_dma_free_pages(&dev, buf);
}
}
-------------------------------------------------------
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
