netfilter: nfnetlink_log: fix silly refcount leak
[safe/jmp/linux-2.6] / sound / isa / sb / sb_mixer.c
index 23cfa6a..318ff0c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for Sound Blaster mixer control
  *
  *
@@ -19,7 +19,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/time.h>
@@ -29,7 +28,7 @@
 
 #undef IO_DEBUG
 
-void snd_sbmixer_write(sb_t *chip, unsigned char reg, unsigned char data)
+void snd_sbmixer_write(struct snd_sb *chip, unsigned char reg, unsigned char data)
 {
        outb(reg, SBP(chip, MIXER_ADDR));
        udelay(10);
@@ -40,7 +39,7 @@ void snd_sbmixer_write(sb_t *chip, unsigned char reg, unsigned char data)
 #endif
 }
 
-unsigned char snd_sbmixer_read(sb_t *chip, unsigned char reg)
+unsigned char snd_sbmixer_read(struct snd_sb *chip, unsigned char reg)
 {
        unsigned char result;
 
@@ -58,7 +57,7 @@ unsigned char snd_sbmixer_read(sb_t *chip, unsigned char reg)
  * Single channel mixer element
  */
 
-static int snd_sbmixer_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_sbmixer_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
        int mask = (kcontrol->private_value >> 24) & 0xff;
 
@@ -69,9 +68,9 @@ static int snd_sbmixer_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
        return 0;
 }
 
-static int snd_sbmixer_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_sbmixer_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       sb_t *sb = snd_kcontrol_chip(kcontrol);
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int reg = kcontrol->private_value & 0xff;
        int shift = (kcontrol->private_value >> 16) & 0xff;
@@ -85,9 +84,9 @@ static int snd_sbmixer_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
        return 0;
 }
 
-static int snd_sbmixer_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_sbmixer_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       sb_t *sb = snd_kcontrol_chip(kcontrol);
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int reg = kcontrol->private_value & 0xff;
        int shift = (kcontrol->private_value >> 16) & 0x07;
@@ -110,7 +109,7 @@ static int snd_sbmixer_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
  * Double channel mixer element
  */
 
-static int snd_sbmixer_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_sbmixer_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
        int mask = (kcontrol->private_value >> 24) & 0xff;
 
@@ -121,9 +120,9 @@ static int snd_sbmixer_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
        return 0;
 }
 
-static int snd_sbmixer_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_sbmixer_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       sb_t *sb = snd_kcontrol_chip(kcontrol);
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int left_reg = kcontrol->private_value & 0xff;
        int right_reg = (kcontrol->private_value >> 8) & 0xff;
@@ -141,9 +140,9 @@ static int snd_sbmixer_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
        return 0;
 }
 
-static int snd_sbmixer_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_sbmixer_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       sb_t *sb = snd_kcontrol_chip(kcontrol);
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int left_reg = kcontrol->private_value & 0xff;
        int right_reg = (kcontrol->private_value >> 8) & 0xff;
@@ -181,9 +180,9 @@ static int snd_sbmixer_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
  * DT-019x / ALS-007 capture/input switch
  */
 
-static int snd_dt019x_input_sw_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_dt019x_input_sw_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-       static char *texts[5] = {
+       static const char *texts[5] = {
                "CD", "Mic", "Line", "Synth", "Master"
        };
 
@@ -196,9 +195,9 @@ static int snd_dt019x_input_sw_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_
        return 0;
 }
 
-static int snd_dt019x_input_sw_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_dt019x_input_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       sb_t *sb = snd_kcontrol_chip(kcontrol);
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        unsigned char oval;
        
@@ -232,9 +231,9 @@ static int snd_dt019x_input_sw_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value
        return 0;
 }
 
-static int snd_dt019x_input_sw_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_dt019x_input_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       sb_t *sb = snd_kcontrol_chip(kcontrol);
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int change;
        unsigned char nval, oval;
@@ -270,12 +269,73 @@ static int snd_dt019x_input_sw_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value
 }
 
 /*
+ * ALS4000 mono recording control switch
+ */
+
+static int snd_als4k_mono_capture_route_info(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_info *uinfo)
+{
+       static const char *texts[3] = {
+               "L chan only", "R chan only", "L ch/2 + R ch/2"
+       };
+
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+       uinfo->count = 1;
+       uinfo->value.enumerated.items = 3;
+       if (uinfo->value.enumerated.item > 2)
+               uinfo->value.enumerated.item = 2;
+       strcpy(uinfo->value.enumerated.name,
+              texts[uinfo->value.enumerated.item]);
+       return 0;
+}
+
+static int snd_als4k_mono_capture_route_get(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
+       unsigned long flags;
+       unsigned char oval;
+
+       spin_lock_irqsave(&sb->mixer_lock, flags);
+       oval = snd_sbmixer_read(sb, SB_ALS4000_MONO_IO_CTRL);
+       spin_unlock_irqrestore(&sb->mixer_lock, flags);
+       oval >>= 6;
+       if (oval > 2)
+               oval = 2;
+
+       ucontrol->value.enumerated.item[0] = oval;
+       return 0;
+}
+
+static int snd_als4k_mono_capture_route_put(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
+       unsigned long flags;
+       int change;
+       unsigned char nval, oval;
+
+       if (ucontrol->value.enumerated.item[0] > 2)
+               return -EINVAL;
+       spin_lock_irqsave(&sb->mixer_lock, flags);
+       oval = snd_sbmixer_read(sb, SB_ALS4000_MONO_IO_CTRL);
+
+       nval = (oval & ~(3 << 6))
+            | (ucontrol->value.enumerated.item[0] << 6);
+       change = nval != oval;
+       if (change)
+               snd_sbmixer_write(sb, SB_ALS4000_MONO_IO_CTRL, nval);
+       spin_unlock_irqrestore(&sb->mixer_lock, flags);
+       return change;
+}
+
+/*
  * SBPRO input multiplexer
  */
 
-static int snd_sb8mixer_info_mux(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_sb8mixer_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-       static char *texts[3] = {
+       static const char *texts[3] = {
                "Mic", "CD", "Line"
        };
 
@@ -289,9 +349,9 @@ static int snd_sb8mixer_info_mux(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
 }
 
 
-static int snd_sb8mixer_get_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_sb8mixer_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       sb_t *sb = snd_kcontrol_chip(kcontrol);
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        unsigned char oval;
        
@@ -312,9 +372,9 @@ static int snd_sb8mixer_get_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
        return 0;
 }
 
-static int snd_sb8mixer_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_sb8mixer_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       sb_t *sb = snd_kcontrol_chip(kcontrol);
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int change;
        unsigned char nval, oval;
@@ -346,7 +406,7 @@ static int snd_sb8mixer_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
  * SB16 input switch
  */
 
-static int snd_sb16mixer_info_input_sw(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_sb16mixer_info_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
        uinfo->count = 4;
@@ -355,9 +415,9 @@ static int snd_sb16mixer_info_input_sw(snd_kcontrol_t * kcontrol, snd_ctl_elem_i
        return 0;
 }
 
-static int snd_sb16mixer_get_input_sw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_sb16mixer_get_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       sb_t *sb = snd_kcontrol_chip(kcontrol);
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int reg1 = kcontrol->private_value & 0xff;
        int reg2 = (kcontrol->private_value >> 8) & 0xff;
@@ -376,9 +436,9 @@ static int snd_sb16mixer_get_input_sw(snd_kcontrol_t * kcontrol, snd_ctl_elem_va
        return 0;
 }                                                                                                                   
 
-static int snd_sb16mixer_put_input_sw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_sb16mixer_put_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       sb_t *sb = snd_kcontrol_chip(kcontrol);
+       struct snd_sb *sb = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int reg1 = kcontrol->private_value & 0xff;
        int reg2 = (kcontrol->private_value >> 8) & 0xff;
@@ -410,9 +470,9 @@ static int snd_sb16mixer_put_input_sw(snd_kcontrol_t * kcontrol, snd_ctl_elem_va
  */
 /*
  */
-int snd_sbmixer_add_ctl(sb_t *chip, const char *name, int index, int type, unsigned long value)
+int snd_sbmixer_add_ctl(struct snd_sb *chip, const char *name, int index, int type, unsigned long value)
 {
-       static snd_kcontrol_new_t newctls[] = {
+       static struct snd_kcontrol_new newctls[] = {
                [SB_MIX_SINGLE] = {
                        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                        .info = snd_sbmixer_info_single,
@@ -443,8 +503,14 @@ int snd_sbmixer_add_ctl(sb_t *chip, const char *name, int index, int type, unsig
                        .get = snd_dt019x_input_sw_get,
                        .put = snd_dt019x_input_sw_put,
                },
+               [SB_MIX_MONO_CAPTURE_ALS4K] = {
+                       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                       .info = snd_als4k_mono_capture_route_info,
+                       .get = snd_als4k_mono_capture_route_get,
+                       .put = snd_als4k_mono_capture_route_put,
+               },
        };
-       snd_kcontrol_t *ctl;
+       struct snd_kcontrol *ctl;
        int err;
 
        ctl = snd_ctl_new1(&newctls[type], chip);
@@ -453,10 +519,8 @@ int snd_sbmixer_add_ctl(sb_t *chip, const char *name, int index, int type, unsig
        strlcpy(ctl->id.name, name, sizeof(ctl->id.name));
        ctl->id.index = index;
        ctl->private_value = value;
-       if ((err = snd_ctl_add(chip->card, ctl)) < 0) {
-               snd_ctl_free_one(ctl);
+       if ((err = snd_ctl_add(chip->card, ctl)) < 0)
                return err;
-       }
        return 0;
 }
 
@@ -567,7 +631,7 @@ static struct sbmix_elem snd_sb16_ctl_mic_play_switch =
 static struct sbmix_elem snd_sb16_ctl_mic_play_vol =
        SB_SINGLE("Mic Playback Volume", SB_DSP4_MIC_DEV, 3, 31);
 static struct sbmix_elem snd_sb16_ctl_pc_speaker_vol =
-       SB_SINGLE("PC Speaker Volume", SB_DSP4_SPEAKER_DEV, 6, 3);
+       SB_SINGLE("Beep Volume", SB_DSP4_SPEAKER_DEV, 6, 3);
 static struct sbmix_elem snd_sb16_ctl_capture_vol =
        SB_DOUBLE("Capture Volume", SB_DSP4_IGAIN_DEV, (SB_DSP4_IGAIN_DEV + 1), 6, 6, 3);
 static struct sbmix_elem snd_sb16_ctl_play_vol =
@@ -625,7 +689,7 @@ static struct sbmix_elem snd_dt019x_ctl_cd_play_vol =
 static struct sbmix_elem snd_dt019x_ctl_mic_play_vol =
        SB_SINGLE("Mic Playback Volume", SB_DT019X_MIC_DEV, 4, 7);
 static struct sbmix_elem snd_dt019x_ctl_pc_speaker_vol =
-       SB_SINGLE("PC Speaker Volume", SB_DT019X_SPKR_DEV, 0,  7);
+       SB_SINGLE("Beep Volume", SB_DT019X_SPKR_DEV, 0,  7);
 static struct sbmix_elem snd_dt019x_ctl_line_play_vol =
        SB_DOUBLE("Line Playback Volume", SB_DT019X_LINE_DEV, SB_DT019X_LINE_DEV, 4,0, 15);
 static struct sbmix_elem snd_dt019x_ctl_pcm_play_switch =
@@ -639,6 +703,8 @@ static struct sbmix_elem snd_dt019x_ctl_capture_source =
        };
 
 static struct sbmix_elem *snd_dt019x_controls[] = {
+       /* ALS4000 below has some parts which we might be lacking,
+        * e.g. snd_als4000_ctl_mono_playback_switch - check it! */
        &snd_dt019x_ctl_master_play_vol,
        &snd_dt019x_ctl_pcm_play_vol,
        &snd_dt019x_ctl_synth_play_vol,
@@ -669,18 +735,21 @@ static unsigned char snd_dt019x_init_values[][2] = {
 /*
  * ALS4000 specific mixer elements
  */
-/* FIXME: SB_ALS4000_MONO_IO_CTRL needs output select ctrl! */
 static struct sbmix_elem snd_als4000_ctl_master_mono_playback_switch =
        SB_SINGLE("Master Mono Playback Switch", SB_ALS4000_MONO_IO_CTRL, 5, 1);
-static struct sbmix_elem snd_als4000_ctl_master_mono_capture_route =
-       SB_SINGLE("Master Mono Capture Route", SB_ALS4000_MONO_IO_CTRL, 6, 0x03);
-/* FIXME: mono playback switch also available on DT019X? */
+static struct sbmix_elem snd_als4k_ctl_master_mono_capture_route = {
+               .name = "Master Mono Capture Route",
+               .type = SB_MIX_MONO_CAPTURE_ALS4K
+       };
 static struct sbmix_elem snd_als4000_ctl_mono_playback_switch =
        SB_SINGLE("Mono Playback Switch", SB_DT019X_OUTPUT_SW2, 0, 1);
 static struct sbmix_elem snd_als4000_ctl_mic_20db_boost =
        SB_SINGLE("Mic Boost (+20dB)", SB_ALS4000_MIC_IN_GAIN, 0, 0x03);
-static struct sbmix_elem snd_als4000_ctl_mixer_loopback =
-       SB_SINGLE("Analog Loopback", SB_ALS4000_MIC_IN_GAIN, 7, 0x01);
+static struct sbmix_elem snd_als4000_ctl_mixer_analog_loopback =
+       SB_SINGLE("Analog Loopback Switch", SB_ALS4000_MIC_IN_GAIN, 7, 0x01);
+static struct sbmix_elem snd_als4000_ctl_mixer_digital_loopback =
+       SB_SINGLE("Digital Loopback Switch",
+                 SB_ALS4000_CR3_CONFIGURATION, 7, 0x01);
 /* FIXME: functionality of 3D controls might be swapped, I didn't find
  * a description of how to identify what is supposed to be what */
 static struct sbmix_elem snd_als4000_3d_control_switch =
@@ -697,6 +766,9 @@ static struct sbmix_elem snd_als4000_3d_control_delay =
        SB_SINGLE("3D Control - Wide", SB_ALS4000_3D_TIME_DELAY, 0, 0x0f);
 static struct sbmix_elem snd_als4000_3d_control_poweroff_switch =
        SB_SINGLE("3D PowerOff Switch", SB_ALS4000_3D_TIME_DELAY, 4, 0x01);
+static struct sbmix_elem snd_als4000_ctl_3db_freq_control_switch =
+       SB_SINGLE("Master Playback 8kHz / 20kHz LPF Switch",
+                 SB_ALS4000_FMDAC, 5, 0x01);
 #ifdef NOT_AVAILABLE
 static struct sbmix_elem snd_als4000_ctl_fmdac =
        SB_SINGLE("FMDAC Switch (Option ?)", SB_ALS4000_FMDAC, 0, 0x01);
@@ -705,35 +777,37 @@ static struct sbmix_elem snd_als4000_ctl_qsound =
 #endif
 
 static struct sbmix_elem *snd_als4000_controls[] = {
-       &snd_sb16_ctl_master_play_vol,
-       &snd_dt019x_ctl_pcm_play_switch,
-       &snd_sb16_ctl_pcm_play_vol,
-       &snd_sb16_ctl_synth_capture_route,
-       &snd_dt019x_ctl_synth_play_switch,
-       &snd_sb16_ctl_synth_play_vol,
-       &snd_sb16_ctl_cd_capture_route,
-       &snd_sb16_ctl_cd_play_switch,
-       &snd_sb16_ctl_cd_play_vol,
-       &snd_sb16_ctl_line_capture_route,
-       &snd_sb16_ctl_line_play_switch,
-       &snd_sb16_ctl_line_play_vol,
-       &snd_sb16_ctl_mic_capture_route,
-       &snd_als4000_ctl_mic_20db_boost,
-       &snd_sb16_ctl_auto_mic_gain,
-       &snd_sb16_ctl_mic_play_switch,
-       &snd_sb16_ctl_mic_play_vol,
-       &snd_sb16_ctl_pc_speaker_vol,
-       &snd_sb16_ctl_capture_vol,
-       &snd_sb16_ctl_play_vol,
-       &snd_als4000_ctl_master_mono_playback_switch,
-       &snd_als4000_ctl_master_mono_capture_route,
-       &snd_als4000_ctl_mono_playback_switch,
-       &snd_als4000_ctl_mixer_loopback,
-       &snd_als4000_3d_control_switch,
-       &snd_als4000_3d_control_ratio,
-       &snd_als4000_3d_control_freq,
-       &snd_als4000_3d_control_delay,
-       &snd_als4000_3d_control_poweroff_switch,
+                                               /* ALS4000a.PDF regs page */
+       &snd_sb16_ctl_master_play_vol,          /* MX30/31 12 */
+       &snd_dt019x_ctl_pcm_play_switch,        /* MX4C    16 */
+       &snd_sb16_ctl_pcm_play_vol,             /* MX32/33 12 */
+       &snd_sb16_ctl_synth_capture_route,      /* MX3D/3E 14 */
+       &snd_dt019x_ctl_synth_play_switch,      /* MX4C    16 */
+       &snd_sb16_ctl_synth_play_vol,           /* MX34/35 12/13 */
+       &snd_sb16_ctl_cd_capture_route,         /* MX3D/3E 14 */
+       &snd_sb16_ctl_cd_play_switch,           /* MX3C    14 */
+       &snd_sb16_ctl_cd_play_vol,              /* MX36/37 13 */
+       &snd_sb16_ctl_line_capture_route,       /* MX3D/3E 14 */
+       &snd_sb16_ctl_line_play_switch,         /* MX3C    14 */
+       &snd_sb16_ctl_line_play_vol,            /* MX38/39 13 */
+       &snd_sb16_ctl_mic_capture_route,        /* MX3D/3E 14 */
+       &snd_als4000_ctl_mic_20db_boost,        /* MX4D    16 */
+       &snd_sb16_ctl_mic_play_switch,          /* MX3C    14 */
+       &snd_sb16_ctl_mic_play_vol,             /* MX3A    13 */
+       &snd_sb16_ctl_pc_speaker_vol,           /* MX3B    14 */
+       &snd_sb16_ctl_capture_vol,              /* MX3F/40 15 */
+       &snd_sb16_ctl_play_vol,                 /* MX41/42 15 */
+       &snd_als4000_ctl_master_mono_playback_switch, /* MX4C 16 */
+       &snd_als4k_ctl_master_mono_capture_route, /* MX4B  16 */
+       &snd_als4000_ctl_mono_playback_switch,  /* MX4C    16 */
+       &snd_als4000_ctl_mixer_analog_loopback, /* MX4D    16 */
+       &snd_als4000_ctl_mixer_digital_loopback, /* CR3    21 */
+       &snd_als4000_3d_control_switch,          /* MX50   17 */
+       &snd_als4000_3d_control_ratio,           /* MX50   17 */
+       &snd_als4000_3d_control_freq,            /* MX50   17 */
+       &snd_als4000_3d_control_delay,           /* MX51   18 */
+       &snd_als4000_3d_control_poweroff_switch,        /* MX51    18 */
+       &snd_als4000_ctl_3db_freq_control_switch,       /* MX4F    17 */
 #ifdef NOT_AVAILABLE
        &snd_als4000_ctl_fmdac,
        &snd_als4000_ctl_qsound,
@@ -758,7 +832,7 @@ static unsigned char snd_als4000_init_values[][2] = {
 
 /*
  */
-static int snd_sbmixer_init(sb_t *chip,
+static int snd_sbmixer_init(struct snd_sb *chip,
                            struct sbmix_elem **controls,
                            int controls_count,
                            unsigned char map[][2],
@@ -766,7 +840,7 @@ static int snd_sbmixer_init(sb_t *chip,
                            char *name)
 {
        unsigned long flags;
-       snd_card_t *card = chip->card;
+       struct snd_card *card = chip->card;
        int idx, err;
 
        /* mixer reset */
@@ -790,12 +864,13 @@ static int snd_sbmixer_init(sb_t *chip,
        return 0;
 }
 
-int snd_sbmixer_new(sb_t *chip)
+int snd_sbmixer_new(struct snd_sb *chip)
 {
-       snd_card_t * card;
+       struct snd_card *card;
        int err;
 
-       snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
+       if (snd_BUG_ON(!chip || !chip->card))
+               return -EINVAL;
 
        card = chip->card;
 
@@ -823,6 +898,7 @@ int snd_sbmixer_new(sb_t *chip)
                break;
        case SB_HW_16:
        case SB_HW_ALS100:
+       case SB_HW_CS5530:
                if ((err = snd_sbmixer_init(chip,
                                            snd_sb16_controls,
                                            ARRAY_SIZE(snd_sb16_controls),
@@ -853,3 +929,147 @@ int snd_sbmixer_new(sb_t *chip)
        }
        return 0;
 }
+
+#ifdef CONFIG_PM
+static unsigned char sb20_saved_regs[] = {
+       SB_DSP20_MASTER_DEV,
+       SB_DSP20_PCM_DEV,
+       SB_DSP20_FM_DEV,
+       SB_DSP20_CD_DEV,
+};
+
+static unsigned char sbpro_saved_regs[] = {
+       SB_DSP_MASTER_DEV,
+       SB_DSP_PCM_DEV,
+       SB_DSP_PLAYBACK_FILT,
+       SB_DSP_FM_DEV,
+       SB_DSP_CD_DEV,
+       SB_DSP_LINE_DEV,
+       SB_DSP_MIC_DEV,
+       SB_DSP_CAPTURE_SOURCE,
+       SB_DSP_CAPTURE_FILT,
+};
+
+static unsigned char sb16_saved_regs[] = {
+       SB_DSP4_MASTER_DEV, SB_DSP4_MASTER_DEV + 1,
+       SB_DSP4_3DSE,
+       SB_DSP4_BASS_DEV, SB_DSP4_BASS_DEV + 1,
+       SB_DSP4_TREBLE_DEV, SB_DSP4_TREBLE_DEV + 1,
+       SB_DSP4_PCM_DEV, SB_DSP4_PCM_DEV + 1,
+       SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT,
+       SB_DSP4_SYNTH_DEV, SB_DSP4_SYNTH_DEV + 1,
+       SB_DSP4_OUTPUT_SW,
+       SB_DSP4_CD_DEV, SB_DSP4_CD_DEV + 1,
+       SB_DSP4_LINE_DEV, SB_DSP4_LINE_DEV + 1,
+       SB_DSP4_MIC_DEV,
+       SB_DSP4_SPEAKER_DEV,
+       SB_DSP4_IGAIN_DEV, SB_DSP4_IGAIN_DEV + 1,
+       SB_DSP4_OGAIN_DEV, SB_DSP4_OGAIN_DEV + 1,
+       SB_DSP4_MIC_AGC
+};
+
+static unsigned char dt019x_saved_regs[] = {
+       SB_DT019X_MASTER_DEV,
+       SB_DT019X_PCM_DEV,
+       SB_DT019X_SYNTH_DEV,
+       SB_DT019X_CD_DEV,
+       SB_DT019X_MIC_DEV,
+       SB_DT019X_SPKR_DEV,
+       SB_DT019X_LINE_DEV,
+       SB_DSP4_OUTPUT_SW,
+       SB_DT019X_OUTPUT_SW2,
+       SB_DT019X_CAPTURE_SW,
+};
+
+static unsigned char als4000_saved_regs[] = {
+       /* please verify in dsheet whether regs to be added
+          are actually real H/W or just dummy */
+       SB_DSP4_MASTER_DEV, SB_DSP4_MASTER_DEV + 1,
+       SB_DSP4_OUTPUT_SW,
+       SB_DSP4_PCM_DEV, SB_DSP4_PCM_DEV + 1,
+       SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT,
+       SB_DSP4_SYNTH_DEV, SB_DSP4_SYNTH_DEV + 1,
+       SB_DSP4_CD_DEV, SB_DSP4_CD_DEV + 1,
+       SB_DSP4_MIC_DEV,
+       SB_DSP4_SPEAKER_DEV,
+       SB_DSP4_IGAIN_DEV, SB_DSP4_IGAIN_DEV + 1,
+       SB_DSP4_OGAIN_DEV, SB_DSP4_OGAIN_DEV + 1,
+       SB_DT019X_OUTPUT_SW2,
+       SB_ALS4000_MONO_IO_CTRL,
+       SB_ALS4000_MIC_IN_GAIN,
+       SB_ALS4000_FMDAC,
+       SB_ALS4000_3D_SND_FX,
+       SB_ALS4000_3D_TIME_DELAY,
+       SB_ALS4000_CR3_CONFIGURATION,
+};
+
+static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)
+{
+       unsigned char *val = chip->saved_regs;
+       if (snd_BUG_ON(num_regs > ARRAY_SIZE(chip->saved_regs)))
+               return;
+       for (; num_regs; num_regs--)
+               *val++ = snd_sbmixer_read(chip, *regs++);
+}
+
+static void restore_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)
+{
+       unsigned char *val = chip->saved_regs;
+       if (snd_BUG_ON(num_regs > ARRAY_SIZE(chip->saved_regs)))
+               return;
+       for (; num_regs; num_regs--)
+               snd_sbmixer_write(chip, *regs++, *val++);
+}
+
+void snd_sbmixer_suspend(struct snd_sb *chip)
+{
+       switch (chip->hardware) {
+       case SB_HW_20:
+       case SB_HW_201:
+               save_mixer(chip, sb20_saved_regs, ARRAY_SIZE(sb20_saved_regs));
+               break;
+       case SB_HW_PRO:
+               save_mixer(chip, sbpro_saved_regs, ARRAY_SIZE(sbpro_saved_regs));
+               break;
+       case SB_HW_16:
+       case SB_HW_ALS100:
+       case SB_HW_CS5530:
+               save_mixer(chip, sb16_saved_regs, ARRAY_SIZE(sb16_saved_regs));
+               break;
+       case SB_HW_ALS4000:
+               save_mixer(chip, als4000_saved_regs, ARRAY_SIZE(als4000_saved_regs));
+               break;
+       case SB_HW_DT019X:
+               save_mixer(chip, dt019x_saved_regs, ARRAY_SIZE(dt019x_saved_regs));
+               break;
+       default:
+               break;
+       }
+}
+
+void snd_sbmixer_resume(struct snd_sb *chip)
+{
+       switch (chip->hardware) {
+       case SB_HW_20:
+       case SB_HW_201:
+               restore_mixer(chip, sb20_saved_regs, ARRAY_SIZE(sb20_saved_regs));
+               break;
+       case SB_HW_PRO:
+               restore_mixer(chip, sbpro_saved_regs, ARRAY_SIZE(sbpro_saved_regs));
+               break;
+       case SB_HW_16:
+       case SB_HW_ALS100:
+       case SB_HW_CS5530:
+               restore_mixer(chip, sb16_saved_regs, ARRAY_SIZE(sb16_saved_regs));
+               break;
+       case SB_HW_ALS4000:
+               restore_mixer(chip, als4000_saved_regs, ARRAY_SIZE(als4000_saved_regs));
+               break;
+       case SB_HW_DT019X:
+               restore_mixer(chip, dt019x_saved_regs, ARRAY_SIZE(dt019x_saved_regs));
+               break;
+       default:
+               break;
+       }
+}
+#endif