Update of /cvsroot/alsa/alsa-kernel/pci/mixart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23362/pci/mixart
Modified Files:
mixart.c mixart_core.c mixart_hwdep.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: mixart.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/mixart/mixart.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mixart.c 2 Mar 2004 15:32:38 -0000 1.5
+++ mixart.c 6 Mar 2004 16:51:30 -0000 1.6
@@ -24,6 +24,7 @@
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <linux/pci.h>
#include <sound/core.h>
#define SNDRV_GET_ID
#include <sound/initval.h>
@@ -910,8 +911,8 @@
subs->stream << 8 | (subs->number + 1) |
(chip->chip_idx + 1) << 24;
}
- snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
- chip->mgr->pci, 32*1024, 32*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+ snd_dma_pci_data(chip->mgr->pci),
32*1024, 32*1024);
}
/*
@@ -1390,8 +1391,8 @@
mgr->board_type = MIXART_DAUGHTER_TYPE_NONE;
memset(&mgr->dma_dev, 0, sizeof(mgr->dma_dev));
- mgr->dma_dev.type = SNDRV_DMA_TYPE_PCI;
- mgr->dma_dev.dev.pci = mgr->pci;
+ mgr->dma_dev.type = SNDRV_DMA_TYPE_DEV;
+ mgr->dma_dev.dev = snd_dma_pci_data(mgr->pci);
/* create array of streaminfo */
size = PAGE_ALIGN( (MIXART_MAX_STREAM_PER_CARD * MIXART_MAX_CARDS *
sizeof(mixart_flowinfo_t)) );
Index: mixart_core.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/mixart/mixart_core.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mixart_core.c 24 Feb 2004 12:08:03 -0000 1.4
+++ mixart_core.c 6 Mar 2004 16:51:30 -0000 1.5
@@ -22,6 +22,7 @@
#include <sound/driver.h>
#include <linux/interrupt.h>
+#include <asm/io.h>
#include <sound/core.h>
#include "mixart.h"
#include "mixart_hwdep.h"
Index: mixart_hwdep.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/mixart/mixart_hwdep.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mixart_hwdep.c 2 Mar 2004 15:32:38 -0000 1.4
+++ mixart_hwdep.c 6 Mar 2004 16:51:30 -0000 1.5
@@ -22,6 +22,7 @@
#include <sound/driver.h>
#include <linux/interrupt.h>
+#include <asm/io.h>
#include <sound/core.h>
#include "mixart.h"
#include "mixart_mixer.h"
-------------------------------------------------------
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
