Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23362/pci/cs46xx
Modified Files:
cs46xx_lib.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: cs46xx_lib.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx_lib.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- cs46xx_lib.c 5 Mar 2004 12:04:44 -0000 1.70
+++ cs46xx_lib.c 6 Mar 2004 16:51:30 -0000 1.71
@@ -1717,8 +1717,8 @@
strcpy(pcm->name, "CS46xx");
chip->pcm = pcm;
- snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
- chip->pci, 64*1024, 256*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+ snd_dma_pci_data(chip->pci), 64*1024,
256*1024);
if (rpcm)
*rpcm = pcm;
@@ -1749,8 +1749,8 @@
strcpy(pcm->name, "CS46xx - Rear");
chip->pcm_rear = pcm;
- snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
- pcm, 64*1024, 256*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+ snd_dma_pci_data(chip->pci), 64*1024,
256*1024);
if (rpcm)
*rpcm = pcm;
@@ -1779,8 +1779,8 @@
strcpy(pcm->name, "CS46xx - Center LFE");
chip->pcm_center_lfe = pcm;
- snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
- chip->pci, 64*1024, 256*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+ snd_dma_pci_data(chip->pci), 64*1024,
256*1024);
if (rpcm)
*rpcm = pcm;
@@ -1809,8 +1809,8 @@
strcpy(pcm->name, "CS46xx - IEC958");
chip->pcm_rear = pcm;
- snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
- chip->pci, 64*1024, 256*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+ snd_dma_pci_data(chip->pci), 64*1024,
256*1024);
if (rpcm)
*rpcm = pcm;
@@ -3931,8 +3931,8 @@
region->size = CS46XX_BA1_REG_SIZE;
memset(&chip->dma_dev, 0, sizeof(chip->dma_dev));
- chip->dma_dev.type = SNDRV_DMA_TYPE_PCI;
- chip->dma_dev.dev.pci = pci;
+ chip->dma_dev.type = SNDRV_DMA_TYPE_DEV;
+ chip->dma_dev.dev = snd_dma_pci_data(pci);
/* set up amp and clkrun hack */
pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &ss_vendor);
-------------------------------------------------------
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
