diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-22 10:33:04 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-22 10:33:04 +0300 |
| commit | 1eaf5c0716d53d3f64da62a09682b1f5ae912ac2 (patch) | |
| tree | 28640e3b0c43651f9dd4f90d29ecd2a95657c76c /sound/pci/hda/hda_local.h | |
| parent | 08989930f91e4802b94e03eb54e5385bac112811 (diff) | |
| parent | 7c7767ebe2fa847c91a0dd5551ca422aba359473 (diff) | |
| download | linux-1eaf5c0716d53d3f64da62a09682b1f5ae912ac2.tar.xz | |
Merge branch 'test/hda-vol-ofs' into next/hda
Diffstat (limited to 'sound/pci/hda/hda_local.h')
| -rw-r--r-- | sound/pci/hda/hda_local.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index a4ecd77a451a..ec687b206c0a 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h @@ -26,8 +26,10 @@ /* * for mixer controls */ +#define HDA_COMPOSE_AMP_VAL_OFS(nid,chs,idx,dir,ofs) \ + ((nid) | ((chs)<<16) | ((dir)<<18) | ((idx)<<19) | ((ofs)<<23)) #define HDA_COMPOSE_AMP_VAL(nid,chs,idx,dir) \ - ((nid) | ((chs)<<16) | ((dir)<<18) | ((idx)<<19)) + HDA_COMPOSE_AMP_VAL_OFS(nid, chs, idx, dir, 0) /* mono volume with index (index=0,1,...) (channel=1,2) */ #define HDA_CODEC_VOLUME_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \ @@ -458,6 +460,7 @@ int snd_hda_check_amp_list_power(struct hda_codec *codec, #define get_amp_channels(kc) (((kc)->private_value >> 16) & 0x3) #define get_amp_direction(kc) (((kc)->private_value >> 18) & 0x1) #define get_amp_index(kc) (((kc)->private_value >> 19) & 0xf) +#define get_amp_offset(kc) (((kc)->private_value >> 23) & 0x3f) /* * CEA Short Audio Descriptor data |