diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-08-23 09:24:39 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-08-23 09:24:39 -0400 |
commit | d025febcd8f0280b2935de299c022002f4c7d490 (patch) | |
tree | 0f6a3cc10543cc3c551049da04a3aea846214bf8 /sound/pci/hda/hda_local.h | |
parent | 8cd0775da2e884cf01f0649402dd725224b308bf (diff) |
ALSA: hda - Rename to snd_hda_parse_pin_defcfg()
... and add a new bit-flags argument to specify the behavior of the
function. The older function is kept as is (as a wrapper).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r-- | sound/pci/hda/hda_local.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 9ed4b0dd6724..6be2e9ea6787 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
@@ -443,9 +443,18 @@ struct auto_pin_cfg { | |||
443 | #define get_defcfg_device(cfg) \ | 443 | #define get_defcfg_device(cfg) \ |
444 | ((cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT) | 444 | ((cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT) |
445 | 445 | ||
446 | int snd_hda_parse_pin_def_config(struct hda_codec *codec, | 446 | /* bit-flags for snd_hda_parse_pin_def_config() behavior */ |
447 | struct auto_pin_cfg *cfg, | 447 | #define HDA_PINCFG_NO_HP_FIXUP (1 << 0) /* no HP-split */ |
448 | const hda_nid_t *ignore_nids); | 448 | #define HDA_PINCFG_NO_LO_FIXUP (1 << 1) /* don't take other outs as LO */ |
449 | |||
450 | int snd_hda_parse_pin_defcfg(struct hda_codec *codec, | ||
451 | struct auto_pin_cfg *cfg, | ||
452 | const hda_nid_t *ignore_nids, | ||
453 | unsigned int cond_flags); | ||
454 | |||
455 | /* older function */ | ||
456 | #define snd_hda_parse_pin_def_config(codec, cfg, ignore) \ | ||
457 | snd_hda_parse_pin_defcfg(codec, cfg, ignore, 0) | ||
449 | 458 | ||
450 | /* amp values */ | 459 | /* amp values */ |
451 | #define AMP_IN_MUTE(idx) (0x7080 | ((idx)<<8)) | 460 | #define AMP_IN_MUTE(idx) (0x7080 | ((idx)<<8)) |