Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 34842
b: refs/heads/master
c: fff36e4
h: refs/heads/master
v: v3
  • Loading branch information
James Courtier-Dutton authored and Jaroslav Kysela committed Sep 23, 2006
1 parent 464e7a7 commit 9900ecd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f1265391ea002a28933dc1a8a55948c0ed64c9d0
refs/heads/master: fff36e472b4315df77513f4339c5c199c6aad28b
8 changes: 6 additions & 2 deletions trunk/sound/pci/ca0106/ca0106_mixer.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@

#include "ca0106.h"

static DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale, -5150, 75, 1);
static DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale1, -5175, 25, 1);
static DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale2, -10350, 50, 1);

static int snd_ca0106_shared_spdif_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
Expand Down Expand Up @@ -477,16 +478,19 @@ static int snd_ca0106_i2c_volume_put(struct snd_kcontrol *kcontrol,
.info = snd_ca0106_volume_info, \
.get = snd_ca0106_volume_get, \
.put = snd_ca0106_volume_put, \
.tlv.p = snd_ca0106_db_scale, \
.tlv.p = snd_ca0106_db_scale1, \
.private_value = ((chid) << 8) | (reg) \
}

#define I2C_VOLUME(xname,chid) \
{ \
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \
SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
.info = snd_ca0106_i2c_volume_info, \
.get = snd_ca0106_i2c_volume_get, \
.put = snd_ca0106_i2c_volume_put, \
.tlv.p = snd_ca0106_db_scale2, \
.private_value = chid \
}

Expand Down

0 comments on commit 9900ecd

Please sign in to comment.