Update of /cvsroot/alsa/alsa-driver/pci/au88x0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24264/pci/au88x0
Modified Files:
au88x0.h au88x0_pcm.c
Log Message:
- clean up the DMA code. added the wrapper for 2.2/2.4 kernels.
- don't include unneeded header files for 2.6 kernels.
- always export pci_alloc_consistent() wrapper for 2.2 kernels.
it's used for ISA buffer allocation now.
- added the missing header files.
Index: au88x0.h
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au88x0.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- au88x0.h 21 Nov 2003 11:16:33 -0000 1.4
+++ au88x0.h 6 Mar 2004 16:55:13 -0000 1.5
@@ -14,14 +14,15 @@
#ifdef __KERNEL__
#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <asm/io.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/rawmidi.h>
#include <sound/mpu401.h>
#include <sound/hwdep.h>
#include <sound/ac97_codec.h>
-#include <asm/io.h>
-#include <linux/init.h>
#include "au88x0_eq.h"
/*
Index: au88x0_pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au88x0_pcm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- au88x0_pcm.c 2 Mar 2004 15:32:35 -0000 1.2
+++ au88x0_pcm.c 6 Mar 2004 16:55:13 -0000 1.3
@@ -403,8 +403,8 @@
if (idx == VORTEX_PCM_ADB)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_vortex_playback_ops);
/* pre-allocation of buffers */
- snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
- chip->pci_dev, 0x10000, 0x10000);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+ snd_dma_pci_data(chip->pci_dev), 0x10000,
0x10000);
if (VORTEX_PCM_TYPE(pcm) == VORTEX_PCM_SPDIF) {
snd_kcontrol_t *kcontrol;
-------------------------------------------------------
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
