diff options
Diffstat (limited to 'sound/pci/ac97/ac97_local.h')
| -rw-r--r-- | sound/pci/ac97/ac97_local.h | 55 |
1 files changed, 32 insertions, 23 deletions
diff --git a/sound/pci/ac97/ac97_local.h b/sound/pci/ac97/ac97_local.h index 536a4d4793af..a6244c720a1d 100644 --- a/sound/pci/ac97/ac97_local.h +++ b/sound/pci/ac97/ac97_local.h @@ -36,6 +36,16 @@ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), .info = snd_ac97_info_volsw, \ .get = snd_ac97_get_volsw, .put = snd_ac97_put_volsw, \ .private_value = (reg) | ((shift_left) << 8) | ((shift_right) << 12) | ((mask) << 16) | ((invert) << 24) } + +/* enum control */ +struct ac97_enum { + unsigned char reg; + unsigned char shift_l; + unsigned char shift_r; + unsigned short mask; + const char **texts; +}; + #define AC97_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xtexts) \ { .reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \ .mask = xmask, .texts = xtexts } @@ -47,34 +57,33 @@ .private_value = (unsigned long)&xenum } /* ac97_codec.c */ -extern const char *snd_ac97_stereo_enhancements[]; -extern const snd_kcontrol_new_t snd_ac97_controls_3d[]; -extern const snd_kcontrol_new_t snd_ac97_controls_spdif[]; -snd_kcontrol_t *snd_ac97_cnew(const snd_kcontrol_new_t *_template, ac97_t * ac97); -void snd_ac97_get_name(ac97_t *ac97, unsigned int id, char *name, int modem); -int snd_ac97_info_volsw(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo); -int snd_ac97_get_volsw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol); -int snd_ac97_put_volsw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol); -int snd_ac97_try_bit(ac97_t * ac97, int reg, int bit); -int snd_ac97_remove_ctl(ac97_t *ac97, const char *name, const char *suffix); -int snd_ac97_rename_ctl(ac97_t *ac97, const char *src, const char *dst, const char *suffix); -int snd_ac97_swap_ctl(ac97_t *ac97, const char *s1, const char *s2, const char *suffix); -void snd_ac97_rename_vol_ctl(ac97_t *ac97, const char *src, const char *dst); -void snd_ac97_restore_status(ac97_t *ac97); -void snd_ac97_restore_iec958(ac97_t *ac97); -int snd_ac97_info_enum_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo); -int snd_ac97_get_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol); -int snd_ac97_put_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol); +extern const struct snd_kcontrol_new snd_ac97_controls_3d[]; +extern const struct snd_kcontrol_new snd_ac97_controls_spdif[]; +struct snd_kcontrol *snd_ac97_cnew(const struct snd_kcontrol_new *_template, struct snd_ac97 * ac97); +void snd_ac97_get_name(struct snd_ac97 *ac97, unsigned int id, char *name, int modem); +int snd_ac97_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); +int snd_ac97_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); +int snd_ac97_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); +int snd_ac97_try_bit(struct snd_ac97 * ac97, int reg, int bit); +int snd_ac97_remove_ctl(struct snd_ac97 *ac97, const char *name, const char *suffix); +int snd_ac97_rename_ctl(struct snd_ac97 *ac97, const char *src, const char *dst, const char *suffix); +int snd_ac97_swap_ctl(struct snd_ac97 *ac97, const char *s1, const char *s2, const char *suffix); +void snd_ac97_rename_vol_ctl(struct snd_ac97 *ac97, const char *src, const char *dst); +void snd_ac97_restore_status(struct snd_ac97 *ac97); +void snd_ac97_restore_iec958(struct snd_ac97 *ac97); +int snd_ac97_info_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); +int snd_ac97_get_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); +int snd_ac97_put_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); -int snd_ac97_update_bits_nolock(ac97_t *ac97, unsigned short reg, +int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, unsigned short reg, unsigned short mask, unsigned short value); /* ac97_proc.c */ #ifdef CONFIG_PROC_FS -void snd_ac97_bus_proc_init(ac97_bus_t * ac97); -void snd_ac97_bus_proc_done(ac97_bus_t * ac97); -void snd_ac97_proc_init(ac97_t * ac97); -void snd_ac97_proc_done(ac97_t * ac97); +void snd_ac97_bus_proc_init(struct snd_ac97_bus * ac97); +void snd_ac97_bus_proc_done(struct snd_ac97_bus * ac97); +void snd_ac97_proc_init(struct snd_ac97 * ac97); +void snd_ac97_proc_done(struct snd_ac97 * ac97); #else #define snd_ac97_bus_proc_init(ac97_bus_t) do { } while (0) #define snd_ac97_bus_proc_done(ac97_bus_t) do { } while (0) |