Skip to contentSkip to conversation

aoss [patch: /dev/sound, man page]

PATCH Florian Schmidt 3 participants 6 messages Aug 4, 2004 – Aug 16, 2004

lore
Share & tools
lore
#0 lore raw

The below patch [also attached] fixes the check for device files in /dev/sound/ [for users of devfs who have configured their apps to use /dev/sound/dsp, etc..] and adds a note to the aoss manpage about the state of mmap support:

----- snip ------

alsa/aoss.1 +0 -0
diff -Nru alsa-oss/alsa/aoss.1 alsa-oss.new/alsa/aoss.1
@@ -30,6 +30,8 @@
 
 In the above configuration examples, the pcm.dsp0 definition is used to

wrap calls do /dev/dsp0. You can also wrap usage of /dev/dsp1, /dev/dsp2, etc. by defining pcm.dsp1, pcm.dsp2, etc..

+Note on mmap: aoss does currently not support full mmap support. Your results may vary when trying to use an application that uses mmap'ing to access the OSS device files.
+

.SS Arguments
.TP

alsa/mixer.c +4 -0
diff -Nru alsa-oss/alsa/mixer.c alsa-oss.new/alsa/mixer.c
@@ -548,6 +548,10 @@
 			minor = (atoi(file + 10) << 4) | OSS_DEVICE_MIXER;
 		else if (!strncmp(file, "/dev/amixer", 11))
 			minor = (atoi(file + 11) << 4) | OSS_DEVICE_AMIXER;
+		else if (!strncmp(file, "/dev/sound/mixer", 16))
+			minor = (atoi(file + 16) << 4) | OSS_DEVICE_MIXER;
+		else if (!strncmp(file, "/dev/sound/amixer", 17))
+			minor = (atoi(file + 17) << 4) | OSS_DEVICE_AMIXER;
 		else {
 			errno = ENOENT;
 			return -1;
alsa/pcm.c +8 -0
diff -Nru alsa-oss/alsa/pcm.c alsa-oss.new/alsa/pcm.c
@@ -1651,6 +1651,14 @@
 			minor = (atoi(file + 9) << 4) | OSS_DEVICE_ADSP;
 		else if (!strncmp(file, "/dev/audio", 10))
 			minor = (atoi(file + 10) << 4) | OSS_DEVICE_AUDIO;
+		else if (!strncmp(file, "/dev/sound/dsp", 14))
+			minor = (atoi(file + 14) << 4) | OSS_DEVICE_DSP;
+		else if (!strncmp(file, "/dev/sound/dspW", 15))
+			minor = (atoi(file + 15) << 4) | OSS_DEVICE_DSPW;
+		else if (!strncmp(file, "/dev/sound/adsp", 15))
+			minor = (atoi(file + 15) << 4) | OSS_DEVICE_ADSP;
+		else if (!strncmp(file, "/dev/sound/audio", 16))
+			minor = (atoi(file + 16) << 4) | OSS_DEVICE_AUDIO;
 		else {
 			errno = ENOENT;
 			return -1;
Signature · 2 lines
Palimm Palimm!
http://affenbande.org/~tapas/
alsa/aoss.1 +2 -0
diff -Nru alsa-oss/alsa/aoss.1 alsa-oss.new/alsa/aoss.1
@@ -30,6 +30,8 @@
 
 In the above configuration examples, the pcm.dsp0 definition is used to wrap calls do /dev/dsp0. You can also wrap usage of /dev/dsp1, /dev/dsp2, etc. by defining pcm.dsp1, pcm.dsp2, etc..
 
+Note on mmap: aoss does currently not support full mmap support. Your results may vary when trying to use an application that uses mmap'ing to access the OSS device files.
+
 
 .SS Arguments
 .TP
alsa/mixer.c +4 -0
diff -Nru alsa-oss/alsa/mixer.c alsa-oss.new/alsa/mixer.c
@@ -548,6 +548,10 @@
 			minor = (atoi(file + 10) << 4) | OSS_DEVICE_MIXER;
 		else if (!strncmp(file, "/dev/amixer", 11))
 			minor = (atoi(file + 11) << 4) | OSS_DEVICE_AMIXER;
+		else if (!strncmp(file, "/dev/sound/mixer", 16))
+			minor = (atoi(file + 16) << 4) | OSS_DEVICE_MIXER;
+		else if (!strncmp(file, "/dev/sound/amixer", 17))
+			minor = (atoi(file + 17) << 4) | OSS_DEVICE_AMIXER;
 		else {
 			errno = ENOENT;
 			return -1;
alsa/pcm.c +8 -0
diff -Nru alsa-oss/alsa/pcm.c alsa-oss.new/alsa/pcm.c
@@ -1651,6 +1651,14 @@
 			minor = (atoi(file + 9) << 4) | OSS_DEVICE_ADSP;
 		else if (!strncmp(file, "/dev/audio", 10))
 			minor = (atoi(file + 10) << 4) | OSS_DEVICE_AUDIO;
+		else if (!strncmp(file, "/dev/sound/dsp", 14))
+			minor = (atoi(file + 14) << 4) | OSS_DEVICE_DSP;
+		else if (!strncmp(file, "/dev/sound/dspW", 15))
+			minor = (atoi(file + 15) << 4) | OSS_DEVICE_DSPW;
+		else if (!strncmp(file, "/dev/sound/adsp", 15))
+			minor = (atoi(file + 15) << 4) | OSS_DEVICE_ADSP;
+		else if (!strncmp(file, "/dev/sound/audio", 16))
+			minor = (atoi(file + 16) << 4) | OSS_DEVICE_AUDIO;
 		else {
 			errno = ENOENT;
 			return -1;
#1 lore raw
Quoted 6 lines · On Thu, 5 Aug 2004 01:44:57 +0200 Florian Schmidt <[email protected]> wrote:

The below patch [also attached] fixes the check for device files in /dev/sound/ [for users of devfs who have configured their apps to use /dev/sound/dsp, etc..] and adds a note to the aoss manpage about the state of mmap support:

Hi,

i wanted to ask if there's a reason for not including this patch in the rc's?

Flo

Signature · 10 lines
Palimm Palimm!
http://affenbande.org/~tapas/



-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
#2 lore raw
Quoted 10 lines · Florian Schmidt
Quoted 6 lines · On Thu, 5 Aug 2004 01:44:57 +0200 Florian Schmidt <[email protected]> wrote:

The below patch [also attached] fixes the check for device files in /dev/sound/ [for users of devfs who have configured their apps to use /dev/sound/dsp, etc..] and adds a note to the aoss manpage about the state of mmap support:

Quoted 4 lines

Hi,

i wanted to ask if there's a reason for not including this patch in the rc's?

Your message fell into my spam folder because of the octet-stream attachement. Applied now, thanks.

Jaroslav

-----
Jaroslav Kysela <[email protected]>
Linux Kernel Sound Maintainer
ALSA Project, SUSE Labs

-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media 100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33 Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285

#3 lore raw
Quoted 2 lines · On Fri, 13 Aug 2004 14:26:44 +0200 (CEST) Jaroslav Kysela <[email protected]> wrote:

Your message fell into my spam folder because of the octet-stream attachement. Applied now, thanks.

Oh ok, i wasn't aware of this problem. I'll dig though my email program's options to see what caused this.. What is the preferred form for patches btw?

Flo

Signature · 10 lines
Palimm Palimm!
http://affenbande.org/~tapas/



-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
#4 lore raw
Quoted 9 lines · Florian Schmidt
Quoted 2 lines · On Fri, 13 Aug 2004 14:26:44 +0200 (CEST) Jaroslav Kysela <[email protected]> wrote:

Your message fell into my spam folder because of the octet-stream attachement. Applied now, thanks.

Oh ok, i wasn't aware of this problem. I'll dig though my email program's options to see what caused this.. What is the preferred form for patches btw?

Copy them directly into e-mail body or larger patches should be put to a public place (HTTP, FTP) and only URL should be posted here.

Thanks,
Jaroslav

-----
Jaroslav Kysela <[email protected]>
Linux Kernel Sound Maintainer
ALSA Project, SUSE Labs

-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media 100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33 Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285

#5 lore raw

At Fri, 13 Aug 2004 14:47:01 +0200 (CEST),

Quoted 9 lines · Jaroslav
Quoted 6 lines · Florian Schmidt
Quoted 2 lines · On Fri, 13 Aug 2004 14:26:44 +0200 (CEST) Jaroslav Kysela <[email protected]> wrote:

Your message fell into my spam folder because of the octet-stream attachement. Applied now, thanks.

Quoted 6 lines
Quoted 3 lines

Oh ok, i wasn't aware of this problem. I'll dig though my email program's options to see what caused this.. What is the preferred form for patches btw?

Copy them directly into e-mail body or larger patches should be put to a public place (HTTP, FTP) and only URL should be posted here.

Usually I took patches, too, but I've been on vacation.

The binary attachment might be sorted out to the spam on my system, too. Text attachment should be fine.

Takashi

-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media 100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33 Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285