aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/sb/sb_mixer.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/sb/sb_mixer.c')
-rw-r--r--sound/isa/sb/sb_mixer.c57
1 files changed, 34 insertions, 23 deletions
diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c
index 5a926a452d38..23cfa6a6a0af 100644
--- a/sound/isa/sb/sb_mixer.c
+++ b/sound/isa/sb/sb_mixer.c
@@ -669,25 +669,34 @@ static unsigned char snd_dt019x_init_values[][2] = {
669/* 669/*
670 * ALS4000 specific mixer elements 670 * ALS4000 specific mixer elements
671 */ 671 */
672/* FIXME: SB_ALS4000_MONO_IO_CTRL needs output select ctrl ! */ 672/* FIXME: SB_ALS4000_MONO_IO_CTRL needs output select ctrl! */
673static struct sbmix_elem snd_als4000_ctl_mono_output_switch = 673static struct sbmix_elem snd_als4000_ctl_master_mono_playback_switch =
674 SB_SINGLE("Mono Output Switch", SB_ALS4000_MONO_IO_CTRL, 5, 1); 674 SB_SINGLE("Master Mono Playback Switch", SB_ALS4000_MONO_IO_CTRL, 5, 1);
675/* FIXME: mono input switch also available on DT019X ? */ 675static struct sbmix_elem snd_als4000_ctl_master_mono_capture_route =
676static struct sbmix_elem snd_als4000_ctl_mono_input_switch = 676 SB_SINGLE("Master Mono Capture Route", SB_ALS4000_MONO_IO_CTRL, 6, 0x03);
677 SB_SINGLE("Mono Input Switch", SB_DT019X_OUTPUT_SW2, 0, 1); 677/* FIXME: mono playback switch also available on DT019X? */
678static struct sbmix_elem snd_als4000_ctl_mono_playback_switch =
679 SB_SINGLE("Mono Playback Switch", SB_DT019X_OUTPUT_SW2, 0, 1);
678static struct sbmix_elem snd_als4000_ctl_mic_20db_boost = 680static struct sbmix_elem snd_als4000_ctl_mic_20db_boost =
679 SB_SINGLE("Mic Boost (+20dB)", SB_ALS4000_MIC_IN_GAIN, 0, 0x03); 681 SB_SINGLE("Mic Boost (+20dB)", SB_ALS4000_MIC_IN_GAIN, 0, 0x03);
680static struct sbmix_elem snd_als4000_ctl_mixer_out_to_in = 682static struct sbmix_elem snd_als4000_ctl_mixer_loopback =
681 SB_SINGLE("Mixer Out To In", SB_ALS4000_MIC_IN_GAIN, 7, 0x01); 683 SB_SINGLE("Analog Loopback", SB_ALS4000_MIC_IN_GAIN, 7, 0x01);
682/* FIXME: 3D needs much more sophisticated controls, many more features ! */ 684/* FIXME: functionality of 3D controls might be swapped, I didn't find
683static struct sbmix_elem snd_als4000_ctl_3d_output_switch = 685 * a description of how to identify what is supposed to be what */
684 SB_SINGLE("3D Output Switch", SB_ALS4000_3D_SND_FX, 6, 0x01); 686static struct sbmix_elem snd_als4000_3d_control_switch =
685static struct sbmix_elem snd_als4000_ctl_3d_output_ratio = 687 SB_SINGLE("3D Control - Switch", SB_ALS4000_3D_SND_FX, 6, 0x01);
686 SB_SINGLE("3D Output Ratio", SB_ALS4000_3D_SND_FX, 0, 0x07); 688static struct sbmix_elem snd_als4000_3d_control_ratio =
687static struct sbmix_elem snd_als4000_ctl_3d_poweroff_switch = 689 SB_SINGLE("3D Control - Level", SB_ALS4000_3D_SND_FX, 0, 0x07);
690static struct sbmix_elem snd_als4000_3d_control_freq =
691 /* FIXME: maybe there's actually some standard 3D ctrl name for it?? */
692 SB_SINGLE("3D Control - Freq", SB_ALS4000_3D_SND_FX, 4, 0x03);
693static struct sbmix_elem snd_als4000_3d_control_delay =
694 /* FIXME: ALS4000a.pdf mentions BBD (Bucket Brigade Device) time delay,
695 * but what ALSA 3D attribute is that actually? "Center", "Depth",
696 * "Wide" or "Space" or even "Level"? Assuming "Wide" for now... */
697 SB_SINGLE("3D Control - Wide", SB_ALS4000_3D_TIME_DELAY, 0, 0x0f);
698static struct sbmix_elem snd_als4000_3d_control_poweroff_switch =
688 SB_SINGLE("3D PowerOff Switch", SB_ALS4000_3D_TIME_DELAY, 4, 0x01); 699 SB_SINGLE("3D PowerOff Switch", SB_ALS4000_3D_TIME_DELAY, 4, 0x01);
689static struct sbmix_elem snd_als4000_ctl_3d_delay =
690 SB_SINGLE("3D Delay", SB_ALS4000_3D_TIME_DELAY, 0, 0x0f);
691#ifdef NOT_AVAILABLE 700#ifdef NOT_AVAILABLE
692static struct sbmix_elem snd_als4000_ctl_fmdac = 701static struct sbmix_elem snd_als4000_ctl_fmdac =
693 SB_SINGLE("FMDAC Switch (Option ?)", SB_ALS4000_FMDAC, 0, 0x01); 702 SB_SINGLE("FMDAC Switch (Option ?)", SB_ALS4000_FMDAC, 0, 0x01);
@@ -716,13 +725,15 @@ static struct sbmix_elem *snd_als4000_controls[] = {
716 &snd_sb16_ctl_pc_speaker_vol, 725 &snd_sb16_ctl_pc_speaker_vol,
717 &snd_sb16_ctl_capture_vol, 726 &snd_sb16_ctl_capture_vol,
718 &snd_sb16_ctl_play_vol, 727 &snd_sb16_ctl_play_vol,
719 &snd_als4000_ctl_mono_output_switch, 728 &snd_als4000_ctl_master_mono_playback_switch,
720 &snd_als4000_ctl_mono_input_switch, 729 &snd_als4000_ctl_master_mono_capture_route,
721 &snd_als4000_ctl_mixer_out_to_in, 730 &snd_als4000_ctl_mono_playback_switch,
722 &snd_als4000_ctl_3d_output_switch, 731 &snd_als4000_ctl_mixer_loopback,
723 &snd_als4000_ctl_3d_output_ratio, 732 &snd_als4000_3d_control_switch,
724 &snd_als4000_ctl_3d_delay, 733 &snd_als4000_3d_control_ratio,
725 &snd_als4000_ctl_3d_poweroff_switch, 734 &snd_als4000_3d_control_freq,
735 &snd_als4000_3d_control_delay,
736 &snd_als4000_3d_control_poweroff_switch,
726#ifdef NOT_AVAILABLE 737#ifdef NOT_AVAILABLE
727 &snd_als4000_ctl_fmdac, 738 &snd_als4000_ctl_fmdac,
728 &snd_als4000_ctl_qsound, 739 &snd_als4000_ctl_qsound,