Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 34865
b: refs/heads/master
c: 683fe15
h: refs/heads/master
i:
  34863: a42f45d
v: v3
  • Loading branch information
Jochen Voss authored and Jaroslav Kysela committed Sep 23, 2006
1 parent 12e9bcc commit 65e3c93
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 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: f5a5ffad072ec3c1fd636174c30f0ba52fe0259f
refs/heads/master: 683fe1537e660c322c8af953773921e814791193
3 changes: 2 additions & 1 deletion trunk/include/sound/ak4xxx-adda.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ struct snd_akm4xxx {
unsigned int idx_offset; /* control index offset */
enum {
SND_AK4524, SND_AK4528, SND_AK4529,
SND_AK4355, SND_AK4358, SND_AK4381
SND_AK4355, SND_AK4358, SND_AK4381,
SND_AK5365
} type;
unsigned int *num_stereo; /* array of combined counts
* for the mixer
Expand Down
25 changes: 25 additions & 0 deletions trunk/sound/i2c/other/ak4xxx-adda.c
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,31 @@ int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)
if (err < 0)
goto __error;
}

if (ak->type == SND_AK5365) {
memset(ctl, 0, sizeof(*ctl));
if (ak->channel_names == NULL)
strcpy(ctl->id.name, "Capture Volume");
else
strcpy(ctl->id.name, ak->channel_names[0]);
ctl->id.index = ak->idx_offset * 2;
ctl->id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
ctl->count = 1;
ctl->info = snd_akm4xxx_stereo_volume_info;
ctl->get = snd_akm4xxx_stereo_volume_get;
ctl->put = snd_akm4xxx_stereo_volume_put;
/* Registers 4 & 5 (see AK5365 data sheet, pages 34 and 35):
* valid values are from 0x00 (mute) to 0x98 (+12dB). */
ctl->private_value =
AK_COMPOSE(0, 4, 0, 0x98);
ctl->private_data = ak;
err = snd_ctl_add(ak->card,
snd_ctl_new(ctl, SNDRV_CTL_ELEM_ACCESS_READ|
SNDRV_CTL_ELEM_ACCESS_WRITE));
if (err < 0)
goto __error;
}

if (ak->type == SND_AK4355 || ak->type == SND_AK4358)
num_emphs = 1;
else
Expand Down

0 comments on commit 65e3c93

Please sign in to comment.