Update of /cvsroot/alsa/alsa-driver/pci/au88x0
In directory sc8-pr-cvs1:/tmp/cvs-serv1034
Modified Files:
au8810_core.c au8810_eq.c au8810_game.c au8810_mixer.c
au8810_mpu401.c au8810_pcm.c au8820_core.c au8820_game.c
au8820_mixer.c au8820_mpu401.c au8820_pcm.c au8820_synth.c
au8830_core.c au8830_eq.c au8830_game.c au8830_mixer.c
au8830_mpu401.c au8830_pcm.c au8830_synth.c au88x0.c au88x0.h
Log Message:
- (hopefully) fixed the compilation on 2.2 kernels.
. avoid pci_request_regions() and pci_release_regions().
. added __NO_VERSION__.
- unmap the memory area at the release.
Index: au8810_core.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8810_core.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8810_core.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8810_core.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8810.h"
#include "au88x0_core.c"
Index: au8810_eq.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8810_eq.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8810_eq.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8810_eq.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8810.h"
#include "au88x0_eq.c"
Index: au8810_game.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8810_game.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8810_game.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8810_game.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8810.h"
#include "au88x0_game.c"
Index: au8810_mixer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8810_mixer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8810_mixer.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8810_mixer.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8810.h"
#include "au88x0_mixer.c"
Index: au8810_mpu401.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8810_mpu401.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8810_mpu401.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8810_mpu401.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8810.h"
#include "au88x0_mpu401.c"
Index: au8810_pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8810_pcm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8810_pcm.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8810_pcm.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8810.h"
#include "au88x0_pcm.c"
Index: au8820_core.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8820_core.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8820_core.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8820_core.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8820.h"
#include "au88x0_core.c"
Index: au8820_game.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8820_game.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8820_game.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8820_game.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8820.h"
#include "au88x0_game.c"
Index: au8820_mixer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8820_mixer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8820_mixer.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8820_mixer.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8820.h"
#include "au88x0_mixer.c"
Index: au8820_mpu401.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8820_mpu401.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8820_mpu401.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8820_mpu401.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8820.h"
#include "au88x0_mpu401.c"
Index: au8820_pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8820_pcm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8820_pcm.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8820_pcm.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8820.h"
#include "au88x0_pcm.c"
Index: au8820_synth.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8820_synth.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8820_synth.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8820_synth.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8820.h"
#include "au88x0_synth.c"
Index: au8830_core.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8830_core.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8830_core.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8830_core.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8830.h"
#include "au88x0_core.c"
Index: au8830_eq.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8830_eq.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8830_eq.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8830_eq.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8830.h"
#include "au88x0_eq.c"
Index: au8830_game.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8830_game.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8830_game.c 6 Oct 2003 14:01:03 -0000 1.1
+++ au8830_game.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8830.h"
#include "au88x0_game.c"
Index: au8830_mixer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8830_mixer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8830_mixer.c 6 Oct 2003 14:01:04 -0000 1.1
+++ au8830_mixer.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8830.h"
#include "au88x0_mixer.c"
Index: au8830_mpu401.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8830_mpu401.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8830_mpu401.c 6 Oct 2003 14:01:04 -0000 1.1
+++ au8830_mpu401.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8830.h"
#include "au88x0_mpu401.c"
Index: au8830_pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8830_pcm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8830_pcm.c 6 Oct 2003 14:01:04 -0000 1.1
+++ au8830_pcm.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8830.h"
#include "au88x0_pcm.c"
Index: au8830_synth.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au8830_synth.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8830_synth.c 6 Oct 2003 14:01:04 -0000 1.1
+++ au8830_synth.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -1,2 +1,3 @@
+#define __NO_VERSION__
#include "au8830.h"
#include "au88x0_synth.c"
Index: au88x0.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au88x0.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au88x0.c 6 Oct 2003 14:01:04 -0000 1.1
+++ au88x0.c 17 Nov 2003 18:27:28 -0000 1.2
@@ -73,7 +73,9 @@
// Take down PCI interface.
synchronize_irq(vortex->irq);
free_irq(vortex->irq, vortex);
- pci_release_regions(vortex->pci_dev);
+ iounmap((void*)vortex->mmio);
+ release_resource(vortex->mmio_res);
+ kfree_nocheck(vortex->mmio_res);
pci_disable_device(vortex->pci_dev);
snd_magic_kfree(vortex);
@@ -118,10 +120,12 @@
// (1) PCI resource allocation
// Get MMIO area
//
- if ((err = pci_request_regions(pci, CARD_NAME_SHORT)) != 0)
+ chip->mmio_res = request_mem_region(pci_resource_start(pci, 0),
pci_resource_len(pci, 0), CARD_NAME_SHORT);
+ if (! chip->mmio_res) {
+ err = -EBUSY;
goto regions_out;
-
- chip->mmio = ioremap_nocache(pci_resource_start(pci,0), pci_resource_len(pci,0));
+ }
+ chip->mmio = (unsigned long) ioremap_nocache(pci_resource_start(pci,0),
pci_resource_len(pci,0));
if (!chip->mmio) {
printk(KERN_ERR "MMIO area remap failed.\n");
err = -ENOMEM;
Index: au88x0.h
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au88x0.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au88x0.h 6 Oct 2003 14:01:04 -0000 1.1
+++ au88x0.h 17 Nov 2003 18:27:28 -0000 1.2
@@ -141,9 +141,10 @@
/* PCI hardware resources */
unsigned long io;
- unsigned long *mmio;
+ unsigned long mmio;
+ struct resource *mmio_res;
unsigned int irq;
- spinlock_t lock;
+ spinlock_t lock;
/* PCI device */
struct pci_dev * pci_dev;
-------------------------------------------------------
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
