mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
ALSA: wss_lib: use wss mixer code instead of ad1848 one
Use the wss mixer code and kill the ad1848 mixer code. Signed-off-by: Krzysztof Helt <[email protected]> Reviewed-by: Rene Herman <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]>
This commit is contained in:
parent
811585e9d1
commit
5664daa1c1
8 changed files with 98 additions and 283 deletions
|
|
@ -115,6 +115,5 @@ int snd_ad1848_create(struct snd_card *card,
|
|||
|
||||
int snd_ad1848_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm);
|
||||
const struct snd_pcm_ops *snd_ad1848_get_pcm_ops(int direction);
|
||||
int snd_ad1848_mixer(struct snd_wss *chip);
|
||||
|
||||
#endif /* __SOUND_AD1848_H */
|
||||
|
|
|
|||
|
|
@ -193,6 +193,31 @@ int snd_wss_put_single(struct snd_kcontrol *kcontrol,
|
|||
.private_value = left_reg | (right_reg << 8) | (shift_left << 16) | \
|
||||
(shift_right << 19) | (mask << 24) | (invert << 22) }
|
||||
|
||||
#define WSS_SINGLE_TLV(xname, xindex, reg, shift, mask, invert, xtlv) \
|
||||
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
|
||||
.name = xname, \
|
||||
.index = xindex, \
|
||||
.info = snd_wss_info_single, \
|
||||
.get = snd_wss_get_single, \
|
||||
.put = snd_wss_put_single, \
|
||||
.private_value = reg | (shift << 8) | (mask << 16) | (invert << 24), \
|
||||
.tlv = { .p = (xtlv) } }
|
||||
|
||||
#define WSS_DOUBLE_TLV(xname, xindex, left_reg, right_reg, \
|
||||
shift_left, shift_right, mask, invert, xtlv) \
|
||||
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
|
||||
.name = xname, \
|
||||
.index = xindex, \
|
||||
.info = snd_wss_info_double, \
|
||||
.get = snd_wss_get_double, \
|
||||
.put = snd_wss_put_double, \
|
||||
.private_value = left_reg | (right_reg << 8) | (shift_left << 16) | \
|
||||
(shift_right << 19) | (mask << 24) | (invert << 22), \
|
||||
.tlv = { .p = (xtlv) } }
|
||||
|
||||
|
||||
int snd_wss_info_double(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_info *uinfo);
|
||||
int snd_wss_get_double(struct snd_kcontrol *kcontrol,
|
||||
|
|
|
|||
Loading…
Reference in a new issue