Added a devfs patch to fix some issues with multiple soundcards, bug 30837

4 files changed, 80 insertions, 4 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index d28217d035ba..e833129bc4e6 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.33 2003/10/02 22:11:35 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.34 2003/10/11 13:40:22 plasmaroo Exp $
 
+  11 Oct 2003; <plasmaroo@gentoo.org> gentoo-sources-2.4.20-r7.ebuild,
+  files/gentoo-sources-2.4.20-devfs-snd-fix.patch:
+  Added a devfs patch to fix some issues with multiple soundcards: Bug #30837.
+ 
   02 Oct 2003; <plasmaroo@gentoo.org> gentoo-sources-2.4.20-r7.ebuild,
   files/gentoo-sources-2.4.20-mdcount.patch:
   Added Software RAID patch for fix unsynchronized reference counts: Bug #30124.
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index f6b2408835a1..e0d78b766b33 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,6 +1,6 @@
-MD5 f91e1543370bcc0df42067797639726d ChangeLog 9778
+MD5 9f900bb0abc59122bb25b8bf597fe3c1 ChangeLog 9981
 MD5 d5979ff24ef45e712ff68e48cf7c66c0 gentoo-sources-2.4.19-r10.ebuild 2113
-MD5 d679f16b0963dfe0536407cdd2f9d2cd gentoo-sources-2.4.20-r7.ebuild 4968
+MD5 8fa2f380a3fb75b34dee0b0bb1ac5e78 gentoo-sources-2.4.20-r7.ebuild 5030
 MD5 4a2e7892431d591f82bb474d737cb4eb gentoo-sources-2.4.20-r5.ebuild 4571
 MD5 a6f7282c48e8a34145a255bc5cb8bbd1 gentoo-sources-2.4.20-r6.ebuild 4725
 MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
@@ -8,6 +8,7 @@ MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 134
 MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r6 145
 MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014
 MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
+MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973
 MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r7 145
 MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
 MD5 857ff623313f874e811763a2db96e831 files/lcall-DoS.patch 885
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-devfs-snd-fix.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-devfs-snd-fix.patch
new file mode 100644
index 000000000000..3a0b26fc39e0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-devfs-snd-fix.patch
@@ -0,0 +1,70 @@
+--- linux-2.4.20-gentoo-r7/drivers/sound/sound_core.c.orig 2003-10-10 17:30:07.000000000 +0000
++++ linux-2.4.20-gentoo-r7/drivers/sound/sound_core.c 2003-10-10 17:33:23.000000000 +0000
+@@ -17,8 +17,9 @@
+  *	plug into this. The fact they dont all go via OSS doesn't mean
+  *	they don't have to implement the OSS API. There is a lot of logic
+  *	to keeping much of the OSS weight out of the code in a compatibility
+- *	module, but its up to the driver to rember to load it...
++ *	module, but it's up to the driver to remember to load it...
+  *
++
+  *	The code provides a set of functions for registration of devices
+  *	by type. This is done rather than providing a single call so that
+  *	we can hide any future changes in the internals (eg when we go to
+@@ -174,10 +174,10 @@
+ 		return r;
+ 	}
+ 	
+-	if (r == low)
++	if (r < SOUND_STEP)
+ 		sprintf (name_buf, "%s", name);
+ 	else
+-		sprintf (name_buf, "%s%d", name, (r - low) / SOUND_STEP);
++		sprintf (name_buf, "%s%d", name, (r / SOUND_STEP));
+ 	s->de = devfs_register (devfs_handle, name_buf,
+ 				DEVFS_FL_NONE, SOUND_MAJOR, s->unit_minor,
+ 				S_IFCHR | mode, fops, NULL);
+@@ -232,17 +233,20 @@
+
+ int register_sound_special(struct file_operations *fops, int unit)
+ {
+-	char *name;
++	const int chain = (unit & 0x0F);
++	int max_unit = chain + 128;
++	const char *name;
+
+-	switch (unit) {
++	switch (chain) {
+	    case 0:
+		name = "mixer";
+		break;
+	    case 1:
+		name = "sequencer";
++		max_unit = unit + 1;
+		break;
+	    case 2:
+-		name = "midi00";
++		name = "midi";
+		break;
+	    case 3:
+		name = "dsp";
+@@ -261,6 +265,7 @@
+		break;
+	    case 8:
+		name = "sequencer2";
++		max_unit = unit + 1;
+		break;
+	    case 9:
+		name = "dmmidi";
+@@ -281,10 +286,10 @@
+		name = "admmidi";
+		break;
+	    default:
+-		name = "unknown";
++		name = "unknownX";
+		break;
+	}
+-	return sound_insert_unit(&chains[unit&15], fops, -1, unit, unit+1,
++	return sound_insert_unit(&chains[chain], fops, -1, unit, max_unit,
+				 name, S_IRUSR | S_IWUSR);
+ }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
index fb78d9540185..e0e308e90525 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild,v 1.4 2003/10/02 22:11:35 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild,v 1.5 2003/10/11 13:40:22 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -119,6 +119,7 @@ src_unpack() {
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-grsec-disabled.patch
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-sched-interrupt.patch
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-mdcount.patch
+	epatch ${FILESDIR}/gentoo-sources-2.4.20-devfs-snd-fix.patch
 
 }