[BACK]Return to mixer.c CVS log [TXT] [DIR] Up to [DragonFly] / src / sys / dev / sound / pcm

Diff for /src/sys/dev/sound/pcm/mixer.c between versions 1.5 and 1.6

version 1.5, 2004/05/13 23:49:21 version 1.6, 2004/05/19 22:52:50
Line 105  mixer_get_devt(device_t dev) Line 105  mixer_get_devt(device_t dev)
         int unit;          int unit;
   
         unit = device_get_unit(dev);          unit = device_get_unit(dev);
         pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, SND_DEV_CTL, 0));          pdev = make_adhoc_dev(&mixer_cdevsw, PCMMKMINOR(unit, SND_DEV_CTL, 0));
   
         return pdev;          return pdev;
 }  }
Line 224  mixer_init(device_t dev, kobj_class_t cl Line 224  mixer_init(device_t dev, kobj_class_t cl
         mixer_setrecsrc(m, SOUND_MASK_MIC);          mixer_setrecsrc(m, SOUND_MASK_MIC);
   
         unit = device_get_unit(dev);          unit = device_get_unit(dev);
           cdevsw_add(&mixer_cdevsw, PCMMKMINOR(-1, 0, 0), PCMMKMINOR(unit, 0, 0));
         pdev = make_dev(&mixer_cdevsw, PCMMKMINOR(unit, SND_DEV_CTL, 0),          pdev = make_dev(&mixer_cdevsw, PCMMKMINOR(unit, SND_DEV_CTL, 0),
                  UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit);                   UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit);
         pdev->si_drv1 = m;          pdev->si_drv1 = m;
Line 254  mixer_uninit(device_t dev) Line 255  mixer_uninit(device_t dev)
         }          }
   
         pdev->si_drv1 = NULL;          pdev->si_drv1 = NULL;
   
           /*
            * The mixer might be used by several entities, so we do not 
            * want to remove the cdevsw here.  Destroy the device instead.
            * destroy_dev() requires a reference count.
            */
           reference_dev(pdev);
         destroy_dev(pdev);          destroy_dev(pdev);
   
         for (i = 0; i < SOUND_MIXER_NRDEVICES; i++)          for (i = 0; i < SOUND_MIXER_NRDEVICES; i++)
Line 497  mixer_clone(void *arg, char *name, int n Line 505  mixer_clone(void *arg, char *name, int n
         if (*dev != NODEV)          if (*dev != NODEV)
                 return;                  return;
         if (strcmp(name, "mixer") == 0) {          if (strcmp(name, "mixer") == 0) {
                 pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(snd_unit, SND_DEV_CTL, 0));                  pdev = make_adhoc_dev(&mixer_cdevsw,
                                           PCMMKMINOR(snd_unit, SND_DEV_CTL, 0));
                 if (pdev->si_flags & SI_NAMED)                  if (pdev->si_flags & SI_NAMED)
                         *dev = pdev;                          *dev = pdev;
         }          }
Removed from v.1.5  
changed lines
  Added in v.1.6