As much as it pains me to submit a diff that contains + in the compat
directory, this is still mostly -. Calling our mixer devices NetBSD
devices doesn't make a whole lot of sense. Also kill some other dead
code.
The comment still doesn't make a lot of sense to me. The comment says
only 32 devices are available, but OSS_SOUND_MIXER_NRDEVICES is
defined to be 17. I leave the thinking to somebody else.
Index: ossaudio.c
===================================================================
RCS file: /cvs/src/sys/compat/ossaudio/ossaudio.c,v
retrieving revision 1.14
diff -u -p -r1.14 ossaudio.c
--- ossaudio.c 22 Apr 2012 05:43:14 -0000 1.14
+++ ossaudio.c 26 Mar 2013 06:21:55 -0000
@@ -494,14 +494,14 @@ oss_ioctl_audio(p, uap, retval)
return (error);
}
-/* If the NetBSD mixer device should have more than 32 devices
+/* If the mixer device should have more than 32 devices
* some will not be available to Linux */
-#define NETBSD_MAXDEVS 64
+#define MAX_MIXER_DEVS 64
struct audiodevinfo {
int done;
dev_t dev;
int16_t devmap[OSS_SOUND_MIXER_NRDEVICES],
- rdevmap[NETBSD_MAXDEVS];
+ rdevmap[MAX_MIXER_DEVS];
u_long devmask, recmask, stereomask;
u_long caps, source;
};
@@ -532,16 +532,10 @@ getdevinfo(fp, p)
{ AudioNtreble, OSS_SOUND_MIXER_TREBLE },
{ AudioNbass, OSS_SOUND_MIXER_BASS },
{ AudioNspeaker, OSS_SOUND_MIXER_SPEAKER },
-/* { AudioNheadphone, ?? },*/
{ AudioNoutput, OSS_SOUND_MIXER_OGAIN },
{ AudioNinput, OSS_SOUND_MIXER_IGAIN },
-/* { AudioNmaster, OSS_SOUND_MIXER_SPEAKER },*/
-/* { AudioNstereo, ?? },*/
-/* { AudioNmono, ?? },*/
{ AudioNfmsynth, OSS_SOUND_MIXER_SYNTH },
-/* { AudioNwave, OSS_SOUND_MIXER_PCM },*/
{ AudioNmidi, OSS_SOUND_MIXER_SYNTH },
-/* { AudioNmixerout, ?? },*/
{ 0, -1 }
};
register const struct oss_devs *dp;
@@ -572,9 +566,9 @@ getdevinfo(fp, p)
di->caps = 0;
for(i = 0; i < OSS_SOUND_MIXER_NRDEVICES; i++)
di->devmap[i] = -1;
- for(i = 0; i < NETBSD_MAXDEVS; i++)
+ for(i = 0; i < MAX_MIXER_DEVS; i++)
di->rdevmap[i] = -1;
- for(i = 0; i < NETBSD_MAXDEVS; i++) {
+ for(i = 0; i < MAX_MIXER_DEVS; i++) {
mi.index = i;
if (ioctlf(fp, AUDIO_MIXER_DEVINFO, (caddr_t)&mi, p) < 0)
break;
@@ -822,11 +816,6 @@ oss_ioctl_sequencer(p, uap, retval)
{
struct file *fp;
struct filedesc *fdp;
-#if 0
- u_long com;
- int idat;
- int error;
-#endif
fdp = p->p_fd;
if ((fp = fd_getfile(fdp, SCARG(uap, fd))) == NULL)
@@ -835,9 +824,6 @@ oss_ioctl_sequencer(p, uap, retval)
if ((fp->f_flag & (FREAD | FWRITE)) == 0)
return (EBADF);
-#if 0
- com = SCARG(uap, com);
-#endif
retval[0] = 0;
return EINVAL;
