- Move all of the hwvol functions into a mixer_hwvol_* namespace, and make

  all of the hwvol members of struct snd_mixer live in a hwvol_* namespace.
- When changing the mixer device via the hwvol_mixer sysctl, reset the
  muted state so that a mute operation on a new device won't try to
  unmute the new device with the old device's saved volume.
- When the volume is muted, if a down or up volume request is received,
  first restore the saved volume level and then adjust it.

Reviewed by:	cg

1 files changed, 3 insertions, 3 deletions

diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index f7ad35c..eeed211 100644
--- a/sys/dev/sound/pcm/mixer.h
+++ b/sys/dev/sound/pcm/mixer.h
@@ -33,9 +33,9 @@ extern int mixer_ioctl(snddev_info *d, u_long cmd, caddr_t arg);
 extern int mixer_busy(snd_mixer *m, int busy);
 extern int mixer_isbusy(snd_mixer *m);
 
-int mixer_hwinit(device_t dev);
-void mixer_hwmute(device_t dev);
-void mixer_hwstep(device_t dev, int left_step, int right_step);
+int mixer_hwvol_init(device_t dev);
+void mixer_hwvol_mute(device_t dev);
+void mixer_hwvol_step(device_t dev, int left_step, int right_step);
 
 extern void change_bits(mixer_tab *t, u_char *regval, int dev, int chn, int newval);