Update of /cvsroot/alsa/alsa-kernel/pci/rme9652
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/pci/rme9652
Modified Files:
hdsp.c rme9652.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: hdsp.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hdsp.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- hdsp.c 22 Feb 2004 18:41:55 -0000 1.52
+++ hdsp.c 2 Mar 2004 15:32:38 -0000 1.53
@@ -568,7 +568,10 @@
struct snd_dma_device pdev;
struct snd_dma_buffer dmbuf;
- snd_dma_device_pci(&pdev, pci, capture);
+ memset(&pdev, 0, sizeof(pdev));
+ pdev.type = SNDRV_DMA_TYPE_PCI;
+ pdev.dev.pci = pci;
+ pdev.id = capture;
dmbuf.bytes = 0;
if (! snd_dma_get_reserved(&pdev, &dmbuf)) {
if (snd_dma_alloc_pages(&pdev, size, &dmbuf) < 0)
@@ -581,9 +584,13 @@
static void snd_hammerfall_free_buffer(struct pci_dev *pci, size_t size, void *ptr,
dma_addr_t addr, int capture)
{
- struct snd_dma_device dev;
- snd_dma_device_pci(&dev, pci, capture);
- snd_dma_free_reserved(&dev);
+ struct snd_dma_device pdev;
+
+ memset(&pdev, 0, sizeof(pdev));
+ pdev.type = SNDRV_DMA_TYPE_PCI;
+ pdev.dev.pci = pci;
+ pdev.id = capture;
+ snd_dma_free_reserved(&pdev);
}
#else
Index: rme9652.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/rme9652.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- rme9652.c 21 Jan 2004 18:32:48 -0000 1.40
+++ rme9652.c 2 Mar 2004 15:32:38 -0000 1.41
@@ -314,7 +314,10 @@
struct snd_dma_device pdev;
struct snd_dma_buffer dmbuf;
- snd_dma_device_pci(&pdev, pci, capture);
+ memset(&pdev, 0, sizeof(pdev));
+ pdev.type = SNDRV_DMA_TYPE_PCI;
+ pdev.dev.pci = pci;
+ pdev.id = capture;
dmbuf.bytes = 0;
if (! snd_dma_get_reserved(&pdev, &dmbuf)) {
if (snd_dma_alloc_pages(&pdev, size, &dmbuf) < 0)
@@ -327,9 +330,13 @@
static void snd_hammerfall_free_buffer(struct pci_dev *pci, size_t size, void *ptr,
dma_addr_t addr, int capture)
{
- struct snd_dma_device dev;
- snd_dma_device_pci(&dev, pci, capture);
- snd_dma_free_reserved(&dev);
+ struct snd_dma_device pdev;
+
+ memset(&pdev, 0, sizeof(pdev));
+ pdev.type = SNDRV_DMA_TYPE_PCI;
+ pdev.dev.pci = pci;
+ pdev.id = capture;
+ snd_dma_free_reserved(&pdev);
}
#else
-------------------------------------------------------
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
