summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortanimura <tanimura@FreeBSD.org>1999-11-01 14:29:07 +0000
committertanimura <tanimura@FreeBSD.org>1999-11-01 14:29:07 +0000
commit9876a339ec8e9f4e1a84431eb38c128d41c0ec13 (patch)
tree78126e4e3304a63550ee2a64c0d2888271ceac3d
parent1de6d3eca0a9128ddd334012676a415d1d9fea1b (diff)
downloadFreeBSD-src-9876a339ec8e9f4e1a84431eb38c128d41c0ec13.zip
FreeBSD-src-9876a339ec8e9f4e1a84431eb38c128d41c0ec13.tar.gz
Call make_dev() to shut up the warning.
Pointed out by: Donn Miller <dmmiller@cvzoom.net>
-rw-r--r--sys/dev/pcm/sound.c13
-rw-r--r--sys/dev/sound/pcm/sound.c13
2 files changed, 24 insertions, 2 deletions
diff --git a/sys/dev/pcm/sound.c b/sys/dev/pcm/sound.c
index 7f659dd..9264eb0 100644
--- a/sys/dev/pcm/sound.c
+++ b/sys/dev/pcm/sound.c
@@ -93,6 +93,7 @@ minor = (channel << 8) + (unit << 4) + dev
#define PCMCHAN(x) ((PCMMINOR(x) & 0x0000ff00) >> 8)
#define PCMUNIT(x) ((PCMMINOR(x) & 0x000000f0) >> 4)
#define PCMDEV(x) (PCMMINOR(x) & 0x0000000f)
+#define PCMMKMINOR(u, d) (((u) & 0x0f) << 4 | ((d) & 0x0f))
static devclass_t pcm_devclass;
@@ -146,7 +147,17 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec)
if (!pcm_devclass) {
pcm_devclass = device_get_devclass(dev);
- cdevsw_add(&snd_cdevsw);
+ make_dev(&snd_cdevsw, PCMMKMINOR(unit, SND_DEV_CTL),
+ UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit);
+ make_dev(&snd_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP),
+ UID_ROOT, GID_WHEEL, 0666, "dsp%d", unit);
+ make_dev(&snd_cdevsw, PCMMKMINOR(unit, SND_DEV_AUDIO),
+ UID_ROOT, GID_WHEEL, 0666, "audio%d", unit);
+ make_dev(&snd_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP16),
+ UID_ROOT, GID_WHEEL, 0666, "dspW%d", unit);
+ make_dev(&snd_cdevsw, PCMMKMINOR(unit, SND_DEV_STATUS),
+ UID_ROOT, GID_WHEEL, 0444, "sndstat");
+ /* XXX SND_DEV_NORESET? */
}
d->devinfo = devinfo;
d->chancount = d->playcount = d->reccount = 0;
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index 7f659dd..9264eb0 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -93,6 +93,7 @@ minor = (channel << 8) + (unit << 4) + dev
#define PCMCHAN(x) ((PCMMINOR(x) & 0x0000ff00) >> 8)
#define PCMUNIT(x) ((PCMMINOR(x) & 0x000000f0) >> 4)
#define PCMDEV(x) (PCMMINOR(x) & 0x0000000f)
+#define PCMMKMINOR(u, d) (((u) & 0x0f) << 4 | ((d) & 0x0f))
static devclass_t pcm_devclass;
@@ -146,7 +147,17 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec)
if (!pcm_devclass) {
pcm_devclass = device_get_devclass(dev);
- cdevsw_add(&snd_cdevsw);
+ make_dev(&snd_cdevsw, PCMMKMINOR(unit, SND_DEV_CTL),
+ UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit);
+ make_dev(&snd_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP),
+ UID_ROOT, GID_WHEEL, 0666, "dsp%d", unit);
+ make_dev(&snd_cdevsw, PCMMKMINOR(unit, SND_DEV_AUDIO),
+ UID_ROOT, GID_WHEEL, 0666, "audio%d", unit);
+ make_dev(&snd_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP16),
+ UID_ROOT, GID_WHEEL, 0666, "dspW%d", unit);
+ make_dev(&snd_cdevsw, PCMMKMINOR(unit, SND_DEV_STATUS),
+ UID_ROOT, GID_WHEEL, 0444, "sndstat");
+ /* XXX SND_DEV_NORESET? */
}
d->devinfo = devinfo;
d->chancount = d->playcount = d->reccount = 0;
OpenPOWER on IntegriCloud