38c38
< SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/mixer.c 246421 2013-02-06 17:43:05Z hselasky $");
---
> SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/mixer.c 246454 2013-02-07 08:20:03Z hselasky $");
896c896
< mixer_hwvol_mute(device_t dev)
---
> mixer_hwvol_mute_locked(struct snd_mixer *m)
898,903d897
< struct snd_mixer *m;
< struct cdev *pdev;
<
< pdev = mixer_get_devt(dev);
< m = pdev->si_drv1;
< snd_mtxlock(m->lock);
912d905
< snd_mtxunlock(m->lock);
916c909
< mixer_hwvol_step(device_t dev, int left_step, int right_step)
---
> mixer_hwvol_mute(device_t dev)
919d911
< int level, left, right;
924a917,925
> mixer_hwvol_mute_locked(m);
> snd_mtxunlock(m->lock);
> }
>
> void
> mixer_hwvol_step_locked(struct snd_mixer *m, int left_step, int right_step)
> {
> int level, left, right;
>
932c933
< right = level >> 8;
---
> right = (level >> 8) & 0xff;
935a937,938
> else if (left > 100)
> left = 100;
938a942,943
> else if (right > 100)
> right = 100;
940a946,957
> }
>
> void
> mixer_hwvol_step(device_t dev, int left_step, int right_step)
> {
> struct snd_mixer *m;
> struct cdev *pdev;
>
> pdev = mixer_get_devt(dev);
> m = pdev->si_drv1;
> snd_mtxlock(m->lock);
> mixer_hwvol_step_locked(m, left_step, right_step);