* [PATCH] ISAPNP support in ALSA (2.5.5-pre1) is broken
@ 2002-02-18 7:27 Andrey Panin
2002-02-18 8:26 ` Jaroslav Kysela
0 siblings, 1 reply; 2+ messages in thread
From: Andrey Panin @ 2002-02-18 7:27 UTC (permalink / raw)
To: linux-kernel; +Cc: perex
[-- Attachment #1.1: Type: text/plain, Size: 449 bytes --]
Hi all,
ISA PnP support in 2.5.5-pre1 ALSA modules is broken.
1) it uses __ISAPNP__ without including linux/isapnp.h,
2) it uses isapnp_dev and isapnp_card sturctures which
are not declared anywhere.
Attached patch fixes these problems, without it snd-sbawe module
doesn't recognize my ISA PnP AWE64.
Best regards.
--
Andrey Panin | Embedded systems software engineer
pazke@orbita1.ru | PGP key: wwwkeys.eu.pgp.net
[-- Attachment #1.2: patch-alsa-isapnp --]
[-- Type: text/plain, Size: 6023 bytes --]
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/ad1816a/ad1816a.c /linux/sound/isa/ad1816a/ad1816a.c
--- /linux.vanilla/sound/isa/ad1816a/ad1816a.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/ad1816a/ad1816a.c Sat Feb 16 22:26:51 2002
@@ -20,6 +20,7 @@
#include <sound/driver.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#define SNDRV_GET_ID
#include <sound/initval.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/als100.c /linux/sound/isa/als100.c
--- /linux.vanilla/sound/isa/als100.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/als100.c Sat Feb 16 22:12:49 2002
@@ -22,12 +22,14 @@
#include <sound/driver.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#define SNDRV_GET_ID
#include <sound/initval.h>
#include <sound/mpu401.h>
#include <sound/opl3.h>
#include <sound/sb.h>
+
#define chip_t sb_t
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/azt2320.c /linux/sound/isa/azt2320.c
--- /linux.vanilla/sound/isa/azt2320.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/azt2320.c Sat Feb 16 22:15:20 2002
@@ -34,6 +34,7 @@
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#define SNDRV_GET_ID
#include <sound/initval.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/cmi8330.c /linux/sound/isa/cmi8330.c
--- /linux.vanilla/sound/isa/cmi8330.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/cmi8330.c Sat Feb 16 22:16:47 2002
@@ -45,6 +45,7 @@
#include <sound/driver.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#include <sound/ad1848.h>
#include <sound/sb.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/cs423x/cs4236.c /linux/sound/isa/cs423x/cs4236.c
--- /linux.vanilla/sound/isa/cs423x/cs4236.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/cs423x/cs4236.c Sat Feb 16 22:25:14 2002
@@ -21,6 +21,7 @@
#include <sound/driver.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#include <sound/cs4231.h>
#include <sound/mpu401.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/dt0197h.c /linux/sound/isa/dt0197h.c
--- /linux.vanilla/sound/isa/dt0197h.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/dt0197h.c Sat Feb 16 22:17:36 2002
@@ -20,6 +20,7 @@
#include <sound/driver.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#define SNDRV_GET_ID
#include <sound/initval.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/es18xx.c /linux/sound/isa/es18xx.c
--- /linux.vanilla/sound/isa/es18xx.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/es18xx.c Sat Feb 16 22:19:00 2002
@@ -68,6 +68,7 @@
#include <asm/io.h>
#include <asm/dma.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/pcm.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/gus/interwave.c /linux/sound/isa/gus/interwave.c
--- /linux.vanilla/sound/isa/gus/interwave.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/gus/interwave.c Sat Feb 16 22:23:49 2002
@@ -26,6 +26,7 @@
#include <asm/dma.h>
#include <linux/delay.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#include <sound/gus.h>
#include <sound/cs4231.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/opl3sa2.c /linux/sound/isa/opl3sa2.c
--- /linux.vanilla/sound/isa/opl3sa2.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/opl3sa2.c Sat Feb 16 22:19:41 2002
@@ -22,6 +22,7 @@
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <linux/pm.h>
#include <sound/core.h>
#include <sound/cs4231.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/opti9xx/opti92x-ad1848.c /linux/sound/isa/opti9xx/opti92x-ad1848.c
--- /linux.vanilla/sound/isa/opti9xx/opti92x-ad1848.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/opti9xx/opti92x-ad1848.c Sat Feb 16 22:23:07 2002
@@ -27,6 +27,7 @@
#include <asm/dma.h>
#include <linux/delay.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#ifdef CS4231
#include <sound/cs4231.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/sb/es968.c /linux/sound/isa/sb/es968.c
--- /linux.vanilla/sound/isa/sb/es968.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/sb/es968.c Sat Feb 16 22:21:42 2002
@@ -22,6 +22,7 @@
#include <sound/driver.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#define SNDRV_GET_ID
#include <sound/initval.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/sb/sb16.c /linux/sound/isa/sb/sb16.c
--- /linux.vanilla/sound/isa/sb/sb16.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/sb/sb16.c Sat Feb 16 22:22:18 2002
@@ -22,6 +22,7 @@
#include <sound/driver.h>
#include <asm/dma.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#include <sound/sb.h>
#include <sound/sb16_csp.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/sound/isa/wavefront/wavefront.c /linux/sound/isa/wavefront/wavefront.c
--- /linux.vanilla/sound/isa/wavefront/wavefront.c Sun Feb 17 15:16:05 2002
+++ /linux/sound/isa/wavefront/wavefront.c Sat Feb 16 22:20:49 2002
@@ -21,6 +21,7 @@
#include <sound/driver.h>
#include <linux/init.h>
+#include <linux/isapnp.h>
#include <sound/core.h>
#define SNDRV_GET_ID
#include <sound/initval.h>
diff -urN -X /usr/share/dontdiff /linux.vanilla/include/sound/core.h /linux/include/sound/core.h
--- /linux.vanilla/include/sound/core.h Sun Feb 17 15:16:02 2002
+++ /linux/include/sound/core.h Sat Feb 16 22:12:24 2002
@@ -338,4 +338,7 @@
#define SNDRV_OSS_VERSION ((3<<16)|(8<<8)|(1<<4)|(0)) /* 3.8.1a */
+#define isapnp_card pci_bus
+#define isapnp_dev pci_dev
+
#endif /* __SOUND_CORE_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] ISAPNP support in ALSA (2.5.5-pre1) is broken
2002-02-18 7:27 [PATCH] ISAPNP support in ALSA (2.5.5-pre1) is broken Andrey Panin
@ 2002-02-18 8:26 ` Jaroslav Kysela
0 siblings, 0 replies; 2+ messages in thread
From: Jaroslav Kysela @ 2002-02-18 8:26 UTC (permalink / raw)
To: Andrey Panin; +Cc: linux-kernel
On Mon, 18 Feb 2002, Andrey Panin wrote:
> Hi all,
>
> ISA PnP support in 2.5.5-pre1 ALSA modules is broken.
> 1) it uses __ISAPNP__ without including linux/isapnp.h,
> 2) it uses isapnp_dev and isapnp_card sturctures which
> are not declared anywhere.
Thanks. I've applied your patch with minor modifications to our
CVS repository.
Jaroslav
-----
Jaroslav Kysela <perex@suse.cz>
Linux Kernel Sound Maintainer
ALSA Project http://www.alsa-project.org
SuSE Linux http://www.suse.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2002-02-18 8:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-02-18 7:27 [PATCH] ISAPNP support in ALSA (2.5.5-pre1) is broken Andrey Panin
2002-02-18 8:26 ` Jaroslav Kysela
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®