diff options
author | Andrew Paprocki <andrew@ishiboo.com> | 2007-12-19 06:13:44 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:29:42 -0500 |
commit | 3982d17e3d38850908ed3400cb5a68fdc623877d (patch) | |
tree | edc3fa96f032fe767f0cbf5a83f85b853cf1b99a /sound/pci/hda/hda_codec.h | |
parent | 1697055e6c82ee5e99f459c15619605782eb7fcc (diff) |
[ALSA] hda-codec - Add missing #defines (and 1 rename) in hda_codec.h
Added AC_VERB_GET_DIGI_CONVERT_2 and renamed AC_VERB_GET_DIGI_CONVERT to
AC_VERB_GET_DIGI_CONVERT_1 to stay consistent with the SET variants. Added
AC_VERB_GET_GPIO_UNSOLICITED_RSP_MASK, AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK,
and AC_PINCAP_LR_SWAP. The missing fields were listed in the ALC883 datasheet
rev 1.3.
Signed-off-by: Andrew Paprocki <andrew@ishiboo.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
-rw-r--r-- | sound/pci/hda/hda_codec.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 2e242dbe0844..20be7761562d 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h | |||
@@ -77,12 +77,14 @@ enum { | |||
77 | #define AC_VERB_GET_PIN_SENSE 0x0f09 | 77 | #define AC_VERB_GET_PIN_SENSE 0x0f09 |
78 | #define AC_VERB_GET_BEEP_CONTROL 0x0f0a | 78 | #define AC_VERB_GET_BEEP_CONTROL 0x0f0a |
79 | #define AC_VERB_GET_EAPD_BTLENABLE 0x0f0c | 79 | #define AC_VERB_GET_EAPD_BTLENABLE 0x0f0c |
80 | #define AC_VERB_GET_DIGI_CONVERT 0x0f0d | 80 | #define AC_VERB_GET_DIGI_CONVERT_1 0x0f0d |
81 | #define AC_VERB_GET_DIGI_CONVERT_2 0x0f0e | ||
81 | #define AC_VERB_GET_VOLUME_KNOB_CONTROL 0x0f0f | 82 | #define AC_VERB_GET_VOLUME_KNOB_CONTROL 0x0f0f |
82 | /* f10-f1a: GPIO */ | 83 | /* f10-f1a: GPIO */ |
83 | #define AC_VERB_GET_GPIO_DATA 0x0f15 | 84 | #define AC_VERB_GET_GPIO_DATA 0x0f15 |
84 | #define AC_VERB_GET_GPIO_MASK 0x0f16 | 85 | #define AC_VERB_GET_GPIO_MASK 0x0f16 |
85 | #define AC_VERB_GET_GPIO_DIRECTION 0x0f17 | 86 | #define AC_VERB_GET_GPIO_DIRECTION 0x0f17 |
87 | #define AC_VERB_GET_GPIO_UNSOLICITED_RSP_MASK 0x0f19 | ||
86 | #define AC_VERB_GET_CONFIG_DEFAULT 0x0f1c | 88 | #define AC_VERB_GET_CONFIG_DEFAULT 0x0f1c |
87 | /* f20: AFG/MFG */ | 89 | /* f20: AFG/MFG */ |
88 | #define AC_VERB_GET_SUBSYSTEM_ID 0x0f20 | 90 | #define AC_VERB_GET_SUBSYSTEM_ID 0x0f20 |
@@ -110,6 +112,7 @@ enum { | |||
110 | #define AC_VERB_SET_GPIO_DATA 0x715 | 112 | #define AC_VERB_SET_GPIO_DATA 0x715 |
111 | #define AC_VERB_SET_GPIO_MASK 0x716 | 113 | #define AC_VERB_SET_GPIO_MASK 0x716 |
112 | #define AC_VERB_SET_GPIO_DIRECTION 0x717 | 114 | #define AC_VERB_SET_GPIO_DIRECTION 0x717 |
115 | #define AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK 0x719 | ||
113 | #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_0 0x71c | 116 | #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_0 0x71c |
114 | #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_1 0x71d | 117 | #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_1 0x71d |
115 | #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_2 0x71e | 118 | #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_2 0x71e |
@@ -190,6 +193,10 @@ enum { | |||
190 | #define AC_PINCAP_OUT (1<<4) /* output capable */ | 193 | #define AC_PINCAP_OUT (1<<4) /* output capable */ |
191 | #define AC_PINCAP_IN (1<<5) /* input capable */ | 194 | #define AC_PINCAP_IN (1<<5) /* input capable */ |
192 | #define AC_PINCAP_BALANCE (1<<6) /* balanced I/O capable */ | 195 | #define AC_PINCAP_BALANCE (1<<6) /* balanced I/O capable */ |
196 | /* Note: This LR_SWAP pincap is defined in the Realtek ALC883 specification, | ||
197 | * but is marked reserved in the Intel HDA specification. | ||
198 | */ | ||
199 | #define AC_PINCAP_LR_SWAP (1<<7) /* L/R swap */ | ||
193 | #define AC_PINCAP_VREF (0x37<<8) | 200 | #define AC_PINCAP_VREF (0x37<<8) |
194 | #define AC_PINCAP_VREF_SHIFT 8 | 201 | #define AC_PINCAP_VREF_SHIFT 8 |
195 | #define AC_PINCAP_EAPD (1<<16) /* EAPD capable */ | 202 | #define AC_PINCAP_EAPD (1<<16) /* EAPD capable */ |