Now that /dev/sound is gone,
should AUDIO_DEV_SOUND be removed from audio.c ?

        Jan



Index: audio.c
===================================================================
RCS file: /cvs/src/sys/dev/audio.c,v
retrieving revision 1.161
diff -u -p -r1.161 audio.c
--- audio.c     11 Mar 2017 10:12:45 -0000      1.161
+++ audio.c     26 Mar 2017 11:40:52 -0000
@@ -50,7 +50,6 @@
 #define DEVNAME(sc)            ((sc)->dev.dv_xname)
 #define AUDIO_UNIT(n)          (minor(n) & 0x0f)
 #define AUDIO_DEV(n)           (minor(n) & 0xf0)
-#define AUDIO_DEV_SOUND                0       /* minor of /dev/sound0 */
 #define AUDIO_DEV_MIXER                0x10    /* minor of /dev/mixer0 */
 #define AUDIO_DEV_AUDIO                0x80    /* minor of /dev/audio0 */
 #define AUDIO_DEV_AUDIOCTL     0xc0    /* minor of /dev/audioctl */
@@ -1137,7 +1136,6 @@ audio_detach(struct device *self, int fl
         * close uses device_lookup, it returns EXIO and does nothing
         */
        mn = self->dv_unit;
-       vdevgone(maj, mn | AUDIO_DEV_SOUND, mn | AUDIO_DEV_SOUND, VCHR);
        vdevgone(maj, mn | AUDIO_DEV_AUDIO, mn | AUDIO_DEV_AUDIO, VCHR);
        vdevgone(maj, mn | AUDIO_DEV_AUDIOCTL, mn | AUDIO_DEV_AUDIOCTL, VCHR);
        vdevgone(maj, mn | AUDIO_DEV_MIXER, mn | AUDIO_DEV_MIXER, VCHR);
@@ -1608,7 +1606,6 @@ audioopen(dev_t dev, int flags, int mode
                error = ENXIO;
        else {
                switch (AUDIO_DEV(dev)) {
-               case AUDIO_DEV_SOUND:
                case AUDIO_DEV_AUDIO:
                        error = audio_open(sc, flags);
                        break;
@@ -1634,7 +1631,6 @@ audioclose(dev_t dev, int flags, int ifm
        if (sc == NULL)
                return ENXIO;
        switch (AUDIO_DEV(dev)) {
-       case AUDIO_DEV_SOUND:
        case AUDIO_DEV_AUDIO:
                error = audio_close(sc);
                break;
@@ -1659,7 +1655,6 @@ audioread(dev_t dev, struct uio *uio, in
        if (sc == NULL)
                return ENXIO;
        switch (AUDIO_DEV(dev)) {
-       case AUDIO_DEV_SOUND:
        case AUDIO_DEV_AUDIO:
                error = audio_read(sc, uio, ioflag);
                break;
@@ -1684,7 +1679,6 @@ audiowrite(dev_t dev, struct uio *uio, i
        if (sc == NULL)
                return ENXIO;
        switch (AUDIO_DEV(dev)) {
-       case AUDIO_DEV_SOUND:
        case AUDIO_DEV_AUDIO:
                error = audio_write(sc, uio, ioflag);
                break;
@@ -1709,7 +1703,6 @@ audioioctl(dev_t dev, u_long cmd, caddr_
        if (sc == NULL)
                return ENXIO;
        switch (AUDIO_DEV(dev)) {
-       case AUDIO_DEV_SOUND:
        case AUDIO_DEV_AUDIO:
                error = audio_ioctl(sc, cmd, addr);
                break;
@@ -1744,7 +1737,6 @@ audiopoll(dev_t dev, int events, struct 
        if (sc == NULL)
                return POLLERR;
        switch (AUDIO_DEV(dev)) {
-       case AUDIO_DEV_SOUND:
        case AUDIO_DEV_AUDIO:
                revents = audio_poll(sc, events, p);
                break;

Reply via email to