Skip to content

L
linux
Commit ee42381e authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] Remove xxx_t typedefs: AC97 

Modules: AC97 Codec

Remove xxx_t typedefs from the AC97 codec support.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent dc4cafba
Hide whitespace changes
Inline Side-by-side
Showing with 511 additions and 509 deletions
include/sound/ac97_codec.h
View file @ ee42381e
...@@ -391,38 +391,35 @@ ...@@ -391,38 +391,35 @@
* *
*/ */
typedef struct _snd_ac97_bus ac97_bus_t; struct snd_ac97;
typedef struct _snd_ac97_bus_ops ac97_bus_ops_t;
typedef struct _snd_ac97_template ac97_template_t;
typedef struct _snd_ac97 ac97_t;
struct snd_ac97_build_ops { struct snd_ac97_build_ops {
int (*build_3d) (ac97_t *ac97); int (*build_3d) (struct snd_ac97 *ac97);
int (*build_specific) (ac97_t *ac97); int (*build_specific) (struct snd_ac97 *ac97);
int (*build_spdif) (ac97_t *ac97); int (*build_spdif) (struct snd_ac97 *ac97);
int (*build_post_spdif) (ac97_t *ac97); int (*build_post_spdif) (struct snd_ac97 *ac97);
#ifdef CONFIG_PM #ifdef CONFIG_PM
void (*suspend) (ac97_t *ac97); void (*suspend) (struct snd_ac97 *ac97);
void (*resume) (ac97_t *ac97); void (*resume) (struct snd_ac97 *ac97);
#endif #endif
void (*update_jacks) (ac97_t *ac97); /* for jack-sharing */ void (*update_jacks) (struct snd_ac97 *ac97); /* for jack-sharing */
}; };
struct _snd_ac97_bus_ops { struct snd_ac97_bus_ops {
void (*reset) (ac97_t *ac97); void (*reset) (struct snd_ac97 *ac97);
void (*write) (ac97_t *ac97, unsigned short reg, unsigned short val); void (*write) (struct snd_ac97 *ac97, unsigned short reg, unsigned short val);
unsigned short (*read) (ac97_t *ac97, unsigned short reg); unsigned short (*read) (struct snd_ac97 *ac97, unsigned short reg);
void (*wait) (ac97_t *ac97); void (*wait) (struct snd_ac97 *ac97);
void (*init) (ac97_t *ac97); void (*init) (struct snd_ac97 *ac97);
}; };
struct _snd_ac97_bus { struct snd_ac97_bus {
/* -- lowlevel (hardware) driver specific -- */ /* -- lowlevel (hardware) driver specific -- */
ac97_bus_ops_t *ops; struct snd_ac97_bus_ops *ops;
void *private_data; void *private_data;
void (*private_free) (ac97_bus_t *bus); void (*private_free) (struct snd_ac97_bus *bus);
/* --- */ /* --- */
snd_card_t *card; struct snd_card *card;
unsigned short num; /* bus number */ unsigned short num; /* bus number */
unsigned short no_vra: 1, /* bridge doesn't support VRA */ unsigned short no_vra: 1, /* bridge doesn't support VRA */
dra: 1, /* bridge supports double rate */ dra: 1, /* bridge supports double rate */
...@@ -432,13 +429,13 @@ struct _snd_ac97_bus { ...@@ -432,13 +429,13 @@ struct _snd_ac97_bus {
unsigned short used_slots[2][4]; /* actually used PCM slots */ unsigned short used_slots[2][4]; /* actually used PCM slots */
unsigned short pcms_count; /* count of PCMs */ unsigned short pcms_count; /* count of PCMs */
struct ac97_pcm *pcms; struct ac97_pcm *pcms;
ac97_t *codec[4]; struct snd_ac97 *codec[4];
snd_info_entry_t *proc; struct snd_info_entry *proc;
}; };
struct _snd_ac97_template { struct snd_ac97_template {
void *private_data; void *private_data;
void (*private_free) (ac97_t *ac97); void (*private_free) (struct snd_ac97 *ac97);
struct pci_dev *pci; /* assigned PCI device - used for quirks */ struct pci_dev *pci; /* assigned PCI device - used for quirks */
unsigned short num; /* number of codec: 0 = primary, 1 = secondary */ unsigned short num; /* number of codec: 0 = primary, 1 = secondary */
unsigned short addr; /* physical address of codec [0-3] */ unsigned short addr; /* physical address of codec [0-3] */
...@@ -447,16 +444,16 @@ struct _snd_ac97_template { ...@@ -447,16 +444,16 @@ struct _snd_ac97_template {
DECLARE_BITMAP(reg_accessed, 0x80); /* bit flags */ DECLARE_BITMAP(reg_accessed, 0x80); /* bit flags */
}; };
struct _snd_ac97 { struct snd_ac97 {
/* -- lowlevel (hardware) driver specific -- */ /* -- lowlevel (hardware) driver specific -- */
struct snd_ac97_build_ops * build_ops; struct snd_ac97_build_ops * build_ops;
void *private_data; void *private_data;
void (*private_free) (ac97_t *ac97); void (*private_free) (struct snd_ac97 *ac97);
/* --- */ /* --- */
ac97_bus_t *bus; struct snd_ac97_bus *bus;
struct pci_dev *pci; /* assigned PCI device - used for quirks */ struct pci_dev *pci; /* assigned PCI device - used for quirks */
snd_info_entry_t *proc; struct snd_info_entry *proc;
snd_info_entry_t *proc_regs; struct snd_info_entry *proc_regs;
unsigned short subsystem_vendor; unsigned short subsystem_vendor;
unsigned short subsystem_device; unsigned short subsystem_device;
struct semaphore reg_mutex; struct semaphore reg_mutex;
...@@ -490,43 +487,47 @@ struct _snd_ac97 { ...@@ -490,43 +487,47 @@ struct _snd_ac97 {
struct device dev; struct device dev;
}; };
#define to_ac97_t(d) container_of(d, struct _snd_ac97, dev) #define to_ac97_t(d) container_of(d, struct snd_ac97, dev)
/* conditions */ /* conditions */
static inline int ac97_is_audio(ac97_t * ac97) static inline int ac97_is_audio(struct snd_ac97 * ac97)
{ {
return (ac97->scaps & AC97_SCAP_AUDIO); return (ac97->scaps & AC97_SCAP_AUDIO);
} }
static inline int ac97_is_modem(ac97_t * ac97) static inline int ac97_is_modem(struct snd_ac97 * ac97)
{ {
return (ac97->scaps & AC97_SCAP_MODEM); return (ac97->scaps & AC97_SCAP_MODEM);
} }
static inline int ac97_is_rev22(ac97_t * ac97) static inline int ac97_is_rev22(struct snd_ac97 * ac97)
{ {
return (ac97->ext_id & AC97_EI_REV_MASK) >= AC97_EI_REV_22; return (ac97->ext_id & AC97_EI_REV_MASK) >= AC97_EI_REV_22;
} }
static inline int ac97_can_amap(ac97_t * ac97) static inline int ac97_can_amap(struct snd_ac97 * ac97)
{ {
return (ac97->ext_id & AC97_EI_AMAP) != 0; return (ac97->ext_id & AC97_EI_AMAP) != 0;
} }
static inline int ac97_can_spdif(ac97_t * ac97) static inline int ac97_can_spdif(struct snd_ac97 * ac97)
{ {
return (ac97->ext_id & AC97_EI_SPDIF) != 0; return (ac97->ext_id & AC97_EI_SPDIF) != 0;
} }
/* functions */ /* functions */
int snd_ac97_bus(snd_card_t *card, int num, ac97_bus_ops_t *ops, void *private_data, ac97_bus_t **rbus); /* create new AC97 bus */ /* create new AC97 bus */
int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97); /* create mixer controls */ int snd_ac97_bus(struct snd_card *card, int num, struct snd_ac97_bus_ops *ops,
const char *snd_ac97_get_short_name(ac97_t *ac97); void *private_data, struct snd_ac97_bus **rbus);
/* create mixer controls */
void snd_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short value); int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
unsigned short snd_ac97_read(ac97_t *ac97, unsigned short reg); struct snd_ac97 **rac97);
void snd_ac97_write_cache(ac97_t *ac97, unsigned short reg, unsigned short value); const char *snd_ac97_get_short_name(struct snd_ac97 *ac97);
int snd_ac97_update(ac97_t *ac97, unsigned short reg, unsigned short value);
int snd_ac97_update_bits(ac97_t *ac97, unsigned short reg, unsigned short mask, unsigned short value); void snd_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short value);
unsigned short snd_ac97_read(struct snd_ac97 *ac97, unsigned short reg);
void snd_ac97_write_cache(struct snd_ac97 *ac97, unsigned short reg, unsigned short value);
int snd_ac97_update(struct snd_ac97 *ac97, unsigned short reg, unsigned short value);
int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned short mask, unsigned short value);
#ifdef CONFIG_PM #ifdef CONFIG_PM
void snd_ac97_suspend(ac97_t *ac97); void snd_ac97_suspend(struct snd_ac97 *ac97);
void snd_ac97_resume(ac97_t *ac97); void snd_ac97_resume(struct snd_ac97 *ac97);
#endif #endif
/* quirk types */ /* quirk types */
...@@ -551,8 +552,8 @@ struct ac97_quirk { ...@@ -551,8 +552,8 @@ struct ac97_quirk {
int type; /* quirk type above */ int type; /* quirk type above */
}; };
int snd_ac97_tune_hardware(ac97_t *ac97, struct ac97_quirk *quirk, const char *override); int snd_ac97_tune_hardware(struct snd_ac97 *ac97, struct ac97_quirk *quirk, const char *override);
int snd_ac97_set_rate(ac97_t *ac97, int reg, unsigned int rate); int snd_ac97_set_rate(struct snd_ac97 *ac97, int reg, unsigned int rate);
/* /*
* PCM allocation * PCM allocation
...@@ -568,7 +569,7 @@ enum ac97_pcm_cfg { ...@@ -568,7 +569,7 @@ enum ac97_pcm_cfg {
}; };
struct ac97_pcm { struct ac97_pcm {
ac97_bus_t *bus; struct snd_ac97_bus *bus;
unsigned int stream: 1, /* stream type: 1 = capture */ unsigned int stream: 1, /* stream type: 1 = capture */
exclusive: 1, /* exclusive mode, don't override with other pcms */ exclusive: 1, /* exclusive mode, don't override with other pcms */
copy_flag: 1, /* lowlevel driver must fill all entries */ copy_flag: 1, /* lowlevel driver must fill all entries */
...@@ -579,18 +580,18 @@ struct ac97_pcm { ...@@ -579,18 +580,18 @@ struct ac97_pcm {
unsigned short slots; /* driver input: requested AC97 slot numbers */ unsigned short slots; /* driver input: requested AC97 slot numbers */
unsigned short rslots[4]; /* allocated slots per codecs */ unsigned short rslots[4]; /* allocated slots per codecs */
unsigned char rate_table[4]; unsigned char rate_table[4];
ac97_t *codec[4]; /* allocated codecs */ struct snd_ac97 *codec[4]; /* allocated codecs */
} r[2]; /* 0 = standard rates, 1 = double rates */ } r[2]; /* 0 = standard rates, 1 = double rates */
unsigned long private_value; /* used by the hardware driver */ unsigned long private_value; /* used by the hardware driver */
}; };
int snd_ac97_pcm_assign(ac97_bus_t *ac97, int snd_ac97_pcm_assign(struct snd_ac97_bus *ac97,
unsigned short pcms_count, unsigned short pcms_count,
const struct ac97_pcm *pcms); const struct ac97_pcm *pcms);
int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate, int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate,
enum ac97_pcm_cfg cfg, unsigned short slots); enum ac97_pcm_cfg cfg, unsigned short slots);
int snd_ac97_pcm_close(struct ac97_pcm *pcm); int snd_ac97_pcm_close(struct ac97_pcm *pcm);
int snd_ac97_pcm_double_rate_rules(snd_pcm_runtime_t *runtime); int snd_ac97_pcm_double_rate_rules(struct snd_pcm_runtime *runtime);
/* ad hoc AC97 device driver access */ /* ad hoc AC97 device driver access */
extern struct bus_type ac97_bus_type; extern struct bus_type ac97_bus_type;
......
sound/pci/ac97/ac97_bus.c
View file @ ee42381e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
/* /*
* Let drivers decide whether they want to support given codec from their * Let drivers decide whether they want to support given codec from their
* probe method. Drivers have direct access to the ac97_t structure and may * probe method. Drivers have direct access to the struct snd_ac97 structure and may
* decide based on the id field amongst other things. * decide based on the id field amongst other things.
*/ */
static int ac97_bus_match(struct device *dev, struct device_driver *drv) static int ac97_bus_match(struct device *dev, struct device_driver *drv)
......
sound/pci/ac97/ac97_codec.c
View file @ ee42381e
...@@ -50,16 +50,16 @@ MODULE_PARM_DESC(enable_loopback, "Enable AC97 ADC/DAC Loopback Control"); ...@@ -50,16 +50,16 @@ MODULE_PARM_DESC(enable_loopback, "Enable AC97 ADC/DAC Loopback Control");
*/ */
typedef struct { struct ac97_codec_id {
unsigned int id; unsigned int id;
unsigned int mask; unsigned int mask;
const char *name; const char *name;
int (*patch)(ac97_t *ac97); int (*patch)(struct snd_ac97 *ac97);
int (*mpatch)(ac97_t *ac97); int (*mpatch)(struct snd_ac97 *ac97);
unsigned int flags; unsigned int flags;
} ac97_codec_id_t; };
static const ac97_codec_id_t snd_ac97_codec_id_vendors[] = { static const struct ac97_codec_id snd_ac97_codec_id_vendors[] = {
{ 0x414b4d00, 0xffffff00, "Asahi Kasei", NULL, NULL }, { 0x414b4d00, 0xffffff00, "Asahi Kasei", NULL, NULL },
{ 0x41445300, 0xffffff00, "Analog Devices", NULL, NULL }, { 0x41445300, 0xffffff00, "Analog Devices", NULL, NULL },
{ 0x414c4300, 0xffffff00, "Realtek", NULL, NULL }, { 0x414c4300, 0xffffff00, "Realtek", NULL, NULL },
...@@ -86,7 +86,7 @@ static const ac97_codec_id_t snd_ac97_codec_id_vendors[] = { ...@@ -86,7 +86,7 @@ static const ac97_codec_id_t snd_ac97_codec_id_vendors[] = {
{ 0, 0, NULL, NULL, NULL } { 0, 0, NULL, NULL, NULL }
}; };
static const ac97_codec_id_t snd_ac97_codec_ids[] = { static const struct ac97_codec_id snd_ac97_codec_ids[] = {
{ 0x414b4d00, 0xffffffff, "AK4540", NULL, NULL }, { 0x414b4d00, 0xffffffff, "AK4540", NULL, NULL },
{ 0x414b4d01, 0xffffffff, "AK4542", NULL, NULL }, { 0x414b4d01, 0xffffffff, "AK4542", NULL, NULL },
{ 0x414b4d02, 0xffffffff, "AK4543", NULL, NULL }, { 0x414b4d02, 0xffffffff, "AK4543", NULL, NULL },
...@@ -225,7 +225,7 @@ const char *snd_ac97_stereo_enhancements[] = ...@@ -225,7 +225,7 @@ const char *snd_ac97_stereo_enhancements[] =
* I/O routines * I/O routines
*/ */
static int snd_ac97_valid_reg(ac97_t *ac97, unsigned short reg) static int snd_ac97_valid_reg(struct snd_ac97 *ac97, unsigned short reg)
{ {
if (ac97->limited_regs && ! test_bit(reg, ac97->reg_accessed)) if (ac97->limited_regs && ! test_bit(reg, ac97->reg_accessed))
return 0; return 0;
...@@ -278,7 +278,7 @@ static int snd_ac97_valid_reg(ac97_t *ac97, unsigned short reg) ...@@ -278,7 +278,7 @@ static int snd_ac97_valid_reg(ac97_t *ac97, unsigned short reg)
* #snd_ca97_write_cache(), so use this only when you don't want to * #snd_ca97_write_cache(), so use this only when you don't want to
* reflect the change to the suspend/resume state. * reflect the change to the suspend/resume state.
*/ */
void snd_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short value) void snd_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short value)
{ {
if (!snd_ac97_valid_reg(ac97, reg)) if (!snd_ac97_valid_reg(ac97, reg))
return; return;
...@@ -301,7 +301,7 @@ void snd_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short value) ...@@ -301,7 +301,7 @@ void snd_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short value)
* *
* Returns the read value. * Returns the read value.
*/ */
unsigned short snd_ac97_read(ac97_t *ac97, unsigned short reg) unsigned short snd_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
{ {
if (!snd_ac97_valid_reg(ac97, reg)) if (!snd_ac97_valid_reg(ac97, reg))
return 0; return 0;
...@@ -309,7 +309,7 @@ unsigned short snd_ac97_read(ac97_t *ac97, unsigned short reg) ...@@ -309,7 +309,7 @@ unsigned short snd_ac97_read(ac97_t *ac97, unsigned short reg)
} }
/* read a register - return the cached value if already read */ /* read a register - return the cached value if already read */
static inline unsigned short snd_ac97_read_cache(ac97_t *ac97, unsigned short reg) static inline unsigned short snd_ac97_read_cache(struct snd_ac97 *ac97, unsigned short reg)
{ {
if (! test_bit(reg, ac97->reg_accessed)) { if (! test_bit(reg, ac97->reg_accessed)) {
ac97->regs[reg] = ac97->bus->ops->read(ac97, reg); ac97->regs[reg] = ac97->bus->ops->read(ac97, reg);
...@@ -328,7 +328,7 @@ static inline unsigned short snd_ac97_read_cache(ac97_t *ac97, unsigned short re ...@@ -328,7 +328,7 @@ static inline unsigned short snd_ac97_read_cache(ac97_t *ac97, unsigned short re
* cache. The cached values are used for the cached-read and the * cache. The cached values are used for the cached-read and the
* suspend/resume. * suspend/resume.
*/ */
void snd_ac97_write_cache(ac97_t *ac97, unsigned short reg, unsigned short value) void snd_ac97_write_cache(struct snd_ac97 *ac97, unsigned short reg, unsigned short value)
{ {
if (!snd_ac97_valid_reg(ac97, reg)) if (!snd_ac97_valid_reg(ac97, reg))
return; return;
...@@ -351,7 +351,7 @@ void snd_ac97_write_cache(ac97_t *ac97, unsigned short reg, unsigned short value ...@@ -351,7 +351,7 @@ void snd_ac97_write_cache(ac97_t *ac97, unsigned short reg, unsigned short value
* Returns 1 if the value is changed, 0 if no change, or a negative * Returns 1 if the value is changed, 0 if no change, or a negative
* code on failure. * code on failure.
*/ */
int snd_ac97_update(ac97_t *ac97, unsigned short reg, unsigned short value) int snd_ac97_update(struct snd_ac97 *ac97, unsigned short reg, unsigned short value)
{ {
int change; int change;
...@@ -381,7 +381,7 @@ int snd_ac97_update(ac97_t *ac97, unsigned short reg, unsigned short value) ...@@ -381,7 +381,7 @@ int snd_ac97_update(ac97_t *ac97, unsigned short reg, unsigned short value)
* Returns 1 if the bits are changed, 0 if no change, or a negative * Returns 1 if the bits are changed, 0 if no change, or a negative
* code on failure. * code on failure.
*/ */
int snd_ac97_update_bits(ac97_t *ac97, unsigned short reg, unsigned short mask, unsigned short value) int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned short mask, unsigned short value)
{ {
int change; int change;
...@@ -394,7 +394,7 @@ int snd_ac97_update_bits(ac97_t *ac97, unsigned short reg, unsigned short mask, ...@@ -394,7 +394,7 @@ int snd_ac97_update_bits(ac97_t *ac97, unsigned short reg, unsigned short mask,
} }
/* no lock version - see snd_ac97_updat_bits() */ /* no lock version - see snd_ac97_updat_bits() */
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) unsigned short mask, unsigned short value)
{ {
int change; int change;
...@@ -411,7 +411,7 @@ int snd_ac97_update_bits_nolock(ac97_t *ac97, unsigned short reg, ...@@ -411,7 +411,7 @@ int snd_ac97_update_bits_nolock(ac97_t *ac97, unsigned short reg,
return change; return change;
} }
static int snd_ac97_ad18xx_update_pcm_bits(ac97_t *ac97, int codec, unsigned short mask, unsigned short value) static int snd_ac97_ad18xx_update_pcm_bits(struct snd_ac97 *ac97, int codec, unsigned short mask, unsigned short value)
{ {
int change; int change;
unsigned short old, new, cfg; unsigned short old, new, cfg;
...@@ -443,7 +443,7 @@ static int snd_ac97_ad18xx_update_pcm_bits(ac97_t *ac97, int codec, unsigned sho ...@@ -443,7 +443,7 @@ static int snd_ac97_ad18xx_update_pcm_bits(ac97_t *ac97, int codec, unsigned sho
* Controls * Controls
*/ */
int snd_ac97_info_enum_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) int snd_ac97_info_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value; struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value;
...@@ -457,9 +457,9 @@ int snd_ac97_info_enum_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * ui ...@@ -457,9 +457,9 @@ int snd_ac97_info_enum_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * ui
return 0; return 0;
} }
int snd_ac97_get_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) int snd_ac97_get_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value; struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value;
unsigned short val, bitmask; unsigned short val, bitmask;
...@@ -473,9 +473,9 @@ int snd_ac97_get_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * u ...@@ -473,9 +473,9 @@ int snd_ac97_get_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * u
return 0; return 0;
} }
int snd_ac97_put_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) int snd_ac97_put_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value; struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value;
unsigned short val; unsigned short val;
unsigned short mask, bitmask; unsigned short mask, bitmask;
...@@ -496,7 +496,7 @@ int snd_ac97_put_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * u ...@@ -496,7 +496,7 @@ int snd_ac97_put_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * u
} }
/* save/restore ac97 v2.3 paging */ /* save/restore ac97 v2.3 paging */
static int snd_ac97_page_save(ac97_t *ac97, int reg, snd_kcontrol_t *kcontrol) static int snd_ac97_page_save(struct snd_ac97 *ac97, int reg, struct snd_kcontrol *kcontrol)
{ {
int page_save = -1; int page_save = -1;
if ((kcontrol->private_value & (1<<25)) && if ((kcontrol->private_value & (1<<25)) &&
...@@ -510,7 +510,7 @@ static int snd_ac97_page_save(ac97_t *ac97, int reg, snd_kcontrol_t *kcontrol) ...@@ -510,7 +510,7 @@ static int snd_ac97_page_save(ac97_t *ac97, int reg, snd_kcontrol_t *kcontrol)
return page_save; return page_save;
} }
static void snd_ac97_page_restore(ac97_t *ac97, int page_save) static void snd_ac97_page_restore(struct snd_ac97 *ac97, int page_save)
{ {
if (page_save >= 0) { if (page_save >= 0) {
snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page_save); snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page_save);
...@@ -519,7 +519,7 @@ static void snd_ac97_page_restore(ac97_t *ac97, int page_save) ...@@ -519,7 +519,7 @@ static void snd_ac97_page_restore(ac97_t *ac97, int page_save)
} }
/* volume and switch controls */ /* volume and switch controls */
int snd_ac97_info_volsw(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) int snd_ac97_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
int mask = (kcontrol->private_value >> 16) & 0xff; int mask = (kcontrol->private_value >> 16) & 0xff;
int shift = (kcontrol->private_value >> 8) & 0x0f; int shift = (kcontrol->private_value >> 8) & 0x0f;
...@@ -532,9 +532,9 @@ int snd_ac97_info_volsw(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) ...@@ -532,9 +532,9 @@ int snd_ac97_info_volsw(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
return 0; return 0;
} }
int snd_ac97_get_volsw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) int snd_ac97_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int reg = kcontrol->private_value & 0xff; int reg = kcontrol->private_value & 0xff;
int shift = (kcontrol->private_value >> 8) & 0x0f; int shift = (kcontrol->private_value >> 8) & 0x0f;
int rshift = (kcontrol->private_value >> 12) & 0x0f; int rshift = (kcontrol->private_value >> 12) & 0x0f;
...@@ -555,9 +555,9 @@ int snd_ac97_get_volsw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontro ...@@ -555,9 +555,9 @@ int snd_ac97_get_volsw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontro
return 0; return 0;
} }
int snd_ac97_put_volsw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) int snd_ac97_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int reg = kcontrol->private_value & 0xff; int reg = kcontrol->private_value & 0xff;
int shift = (kcontrol->private_value >> 8) & 0x0f; int shift = (kcontrol->private_value >> 8) & 0x0f;
int rshift = (kcontrol->private_value >> 12) & 0x0f; int rshift = (kcontrol->private_value >> 12) & 0x0f;
...@@ -584,22 +584,22 @@ int snd_ac97_put_volsw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontro ...@@ -584,22 +584,22 @@ int snd_ac97_put_volsw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontro
return err; return err;
} }
static const snd_kcontrol_new_t snd_ac97_controls_master_mono[2] = { static const struct snd_kcontrol_new snd_ac97_controls_master_mono[2] = {
AC97_SINGLE("Master Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1), AC97_SINGLE("Master Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1),
AC97_SINGLE("Master Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1) AC97_SINGLE("Master Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1)
}; };
static const snd_kcontrol_new_t snd_ac97_controls_tone[2] = { static const struct snd_kcontrol_new snd_ac97_controls_tone[2] = {
AC97_SINGLE("Tone Control - Bass", AC97_MASTER_TONE, 8, 15, 1), AC97_SINGLE("Tone Control - Bass", AC97_MASTER_TONE, 8, 15, 1),
AC97_SINGLE("Tone Control - Treble", AC97_MASTER_TONE, 0, 15, 1) AC97_SINGLE("Tone Control - Treble", AC97_MASTER_TONE, 0, 15, 1)
}; };
static const snd_kcontrol_new_t snd_ac97_controls_pc_beep[2] = { static const struct snd_kcontrol_new snd_ac97_controls_pc_beep[2] = {
AC97_SINGLE("PC Speaker Playback Switch", AC97_PC_BEEP, 15, 1, 1), AC97_SINGLE("PC Speaker Playback Switch", AC97_PC_BEEP, 15, 1, 1),
AC97_SINGLE("PC Speaker Playback Volume", AC97_PC_BEEP, 1, 15, 1) AC97_SINGLE("PC Speaker Playback Volume", AC97_PC_BEEP, 1, 15, 1)
}; };
static const snd_kcontrol_new_t snd_ac97_controls_mic_boost = static const struct snd_kcontrol_new snd_ac97_controls_mic_boost =
AC97_SINGLE("Mic Boost (+20dB)", AC97_MIC, 6, 1, 0); AC97_SINGLE("Mic Boost (+20dB)", AC97_MIC, 6, 1, 0);
...@@ -615,18 +615,18 @@ AC97_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 9, 2, std_mix), ...@@ -615,18 +615,18 @@ AC97_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 9, 2, std_mix),
AC97_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 8, 2, std_mic), AC97_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 8, 2, std_mic),
}; };
static const snd_kcontrol_new_t snd_ac97_control_capture_src = static const struct snd_kcontrol_new snd_ac97_control_capture_src =
AC97_ENUM("Capture Source", std_enum[0]); AC97_ENUM("Capture Source", std_enum[0]);
static const snd_kcontrol_new_t snd_ac97_control_capture_vol = static const struct snd_kcontrol_new snd_ac97_control_capture_vol =
AC97_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 15, 0); AC97_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 15, 0);
static const snd_kcontrol_new_t snd_ac97_controls_mic_capture[2] = { static const struct snd_kcontrol_new snd_ac97_controls_mic_capture[2] = {
AC97_SINGLE("Mic Capture Switch", AC97_REC_GAIN_MIC, 15, 1, 1), AC97_SINGLE("Mic Capture Switch", AC97_REC_GAIN_MIC, 15, 1, 1),
AC97_SINGLE("Mic Capture Volume", AC97_REC_GAIN_MIC, 0, 15, 0) AC97_SINGLE("Mic Capture Volume", AC97_REC_GAIN_MIC, 0, 15, 0)
}; };
typedef enum { enum {
AC97_GENERAL_PCM_OUT = 0, AC97_GENERAL_PCM_OUT = 0,
AC97_GENERAL_STEREO_ENHANCEMENT, AC97_GENERAL_STEREO_ENHANCEMENT,
AC97_GENERAL_3D, AC97_GENERAL_3D,
...@@ -634,9 +634,9 @@ typedef enum { ...@@ -634,9 +634,9 @@ typedef enum {
AC97_GENERAL_MONO, AC97_GENERAL_MONO,
AC97_GENERAL_MIC, AC97_GENERAL_MIC,
AC97_GENERAL_LOOPBACK AC97_GENERAL_LOOPBACK
} ac97_general_index_t; };
static const snd_kcontrol_new_t snd_ac97_controls_general[7] = { static const struct snd_kcontrol_new snd_ac97_controls_general[7] = {
AC97_ENUM("PCM Out Path & Mute", std_enum[1]), AC97_ENUM("PCM Out Path & Mute", std_enum[1]),
AC97_SINGLE("Simulated Stereo Enhancement", AC97_GENERAL_PURPOSE, 14, 1, 0), AC97_SINGLE("Simulated Stereo Enhancement", AC97_GENERAL_PURPOSE, 14, 1, 0),
AC97_SINGLE("3D Control - Switch", AC97_GENERAL_PURPOSE, 13, 1, 0), AC97_SINGLE("3D Control - Switch", AC97_GENERAL_PURPOSE, 13, 1, 0),
...@@ -646,45 +646,45 @@ AC97_ENUM("Mic Select", std_enum[3]), ...@@ -646,45 +646,45 @@ AC97_ENUM("Mic Select", std_enum[3]),
AC97_SINGLE("ADC/DAC Loopback", AC97_GENERAL_PURPOSE, 7, 1, 0) AC97_SINGLE("ADC/DAC Loopback", AC97_GENERAL_PURPOSE, 7, 1, 0)
}; };
const snd_kcontrol_new_t snd_ac97_controls_3d[2] = { const struct snd_kcontrol_new snd_ac97_controls_3d[2] = {
AC97_SINGLE("3D Control - Center", AC97_3D_CONTROL, 8, 15, 0), AC97_SINGLE("3D Control - Center", AC97_3D_CONTROL, 8, 15, 0),
AC97_SINGLE("3D Control - Depth", AC97_3D_CONTROL, 0, 15, 0) AC97_SINGLE("3D Control - Depth", AC97_3D_CONTROL, 0, 15, 0)
}; };
static const snd_kcontrol_new_t snd_ac97_controls_center[2] = { static const struct snd_kcontrol_new snd_ac97_controls_center[2] = {
AC97_SINGLE("Center Playback Switch", AC97_CENTER_LFE_MASTER, 7, 1, 1), AC97_SINGLE("Center Playback Switch", AC97_CENTER_LFE_MASTER, 7, 1, 1),
AC97_SINGLE("Center Playback Volume", AC97_CENTER_LFE_MASTER, 0, 31, 1) AC97_SINGLE("Center Playback Volume", AC97_CENTER_LFE_MASTER, 0, 31, 1)
}; };
static const snd_kcontrol_new_t snd_ac97_controls_lfe[2] = { static const struct snd_kcontrol_new snd_ac97_controls_lfe[2] = {
AC97_SINGLE("LFE Playback Switch", AC97_CENTER_LFE_MASTER, 15, 1, 1), AC97_SINGLE("LFE Playback Switch", AC97_CENTER_LFE_MASTER, 15, 1, 1),
AC97_SINGLE("LFE Playback Volume", AC97_CENTER_LFE_MASTER, 8, 31, 1) AC97_SINGLE("LFE Playback Volume", AC97_CENTER_LFE_MASTER, 8, 31, 1)
}; };
static const snd_kcontrol_new_t snd_ac97_control_eapd = static const struct snd_kcontrol_new snd_ac97_control_eapd =
AC97_SINGLE("External Amplifier", AC97_POWERDOWN, 15, 1, 1); AC97_SINGLE("External Amplifier", AC97_POWERDOWN, 15, 1, 1);
static const snd_kcontrol_new_t snd_ac97_controls_modem_switches[2] = { static const struct snd_kcontrol_new snd_ac97_controls_modem_switches[2] = {
AC97_SINGLE("Off-hook Switch", AC97_GPIO_STATUS, 0, 1, 0), AC97_SINGLE("Off-hook Switch", AC97_GPIO_STATUS, 0, 1, 0),
AC97_SINGLE("Caller ID Switch", AC97_GPIO_STATUS, 2, 1, 0) AC97_SINGLE("Caller ID Switch", AC97_GPIO_STATUS, 2, 1, 0)
}; };
/* change the existing EAPD control as inverted */ /* change the existing EAPD control as inverted */
static void set_inv_eapd(ac97_t *ac97, snd_kcontrol_t *kctl) static void set_inv_eapd(struct snd_ac97 *ac97, struct snd_kcontrol *kctl)
{ {
kctl->private_value = AC97_SINGLE_VALUE(AC97_POWERDOWN, 15, 1, 0); kctl->private_value = AC97_SINGLE_VALUE(AC97_POWERDOWN, 15, 1, 0);
snd_ac97_update_bits(ac97, AC97_POWERDOWN, (1<<15), (1<<15)); /* EAPD up */ snd_ac97_update_bits(ac97, AC97_POWERDOWN, (1<<15), (1<<15)); /* EAPD up */
ac97->scaps |= AC97_SCAP_INV_EAPD; ac97->scaps |= AC97_SCAP_INV_EAPD;
} }
static int snd_ac97_spdif_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_ac97_spdif_mask_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958; uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1; uinfo->count = 1;
return 0; return 0;
} }
static int snd_ac97_spdif_cmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_spdif_cmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL | ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |
IEC958_AES0_NONAUDIO | IEC958_AES0_NONAUDIO |
...@@ -696,7 +696,7 @@ static int snd_ac97_spdif_cmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value ...@@ -696,7 +696,7 @@ static int snd_ac97_spdif_cmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value
return 0; return 0;
} }
static int snd_ac97_spdif_pmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_spdif_pmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
/* FIXME: AC'97 spec doesn't say which bits are used for what */ /* FIXME: AC'97 spec doesn't say which bits are used for what */
ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL | ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |
...@@ -706,9 +706,9 @@ static int snd_ac97_spdif_pmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value ...@@ -706,9 +706,9 @@ static int snd_ac97_spdif_pmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value
return 0; return 0;
} }
static int snd_ac97_spdif_default_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_spdif_default_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
down(&ac97->reg_mutex); down(&ac97->reg_mutex);
ucontrol->value.iec958.status[0] = ac97->spdif_status & 0xff; ucontrol->value.iec958.status[0] = ac97->spdif_status & 0xff;
...@@ -719,9 +719,9 @@ static int snd_ac97_spdif_default_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_val ...@@ -719,9 +719,9 @@ static int snd_ac97_spdif_default_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_val
return 0; return 0;
} }
static int snd_ac97_spdif_default_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned int new = 0; unsigned int new = 0;
unsigned short val = 0; unsigned short val = 0;
int change; int change;
...@@ -787,9 +787,9 @@ static int snd_ac97_spdif_default_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_val ...@@ -787,9 +787,9 @@ static int snd_ac97_spdif_default_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_val
return change; return change;
} }
static int snd_ac97_put_spsa(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_ac97_put_spsa(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int reg = kcontrol->private_value & 0xff; int reg = kcontrol->private_value & 0xff;
int shift = (kcontrol->private_value >> 8) & 0xff; int shift = (kcontrol->private_value >> 8) & 0xff;
int mask = (kcontrol->private_value >> 16) & 0xff; int mask = (kcontrol->private_value >> 16) & 0xff;
...@@ -817,7 +817,7 @@ static int snd_ac97_put_spsa(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uco ...@@ -817,7 +817,7 @@ static int snd_ac97_put_spsa(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uco
return change; return change;
} }
const snd_kcontrol_new_t snd_ac97_controls_spdif[5] = { const struct snd_kcontrol_new snd_ac97_controls_spdif[5] = {
{ {
.access = SNDRV_CTL_ELEM_ACCESS_READ, .access = SNDRV_CTL_ELEM_ACCESS_READ,
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
...@@ -856,9 +856,9 @@ const snd_kcontrol_new_t snd_ac97_controls_spdif[5] = { ...@@ -856,9 +856,9 @@ const snd_kcontrol_new_t snd_ac97_controls_spdif[5] = {
.get = snd_ac97_ad18xx_pcm_get_bits, .put = snd_ac97_ad18xx_pcm_put_bits, \ .get = snd_ac97_ad18xx_pcm_get_bits, .put = snd_ac97_ad18xx_pcm_put_bits, \
.private_value = (codec) | ((lshift) << 8) | ((rshift) << 12) | ((mask) << 16) } .private_value = (codec) | ((lshift) << 8) | ((rshift) << 12) | ((mask) << 16) }
static int snd_ac97_ad18xx_pcm_info_bits(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_ac97_ad18xx_pcm_info_bits(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int mask = (kcontrol->private_value >> 16) & 0x0f; int mask = (kcontrol->private_value >> 16) & 0x0f;
int lshift = (kcontrol->private_value >> 8) & 0x0f; int lshift = (kcontrol->private_value >> 8) & 0x0f;
int rshift = (kcontrol->private_value >> 12) & 0x0f; int rshift = (kcontrol->private_value >> 12) & 0x0f;
...@@ -873,9 +873,9 @@ static int snd_ac97_ad18xx_pcm_info_bits(snd_kcontrol_t *kcontrol, snd_ctl_elem_ ...@@ -873,9 +873,9 @@ static int snd_ac97_ad18xx_pcm_info_bits(snd_kcontrol_t *kcontrol, snd_ctl_elem_
return 0; return 0;
} }
static int snd_ac97_ad18xx_pcm_get_bits(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ad18xx_pcm_get_bits(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int codec = kcontrol->private_value & 3; int codec = kcontrol->private_value & 3;
int lshift = (kcontrol->private_value >> 8) & 0x0f; int lshift = (kcontrol->private_value >> 8) & 0x0f;
int rshift = (kcontrol->private_value >> 12) & 0x0f; int rshift = (kcontrol->private_value >> 12) & 0x0f;
...@@ -887,9 +887,9 @@ static int snd_ac97_ad18xx_pcm_get_bits(snd_kcontrol_t * kcontrol, snd_ctl_elem_ ...@@ -887,9 +887,9 @@ static int snd_ac97_ad18xx_pcm_get_bits(snd_kcontrol_t * kcontrol, snd_ctl_elem_
return 0; return 0;
} }
static int snd_ac97_ad18xx_pcm_put_bits(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ad18xx_pcm_put_bits(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int codec = kcontrol->private_value & 3; int codec = kcontrol->private_value & 3;
int lshift = (kcontrol->private_value >> 8) & 0x0f; int lshift = (kcontrol->private_value >> 8) & 0x0f;
int rshift = (kcontrol->private_value >> 12) & 0x0f; int rshift = (kcontrol->private_value >> 12) & 0x0f;
...@@ -910,7 +910,7 @@ static int snd_ac97_ad18xx_pcm_put_bits(snd_kcontrol_t * kcontrol, snd_ctl_elem_ ...@@ -910,7 +910,7 @@ static int snd_ac97_ad18xx_pcm_put_bits(snd_kcontrol_t * kcontrol, snd_ctl_elem_
.get = snd_ac97_ad18xx_pcm_get_volume, .put = snd_ac97_ad18xx_pcm_put_volume, \ .get = snd_ac97_ad18xx_pcm_get_volume, .put = snd_ac97_ad18xx_pcm_put_volume, \
.private_value = codec } .private_value = codec }
static int snd_ac97_ad18xx_pcm_info_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_ac97_ad18xx_pcm_info_volume(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 2; uinfo->count = 2;
...@@ -919,9 +919,9 @@ static int snd_ac97_ad18xx_pcm_info_volume(snd_kcontrol_t *kcontrol, snd_ctl_ele ...@@ -919,9 +919,9 @@ static int snd_ac97_ad18xx_pcm_info_volume(snd_kcontrol_t *kcontrol, snd_ctl_ele
return 0; return 0;
} }
static int snd_ac97_ad18xx_pcm_get_volume(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ad18xx_pcm_get_volume(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int codec = kcontrol->private_value & 3; int codec = kcontrol->private_value & 3;
down(&ac97->page_mutex); down(&ac97->page_mutex);
...@@ -931,9 +931,9 @@ static int snd_ac97_ad18xx_pcm_get_volume(snd_kcontrol_t * kcontrol, snd_ctl_ele ...@@ -931,9 +931,9 @@ static int snd_ac97_ad18xx_pcm_get_volume(snd_kcontrol_t * kcontrol, snd_ctl_ele
return 0; return 0;
} }
static int snd_ac97_ad18xx_pcm_put_volume(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ad18xx_pcm_put_volume(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int codec = kcontrol->private_value & 3; int codec = kcontrol->private_value & 3;
unsigned short val1, val2; unsigned short val1, val2;
...@@ -942,22 +942,22 @@ static int snd_ac97_ad18xx_pcm_put_volume(snd_kcontrol_t * kcontrol, snd_ctl_ele ...@@ -942,22 +942,22 @@ static int snd_ac97_ad18xx_pcm_put_volume(snd_kcontrol_t * kcontrol, snd_ctl_ele
return snd_ac97_ad18xx_update_pcm_bits(ac97, codec, 0x1f1f, (val1 << 8) | val2); return snd_ac97_ad18xx_update_pcm_bits(ac97, codec, 0x1f1f, (val1 << 8) | val2);
} }
static const snd_kcontrol_new_t snd_ac97_controls_ad18xx_pcm[2] = { static const struct snd_kcontrol_new snd_ac97_controls_ad18xx_pcm[2] = {
AD18XX_PCM_BITS("PCM Playback Switch", 0, 15, 7, 1), AD18XX_PCM_BITS("PCM Playback Switch", 0, 15, 7, 1),
AD18XX_PCM_VOLUME("PCM Playback Volume", 0) AD18XX_PCM_VOLUME("PCM Playback Volume", 0)
}; };
static const snd_kcontrol_new_t snd_ac97_controls_ad18xx_surround[2] = { static const struct snd_kcontrol_new snd_ac97_controls_ad18xx_surround[2] = {
AD18XX_PCM_BITS("Surround Playback Switch", 1, 15, 7, 1), AD18XX_PCM_BITS("Surround Playback Switch", 1, 15, 7, 1),
AD18XX_PCM_VOLUME("Surround Playback Volume", 1) AD18XX_PCM_VOLUME("Surround Playback Volume", 1)
}; };
static const snd_kcontrol_new_t snd_ac97_controls_ad18xx_center[2] = { static const struct snd_kcontrol_new snd_ac97_controls_ad18xx_center[2] = {
AD18XX_PCM_BITS("Center Playback Switch", 2, 15, 15, 1), AD18XX_PCM_BITS("Center Playback Switch", 2, 15, 15, 1),
AD18XX_PCM_BITS("Center Playback Volume", 2, 8, 8, 31) AD18XX_PCM_BITS("Center Playback Volume", 2, 8, 8, 31)
}; };
static const snd_kcontrol_new_t snd_ac97_controls_ad18xx_lfe[2] = { static const struct snd_kcontrol_new snd_ac97_controls_ad18xx_lfe[2] = {
AD18XX_PCM_BITS("LFE Playback Switch", 2, 7, 7, 1), AD18XX_PCM_BITS("LFE Playback Switch", 2, 7, 7, 1),
AD18XX_PCM_BITS("LFE Playback Volume", 2, 0, 0, 31) AD18XX_PCM_BITS("LFE Playback Volume", 2, 0, 0, 31)
}; };
...@@ -966,9 +966,9 @@ AD18XX_PCM_BITS("LFE Playback Volume", 2, 0, 0, 31) ...@@ -966,9 +966,9 @@ AD18XX_PCM_BITS("LFE Playback Volume", 2, 0, 0, 31)
* *
*/ */
static void snd_ac97_powerdown(ac97_t *ac97); static void snd_ac97_powerdown(struct snd_ac97 *ac97);
static int snd_ac97_bus_free(ac97_bus_t *bus) static int snd_ac97_bus_free(struct snd_ac97_bus *bus)
{ {
if (bus) { if (bus) {
snd_ac97_bus_proc_done(bus); snd_ac97_bus_proc_done(bus);
...@@ -980,13 +980,13 @@ static int snd_ac97_bus_free(ac97_bus_t *bus) ...@@ -980,13 +980,13 @@ static int snd_ac97_bus_free(ac97_bus_t *bus)
return 0; return 0;
} }
static int snd_ac97_bus_dev_free(snd_device_t *device) static int snd_ac97_bus_dev_free(struct snd_device *device)
{ {
ac97_bus_t *bus = device->device_data; struct snd_ac97_bus *bus = device->device_data;
return snd_ac97_bus_free(bus); return snd_ac97_bus_free(bus);
} }
static int snd_ac97_free(ac97_t *ac97) static int snd_ac97_free(struct snd_ac97 *ac97)
{ {
if (ac97) { if (ac97) {
snd_ac97_proc_done(ac97); snd_ac97_proc_done(ac97);
...@@ -999,14 +999,14 @@ static int snd_ac97_free(ac97_t *ac97) ...@@ -999,14 +999,14 @@ static int snd_ac97_free(ac97_t *ac97)
return 0; return 0;
} }
static int snd_ac97_dev_free(snd_device_t *device) static int snd_ac97_dev_free(struct snd_device *device)
{ {
ac97_t *ac97 = device->device_data; struct snd_ac97 *ac97 = device->device_data;
snd_ac97_powerdown(ac97); /* for avoiding click noises during shut down */ snd_ac97_powerdown(ac97); /* for avoiding click noises during shut down */
return snd_ac97_free(ac97); return snd_ac97_free(ac97);
} }
static int snd_ac97_try_volume_mix(ac97_t * ac97, int reg) static int snd_ac97_try_volume_mix(struct snd_ac97 * ac97, int reg)
{ {
unsigned short val, mask = 0x8000; unsigned short val, mask = 0x8000;
...@@ -1052,13 +1052,14 @@ static int snd_ac97_try_volume_mix(ac97_t * ac97, int reg) ...@@ -1052,13 +1052,14 @@ static int snd_ac97_try_volume_mix(ac97_t * ac97, int reg)
/* try another test */ /* try another test */
snd_ac97_write_cache(ac97, reg, val | mask); snd_ac97_write_cache(ac97, reg, val | mask);
val = snd_ac97_read(ac97, reg); val = snd_ac97_read(ac97, reg);
val = snd_ac97_read(ac97, reg);
if (!(val & mask)) if (!(val & mask))
return 0; /* nothing here */ return 0; /* nothing here */
} }
return 1; /* success, useable */ return 1; /* success, useable */
} }
static void check_volume_resolution(ac97_t *ac97, int reg, unsigned char *lo_max, unsigned char *hi_max) static void check_volume_resolution(struct snd_ac97 *ac97, int reg, unsigned char *lo_max, unsigned char *hi_max)
{ {
unsigned short cbit[3] = { 0x20, 0x10, 0x01 }; unsigned short cbit[3] = { 0x20, 0x10, 0x01 };
unsigned char max[3] = { 63, 31, 15 }; unsigned char max[3] = { 63, 31, 15 };
...@@ -1083,7 +1084,7 @@ static void check_volume_resolution(ac97_t *ac97, int reg, unsigned char *lo_max ...@@ -1083,7 +1084,7 @@ static void check_volume_resolution(ac97_t *ac97, int reg, unsigned char *lo_max
} }
} }
int snd_ac97_try_bit(ac97_t * ac97, int reg, int bit) int snd_ac97_try_bit(struct snd_ac97 * ac97, int reg, int bit)
{ {
unsigned short mask, val, orig, res; unsigned short mask, val, orig, res;
...@@ -1097,7 +1098,7 @@ int snd_ac97_try_bit(ac97_t * ac97, int reg, int bit) ...@@ -1097,7 +1098,7 @@ int snd_ac97_try_bit(ac97_t * ac97, int reg, int bit)
} }
/* check the volume resolution of center/lfe */ /* check the volume resolution of center/lfe */
static void snd_ac97_change_volume_params2(ac97_t * ac97, int reg, int shift, unsigned char *max) static void snd_ac97_change_volume_params2(struct snd_ac97 * ac97, int reg, int shift, unsigned char *max)
{ {
unsigned short val, val1; unsigned short val, val1;
...@@ -1123,9 +1124,9 @@ static inline int printable(unsigned int x) ...@@ -1123,9 +1124,9 @@ static inline int printable(unsigned int x)
return x; return x;
} }
snd_kcontrol_t *snd_ac97_cnew(const snd_kcontrol_new_t *_template, ac97_t * ac97) struct snd_kcontrol *snd_ac97_cnew(const struct snd_kcontrol_new *_template, struct snd_ac97 * ac97)
{ {
snd_kcontrol_new_t template; struct snd_kcontrol_new template;
memcpy(&template, _template, sizeof(template)); memcpy(&template, _template, sizeof(template));
template.index = ac97->num; template.index = ac97->num;
return snd_ctl_new1(&template, ac97); return snd_ctl_new1(&template, ac97);
...@@ -1134,9 +1135,9 @@ snd_kcontrol_t *snd_ac97_cnew(const snd_kcontrol_new_t *_template, ac97_t * ac97 ...@@ -1134,9 +1135,9 @@ snd_kcontrol_t *snd_ac97_cnew(const snd_kcontrol_new_t *_template, ac97_t * ac97
/* /*
* create mute switch(es) for normal stereo controls * create mute switch(es) for normal stereo controls
*/ */
static int snd_ac97_cmute_new_stereo(snd_card_t *card, char *name, int reg, int check_stereo, ac97_t *ac97) static int snd_ac97_cmute_new_stereo(struct snd_card *card, char *name, int reg, int check_stereo, struct snd_ac97 *ac97)
{ {
snd_kcontrol_t *kctl; struct snd_kcontrol *kctl;
int err; int err;
unsigned short val, val1, mute_mask; unsigned short val, val1, mute_mask;
...@@ -1153,11 +1154,11 @@ static int snd_ac97_cmute_new_stereo(snd_card_t *card, char *name, int reg, int ...@@ -1153,11 +1154,11 @@ static int snd_ac97_cmute_new_stereo(snd_card_t *card, char *name, int reg, int
mute_mask = 0x8080; mute_mask = 0x8080;
} }
if (mute_mask == 0x8080) { if (mute_mask == 0x8080) {
snd_kcontrol_new_t tmp = AC97_DOUBLE(name, reg, 15, 7, 1, 1); struct snd_kcontrol_new tmp = AC97_DOUBLE(name, reg, 15, 7, 1, 1);
tmp.index = ac97->num; tmp.index = ac97->num;
kctl = snd_ctl_new1(&tmp, ac97); kctl = snd_ctl_new1(&tmp, ac97);
} else { } else {
snd_kcontrol_new_t tmp = AC97_SINGLE(name, reg, 15, 1, 1); struct snd_kcontrol_new tmp = AC97_SINGLE(name, reg, 15, 1, 1);
tmp.index = ac97->num; tmp.index = ac97->num;
kctl = snd_ctl_new1(&tmp, ac97); kctl = snd_ctl_new1(&tmp, ac97);
} }
...@@ -1172,22 +1173,22 @@ static int snd_ac97_cmute_new_stereo(snd_card_t *card, char *name, int reg, int ...@@ -1172,22 +1173,22 @@ static int snd_ac97_cmute_new_stereo(snd_card_t *card, char *name, int reg, int
/* /*
* create a volume for normal stereo/mono controls * create a volume for normal stereo/mono controls
*/ */
static int snd_ac97_cvol_new(snd_card_t *card, char *name, int reg, unsigned int lo_max, static int snd_ac97_cvol_new(struct snd_card *card, char *name, int reg, unsigned int lo_max,
unsigned int hi_max, ac97_t *ac97) unsigned int hi_max, struct snd_ac97 *ac97)
{ {
int err; int err;
snd_kcontrol_t *kctl; struct snd_kcontrol *kctl;
if (! snd_ac97_valid_reg(ac97, reg)) if (! snd_ac97_valid_reg(ac97, reg))
return 0; return 0;
if (hi_max) { if (hi_max) {
/* invert */ /* invert */
snd_kcontrol_new_t tmp = AC97_DOUBLE(name, reg, 8, 0, lo_max, 1); struct snd_kcontrol_new tmp = AC97_DOUBLE(name, reg, 8, 0, lo_max, 1);
tmp.index = ac97->num; tmp.index = ac97->num;
kctl = snd_ctl_new1(&tmp, ac97); kctl = snd_ctl_new1(&tmp, ac97);
} else { } else {
/* invert */ /* invert */
snd_kcontrol_new_t tmp = AC97_SINGLE(name, reg, 0, lo_max, 1); struct snd_kcontrol_new tmp = AC97_SINGLE(name, reg, 0, lo_max, 1);
tmp.index = ac97->num; tmp.index = ac97->num;
kctl = snd_ctl_new1(&tmp, ac97); kctl = snd_ctl_new1(&tmp, ac97);
} }
...@@ -1203,7 +1204,7 @@ static int snd_ac97_cvol_new(snd_card_t *card, char *name, int reg, unsigned int ...@@ -1203,7 +1204,7 @@ static int snd_ac97_cvol_new(snd_card_t *card, char *name, int reg, unsigned int
/* /*
* create a mute-switch and a volume for normal stereo/mono controls * create a mute-switch and a volume for normal stereo/mono controls
*/ */
static int snd_ac97_cmix_new_stereo(snd_card_t *card, const char *pfx, int reg, int check_stereo, ac97_t *ac97) static int snd_ac97_cmix_new_stereo(struct snd_card *card, const char *pfx, int reg, int check_stereo, struct snd_ac97 *ac97)
{ {
int err; int err;
char name[44]; char name[44];
...@@ -1229,12 +1230,12 @@ static int snd_ac97_cmix_new_stereo(snd_card_t *card, const char *pfx, int reg, ...@@ -1229,12 +1230,12 @@ static int snd_ac97_cmix_new_stereo(snd_card_t *card, const char *pfx, int reg,
#define snd_ac97_cmix_new(card, pfx, reg, ac97) snd_ac97_cmix_new_stereo(card, pfx, reg, 0, ac97) #define snd_ac97_cmix_new(card, pfx, reg, ac97) snd_ac97_cmix_new_stereo(card, pfx, reg, 0, ac97)
#define snd_ac97_cmute_new(card, name, reg, ac97) snd_ac97_cmute_new_stereo(card, name, reg, 0, ac97) #define snd_ac97_cmute_new(card, name, reg, ac97) snd_ac97_cmute_new_stereo(card, name, reg, 0, ac97)
static unsigned int snd_ac97_determine_spdif_rates(ac97_t *ac97); static unsigned int snd_ac97_determine_spdif_rates(struct snd_ac97 *ac97);
static int snd_ac97_mixer_build(ac97_t * ac97) static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
{ {
snd_card_t *card = ac97->bus->card; struct snd_card *card = ac97->bus->card;
snd_kcontrol_t *kctl; struct snd_kcontrol *kctl;
int err; int err;
unsigned int idx; unsigned int idx;
unsigned char max; unsigned char max;
...@@ -1531,7 +1532,7 @@ static int snd_ac97_mixer_build(ac97_t * ac97) ...@@ -1531,7 +1532,7 @@ static int snd_ac97_mixer_build(ac97_t * ac97)
return 0; return 0;
} }
static int snd_ac97_modem_build(snd_card_t * card, ac97_t * ac97) static int snd_ac97_modem_build(struct snd_card *card, struct snd_ac97 * ac97)
{ {
int err, idx; int err, idx;
...@@ -1555,7 +1556,7 @@ static int snd_ac97_modem_build(snd_card_t * card, ac97_t * ac97) ...@@ -1555,7 +1556,7 @@ static int snd_ac97_modem_build(snd_card_t * card, ac97_t * ac97)
return 0; return 0;
} }
static int snd_ac97_test_rate(ac97_t *ac97, int reg, int shadow_reg, int rate) static int snd_ac97_test_rate(struct snd_ac97 *ac97, int reg, int shadow_reg, int rate)
{ {
unsigned short val; unsigned short val;
unsigned int tmp; unsigned int tmp;
...@@ -1568,7 +1569,7 @@ static int snd_ac97_test_rate(ac97_t *ac97, int reg, int shadow_reg, int rate) ...@@ -1568,7 +1569,7 @@ static int snd_ac97_test_rate(ac97_t *ac97, int reg, int shadow_reg, int rate)
return val == (tmp & 0xffff); return val == (tmp & 0xffff);
} }
static void snd_ac97_determine_rates(ac97_t *ac97, int reg, int shadow_reg, unsigned int *r_result) static void snd_ac97_determine_rates(struct snd_ac97 *ac97, int reg, int shadow_reg, unsigned int *r_result)
{ {
unsigned int result = 0; unsigned int result = 0;
unsigned short saved; unsigned short saved;
...@@ -1628,7 +1629,7 @@ static void snd_ac97_determine_rates(ac97_t *ac97, int reg, int shadow_reg, unsi ...@@ -1628,7 +1629,7 @@ static void snd_ac97_determine_rates(ac97_t *ac97, int reg, int shadow_reg, unsi
} }
/* check AC97_SPDIF register to accept which sample rates */ /* check AC97_SPDIF register to accept which sample rates */
static unsigned int snd_ac97_determine_spdif_rates(ac97_t *ac97) static unsigned int snd_ac97_determine_spdif_rates(struct snd_ac97 *ac97)
{ {
unsigned int result = 0; unsigned int result = 0;
int i; int i;
...@@ -1648,10 +1649,10 @@ static unsigned int snd_ac97_determine_spdif_rates(ac97_t *ac97) ...@@ -1648,10 +1649,10 @@ static unsigned int snd_ac97_determine_spdif_rates(ac97_t *ac97)
} }
/* look for the codec id table matching with the given id */ /* look for the codec id table matching with the given id */
static const ac97_codec_id_t *look_for_codec_id(const ac97_codec_id_t *table, static const struct ac97_codec_id *look_for_codec_id(const struct ac97_codec_id *table,
unsigned int id) unsigned int id)
{ {
const ac97_codec_id_t *pid; const struct ac97_codec_id *pid;
for (pid = table; pid->id; pid++) for (pid = table; pid->id; pid++)
if (pid->id == (id & pid->mask)) if (pid->id == (id & pid->mask))
...@@ -1659,9 +1660,9 @@ static const ac97_codec_id_t *look_for_codec_id(const ac97_codec_id_t *table, ...@@ -1659,9 +1660,9 @@ static const ac97_codec_id_t *look_for_codec_id(const ac97_codec_id_t *table,
return NULL; return NULL;
} }
void snd_ac97_get_name(ac97_t *ac97, unsigned int id, char *name, int modem) void snd_ac97_get_name(struct snd_ac97 *ac97, unsigned int id, char *name, int modem)
{ {
const ac97_codec_id_t *pid; const struct ac97_codec_id *pid;
sprintf(name, "0x%x %c%c%c", id, sprintf(name, "0x%x %c%c%c", id,
printable(id >> 24), printable(id >> 24),
...@@ -1699,9 +1700,9 @@ void snd_ac97_get_name(ac97_t *ac97, unsigned int id, char *name, int modem) ...@@ -1699,9 +1700,9 @@ void snd_ac97_get_name(ac97_t *ac97, unsigned int id, char *name, int modem)
* *
* Returns the short identifying name of the codec. * Returns the short identifying name of the codec.
*/ */
const char *snd_ac97_get_short_name(ac97_t *ac97) const char *snd_ac97_get_short_name(struct snd_ac97 *ac97)
{ {
const ac97_codec_id_t *pid; const struct ac97_codec_id *pid;
for (pid = snd_ac97_codec_ids; pid->id; pid++) for (pid = snd_ac97_codec_ids; pid->id; pid++)
if (pid->id == (ac97->id & pid->mask)) if (pid->id == (ac97->id & pid->mask))
...@@ -1713,7 +1714,7 @@ const char *snd_ac97_get_short_name(ac97_t *ac97) ...@@ -1713,7 +1714,7 @@ const char *snd_ac97_get_short_name(ac97_t *ac97)
/* wait for a while until registers are accessible after RESET /* wait for a while until registers are accessible after RESET
* return 0 if ok, negative not ready * return 0 if ok, negative not ready
*/ */
static int ac97_reset_wait(ac97_t *ac97, int timeout, int with_modem) static int ac97_reset_wait(struct snd_ac97 *ac97, int timeout, int with_modem)
{ {
unsigned long end_time; unsigned long end_time;
unsigned short val; unsigned short val;
...@@ -1758,7 +1759,7 @@ static int ac97_reset_wait(ac97_t *ac97, int timeout, int with_modem) ...@@ -1758,7 +1759,7 @@ static int ac97_reset_wait(ac97_t *ac97, int timeout, int with_modem)
* @private_data: private data pointer for the new instance * @private_data: private data pointer for the new instance
* @rbus: the pointer to store the new AC97 bus instance. * @rbus: the pointer to store the new AC97 bus instance.
* *
* Creates an AC97 bus component. An ac97_bus_t instance is newly * Creates an AC97 bus component. An struct snd_ac97_bus instance is newly
* allocated and initialized. * allocated and initialized.
* *
* The ops table must include valid callbacks (at least read and * The ops table must include valid callbacks (at least read and
...@@ -1772,12 +1773,12 @@ static int ac97_reset_wait(ac97_t *ac97, int timeout, int with_modem) ...@@ -1772,12 +1773,12 @@ static int ac97_reset_wait(ac97_t *ac97, int timeout, int with_modem)
* *
* Returns zero if successful, or a negative error code on failure. * Returns zero if successful, or a negative error code on failure.
*/ */
int snd_ac97_bus(snd_card_t *card, int num, ac97_bus_ops_t *ops, int snd_ac97_bus(struct snd_card *card, int num, struct snd_ac97_bus_ops *ops,
void *private_data, ac97_bus_t **rbus) void *private_data, struct snd_ac97_bus **rbus)
{ {
int err; int err;
ac97_bus_t *bus; struct snd_ac97_bus *bus;
static snd_device_ops_t dev_ops = { static struct snd_device_ops dev_ops = {
.dev_free = snd_ac97_bus_dev_free, .dev_free = snd_ac97_bus_dev_free,
}; };
...@@ -1807,9 +1808,9 @@ static void ac97_device_release(struct device * dev) ...@@ -1807,9 +1808,9 @@ static void ac97_device_release(struct device * dev)
} }
/* register ac97 codec to bus */ /* register ac97 codec to bus */
static int snd_ac97_dev_register(snd_device_t *device) static int snd_ac97_dev_register(struct snd_device *device)
{ {
ac97_t *ac97 = device->device_data; struct snd_ac97 *ac97 = device->device_data;
int err; int err;
ac97->dev.bus = &ac97_bus_type; ac97->dev.bus = &ac97_bus_type;
...@@ -1825,9 +1826,9 @@ static int snd_ac97_dev_register(snd_device_t *device) ...@@ -1825,9 +1826,9 @@ static int snd_ac97_dev_register(snd_device_t *device)
} }
/* unregister ac97 codec */ /* unregister ac97 codec */
static int snd_ac97_dev_unregister(snd_device_t *device) static int snd_ac97_dev_unregister(struct snd_device *device)
{ {
ac97_t *ac97 = device->device_data; struct snd_ac97 *ac97 = device->device_data;
if (ac97->dev.bus) if (ac97->dev.bus)
device_unregister(&ac97->dev); device_unregister(&ac97->dev);
return snd_ac97_free(ac97); return snd_ac97_free(ac97);
...@@ -1843,7 +1844,7 @@ static struct snd_ac97_build_ops null_build_ops; ...@@ -1843,7 +1844,7 @@ static struct snd_ac97_build_ops null_build_ops;
* the private data. * the private data.
* @rac97: the pointer to store the new ac97 instance. * @rac97: the pointer to store the new ac97 instance.
* *
* Creates an Codec97 component. An ac97_t instance is newly * Creates an Codec97 component. An struct snd_ac97 instance is newly
* allocated and initialized from the template. The codec * allocated and initialized from the template. The codec
* is then initialized by the standard procedure. * is then initialized by the standard procedure.
* *
...@@ -1855,16 +1856,16 @@ static struct snd_ac97_build_ops null_build_ops; ...@@ -1855,16 +1856,16 @@ static struct snd_ac97_build_ops null_build_ops;
* *
* Returns zero if successful, or a negative error code on failure. * Returns zero if successful, or a negative error code on failure.
*/ */
int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97) int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, struct snd_ac97 **rac97)
{ {
int err; int err;
ac97_t *ac97; struct snd_ac97 *ac97;
snd_card_t *card; struct snd_card *card;
char name[64]; char name[64];
unsigned long end_time; unsigned long end_time;
unsigned int reg; unsigned int reg;
const ac97_codec_id_t *pid; const struct ac97_codec_id *pid;
static snd_device_ops_t ops = { static struct snd_device_ops ops = {
.dev_free = snd_ac97_dev_free, .dev_free = snd_ac97_dev_free,
.dev_register = snd_ac97_dev_register, .dev_register = snd_ac97_dev_register,
.dev_unregister = snd_ac97_dev_unregister, .dev_unregister = snd_ac97_dev_unregister,
...@@ -2148,7 +2149,7 @@ int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97) ...@@ -2148,7 +2149,7 @@ int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97)
* MASTER and HEADPHONE registers are muted but the register cache values * MASTER and HEADPHONE registers are muted but the register cache values
* are not changed, so that the values can be restored in snd_ac97_resume(). * are not changed, so that the values can be restored in snd_ac97_resume().
*/ */
static void snd_ac97_powerdown(ac97_t *ac97) static void snd_ac97_powerdown(struct snd_ac97 *ac97)
{ {
unsigned short power; unsigned short power;
...@@ -2181,7 +2182,7 @@ static void snd_ac97_powerdown(ac97_t *ac97) ...@@ -2181,7 +2182,7 @@ static void snd_ac97_powerdown(ac97_t *ac97)
* *
* Suspends the codec, power down the chip. * Suspends the codec, power down the chip.
*/ */
void snd_ac97_suspend(ac97_t *ac97) void snd_ac97_suspend(struct snd_ac97 *ac97)
{ {
if (ac97->build_ops->suspend) if (ac97->build_ops->suspend)
ac97->build_ops->suspend(ac97); ac97->build_ops->suspend(ac97);
...@@ -2191,7 +2192,7 @@ void snd_ac97_suspend(ac97_t *ac97) ...@@ -2191,7 +2192,7 @@ void snd_ac97_suspend(ac97_t *ac97)
/* /*
* restore ac97 status * restore ac97 status
*/ */
void snd_ac97_restore_status(ac97_t *ac97) void snd_ac97_restore_status(struct snd_ac97 *ac97)
{ {
int i; int i;
...@@ -2212,7 +2213,7 @@ void snd_ac97_restore_status(ac97_t *ac97) ...@@ -2212,7 +2213,7 @@ void snd_ac97_restore_status(ac97_t *ac97)
/* /*
* restore IEC958 status * restore IEC958 status
*/ */
void snd_ac97_restore_iec958(ac97_t *ac97) void snd_ac97_restore_iec958(struct snd_ac97 *ac97)
{ {
if (ac97->ext_id & AC97_EI_SPDIF) { if (ac97->ext_id & AC97_EI_SPDIF) {
if (ac97->regs[AC97_EXTENDED_STATUS] & AC97_EA_SPDIF) { if (ac97->regs[AC97_EXTENDED_STATUS] & AC97_EA_SPDIF) {
...@@ -2235,7 +2236,7 @@ void snd_ac97_restore_iec958(ac97_t *ac97) ...@@ -2235,7 +2236,7 @@ void snd_ac97_restore_iec958(ac97_t *ac97)
* Do the standard resume procedure, power up and restoring the * Do the standard resume procedure, power up and restoring the
* old register values. * old register values.
*/ */
void snd_ac97_resume(ac97_t *ac97) void snd_ac97_resume(struct snd_ac97 *ac97)
{ {
unsigned long end_time; unsigned long end_time;
...@@ -2301,18 +2302,18 @@ static void set_ctl_name(char *dst, const char *src, const char *suffix) ...@@ -2301,18 +2302,18 @@ static void set_ctl_name(char *dst, const char *src, const char *suffix)
} }
/* remove the control with the given name and optional suffix */ /* remove the control with the given name and optional suffix */
int snd_ac97_remove_ctl(ac97_t *ac97, const char *name, const char *suffix) int snd_ac97_remove_ctl(struct snd_ac97 *ac97, const char *name, const char *suffix)
{ {
snd_ctl_elem_id_t id; struct snd_ctl_elem_id id;
memset(&id, 0, sizeof(id)); memset(&id, 0, sizeof(id));
set_ctl_name(id.name, name, suffix); set_ctl_name(id.name, name, suffix);
id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
return snd_ctl_remove_id(ac97->bus->card, &id); return snd_ctl_remove_id(ac97->bus->card, &id);
} }
static snd_kcontrol_t *ctl_find(ac97_t *ac97, const char *name, const char *suffix) static struct snd_kcontrol *ctl_find(struct snd_ac97 *ac97, const char *name, const char *suffix)
{ {
snd_ctl_elem_id_t sid; struct snd_ctl_elem_id sid;
memset(&sid, 0, sizeof(sid)); memset(&sid, 0, sizeof(sid));
set_ctl_name(sid.name, name, suffix); set_ctl_name(sid.name, name, suffix);
sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER; sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
...@@ -2320,9 +2321,9 @@ static snd_kcontrol_t *ctl_find(ac97_t *ac97, const char *name, const char *suff ...@@ -2320,9 +2321,9 @@ static snd_kcontrol_t *ctl_find(ac97_t *ac97, const char *name, const char *suff
} }
/* rename the control with the given name and optional suffix */ /* rename the control with the given name and optional suffix */
int snd_ac97_rename_ctl(ac97_t *ac97, const char *src, const char *dst, const char *suffix) int snd_ac97_rename_ctl(struct snd_ac97 *ac97, const char *src, const char *dst, const char *suffix)
{ {
snd_kcontrol_t *kctl = ctl_find(ac97, src, suffix); struct snd_kcontrol *kctl = ctl_find(ac97, src, suffix);
if (kctl) { if (kctl) {
set_ctl_name(kctl->id.name, dst, suffix); set_ctl_name(kctl->id.name, dst, suffix);
return 0; return 0;
...@@ -2331,16 +2332,16 @@ int snd_ac97_rename_ctl(ac97_t *ac97, const char *src, const char *dst, const ch ...@@ -2331,16 +2332,16 @@ int snd_ac97_rename_ctl(ac97_t *ac97, const char *src, const char *dst, const ch
} }
/* rename both Volume and Switch controls - don't check the return value */ /* rename both Volume and Switch controls - don't check the return value */
void snd_ac97_rename_vol_ctl(ac97_t *ac97, const char *src, const char *dst) void snd_ac97_rename_vol_ctl(struct snd_ac97 *ac97, const char *src, const char *dst)
{ {
snd_ac97_rename_ctl(ac97, src, dst, "Switch"); snd_ac97_rename_ctl(ac97, src, dst, "Switch");
snd_ac97_rename_ctl(ac97, src, dst, "Volume"); snd_ac97_rename_ctl(ac97, src, dst, "Volume");
} }
/* swap controls */ /* swap controls */
int snd_ac97_swap_ctl(ac97_t *ac97, const char *s1, const char *s2, const char *suffix) int snd_ac97_swap_ctl(struct snd_ac97 *ac97, const char *s1, const char *s2, const char *suffix)
{ {
snd_kcontrol_t *kctl1, *kctl2; struct snd_kcontrol *kctl1, *kctl2;
kctl1 = ctl_find(ac97, s1, suffix); kctl1 = ctl_find(ac97, s1, suffix);
kctl2 = ctl_find(ac97, s2, suffix); kctl2 = ctl_find(ac97, s2, suffix);
if (kctl1 && kctl2) { if (kctl1 && kctl2) {
...@@ -2353,7 +2354,7 @@ int snd_ac97_swap_ctl(ac97_t *ac97, const char *s1, const char *s2, const char * ...@@ -2353,7 +2354,7 @@ int snd_ac97_swap_ctl(ac97_t *ac97, const char *s1, const char *s2, const char *
#if 1 #if 1
/* bind hp and master controls instead of using only hp control */ /* bind hp and master controls instead of using only hp control */
static int bind_hp_volsw_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int bind_hp_volsw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
int err = snd_ac97_put_volsw(kcontrol, ucontrol); int err = snd_ac97_put_volsw(kcontrol, ucontrol);
if (err > 0) { if (err > 0) {
...@@ -2366,10 +2367,10 @@ static int bind_hp_volsw_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uco ...@@ -2366,10 +2367,10 @@ static int bind_hp_volsw_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uco
} }
/* ac97 tune: bind Master and Headphone controls */ /* ac97 tune: bind Master and Headphone controls */
static int tune_hp_only(ac97_t *ac97) static int tune_hp_only(struct snd_ac97 *ac97)
{ {
snd_kcontrol_t *msw = ctl_find(ac97, "Master Playback Switch", NULL); struct snd_kcontrol *msw = ctl_find(ac97, "Master Playback Switch", NULL);
snd_kcontrol_t *mvol = ctl_find(ac97, "Master Playback Volume", NULL); struct snd_kcontrol *mvol = ctl_find(ac97, "Master Playback Volume", NULL);
if (! msw || ! mvol) if (! msw || ! mvol)
return -ENOENT; return -ENOENT;
msw->put = bind_hp_volsw_put; msw->put = bind_hp_volsw_put;
...@@ -2381,7 +2382,7 @@ static int tune_hp_only(ac97_t *ac97) ...@@ -2381,7 +2382,7 @@ static int tune_hp_only(ac97_t *ac97)
#else #else
/* ac97 tune: use Headphone control as master */ /* ac97 tune: use Headphone control as master */
static int tune_hp_only(ac97_t *ac97) static int tune_hp_only(struct snd_ac97 *ac97)
{ {
if (ctl_find(ac97, "Headphone Playback Switch", NULL) == NULL) if (ctl_find(ac97, "Headphone Playback Switch", NULL) == NULL)
return -ENOENT; return -ENOENT;
...@@ -2393,7 +2394,7 @@ static int tune_hp_only(ac97_t *ac97) ...@@ -2393,7 +2394,7 @@ static int tune_hp_only(ac97_t *ac97)
#endif #endif
/* ac97 tune: swap Headphone and Master controls */ /* ac97 tune: swap Headphone and Master controls */
static int tune_swap_hp(ac97_t *ac97) static int tune_swap_hp(struct snd_ac97 *ac97)
{ {
if (ctl_find(ac97, "Headphone Playback Switch", NULL) == NULL) if (ctl_find(ac97, "Headphone Playback Switch", NULL) == NULL)
return -ENOENT; return -ENOENT;
...@@ -2403,7 +2404,7 @@ static int tune_swap_hp(ac97_t *ac97) ...@@ -2403,7 +2404,7 @@ static int tune_swap_hp(ac97_t *ac97)
} }
/* ac97 tune: swap Surround and Master controls */ /* ac97 tune: swap Surround and Master controls */
static int tune_swap_surround(ac97_t *ac97) static int tune_swap_surround(struct snd_ac97 *ac97)
{ {
if (snd_ac97_swap_ctl(ac97, "Master Playback", "Surround Playback", "Switch") || if (snd_ac97_swap_ctl(ac97, "Master Playback", "Surround Playback", "Switch") ||
snd_ac97_swap_ctl(ac97, "Master Playback", "Surround Playback", "Volume")) snd_ac97_swap_ctl(ac97, "Master Playback", "Surround Playback", "Volume"))
...@@ -2412,7 +2413,7 @@ static int tune_swap_surround(ac97_t *ac97) ...@@ -2412,7 +2413,7 @@ static int tune_swap_surround(ac97_t *ac97)
} }
/* ac97 tune: set up mic sharing for AD codecs */ /* ac97 tune: set up mic sharing for AD codecs */
static int tune_ad_sharing(ac97_t *ac97) static int tune_ad_sharing(struct snd_ac97 *ac97)
{ {
unsigned short scfg; unsigned short scfg;
if ((ac97->id & 0xffffff00) != 0x41445300) { if ((ac97->id & 0xffffff00) != 0x41445300) {
...@@ -2425,11 +2426,11 @@ static int tune_ad_sharing(ac97_t *ac97) ...@@ -2425,11 +2426,11 @@ static int tune_ad_sharing(ac97_t *ac97)
return 0; return 0;
} }
static const snd_kcontrol_new_t snd_ac97_alc_jack_detect = static const struct snd_kcontrol_new snd_ac97_alc_jack_detect =
AC97_SINGLE("Jack Detect", AC97_ALC650_CLOCK, 5, 1, 0); AC97_SINGLE("Jack Detect", AC97_ALC650_CLOCK, 5, 1, 0);
/* ac97 tune: set up ALC jack-select */ /* ac97 tune: set up ALC jack-select */
static int tune_alc_jack(ac97_t *ac97) static int tune_alc_jack(struct snd_ac97 *ac97)
{ {
if ((ac97->id & 0xffffff00) != 0x414c4700) { if ((ac97->id & 0xffffff00) != 0x414c4700) {
snd_printk(KERN_ERR "ac97_quirk ALC_JACK is only for Realtek codecs\n"); snd_printk(KERN_ERR "ac97_quirk ALC_JACK is only for Realtek codecs\n");
...@@ -2441,20 +2442,20 @@ static int tune_alc_jack(ac97_t *ac97) ...@@ -2441,20 +2442,20 @@ static int tune_alc_jack(ac97_t *ac97)
} }
/* ac97 tune: inversed EAPD bit */ /* ac97 tune: inversed EAPD bit */
static int tune_inv_eapd(ac97_t *ac97) static int tune_inv_eapd(struct snd_ac97 *ac97)
{ {
snd_kcontrol_t *kctl = ctl_find(ac97, "External Amplifier", NULL); struct snd_kcontrol *kctl = ctl_find(ac97, "External Amplifier", NULL);
if (! kctl) if (! kctl)
return -ENOENT; return -ENOENT;
set_inv_eapd(ac97, kctl); set_inv_eapd(ac97, kctl);
return 0; return 0;
} }
static int master_mute_sw_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int master_mute_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
int err = snd_ac97_put_volsw(kcontrol, ucontrol); int err = snd_ac97_put_volsw(kcontrol, ucontrol);
if (err > 0) { if (err > 0) {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int shift = (kcontrol->private_value >> 8) & 0x0f; int shift = (kcontrol->private_value >> 8) & 0x0f;
int rshift = (kcontrol->private_value >> 12) & 0x0f; int rshift = (kcontrol->private_value >> 12) & 0x0f;
unsigned short mask; unsigned short mask;
...@@ -2470,9 +2471,9 @@ static int master_mute_sw_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uc ...@@ -2470,9 +2471,9 @@ static int master_mute_sw_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uc
} }
/* ac97 tune: EAPD controls mute LED bound with the master mute */ /* ac97 tune: EAPD controls mute LED bound with the master mute */
static int tune_mute_led(ac97_t *ac97) static int tune_mute_led(struct snd_ac97 *ac97)
{ {
snd_kcontrol_t *msw = ctl_find(ac97, "Master Playback Switch", NULL); struct snd_kcontrol *msw = ctl_find(ac97, "Master Playback Switch", NULL);
if (! msw) if (! msw)
return -ENOENT; return -ENOENT;
msw->put = master_mute_sw_put; msw->put = master_mute_sw_put;
...@@ -2483,7 +2484,7 @@ static int tune_mute_led(ac97_t *ac97) ...@@ -2483,7 +2484,7 @@ static int tune_mute_led(ac97_t *ac97)
struct quirk_table { struct quirk_table {
const char *name; const char *name;
int (*func)(ac97_t *); int (*func)(struct snd_ac97 *);
}; };
static struct quirk_table applicable_quirks[] = { static struct quirk_table applicable_quirks[] = {
...@@ -2498,7 +2499,7 @@ static struct quirk_table applicable_quirks[] = { ...@@ -2498,7 +2499,7 @@ static struct quirk_table applicable_quirks[] = {
}; };
/* apply the quirk with the given type */ /* apply the quirk with the given type */
static int apply_quirk(ac97_t *ac97, int type) static int apply_quirk(struct snd_ac97 *ac97, int type)
{ {
if (type <= 0) if (type <= 0)
return 0; return 0;
...@@ -2510,7 +2511,7 @@ static int apply_quirk(ac97_t *ac97, int type) ...@@ -2510,7 +2511,7 @@ static int apply_quirk(ac97_t *ac97, int type)
} }
/* apply the quirk with the given name */ /* apply the quirk with the given name */
static int apply_quirk_str(ac97_t *ac97, const char *typestr) static int apply_quirk_str(struct snd_ac97 *ac97, const char *typestr)
{ {
int i; int i;
struct quirk_table *q; struct quirk_table *q;
...@@ -2539,7 +2540,7 @@ static int apply_quirk_str(ac97_t *ac97, const char *typestr) ...@@ -2539,7 +2540,7 @@ static int apply_quirk_str(ac97_t *ac97, const char *typestr)
* Returns zero if successful, or a negative error code on failure. * Returns zero if successful, or a negative error code on failure.
*/ */
int snd_ac97_tune_hardware(ac97_t *ac97, struct ac97_quirk *quirk, const char *override) int snd_ac97_tune_hardware(struct snd_ac97 *ac97, struct ac97_quirk *quirk, const char *override)
{ {
int result; int result;
......
sound/pci/ac97/ac97_local.h
View file @ ee42381e
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
.get = snd_ac97_get_volsw, .put = snd_ac97_put_volsw, \ .get = snd_ac97_get_volsw, .put = snd_ac97_put_volsw, \
.private_value = (reg) | ((shift_left) << 8) | ((shift_right) << 12) | ((mask) << 16) | ((invert) << 24) } .private_value = (reg) | ((shift_left) << 8) | ((shift_right) << 12) | ((mask) << 16) | ((invert) << 24) }
/* enum control */
struct ac97_enum { struct ac97_enum {
unsigned char reg; unsigned char reg;
unsigned char shift_l; unsigned char shift_l;
...@@ -57,33 +58,33 @@ struct ac97_enum { ...@@ -57,33 +58,33 @@ struct ac97_enum {
/* ac97_codec.c */ /* ac97_codec.c */
extern const char *snd_ac97_stereo_enhancements[]; extern const char *snd_ac97_stereo_enhancements[];
extern const snd_kcontrol_new_t snd_ac97_controls_3d[]; extern const struct snd_kcontrol_new snd_ac97_controls_3d[];
extern const snd_kcontrol_new_t snd_ac97_controls_spdif[]; extern const struct snd_kcontrol_new snd_ac97_controls_spdif[];
snd_kcontrol_t *snd_ac97_cnew(const snd_kcontrol_new_t *_template, ac97_t * ac97); struct snd_kcontrol *snd_ac97_cnew(const struct snd_kcontrol_new *_template, struct snd_ac97 * ac97);
void snd_ac97_get_name(ac97_t *ac97, unsigned int id, char *name, int modem); void snd_ac97_get_name(struct snd_ac97 *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_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
int snd_ac97_get_volsw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol); int snd_ac97_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
int snd_ac97_put_volsw(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol); int snd_ac97_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
int snd_ac97_try_bit(ac97_t * ac97, int reg, int bit); int snd_ac97_try_bit(struct snd_ac97 * ac97, int reg, int bit);
int snd_ac97_remove_ctl(ac97_t *ac97, const char *name, const char *suffix); int snd_ac97_remove_ctl(struct snd_ac97 *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_rename_ctl(struct snd_ac97 *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); int snd_ac97_swap_ctl(struct snd_ac97 *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_rename_vol_ctl(struct snd_ac97 *ac97, const char *src, const char *dst);
void snd_ac97_restore_status(ac97_t *ac97); void snd_ac97_restore_status(struct snd_ac97 *ac97);
void snd_ac97_restore_iec958(ac97_t *ac97); void snd_ac97_restore_iec958(struct snd_ac97 *ac97);
int snd_ac97_info_enum_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo); int snd_ac97_info_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
int snd_ac97_get_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol); int snd_ac97_get_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
int snd_ac97_put_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * 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); unsigned short mask, unsigned short value);
/* ac97_proc.c */ /* ac97_proc.c */
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
void snd_ac97_bus_proc_init(ac97_bus_t * ac97); void snd_ac97_bus_proc_init(struct snd_ac97_bus * ac97);
void snd_ac97_bus_proc_done(ac97_bus_t * ac97); void snd_ac97_bus_proc_done(struct snd_ac97_bus * ac97);
void snd_ac97_proc_init(ac97_t * ac97); void snd_ac97_proc_init(struct snd_ac97 * ac97);
void snd_ac97_proc_done(ac97_t * ac97); void snd_ac97_proc_done(struct snd_ac97 * ac97);
#else #else
#define snd_ac97_bus_proc_init(ac97_bus_t) do { } while (0) #define snd_ac97_bus_proc_init(ac97_bus_t) do { } while (0)
#define snd_ac97_bus_proc_done(ac97_bus_t) do { } while (0) #define snd_ac97_bus_proc_done(ac97_bus_t) do { } while (0)
......
sound/pci/ac97/ac97_patch.c
View file @ ee42381e
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
* Chip specific initialization * Chip specific initialization
*/ */
static int patch_build_controls(ac97_t * ac97, const snd_kcontrol_new_t *controls, int count) static int patch_build_controls(struct snd_ac97 * ac97, const struct snd_kcontrol_new *controls, int count)
{ {
int idx, err; int idx, err;
...@@ -50,7 +50,7 @@ static int patch_build_controls(ac97_t * ac97, const snd_kcontrol_new_t *control ...@@ -50,7 +50,7 @@ static int patch_build_controls(ac97_t * ac97, const snd_kcontrol_new_t *control
} }
/* set to the page, update bits and restore the page */ /* set to the page, update bits and restore the page */
static int ac97_update_bits_page(ac97_t *ac97, unsigned short reg, unsigned short mask, unsigned short value, unsigned short page) static int ac97_update_bits_page(struct snd_ac97 *ac97, unsigned short reg, unsigned short mask, unsigned short value, unsigned short page)
{ {
unsigned short page_save; unsigned short page_save;
int ret; int ret;
...@@ -67,7 +67,7 @@ static int ac97_update_bits_page(ac97_t *ac97, unsigned short reg, unsigned shor ...@@ -67,7 +67,7 @@ static int ac97_update_bits_page(ac97_t *ac97, unsigned short reg, unsigned shor
/* /*
* shared line-in/mic controls * shared line-in/mic controls
*/ */
static int ac97_enum_text_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo, static int ac97_enum_text_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo,
const char **texts, unsigned int nums) const char **texts, unsigned int nums)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
...@@ -79,23 +79,23 @@ static int ac97_enum_text_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *ui ...@@ -79,23 +79,23 @@ static int ac97_enum_text_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *ui
return 0; return 0;
} }
static int ac97_surround_jack_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int ac97_surround_jack_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static const char *texts[] = { "Shared", "Independent" }; static const char *texts[] = { "Shared", "Independent" };
return ac97_enum_text_info(kcontrol, uinfo, texts, 2); return ac97_enum_text_info(kcontrol, uinfo, texts, 2);
} }
static int ac97_surround_jack_mode_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int ac97_surround_jack_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
ucontrol->value.enumerated.item[0] = ac97->indep_surround; ucontrol->value.enumerated.item[0] = ac97->indep_surround;
return 0; return 0;
} }
static int ac97_surround_jack_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int ac97_surround_jack_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned char indep = !!ucontrol->value.enumerated.item[0]; unsigned char indep = !!ucontrol->value.enumerated.item[0];
if (indep != ac97->indep_surround) { if (indep != ac97->indep_surround) {
...@@ -107,7 +107,7 @@ static int ac97_surround_jack_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_va ...@@ -107,7 +107,7 @@ static int ac97_surround_jack_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_va
return 0; return 0;
} }
static int ac97_channel_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int ac97_channel_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static const char *texts[] = { "2ch", "4ch", "6ch" }; static const char *texts[] = { "2ch", "4ch", "6ch" };
if (kcontrol->private_value) if (kcontrol->private_value)
...@@ -115,17 +115,17 @@ static int ac97_channel_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t ...@@ -115,17 +115,17 @@ static int ac97_channel_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
return ac97_enum_text_info(kcontrol, uinfo, texts, 3); return ac97_enum_text_info(kcontrol, uinfo, texts, 3);
} }
static int ac97_channel_mode_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int ac97_channel_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
ucontrol->value.enumerated.item[0] = ac97->channel_mode; ucontrol->value.enumerated.item[0] = ac97->channel_mode;
return 0; return 0;
} }
static int ac97_channel_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int ac97_channel_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned char mode = ucontrol->value.enumerated.item[0]; unsigned char mode = ucontrol->value.enumerated.item[0];
if (mode != ac97->channel_mode) { if (mode != ac97->channel_mode) {
...@@ -163,22 +163,22 @@ static int ac97_channel_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t ...@@ -163,22 +163,22 @@ static int ac97_channel_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
.private_value = 1, \ .private_value = 1, \
} }
static inline int is_surround_on(ac97_t *ac97) static inline int is_surround_on(struct snd_ac97 *ac97)
{ {
return ac97->channel_mode >= 1; return ac97->channel_mode >= 1;
} }
static inline int is_clfe_on(ac97_t *ac97) static inline int is_clfe_on(struct snd_ac97 *ac97)
{ {
return ac97->channel_mode >= 2; return ac97->channel_mode >= 2;
} }
static inline int is_shared_linein(ac97_t *ac97) static inline int is_shared_linein(struct snd_ac97 *ac97)
{ {
return ! ac97->indep_surround && is_surround_on(ac97); return ! ac97->indep_surround && is_surround_on(ac97);
} }
static inline int is_shared_micin(ac97_t *ac97) static inline int is_shared_micin(struct snd_ac97 *ac97)
{ {
return ! ac97->indep_surround && is_clfe_on(ac97); return ! ac97->indep_surround && is_clfe_on(ac97);
} }
...@@ -187,7 +187,7 @@ static inline int is_shared_micin(ac97_t *ac97) ...@@ -187,7 +187,7 @@ static inline int is_shared_micin(ac97_t *ac97)
/* The following snd_ac97_ymf753_... items added by David Shust (dshust@shustring.com) */ /* The following snd_ac97_ymf753_... items added by David Shust (dshust@shustring.com) */
/* It is possible to indicate to the Yamaha YMF753 the type of speakers being used. */ /* It is possible to indicate to the Yamaha YMF753 the type of speakers being used. */
static int snd_ac97_ymf753_info_speaker(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_ac97_ymf753_info_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[3] = { static char *texts[3] = {
"Standard", "Small", "Smaller" "Standard", "Small", "Smaller"
...@@ -202,9 +202,9 @@ static int snd_ac97_ymf753_info_speaker(snd_kcontrol_t *kcontrol, snd_ctl_elem_i ...@@ -202,9 +202,9 @@ static int snd_ac97_ymf753_info_speaker(snd_kcontrol_t *kcontrol, snd_ctl_elem_i
return 0; return 0;
} }
static int snd_ac97_ymf753_get_speaker(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ymf753_get_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
val = ac97->regs[AC97_YMF753_3D_MODE_SEL]; val = ac97->regs[AC97_YMF753_3D_MODE_SEL];
...@@ -215,9 +215,9 @@ static int snd_ac97_ymf753_get_speaker(snd_kcontrol_t * kcontrol, snd_ctl_elem_v ...@@ -215,9 +215,9 @@ static int snd_ac97_ymf753_get_speaker(snd_kcontrol_t * kcontrol, snd_ctl_elem_v
return 0; return 0;
} }
static int snd_ac97_ymf753_put_speaker(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ymf753_put_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
if (ucontrol->value.enumerated.item[0] > 2) if (ucontrol->value.enumerated.item[0] > 2)
...@@ -226,7 +226,7 @@ static int snd_ac97_ymf753_put_speaker(snd_kcontrol_t * kcontrol, snd_ctl_elem_v ...@@ -226,7 +226,7 @@ static int snd_ac97_ymf753_put_speaker(snd_kcontrol_t * kcontrol, snd_ctl_elem_v
return snd_ac97_update(ac97, AC97_YMF753_3D_MODE_SEL, val); return snd_ac97_update(ac97, AC97_YMF753_3D_MODE_SEL, val);
} }
static const snd_kcontrol_new_t snd_ac97_ymf753_controls_speaker = static const struct snd_kcontrol_new snd_ac97_ymf753_controls_speaker =
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "3D Control - Speaker", .name = "3D Control - Speaker",
...@@ -236,7 +236,7 @@ static const snd_kcontrol_new_t snd_ac97_ymf753_controls_speaker = ...@@ -236,7 +236,7 @@ static const snd_kcontrol_new_t snd_ac97_ymf753_controls_speaker =
}; };
/* It is possible to indicate to the Yamaha YMF753 the source to direct to the S/PDIF output. */ /* It is possible to indicate to the Yamaha YMF753 the source to direct to the S/PDIF output. */
static int snd_ac97_ymf753_spdif_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_ac97_ymf753_spdif_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[2] = { "AC-Link", "A/D Converter" }; static char *texts[2] = { "AC-Link", "A/D Converter" };
...@@ -249,9 +249,9 @@ static int snd_ac97_ymf753_spdif_source_info(snd_kcontrol_t *kcontrol, snd_ctl_e ...@@ -249,9 +249,9 @@ static int snd_ac97_ymf753_spdif_source_info(snd_kcontrol_t *kcontrol, snd_ctl_e
return 0; return 0;
} }
static int snd_ac97_ymf753_spdif_source_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ymf753_spdif_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
val = ac97->regs[AC97_YMF753_DIT_CTRL2]; val = ac97->regs[AC97_YMF753_DIT_CTRL2];
...@@ -259,9 +259,9 @@ static int snd_ac97_ymf753_spdif_source_get(snd_kcontrol_t * kcontrol, snd_ctl_e ...@@ -259,9 +259,9 @@ static int snd_ac97_ymf753_spdif_source_get(snd_kcontrol_t * kcontrol, snd_ctl_e
return 0; return 0;
} }
static int snd_ac97_ymf753_spdif_source_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ymf753_spdif_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
if (ucontrol->value.enumerated.item[0] > 1) if (ucontrol->value.enumerated.item[0] > 1)
...@@ -274,7 +274,7 @@ static int snd_ac97_ymf753_spdif_source_put(snd_kcontrol_t * kcontrol, snd_ctl_e ...@@ -274,7 +274,7 @@ static int snd_ac97_ymf753_spdif_source_put(snd_kcontrol_t * kcontrol, snd_ctl_e
The YMF753 will output the S/PDIF signal to pin 43, 47 (EAPD), or 48. The YMF753 will output the S/PDIF signal to pin 43, 47 (EAPD), or 48.
By default, no output pin is selected, and the S/PDIF signal is not output. By default, no output pin is selected, and the S/PDIF signal is not output.
There is also a bit to mute S/PDIF output in a vendor-specific register. */ There is also a bit to mute S/PDIF output in a vendor-specific register. */
static int snd_ac97_ymf753_spdif_output_pin_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_ac97_ymf753_spdif_output_pin_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[3] = { "Disabled", "Pin 43", "Pin 48" }; static char *texts[3] = { "Disabled", "Pin 43", "Pin 48" };
...@@ -287,9 +287,9 @@ static int snd_ac97_ymf753_spdif_output_pin_info(snd_kcontrol_t *kcontrol, snd_c ...@@ -287,9 +287,9 @@ static int snd_ac97_ymf753_spdif_output_pin_info(snd_kcontrol_t *kcontrol, snd_c
return 0; return 0;
} }
static int snd_ac97_ymf753_spdif_output_pin_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ymf753_spdif_output_pin_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
val = ac97->regs[AC97_YMF753_DIT_CTRL2]; val = ac97->regs[AC97_YMF753_DIT_CTRL2];
...@@ -297,9 +297,9 @@ static int snd_ac97_ymf753_spdif_output_pin_get(snd_kcontrol_t * kcontrol, snd_c ...@@ -297,9 +297,9 @@ static int snd_ac97_ymf753_spdif_output_pin_get(snd_kcontrol_t * kcontrol, snd_c
return 0; return 0;
} }
static int snd_ac97_ymf753_spdif_output_pin_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ymf753_spdif_output_pin_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
if (ucontrol->value.enumerated.item[0] > 2) if (ucontrol->value.enumerated.item[0] > 2)
...@@ -311,7 +311,7 @@ static int snd_ac97_ymf753_spdif_output_pin_put(snd_kcontrol_t * kcontrol, snd_c ...@@ -311,7 +311,7 @@ static int snd_ac97_ymf753_spdif_output_pin_put(snd_kcontrol_t * kcontrol, snd_c
snd_ac97_write_cache(ac97, 0x62, snd_ac97_read(ac97, 0x62) | 0x0008); */ snd_ac97_write_cache(ac97, 0x62, snd_ac97_read(ac97, 0x62) | 0x0008); */
} }
static const snd_kcontrol_new_t snd_ac97_ymf753_controls_spdif[3] = { static const struct snd_kcontrol_new snd_ac97_ymf753_controls_spdif[3] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
...@@ -329,9 +329,9 @@ static const snd_kcontrol_new_t snd_ac97_ymf753_controls_spdif[3] = { ...@@ -329,9 +329,9 @@ static const snd_kcontrol_new_t snd_ac97_ymf753_controls_spdif[3] = {
AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",NONE,NONE) "Mute", AC97_YMF753_DIT_CTRL2, 2, 1, 1) AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",NONE,NONE) "Mute", AC97_YMF753_DIT_CTRL2, 2, 1, 1)
}; };
static int patch_yamaha_ymf753_3d(ac97_t * ac97) static int patch_yamaha_ymf753_3d(struct snd_ac97 * ac97)
{ {
snd_kcontrol_t *kctl; struct snd_kcontrol *kctl;
int err; int err;
if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0) if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0)
...@@ -345,7 +345,7 @@ static int patch_yamaha_ymf753_3d(ac97_t * ac97) ...@@ -345,7 +345,7 @@ static int patch_yamaha_ymf753_3d(ac97_t * ac97)
return 0; return 0;
} }
static int patch_yamaha_ymf753_post_spdif(ac97_t * ac97) static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97)
{ {
int err; int err;
...@@ -359,7 +359,7 @@ static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = { ...@@ -359,7 +359,7 @@ static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {
.build_post_spdif = patch_yamaha_ymf753_post_spdif .build_post_spdif = patch_yamaha_ymf753_post_spdif
}; };
int patch_yamaha_ymf753(ac97_t * ac97) int patch_yamaha_ymf753(struct snd_ac97 * ac97)
{ {
/* Patch for Yamaha YMF753, Copyright (c) by David Shust, dshust@shustring.com. /* Patch for Yamaha YMF753, Copyright (c) by David Shust, dshust@shustring.com.
This chip has nonstandard and extended behaviour with regard to its S/PDIF output. This chip has nonstandard and extended behaviour with regard to its S/PDIF output.
...@@ -380,12 +380,12 @@ int patch_yamaha_ymf753(ac97_t * ac97) ...@@ -380,12 +380,12 @@ int patch_yamaha_ymf753(ac97_t * ac97)
* added support for WM9705,WM9708,WM9709,WM9710,WM9711,WM9712 and WM9717. * added support for WM9705,WM9708,WM9709,WM9710,WM9711,WM9712 and WM9717.
*/ */
static const snd_kcontrol_new_t wm97xx_snd_ac97_controls[] = { static const struct snd_kcontrol_new wm97xx_snd_ac97_controls[] = {
AC97_DOUBLE("Front Playback Volume", AC97_WM97XX_FMIXER_VOL, 8, 0, 31, 1), AC97_DOUBLE("Front Playback Volume", AC97_WM97XX_FMIXER_VOL, 8, 0, 31, 1),
AC97_SINGLE("Front Playback Switch", AC97_WM97XX_FMIXER_VOL, 15, 1, 1), AC97_SINGLE("Front Playback Switch", AC97_WM97XX_FMIXER_VOL, 15, 1, 1),
}; };
static int patch_wolfson_wm9703_specific(ac97_t * ac97) static int patch_wolfson_wm9703_specific(struct snd_ac97 * ac97)
{ {
/* This is known to work for the ViewSonic ViewPad 1000 /* This is known to work for the ViewSonic ViewPad 1000
* Randolph Bentson <bentson@holmsjoen.com> * Randolph Bentson <bentson@holmsjoen.com>
...@@ -405,13 +405,13 @@ static struct snd_ac97_build_ops patch_wolfson_wm9703_ops = { ...@@ -405,13 +405,13 @@ static struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {
.build_specific = patch_wolfson_wm9703_specific, .build_specific = patch_wolfson_wm9703_specific,
}; };
int patch_wolfson03(ac97_t * ac97) int patch_wolfson03(struct snd_ac97 * ac97)
{ {
ac97->build_ops = &patch_wolfson_wm9703_ops; ac97->build_ops = &patch_wolfson_wm9703_ops;
return 0; return 0;
} }
static const snd_kcontrol_new_t wm9704_snd_ac97_controls[] = { static const struct snd_kcontrol_new wm9704_snd_ac97_controls[] = {
AC97_DOUBLE("Front Playback Volume", AC97_WM97XX_FMIXER_VOL, 8, 0, 31, 1), AC97_DOUBLE("Front Playback Volume", AC97_WM97XX_FMIXER_VOL, 8, 0, 31, 1),
AC97_SINGLE("Front Playback Switch", AC97_WM97XX_FMIXER_VOL, 15, 1, 1), AC97_SINGLE("Front Playback Switch", AC97_WM97XX_FMIXER_VOL, 15, 1, 1),
AC97_DOUBLE("Rear Playback Volume", AC97_WM9704_RMIXER_VOL, 8, 0, 31, 1), AC97_DOUBLE("Rear Playback Volume", AC97_WM9704_RMIXER_VOL, 8, 0, 31, 1),
...@@ -420,7 +420,7 @@ AC97_DOUBLE("Rear DAC Volume", AC97_WM9704_RPCM_VOL, 8, 0, 31, 1), ...@@ -420,7 +420,7 @@ AC97_DOUBLE("Rear DAC Volume", AC97_WM9704_RPCM_VOL, 8, 0, 31, 1),
AC97_DOUBLE("Surround Volume", AC97_SURROUND_MASTER, 8, 0, 31, 1), AC97_DOUBLE("Surround Volume", AC97_SURROUND_MASTER, 8, 0, 31, 1),
}; };
static int patch_wolfson_wm9704_specific(ac97_t * ac97) static int patch_wolfson_wm9704_specific(struct snd_ac97 * ac97)
{ {
int err, i; int err, i;
for (i = 0; i < ARRAY_SIZE(wm9704_snd_ac97_controls); i++) { for (i = 0; i < ARRAY_SIZE(wm9704_snd_ac97_controls); i++) {
...@@ -436,14 +436,14 @@ static struct snd_ac97_build_ops patch_wolfson_wm9704_ops = { ...@@ -436,14 +436,14 @@ static struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {
.build_specific = patch_wolfson_wm9704_specific, .build_specific = patch_wolfson_wm9704_specific,
}; };
int patch_wolfson04(ac97_t * ac97) int patch_wolfson04(struct snd_ac97 * ac97)
{ {
/* WM9704M/9704Q */ /* WM9704M/9704Q */
ac97->build_ops = &patch_wolfson_wm9704_ops; ac97->build_ops = &patch_wolfson_wm9704_ops;
return 0; return 0;
} }
static int patch_wolfson_wm9705_specific(ac97_t * ac97) static int patch_wolfson_wm9705_specific(struct snd_ac97 * ac97)
{ {
int err, i; int err, i;
for (i = 0; i < ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) { for (i = 0; i < ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) {
...@@ -458,7 +458,7 @@ static struct snd_ac97_build_ops patch_wolfson_wm9705_ops = { ...@@ -458,7 +458,7 @@ static struct snd_ac97_build_ops patch_wolfson_wm9705_ops = {
.build_specific = patch_wolfson_wm9705_specific, .build_specific = patch_wolfson_wm9705_specific,
}; };
int patch_wolfson05(ac97_t * ac97) int patch_wolfson05(struct snd_ac97 * ac97)
{ {
/* WM9705, WM9710 */ /* WM9705, WM9710 */
ac97->build_ops = &patch_wolfson_wm9705_ops; ac97->build_ops = &patch_wolfson_wm9705_ops;
...@@ -490,7 +490,7 @@ AC97_ENUM_DOUBLE(AC97_REC_SEL, 8, 0, 8, wm9711_rec_sel), ...@@ -490,7 +490,7 @@ AC97_ENUM_DOUBLE(AC97_REC_SEL, 8, 0, 8, wm9711_rec_sel),
AC97_ENUM_SINGLE(AC97_PCI_SVID, 5, 2, wm9711_ng_type), AC97_ENUM_SINGLE(AC97_PCI_SVID, 5, 2, wm9711_ng_type),
}; };
static const snd_kcontrol_new_t wm9711_snd_ac97_controls[] = { static const struct snd_kcontrol_new wm9711_snd_ac97_controls[] = {
AC97_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0), AC97_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0),
AC97_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0), AC97_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0),
AC97_SINGLE("ALC Decay Time", AC97_CODEC_CLASS_REV, 4, 15, 0), AC97_SINGLE("ALC Decay Time", AC97_CODEC_CLASS_REV, 4, 15, 0),
...@@ -568,7 +568,7 @@ AC97_SINGLE("Headphone ZC Switch", AC97_HEADPHONE, 7, 1, 0), ...@@ -568,7 +568,7 @@ AC97_SINGLE("Headphone ZC Switch", AC97_HEADPHONE, 7, 1, 0),
AC97_SINGLE("Mono ZC Switch", AC97_MASTER_MONO, 7, 1, 0), AC97_SINGLE("Mono ZC Switch", AC97_MASTER_MONO, 7, 1, 0),
}; };
static int patch_wolfson_wm9711_specific(ac97_t * ac97) static int patch_wolfson_wm9711_specific(struct snd_ac97 * ac97)
{ {
int err, i; int err, i;
...@@ -589,7 +589,7 @@ static struct snd_ac97_build_ops patch_wolfson_wm9711_ops = { ...@@ -589,7 +589,7 @@ static struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {
.build_specific = patch_wolfson_wm9711_specific, .build_specific = patch_wolfson_wm9711_specific,
}; };
int patch_wolfson11(ac97_t * ac97) int patch_wolfson11(struct snd_ac97 * ac97)
{ {
/* WM9711, WM9712 */ /* WM9711, WM9712 */
ac97->build_ops = &patch_wolfson_wm9711_ops; ac97->build_ops = &patch_wolfson_wm9711_ops;
...@@ -636,7 +636,7 @@ AC97_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 15, 2, wm9713_base), ...@@ -636,7 +636,7 @@ AC97_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 15, 2, wm9713_base),
AC97_ENUM_SINGLE(AC97_PCI_SVID, 5, 2, wm9713_ng_type), AC97_ENUM_SINGLE(AC97_PCI_SVID, 5, 2, wm9713_ng_type),
}; };
static const snd_kcontrol_new_t wm13_snd_ac97_controls[] = { static const struct snd_kcontrol_new wm13_snd_ac97_controls[] = {
AC97_DOUBLE("Line In Volume", AC97_PC_BEEP, 8, 0, 31, 1), AC97_DOUBLE("Line In Volume", AC97_PC_BEEP, 8, 0, 31, 1),
AC97_SINGLE("Line In to Headphone Switch", AC97_PC_BEEP, 15, 1, 1), AC97_SINGLE("Line In to Headphone Switch", AC97_PC_BEEP, 15, 1, 1),
AC97_SINGLE("Line In to Master Switch", AC97_PC_BEEP, 14, 1, 1), AC97_SINGLE("Line In to Master Switch", AC97_PC_BEEP, 14, 1, 1),
...@@ -728,14 +728,14 @@ AC97_SINGLE("Bass Volume", AC97_GENERAL_PURPOSE, 8, 15, 1), ...@@ -728,14 +728,14 @@ AC97_SINGLE("Bass Volume", AC97_GENERAL_PURPOSE, 8, 15, 1),
AC97_SINGLE("Tone Volume", AC97_GENERAL_PURPOSE, 0, 15, 1), AC97_SINGLE("Tone Volume", AC97_GENERAL_PURPOSE, 0, 15, 1),
}; };
static const snd_kcontrol_new_t wm13_snd_ac97_controls_3d[] = { static const struct snd_kcontrol_new wm13_snd_ac97_controls_3d[] = {
AC97_ENUM("Inv Input Mux", wm9713_enum[11]), AC97_ENUM("Inv Input Mux", wm9713_enum[11]),
AC97_SINGLE("3D Upper Cut-off Switch", AC97_REC_GAIN_MIC, 5, 1, 0), AC97_SINGLE("3D Upper Cut-off Switch", AC97_REC_GAIN_MIC, 5, 1, 0),
AC97_SINGLE("3D Lower Cut-off Switch", AC97_REC_GAIN_MIC, 4, 1, 0), AC97_SINGLE("3D Lower Cut-off Switch", AC97_REC_GAIN_MIC, 4, 1, 0),
AC97_SINGLE("3D Depth", AC97_REC_GAIN_MIC, 0, 15, 1), AC97_SINGLE("3D Depth", AC97_REC_GAIN_MIC, 0, 15, 1),
}; };
static int patch_wolfson_wm9713_3d (ac97_t * ac97) static int patch_wolfson_wm9713_3d (struct snd_ac97 * ac97)
{ {
int err, i; int err, i;
...@@ -746,7 +746,7 @@ static int patch_wolfson_wm9713_3d (ac97_t * ac97) ...@@ -746,7 +746,7 @@ static int patch_wolfson_wm9713_3d (ac97_t * ac97)
return 0; return 0;
} }
static int patch_wolfson_wm9713_specific(ac97_t * ac97) static int patch_wolfson_wm9713_specific(struct snd_ac97 * ac97)
{ {
int err, i; int err, i;
...@@ -765,13 +765,13 @@ static int patch_wolfson_wm9713_specific(ac97_t * ac97) ...@@ -765,13 +765,13 @@ static int patch_wolfson_wm9713_specific(ac97_t * ac97)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static void patch_wolfson_wm9713_suspend (ac97_t * ac97) static void patch_wolfson_wm9713_suspend (struct snd_ac97 * ac97)
{ {
snd_ac97_write_cache(ac97, AC97_EXTENDED_MID, 0xfeff); snd_ac97_write_cache(ac97, AC97_EXTENDED_MID, 0xfeff);
snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0xffff); snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0xffff);
} }
static void patch_wolfson_wm9713_resume (ac97_t * ac97) static void patch_wolfson_wm9713_resume (struct snd_ac97 * ac97)
{ {
snd_ac97_write_cache(ac97, AC97_EXTENDED_MID, 0xda00); snd_ac97_write_cache(ac97, AC97_EXTENDED_MID, 0xda00);
snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0x3810); snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0x3810);
...@@ -788,7 +788,7 @@ static struct snd_ac97_build_ops patch_wolfson_wm9713_ops = { ...@@ -788,7 +788,7 @@ static struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {
#endif #endif
}; };
int patch_wolfson13(ac97_t * ac97) int patch_wolfson13(struct snd_ac97 * ac97)
{ {
/* WM9713, WM9714 */ /* WM9713, WM9714 */
ac97->build_ops = &patch_wolfson_wm9713_ops; ac97->build_ops = &patch_wolfson_wm9713_ops;
...@@ -808,7 +808,7 @@ int patch_wolfson13(ac97_t * ac97) ...@@ -808,7 +808,7 @@ int patch_wolfson13(ac97_t * ac97)
/* /*
* Tritech codec * Tritech codec
*/ */
int patch_tritech_tr28028(ac97_t * ac97) int patch_tritech_tr28028(struct snd_ac97 * ac97)
{ {
snd_ac97_write_cache(ac97, 0x26, 0x0300); snd_ac97_write_cache(ac97, 0x26, 0x0300);
snd_ac97_write_cache(ac97, 0x26, 0x0000); snd_ac97_write_cache(ac97, 0x26, 0x0000);
...@@ -820,9 +820,9 @@ int patch_tritech_tr28028(ac97_t * ac97) ...@@ -820,9 +820,9 @@ int patch_tritech_tr28028(ac97_t * ac97)
/* /*
* Sigmatel STAC97xx codecs * Sigmatel STAC97xx codecs
*/ */
static int patch_sigmatel_stac9700_3d(ac97_t * ac97) static int patch_sigmatel_stac9700_3d(struct snd_ac97 * ac97)
{ {
snd_kcontrol_t *kctl; struct snd_kcontrol *kctl;
int err; int err;
if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0) if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0)
...@@ -833,9 +833,9 @@ static int patch_sigmatel_stac9700_3d(ac97_t * ac97) ...@@ -833,9 +833,9 @@ static int patch_sigmatel_stac9700_3d(ac97_t * ac97)
return 0; return 0;
} }
static int patch_sigmatel_stac9708_3d(ac97_t * ac97) static int patch_sigmatel_stac9708_3d(struct snd_ac97 * ac97)
{ {
snd_kcontrol_t *kctl; struct snd_kcontrol *kctl;
int err; int err;
if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0) if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0)
...@@ -850,18 +850,18 @@ static int patch_sigmatel_stac9708_3d(ac97_t * ac97) ...@@ -850,18 +850,18 @@ static int patch_sigmatel_stac9708_3d(ac97_t * ac97)
return 0; return 0;
} }
static const snd_kcontrol_new_t snd_ac97_sigmatel_4speaker = static const struct snd_kcontrol_new snd_ac97_sigmatel_4speaker =
AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch", AC97_SIGMATEL_DAC2INVERT, 2, 1, 0); AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch", AC97_SIGMATEL_DAC2INVERT, 2, 1, 0);
static const snd_kcontrol_new_t snd_ac97_sigmatel_phaseinvert = static const struct snd_kcontrol_new snd_ac97_sigmatel_phaseinvert =
AC97_SINGLE("Sigmatel Surround Phase Inversion Playback Switch", AC97_SIGMATEL_DAC2INVERT, 3, 1, 0); AC97_SINGLE("Sigmatel Surround Phase Inversion Playback Switch", AC97_SIGMATEL_DAC2INVERT, 3, 1, 0);
static const snd_kcontrol_new_t snd_ac97_sigmatel_controls[] = { static const struct snd_kcontrol_new snd_ac97_sigmatel_controls[] = {
AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0), AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0),
AC97_SINGLE("Sigmatel ADC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 0, 1, 0) AC97_SINGLE("Sigmatel ADC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 0, 1, 0)
}; };
static int patch_sigmatel_stac97xx_specific(ac97_t * ac97) static int patch_sigmatel_stac97xx_specific(struct snd_ac97 * ac97)
{ {
int err; int err;
...@@ -886,15 +886,15 @@ static struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = { ...@@ -886,15 +886,15 @@ static struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {
.build_specific = patch_sigmatel_stac97xx_specific .build_specific = patch_sigmatel_stac97xx_specific
}; };
int patch_sigmatel_stac9700(ac97_t * ac97) int patch_sigmatel_stac9700(struct snd_ac97 * ac97)
{ {
ac97->build_ops = &patch_sigmatel_stac9700_ops; ac97->build_ops = &patch_sigmatel_stac9700_ops;
return 0; return 0;
} }
static int snd_ac97_stac9708_put_bias(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_ac97_stac9708_put_bias(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int err; int err;
down(&ac97->page_mutex); down(&ac97->page_mutex);
...@@ -906,7 +906,7 @@ static int snd_ac97_stac9708_put_bias(snd_kcontrol_t *kcontrol, snd_ctl_elem_val ...@@ -906,7 +906,7 @@ static int snd_ac97_stac9708_put_bias(snd_kcontrol_t *kcontrol, snd_ctl_elem_val
return err; return err;
} }
static const snd_kcontrol_new_t snd_ac97_stac9708_bias_control = { static const struct snd_kcontrol_new snd_ac97_stac9708_bias_control = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Sigmatel Output Bias Switch", .name = "Sigmatel Output Bias Switch",
.info = snd_ac97_info_volsw, .info = snd_ac97_info_volsw,
...@@ -915,7 +915,7 @@ static const snd_kcontrol_new_t snd_ac97_stac9708_bias_control = { ...@@ -915,7 +915,7 @@ static const snd_kcontrol_new_t snd_ac97_stac9708_bias_control = {
.private_value = AC97_SINGLE_VALUE(AC97_SIGMATEL_BIAS2, 4, 1, 0), .private_value = AC97_SINGLE_VALUE(AC97_SIGMATEL_BIAS2, 4, 1, 0),
}; };
static int patch_sigmatel_stac9708_specific(ac97_t *ac97) static int patch_sigmatel_stac9708_specific(struct snd_ac97 *ac97)
{ {
int err; int err;
...@@ -930,7 +930,7 @@ static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = { ...@@ -930,7 +930,7 @@ static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {
.build_specific = patch_sigmatel_stac9708_specific .build_specific = patch_sigmatel_stac9708_specific
}; };
int patch_sigmatel_stac9708(ac97_t * ac97) int patch_sigmatel_stac9708(struct snd_ac97 * ac97)
{ {
unsigned int codec72, codec6c; unsigned int codec72, codec6c;
...@@ -956,7 +956,7 @@ int patch_sigmatel_stac9708(ac97_t * ac97) ...@@ -956,7 +956,7 @@ int patch_sigmatel_stac9708(ac97_t * ac97)
return 0; return 0;
} }
int patch_sigmatel_stac9721(ac97_t * ac97) int patch_sigmatel_stac9721(struct snd_ac97 * ac97)
{ {
ac97->build_ops = &patch_sigmatel_stac9700_ops; ac97->build_ops = &patch_sigmatel_stac9700_ops;
if (snd_ac97_read(ac97, AC97_SIGMATEL_ANALOG) == 0) { if (snd_ac97_read(ac97, AC97_SIGMATEL_ANALOG) == 0) {
...@@ -970,7 +970,7 @@ int patch_sigmatel_stac9721(ac97_t * ac97) ...@@ -970,7 +970,7 @@ int patch_sigmatel_stac9721(ac97_t * ac97)
return 0; return 0;
} }
int patch_sigmatel_stac9744(ac97_t * ac97) int patch_sigmatel_stac9744(struct snd_ac97 * ac97)
{ {
// patch for SigmaTel // patch for SigmaTel
ac97->build_ops = &patch_sigmatel_stac9700_ops; ac97->build_ops = &patch_sigmatel_stac9700_ops;
...@@ -982,7 +982,7 @@ int patch_sigmatel_stac9744(ac97_t * ac97) ...@@ -982,7 +982,7 @@ int patch_sigmatel_stac9744(ac97_t * ac97)
return 0; return 0;
} }
int patch_sigmatel_stac9756(ac97_t * ac97) int patch_sigmatel_stac9756(struct snd_ac97 * ac97)
{ {
// patch for SigmaTel // patch for SigmaTel
ac97->build_ops = &patch_sigmatel_stac9700_ops; ac97->build_ops = &patch_sigmatel_stac9700_ops;
...@@ -994,7 +994,7 @@ int patch_sigmatel_stac9756(ac97_t * ac97) ...@@ -994,7 +994,7 @@ int patch_sigmatel_stac9756(ac97_t * ac97)
return 0; return 0;
} }
static int snd_ac97_stac9758_output_jack_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int snd_ac97_stac9758_output_jack_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[5] = { "Input/Disabled", "Front Output", static char *texts[5] = { "Input/Disabled", "Front Output",
"Rear Output", "Center/LFE Output", "Mixer Output" }; "Rear Output", "Center/LFE Output", "Mixer Output" };
...@@ -1008,9 +1008,9 @@ static int snd_ac97_stac9758_output_jack_info(snd_kcontrol_t *kcontrol, snd_ctl_ ...@@ -1008,9 +1008,9 @@ static int snd_ac97_stac9758_output_jack_info(snd_kcontrol_t *kcontrol, snd_ctl_
return 0; return 0;
} }
static int snd_ac97_stac9758_output_jack_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t* ucontrol) static int snd_ac97_stac9758_output_jack_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int shift = kcontrol->private_value; int shift = kcontrol->private_value;
unsigned short val; unsigned short val;
...@@ -1022,9 +1022,9 @@ static int snd_ac97_stac9758_output_jack_get(snd_kcontrol_t *kcontrol, snd_ctl_e ...@@ -1022,9 +1022,9 @@ static int snd_ac97_stac9758_output_jack_get(snd_kcontrol_t *kcontrol, snd_ctl_e
return 0; return 0;
} }
static int snd_ac97_stac9758_output_jack_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_ac97_stac9758_output_jack_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int shift = kcontrol->private_value; int shift = kcontrol->private_value;
unsigned short val; unsigned short val;
...@@ -1038,7 +1038,7 @@ static int snd_ac97_stac9758_output_jack_put(snd_kcontrol_t *kcontrol, snd_ctl_e ...@@ -1038,7 +1038,7 @@ static int snd_ac97_stac9758_output_jack_put(snd_kcontrol_t *kcontrol, snd_ctl_e
7 << shift, val << shift, 0); 7 << shift, val << shift, 0);
} }
static int snd_ac97_stac9758_input_jack_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int snd_ac97_stac9758_input_jack_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[7] = { "Mic2 Jack", "Mic1 Jack", "Line In Jack", static char *texts[7] = { "Mic2 Jack", "Mic1 Jack", "Line In Jack",
"Front Jack", "Rear Jack", "Center/LFE Jack", "Mute" }; "Front Jack", "Rear Jack", "Center/LFE Jack", "Mute" };
...@@ -1052,9 +1052,9 @@ static int snd_ac97_stac9758_input_jack_info(snd_kcontrol_t *kcontrol, snd_ctl_e ...@@ -1052,9 +1052,9 @@ static int snd_ac97_stac9758_input_jack_info(snd_kcontrol_t *kcontrol, snd_ctl_e
return 0; return 0;
} }
static int snd_ac97_stac9758_input_jack_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t* ucontrol) static int snd_ac97_stac9758_input_jack_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int shift = kcontrol->private_value; int shift = kcontrol->private_value;
unsigned short val; unsigned short val;
...@@ -1063,16 +1063,16 @@ static int snd_ac97_stac9758_input_jack_get(snd_kcontrol_t *kcontrol, snd_ctl_el ...@@ -1063,16 +1063,16 @@ static int snd_ac97_stac9758_input_jack_get(snd_kcontrol_t *kcontrol, snd_ctl_el
return 0; return 0;
} }
static int snd_ac97_stac9758_input_jack_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_ac97_stac9758_input_jack_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
int shift = kcontrol->private_value; int shift = kcontrol->private_value;
return ac97_update_bits_page(ac97, AC97_SIGMATEL_INSEL, 7 << shift, return ac97_update_bits_page(ac97, AC97_SIGMATEL_INSEL, 7 << shift,
ucontrol->value.enumerated.item[0] << shift, 0); ucontrol->value.enumerated.item[0] << shift, 0);
} }
static int snd_ac97_stac9758_phonesel_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int snd_ac97_stac9758_phonesel_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[3] = { "None", "Front Jack", "Rear Jack" }; static char *texts[3] = { "None", "Front Jack", "Rear Jack" };
...@@ -1085,17 +1085,17 @@ static int snd_ac97_stac9758_phonesel_info(snd_kcontrol_t *kcontrol, snd_ctl_ele ...@@ -1085,17 +1085,17 @@ static int snd_ac97_stac9758_phonesel_info(snd_kcontrol_t *kcontrol, snd_ctl_ele
return 0; return 0;
} }
static int snd_ac97_stac9758_phonesel_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t* ucontrol) static int snd_ac97_stac9758_phonesel_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
ucontrol->value.enumerated.item[0] = ac97->regs[AC97_SIGMATEL_IOMISC] & 3; ucontrol->value.enumerated.item[0] = ac97->regs[AC97_SIGMATEL_IOMISC] & 3;
return 0; return 0;
} }
static int snd_ac97_stac9758_phonesel_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_ac97_stac9758_phonesel_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
return ac97_update_bits_page(ac97, AC97_SIGMATEL_IOMISC, 3, return ac97_update_bits_page(ac97, AC97_SIGMATEL_IOMISC, 3,
ucontrol->value.enumerated.item[0], 0); ucontrol->value.enumerated.item[0], 0);
...@@ -1113,7 +1113,7 @@ static int snd_ac97_stac9758_phonesel_put(snd_kcontrol_t *kcontrol, snd_ctl_elem ...@@ -1113,7 +1113,7 @@ static int snd_ac97_stac9758_phonesel_put(snd_kcontrol_t *kcontrol, snd_ctl_elem
.get = snd_ac97_stac9758_input_jack_get, \ .get = snd_ac97_stac9758_input_jack_get, \
.put = snd_ac97_stac9758_input_jack_put, \ .put = snd_ac97_stac9758_input_jack_put, \
.private_value = shift } .private_value = shift }
static const snd_kcontrol_new_t snd_ac97_sigmatel_stac9758_controls[] = { static const struct snd_kcontrol_new snd_ac97_sigmatel_stac9758_controls[] = {
STAC9758_OUTPUT_JACK("Mic1 Jack", 1), STAC9758_OUTPUT_JACK("Mic1 Jack", 1),
STAC9758_OUTPUT_JACK("LineIn Jack", 4), STAC9758_OUTPUT_JACK("LineIn Jack", 4),
STAC9758_OUTPUT_JACK("Front Jack", 7), STAC9758_OUTPUT_JACK("Front Jack", 7),
...@@ -1132,7 +1132,7 @@ static const snd_kcontrol_new_t snd_ac97_sigmatel_stac9758_controls[] = { ...@@ -1132,7 +1132,7 @@ static const snd_kcontrol_new_t snd_ac97_sigmatel_stac9758_controls[] = {
AC97_SINGLE("Headphone +3dB Boost", AC97_SIGMATEL_IOMISC, 8, 1, 0) AC97_SINGLE("Headphone +3dB Boost", AC97_SIGMATEL_IOMISC, 8, 1, 0)
}; };
static int patch_sigmatel_stac9758_specific(ac97_t *ac97) static int patch_sigmatel_stac9758_specific(struct snd_ac97 *ac97)
{ {
int err; int err;
...@@ -1159,7 +1159,7 @@ static struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = { ...@@ -1159,7 +1159,7 @@ static struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {
.build_specific = patch_sigmatel_stac9758_specific .build_specific = patch_sigmatel_stac9758_specific
}; };
int patch_sigmatel_stac9758(ac97_t * ac97) int patch_sigmatel_stac9758(struct snd_ac97 * ac97)
{ {
static unsigned short regs[4] = { static unsigned short regs[4] = {
AC97_SIGMATEL_OUTSEL, AC97_SIGMATEL_OUTSEL,
...@@ -1202,12 +1202,12 @@ int patch_sigmatel_stac9758(ac97_t * ac97) ...@@ -1202,12 +1202,12 @@ int patch_sigmatel_stac9758(ac97_t * ac97)
/* /*
* Cirrus Logic CS42xx codecs * Cirrus Logic CS42xx codecs
*/ */
static const snd_kcontrol_new_t snd_ac97_cirrus_controls_spdif[2] = { static const struct snd_kcontrol_new snd_ac97_cirrus_controls_spdif[2] = {
AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), AC97_CSR_SPDIF, 15, 1, 0), AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), AC97_CSR_SPDIF, 15, 1, 0),
AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "AC97-SPSA", AC97_CSR_ACMODE, 0, 3, 0) AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "AC97-SPSA", AC97_CSR_ACMODE, 0, 3, 0)
}; };
static int patch_cirrus_build_spdif(ac97_t * ac97) static int patch_cirrus_build_spdif(struct snd_ac97 * ac97)
{ {
int err; int err;
...@@ -1233,7 +1233,7 @@ static struct snd_ac97_build_ops patch_cirrus_ops = { ...@@ -1233,7 +1233,7 @@ static struct snd_ac97_build_ops patch_cirrus_ops = {
.build_spdif = patch_cirrus_build_spdif .build_spdif = patch_cirrus_build_spdif
}; };
int patch_cirrus_spdif(ac97_t * ac97) int patch_cirrus_spdif(struct snd_ac97 * ac97)
{ {
/* Basically, the cs4201/cs4205/cs4297a has non-standard sp/dif registers. /* Basically, the cs4201/cs4205/cs4297a has non-standard sp/dif registers.
WHY CAN'T ANYONE FOLLOW THE BLOODY SPEC? *sigh* WHY CAN'T ANYONE FOLLOW THE BLOODY SPEC? *sigh*
...@@ -1254,7 +1254,7 @@ int patch_cirrus_spdif(ac97_t * ac97) ...@@ -1254,7 +1254,7 @@ int patch_cirrus_spdif(ac97_t * ac97)
return 0; return 0;
} }
int patch_cirrus_cs4299(ac97_t * ac97) int patch_cirrus_cs4299(struct snd_ac97 * ac97)
{ {
/* force the detection of PC Beep */ /* force the detection of PC Beep */
ac97->flags |= AC97_HAS_PC_BEEP; ac97->flags |= AC97_HAS_PC_BEEP;
...@@ -1265,11 +1265,11 @@ int patch_cirrus_cs4299(ac97_t * ac97) ...@@ -1265,11 +1265,11 @@ int patch_cirrus_cs4299(ac97_t * ac97)
/* /*
* Conexant codecs * Conexant codecs
*/ */
static const snd_kcontrol_new_t snd_ac97_conexant_controls_spdif[1] = { static const struct snd_kcontrol_new snd_ac97_conexant_controls_spdif[1] = {
AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), AC97_CXR_AUDIO_MISC, 3, 1, 0), AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), AC97_CXR_AUDIO_MISC, 3, 1, 0),
}; };
static int patch_conexant_build_spdif(ac97_t * ac97) static int patch_conexant_build_spdif(struct snd_ac97 * ac97)
{ {
int err; int err;
...@@ -1290,7 +1290,7 @@ static struct snd_ac97_build_ops patch_conexant_ops = { ...@@ -1290,7 +1290,7 @@ static struct snd_ac97_build_ops patch_conexant_ops = {
.build_spdif = patch_conexant_build_spdif .build_spdif = patch_conexant_build_spdif
}; };
int patch_conexant(ac97_t * ac97) int patch_conexant(struct snd_ac97 * ac97)
{ {
ac97->build_ops = &patch_conexant_ops; ac97->build_ops = &patch_conexant_ops;
ac97->flags |= AC97_CX_SPDIF; ac97->flags |= AC97_CX_SPDIF;
...@@ -1303,7 +1303,7 @@ int patch_conexant(ac97_t * ac97) ...@@ -1303,7 +1303,7 @@ int patch_conexant(ac97_t * ac97)
* Analog Device AD18xx, AD19xx codecs * Analog Device AD18xx, AD19xx codecs
*/ */
#ifdef CONFIG_PM #ifdef CONFIG_PM
static void ad18xx_resume(ac97_t *ac97) static void ad18xx_resume(struct snd_ac97 *ac97)
{ {
static unsigned short setup_regs[] = { static unsigned short setup_regs[] = {
AC97_AD_MISC, AC97_AD_SERIAL_CFG, AC97_AD_JACK_SPDIF, AC97_AD_MISC, AC97_AD_SERIAL_CFG, AC97_AD_JACK_SPDIF,
...@@ -1367,7 +1367,7 @@ static void ad18xx_resume(ac97_t *ac97) ...@@ -1367,7 +1367,7 @@ static void ad18xx_resume(ac97_t *ac97)
} }
#endif #endif
int patch_ad1819(ac97_t * ac97) int patch_ad1819(struct snd_ac97 * ac97)
{ {
unsigned short scfg; unsigned short scfg;
...@@ -1377,7 +1377,7 @@ int patch_ad1819(ac97_t * ac97) ...@@ -1377,7 +1377,7 @@ int patch_ad1819(ac97_t * ac97)
return 0; return 0;
} }
static unsigned short patch_ad1881_unchained(ac97_t * ac97, int idx, unsigned short mask) static unsigned short patch_ad1881_unchained(struct snd_ac97 * ac97, int idx, unsigned short mask)
{ {
unsigned short val; unsigned short val;
...@@ -1393,7 +1393,7 @@ static unsigned short patch_ad1881_unchained(ac97_t * ac97, int idx, unsigned sh ...@@ -1393,7 +1393,7 @@ static unsigned short patch_ad1881_unchained(ac97_t * ac97, int idx, unsigned sh
return mask; return mask;
} }
static int patch_ad1881_chained1(ac97_t * ac97, int idx, unsigned short codec_bits) static int patch_ad1881_chained1(struct snd_ac97 * ac97, int idx, unsigned short codec_bits)
{ {
static int cfg_bits[3] = { 1<<12, 1<<14, 1<<13 }; static int cfg_bits[3] = { 1<<12, 1<<14, 1<<13 };
unsigned short val; unsigned short val;
...@@ -1411,7 +1411,7 @@ static int patch_ad1881_chained1(ac97_t * ac97, int idx, unsigned short codec_bi ...@@ -1411,7 +1411,7 @@ static int patch_ad1881_chained1(ac97_t * ac97, int idx, unsigned short codec_bi
return 1; return 1;
} }
static void patch_ad1881_chained(ac97_t * ac97, int unchained_idx, int cidx1, int cidx2) static void patch_ad1881_chained(struct snd_ac97 * ac97, int unchained_idx, int cidx1, int cidx2)
{ {
// already detected? // already detected?
if (ac97->spec.ad18xx.unchained[cidx1] || ac97->spec.ad18xx.chained[cidx1]) if (ac97->spec.ad18xx.unchained[cidx1] || ac97->spec.ad18xx.chained[cidx1])
...@@ -1441,7 +1441,7 @@ static struct snd_ac97_build_ops patch_ad1881_build_ops = { ...@@ -1441,7 +1441,7 @@ static struct snd_ac97_build_ops patch_ad1881_build_ops = {
#endif #endif
}; };
int patch_ad1881(ac97_t * ac97) int patch_ad1881(struct snd_ac97 * ac97)
{ {
static const char cfg_idxs[3][2] = { static const char cfg_idxs[3][2] = {
{2, 1}, {2, 1},
...@@ -1500,7 +1500,7 @@ int patch_ad1881(ac97_t * ac97) ...@@ -1500,7 +1500,7 @@ int patch_ad1881(ac97_t * ac97)
return 0; return 0;
} }
static const snd_kcontrol_new_t snd_ac97_controls_ad1885[] = { static const struct snd_kcontrol_new snd_ac97_controls_ad1885[] = {
AC97_SINGLE("Digital Mono Direct", AC97_AD_MISC, 11, 1, 0), AC97_SINGLE("Digital Mono Direct", AC97_AD_MISC, 11, 1, 0),
/* AC97_SINGLE("Digital Audio Mode", AC97_AD_MISC, 12, 1, 0), */ /* seems problematic */ /* AC97_SINGLE("Digital Audio Mode", AC97_AD_MISC, 12, 1, 0), */ /* seems problematic */
AC97_SINGLE("Low Power Mixer", AC97_AD_MISC, 14, 1, 0), AC97_SINGLE("Low Power Mixer", AC97_AD_MISC, 14, 1, 0),
...@@ -1509,7 +1509,7 @@ static const snd_kcontrol_new_t snd_ac97_controls_ad1885[] = { ...@@ -1509,7 +1509,7 @@ static const snd_kcontrol_new_t snd_ac97_controls_ad1885[] = {
AC97_SINGLE("Line Jack Sense", AC97_AD_JACK_SPDIF, 8, 1, 1), /* inverted */ AC97_SINGLE("Line Jack Sense", AC97_AD_JACK_SPDIF, 8, 1, 1), /* inverted */
}; };
static int patch_ad1885_specific(ac97_t * ac97) static int patch_ad1885_specific(struct snd_ac97 * ac97)
{ {
int err; int err;
...@@ -1525,7 +1525,7 @@ static struct snd_ac97_build_ops patch_ad1885_build_ops = { ...@@ -1525,7 +1525,7 @@ static struct snd_ac97_build_ops patch_ad1885_build_ops = {
#endif #endif
}; };
int patch_ad1885(ac97_t * ac97) int patch_ad1885(struct snd_ac97 * ac97)
{ {
patch_ad1881(ac97); patch_ad1881(ac97);
/* This is required to deal with the Intel D815EEAL2 */ /* This is required to deal with the Intel D815EEAL2 */
...@@ -1538,7 +1538,7 @@ int patch_ad1885(ac97_t * ac97) ...@@ -1538,7 +1538,7 @@ int patch_ad1885(ac97_t * ac97)
return 0; return 0;
} }
int patch_ad1886(ac97_t * ac97) int patch_ad1886(struct snd_ac97 * ac97)
{ {
patch_ad1881(ac97); patch_ad1881(ac97);
/* Presario700 workaround */ /* Presario700 workaround */
...@@ -1569,7 +1569,7 @@ int patch_ad1886(ac97_t * ac97) ...@@ -1569,7 +1569,7 @@ int patch_ad1886(ac97_t * ac97)
#define AC97_AD198X_DACZ 0x8000 /* DAC zero-fill mode */ #define AC97_AD198X_DACZ 0x8000 /* DAC zero-fill mode */
static int snd_ac97_ad198x_spdif_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_ac97_ad198x_spdif_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[2] = { "AC-Link", "A/D Converter" }; static char *texts[2] = { "AC-Link", "A/D Converter" };
...@@ -1582,9 +1582,9 @@ static int snd_ac97_ad198x_spdif_source_info(snd_kcontrol_t *kcontrol, snd_ctl_e ...@@ -1582,9 +1582,9 @@ static int snd_ac97_ad198x_spdif_source_info(snd_kcontrol_t *kcontrol, snd_ctl_e
return 0; return 0;
} }
static int snd_ac97_ad198x_spdif_source_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ad198x_spdif_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
val = ac97->regs[AC97_AD_SERIAL_CFG]; val = ac97->regs[AC97_AD_SERIAL_CFG];
...@@ -1592,9 +1592,9 @@ static int snd_ac97_ad198x_spdif_source_get(snd_kcontrol_t * kcontrol, snd_ctl_e ...@@ -1592,9 +1592,9 @@ static int snd_ac97_ad198x_spdif_source_get(snd_kcontrol_t * kcontrol, snd_ctl_e
return 0; return 0;
} }
static int snd_ac97_ad198x_spdif_source_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_ad198x_spdif_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
if (ucontrol->value.enumerated.item[0] > 1) if (ucontrol->value.enumerated.item[0] > 1)
...@@ -1603,7 +1603,7 @@ static int snd_ac97_ad198x_spdif_source_put(snd_kcontrol_t * kcontrol, snd_ctl_e ...@@ -1603,7 +1603,7 @@ static int snd_ac97_ad198x_spdif_source_put(snd_kcontrol_t * kcontrol, snd_ctl_e
return snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x0004, val); return snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x0004, val);
} }
static const snd_kcontrol_new_t snd_ac97_ad198x_spdif_source = { static const struct snd_kcontrol_new snd_ac97_ad198x_spdif_source = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
.info = snd_ac97_ad198x_spdif_source_info, .info = snd_ac97_ad198x_spdif_source_info,
...@@ -1611,17 +1611,17 @@ static const snd_kcontrol_new_t snd_ac97_ad198x_spdif_source = { ...@@ -1611,17 +1611,17 @@ static const snd_kcontrol_new_t snd_ac97_ad198x_spdif_source = {
.put = snd_ac97_ad198x_spdif_source_put, .put = snd_ac97_ad198x_spdif_source_put,
}; };
static int patch_ad198x_post_spdif(ac97_t * ac97) static int patch_ad198x_post_spdif(struct snd_ac97 * ac97)
{ {
return patch_build_controls(ac97, &snd_ac97_ad198x_spdif_source, 1); return patch_build_controls(ac97, &snd_ac97_ad198x_spdif_source, 1);
} }
static const snd_kcontrol_new_t snd_ac97_ad1981x_jack_sense[] = { static const struct snd_kcontrol_new snd_ac97_ad1981x_jack_sense[] = {
AC97_SINGLE("Headphone Jack Sense", AC97_AD_JACK_SPDIF, 11, 1, 0), AC97_SINGLE("Headphone Jack Sense", AC97_AD_JACK_SPDIF, 11, 1, 0),
AC97_SINGLE("Line Jack Sense", AC97_AD_JACK_SPDIF, 12, 1, 0), AC97_SINGLE("Line Jack Sense", AC97_AD_JACK_SPDIF, 12, 1, 0),
}; };
static int patch_ad1981a_specific(ac97_t * ac97) static int patch_ad1981a_specific(struct snd_ac97 * ac97)
{ {
return patch_build_controls(ac97, snd_ac97_ad1981x_jack_sense, return patch_build_controls(ac97, snd_ac97_ad1981x_jack_sense,
ARRAY_SIZE(snd_ac97_ad1981x_jack_sense)); ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
...@@ -1635,7 +1635,7 @@ static struct snd_ac97_build_ops patch_ad1981a_build_ops = { ...@@ -1635,7 +1635,7 @@ static struct snd_ac97_build_ops patch_ad1981a_build_ops = {
#endif #endif
}; };
static void check_ad1981_hp_jack_sense(ac97_t *ac97) static void check_ad1981_hp_jack_sense(struct snd_ac97 *ac97)
{ {
u32 subid = ((u32)ac97->subsystem_vendor << 16) | ac97->subsystem_device; u32 subid = ((u32)ac97->subsystem_vendor << 16) | ac97->subsystem_device;
switch (subid) { switch (subid) {
...@@ -1649,7 +1649,7 @@ static void check_ad1981_hp_jack_sense(ac97_t *ac97) ...@@ -1649,7 +1649,7 @@ static void check_ad1981_hp_jack_sense(ac97_t *ac97)
} }
} }
int patch_ad1981a(ac97_t *ac97) int patch_ad1981a(struct snd_ac97 *ac97)
{ {
patch_ad1881(ac97); patch_ad1881(ac97);
ac97->build_ops = &patch_ad1981a_build_ops; ac97->build_ops = &patch_ad1981a_build_ops;
...@@ -1659,10 +1659,10 @@ int patch_ad1981a(ac97_t *ac97) ...@@ -1659,10 +1659,10 @@ int patch_ad1981a(ac97_t *ac97)
return 0; return 0;
} }
static const snd_kcontrol_new_t snd_ac97_ad198x_2cmic = static const struct snd_kcontrol_new snd_ac97_ad198x_2cmic =
AC97_SINGLE("Stereo Mic", AC97_AD_MISC, 6, 1, 0); AC97_SINGLE("Stereo Mic", AC97_AD_MISC, 6, 1, 0);
static int patch_ad1981b_specific(ac97_t *ac97) static int patch_ad1981b_specific(struct snd_ac97 *ac97)
{ {
int err; int err;
...@@ -1680,7 +1680,7 @@ static struct snd_ac97_build_ops patch_ad1981b_build_ops = { ...@@ -1680,7 +1680,7 @@ static struct snd_ac97_build_ops patch_ad1981b_build_ops = {
#endif #endif
}; };
int patch_ad1981b(ac97_t *ac97) int patch_ad1981b(struct snd_ac97 *ac97)
{ {
patch_ad1881(ac97); patch_ad1881(ac97);
ac97->build_ops = &patch_ad1981b_build_ops; ac97->build_ops = &patch_ad1981b_build_ops;
...@@ -1690,7 +1690,7 @@ int patch_ad1981b(ac97_t *ac97) ...@@ -1690,7 +1690,7 @@ int patch_ad1981b(ac97_t *ac97)
return 0; return 0;
} }
static int snd_ac97_ad1888_lohpsel_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int snd_ac97_ad1888_lohpsel_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 1; uinfo->count = 1;
...@@ -1699,9 +1699,9 @@ static int snd_ac97_ad1888_lohpsel_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_i ...@@ -1699,9 +1699,9 @@ static int snd_ac97_ad1888_lohpsel_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_i
return 0; return 0;
} }
static int snd_ac97_ad1888_lohpsel_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t* ucontrol) static int snd_ac97_ad1888_lohpsel_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
val = ac97->regs[AC97_AD_MISC]; val = ac97->regs[AC97_AD_MISC];
...@@ -1709,9 +1709,9 @@ static int snd_ac97_ad1888_lohpsel_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_va ...@@ -1709,9 +1709,9 @@ static int snd_ac97_ad1888_lohpsel_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_va
return 0; return 0;
} }
static int snd_ac97_ad1888_lohpsel_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_ac97_ad1888_lohpsel_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
val = !ucontrol->value.integer.value[0] val = !ucontrol->value.integer.value[0]
...@@ -1720,7 +1720,7 @@ static int snd_ac97_ad1888_lohpsel_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_va ...@@ -1720,7 +1720,7 @@ static int snd_ac97_ad1888_lohpsel_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_va
AC97_AD198X_LOSEL | AC97_AD198X_HPSEL, val); AC97_AD198X_LOSEL | AC97_AD198X_HPSEL, val);
} }
static int snd_ac97_ad1888_downmix_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int snd_ac97_ad1888_downmix_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[3] = {"Off", "6 -> 4", "6 -> 2"}; static char *texts[3] = {"Off", "6 -> 4", "6 -> 2"};
...@@ -1733,9 +1733,9 @@ static int snd_ac97_ad1888_downmix_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_i ...@@ -1733,9 +1733,9 @@ static int snd_ac97_ad1888_downmix_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_i
return 0; return 0;
} }
static int snd_ac97_ad1888_downmix_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t* ucontrol) static int snd_ac97_ad1888_downmix_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
val = ac97->regs[AC97_AD_MISC]; val = ac97->regs[AC97_AD_MISC];
...@@ -1746,9 +1746,9 @@ static int snd_ac97_ad1888_downmix_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_va ...@@ -1746,9 +1746,9 @@ static int snd_ac97_ad1888_downmix_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_va
return 0; return 0;
} }
static int snd_ac97_ad1888_downmix_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_ac97_ad1888_downmix_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
if (ucontrol->value.enumerated.item[0] > 2) if (ucontrol->value.enumerated.item[0] > 2)
...@@ -1762,7 +1762,7 @@ static int snd_ac97_ad1888_downmix_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_va ...@@ -1762,7 +1762,7 @@ static int snd_ac97_ad1888_downmix_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_va
AC97_AD198X_DMIX0 | AC97_AD198X_DMIX1, val); AC97_AD198X_DMIX0 | AC97_AD198X_DMIX1, val);
} }
static void ad1888_update_jacks(ac97_t *ac97) static void ad1888_update_jacks(struct snd_ac97 *ac97)
{ {
unsigned short val = 0; unsigned short val = 0;
if (! is_shared_linein(ac97)) if (! is_shared_linein(ac97))
...@@ -1773,7 +1773,7 @@ static void ad1888_update_jacks(ac97_t *ac97) ...@@ -1773,7 +1773,7 @@ static void ad1888_update_jacks(ac97_t *ac97)
snd_ac97_update_bits(ac97, AC97_AD_MISC, (1 << 11) | (1 << 12), val); snd_ac97_update_bits(ac97, AC97_AD_MISC, (1 << 11) | (1 << 12), val);
} }
static const snd_kcontrol_new_t snd_ac97_ad1888_controls[] = { static const struct snd_kcontrol_new snd_ac97_ad1888_controls[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Exchange Front/Surround", .name = "Exchange Front/Surround",
...@@ -1796,7 +1796,7 @@ static const snd_kcontrol_new_t snd_ac97_ad1888_controls[] = { ...@@ -1796,7 +1796,7 @@ static const snd_kcontrol_new_t snd_ac97_ad1888_controls[] = {
AC97_SINGLE("Line Jack Sense", AC97_AD_JACK_SPDIF, 12, 1, 0), AC97_SINGLE("Line Jack Sense", AC97_AD_JACK_SPDIF, 12, 1, 0),
}; };
static int patch_ad1888_specific(ac97_t *ac97) static int patch_ad1888_specific(struct snd_ac97 *ac97)
{ {
/* rename 0x04 as "Master" and 0x02 as "Master Surround" */ /* rename 0x04 as "Master" and 0x02 as "Master Surround" */
snd_ac97_rename_vol_ctl(ac97, "Master Playback", "Master Surround Playback"); snd_ac97_rename_vol_ctl(ac97, "Master Playback", "Master Surround Playback");
...@@ -1813,7 +1813,7 @@ static struct snd_ac97_build_ops patch_ad1888_build_ops = { ...@@ -1813,7 +1813,7 @@ static struct snd_ac97_build_ops patch_ad1888_build_ops = {
.update_jacks = ad1888_update_jacks, .update_jacks = ad1888_update_jacks,
}; };
int patch_ad1888(ac97_t * ac97) int patch_ad1888(struct snd_ac97 * ac97)
{ {
unsigned short misc; unsigned short misc;
...@@ -1833,7 +1833,7 @@ int patch_ad1888(ac97_t * ac97) ...@@ -1833,7 +1833,7 @@ int patch_ad1888(ac97_t * ac97)
return 0; return 0;
} }
static int patch_ad1980_specific(ac97_t *ac97) static int patch_ad1980_specific(struct snd_ac97 *ac97)
{ {
int err; int err;
...@@ -1851,25 +1851,25 @@ static struct snd_ac97_build_ops patch_ad1980_build_ops = { ...@@ -1851,25 +1851,25 @@ static struct snd_ac97_build_ops patch_ad1980_build_ops = {
.update_jacks = ad1888_update_jacks, .update_jacks = ad1888_update_jacks,
}; };
int patch_ad1980(ac97_t * ac97) int patch_ad1980(struct snd_ac97 * ac97)
{ {
patch_ad1888(ac97); patch_ad1888(ac97);
ac97->build_ops = &patch_ad1980_build_ops; ac97->build_ops = &patch_ad1980_build_ops;
return 0; return 0;
} }
static const snd_kcontrol_new_t snd_ac97_ad1985_controls[] = { static const struct snd_kcontrol_new snd_ac97_ad1985_controls[] = {
AC97_SINGLE("Exchange Center/LFE", AC97_AD_SERIAL_CFG, 3, 1, 0) AC97_SINGLE("Exchange Center/LFE", AC97_AD_SERIAL_CFG, 3, 1, 0)
}; };
static void ad1985_update_jacks(ac97_t *ac97) static void ad1985_update_jacks(struct snd_ac97 *ac97)
{ {
ad1888_update_jacks(ac97); ad1888_update_jacks(ac97);
snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 1 << 9, snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 1 << 9,
is_shared_micin(ac97) ? 0 : 1 << 9); is_shared_micin(ac97) ? 0 : 1 << 9);
} }
static int patch_ad1985_specific(ac97_t *ac97) static int patch_ad1985_specific(struct snd_ac97 *ac97)
{ {
int err; int err;
...@@ -1887,7 +1887,7 @@ static struct snd_ac97_build_ops patch_ad1985_build_ops = { ...@@ -1887,7 +1887,7 @@ static struct snd_ac97_build_ops patch_ad1985_build_ops = {
.update_jacks = ad1985_update_jacks, .update_jacks = ad1985_update_jacks,
}; };
int patch_ad1985(ac97_t * ac97) int patch_ad1985(struct snd_ac97 * ac97)
{ {
unsigned short misc; unsigned short misc;
...@@ -1916,7 +1916,7 @@ int patch_ad1985(ac97_t * ac97) ...@@ -1916,7 +1916,7 @@ int patch_ad1985(ac97_t * ac97)
/* /*
* realtek ALC65x/850 codecs * realtek ALC65x/850 codecs
*/ */
static void alc650_update_jacks(ac97_t *ac97) static void alc650_update_jacks(struct snd_ac97 *ac97)
{ {
int shared; int shared;
...@@ -1937,7 +1937,7 @@ static void alc650_update_jacks(ac97_t *ac97) ...@@ -1937,7 +1937,7 @@ static void alc650_update_jacks(ac97_t *ac97)
shared ? 0 : 0x100); shared ? 0 : 0x100);
} }
static const snd_kcontrol_new_t snd_ac97_controls_alc650[] = { static const struct snd_kcontrol_new snd_ac97_controls_alc650[] = {
AC97_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0), AC97_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0),
AC97_SINGLE("Surround Down Mix", AC97_ALC650_MULTICH, 1, 1, 0), AC97_SINGLE("Surround Down Mix", AC97_ALC650_MULTICH, 1, 1, 0),
AC97_SINGLE("Center/LFE Down Mix", AC97_ALC650_MULTICH, 2, 1, 0), AC97_SINGLE("Center/LFE Down Mix", AC97_ALC650_MULTICH, 2, 1, 0),
...@@ -1963,14 +1963,14 @@ static const snd_kcontrol_new_t snd_ac97_controls_alc650[] = { ...@@ -1963,14 +1963,14 @@ static const snd_kcontrol_new_t snd_ac97_controls_alc650[] = {
AC97_CHANNEL_MODE_CTL, AC97_CHANNEL_MODE_CTL,
}; };
static const snd_kcontrol_new_t snd_ac97_spdif_controls_alc650[] = { static const struct snd_kcontrol_new snd_ac97_spdif_controls_alc650[] = {
AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), AC97_ALC650_MULTICH, 11, 1, 0), AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), AC97_ALC650_MULTICH, 11, 1, 0),
AC97_SINGLE("Analog to IEC958 Output", AC97_ALC650_MULTICH, 12, 1, 0), AC97_SINGLE("Analog to IEC958 Output", AC97_ALC650_MULTICH, 12, 1, 0),
/* disable this controls since it doesn't work as expected */ /* disable this controls since it doesn't work as expected */
/* AC97_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 13, 1, 0), */ /* AC97_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 13, 1, 0), */
}; };
static int patch_alc650_specific(ac97_t * ac97) static int patch_alc650_specific(struct snd_ac97 * ac97)
{ {
int err; int err;
...@@ -1988,7 +1988,7 @@ static struct snd_ac97_build_ops patch_alc650_ops = { ...@@ -1988,7 +1988,7 @@ static struct snd_ac97_build_ops patch_alc650_ops = {
.update_jacks = alc650_update_jacks .update_jacks = alc650_update_jacks
}; };
int patch_alc650(ac97_t * ac97) int patch_alc650(struct snd_ac97 * ac97)
{ {
unsigned short val; unsigned short val;
...@@ -2043,7 +2043,7 @@ int patch_alc650(ac97_t * ac97) ...@@ -2043,7 +2043,7 @@ int patch_alc650(ac97_t * ac97)
return 0; return 0;
} }
static void alc655_update_jacks(ac97_t *ac97) static void alc655_update_jacks(struct snd_ac97 *ac97)
{ {
int shared; int shared;
...@@ -2060,17 +2060,17 @@ static void alc655_update_jacks(ac97_t *ac97) ...@@ -2060,17 +2060,17 @@ static void alc655_update_jacks(ac97_t *ac97)
shared ? (1 << 10) : 0, 0); shared ? (1 << 10) : 0, 0);
} }
static const snd_kcontrol_new_t snd_ac97_controls_alc655[] = { static const struct snd_kcontrol_new snd_ac97_controls_alc655[] = {
AC97_PAGE_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0, 0), AC97_PAGE_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0, 0),
AC97_SURROUND_JACK_MODE_CTL, AC97_SURROUND_JACK_MODE_CTL,
AC97_CHANNEL_MODE_CTL, AC97_CHANNEL_MODE_CTL,
}; };
static int alc655_iec958_route_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int alc655_iec958_route_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts_655[3] = { "PCM", "Analog In", "IEC958 In" }; static char *texts_655[3] = { "PCM", "Analog In", "IEC958 In" };
static char *texts_658[4] = { "PCM", "Analog1 In", "Analog2 In", "IEC958 In" }; static char *texts_658[4] = { "PCM", "Analog1 In", "Analog2 In", "IEC958 In" };
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
uinfo->count = 1; uinfo->count = 1;
...@@ -2084,9 +2084,9 @@ static int alc655_iec958_route_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_ ...@@ -2084,9 +2084,9 @@ static int alc655_iec958_route_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_
return 0; return 0;
} }
static int alc655_iec958_route_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int alc655_iec958_route_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
val = ac97->regs[AC97_ALC650_MULTICH]; val = ac97->regs[AC97_ALC650_MULTICH];
...@@ -2097,16 +2097,16 @@ static int alc655_iec958_route_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_ ...@@ -2097,16 +2097,16 @@ static int alc655_iec958_route_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_
return 0; return 0;
} }
static int alc655_iec958_route_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int alc655_iec958_route_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
return ac97_update_bits_page(ac97, AC97_ALC650_MULTICH, 3 << 12, return ac97_update_bits_page(ac97, AC97_ALC650_MULTICH, 3 << 12,
(unsigned short)ucontrol->value.enumerated.item[0] << 12, (unsigned short)ucontrol->value.enumerated.item[0] << 12,
0); 0);
} }
static const snd_kcontrol_new_t snd_ac97_spdif_controls_alc655[] = { static const struct snd_kcontrol_new snd_ac97_spdif_controls_alc655[] = {
AC97_PAGE_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), AC97_ALC650_MULTICH, 11, 1, 0, 0), AC97_PAGE_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), AC97_ALC650_MULTICH, 11, 1, 0, 0),
/* disable this controls since it doesn't work as expected */ /* disable this controls since it doesn't work as expected */
/* AC97_PAGE_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 14, 1, 0, 0), */ /* AC97_PAGE_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 14, 1, 0, 0), */
...@@ -2119,7 +2119,7 @@ static const snd_kcontrol_new_t snd_ac97_spdif_controls_alc655[] = { ...@@ -2119,7 +2119,7 @@ static const snd_kcontrol_new_t snd_ac97_spdif_controls_alc655[] = {
}, },
}; };
static int patch_alc655_specific(ac97_t * ac97) static int patch_alc655_specific(struct snd_ac97 * ac97)
{ {
int err; int err;
...@@ -2137,7 +2137,7 @@ static struct snd_ac97_build_ops patch_alc655_ops = { ...@@ -2137,7 +2137,7 @@ static struct snd_ac97_build_ops patch_alc655_ops = {
.update_jacks = alc655_update_jacks .update_jacks = alc655_update_jacks
}; };
int patch_alc655(ac97_t * ac97) int patch_alc655(struct snd_ac97 * ac97)
{ {
unsigned int val; unsigned int val;
...@@ -2189,7 +2189,7 @@ int patch_alc655(ac97_t * ac97) ...@@ -2189,7 +2189,7 @@ int patch_alc655(ac97_t * ac97)
#define AC97_ALC850_JACK_SELECT 0x76 #define AC97_ALC850_JACK_SELECT 0x76
#define AC97_ALC850_MISC1 0x7a #define AC97_ALC850_MISC1 0x7a
static void alc850_update_jacks(ac97_t *ac97) static void alc850_update_jacks(struct snd_ac97 *ac97)
{ {
int shared; int shared;
...@@ -2211,14 +2211,14 @@ static void alc850_update_jacks(ac97_t *ac97) ...@@ -2211,14 +2211,14 @@ static void alc850_update_jacks(ac97_t *ac97)
shared ? (2<<4) : (1<<4)); shared ? (2<<4) : (1<<4));
} }
static const snd_kcontrol_new_t snd_ac97_controls_alc850[] = { static const struct snd_kcontrol_new snd_ac97_controls_alc850[] = {
AC97_PAGE_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0, 0), AC97_PAGE_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0, 0),
AC97_SINGLE("Mic Front Input Switch", AC97_ALC850_JACK_SELECT, 15, 1, 1), AC97_SINGLE("Mic Front Input Switch", AC97_ALC850_JACK_SELECT, 15, 1, 1),
AC97_SURROUND_JACK_MODE_CTL, AC97_SURROUND_JACK_MODE_CTL,
AC97_CHANNEL_MODE_CTL, AC97_CHANNEL_MODE_CTL,
}; };
static int patch_alc850_specific(ac97_t *ac97) static int patch_alc850_specific(struct snd_ac97 *ac97)
{ {
int err; int err;
...@@ -2236,7 +2236,7 @@ static struct snd_ac97_build_ops patch_alc850_ops = { ...@@ -2236,7 +2236,7 @@ static struct snd_ac97_build_ops patch_alc850_ops = {
.update_jacks = alc850_update_jacks .update_jacks = alc850_update_jacks
}; };
int patch_alc850(ac97_t *ac97) int patch_alc850(struct snd_ac97 *ac97)
{ {
ac97->build_ops = &patch_alc850_ops; ac97->build_ops = &patch_alc850_ops;
...@@ -2273,20 +2273,20 @@ int patch_alc850(ac97_t *ac97) ...@@ -2273,20 +2273,20 @@ int patch_alc850(ac97_t *ac97)
/* /*
* C-Media CM97xx codecs * C-Media CM97xx codecs
*/ */
static void cm9738_update_jacks(ac97_t *ac97) static void cm9738_update_jacks(struct snd_ac97 *ac97)
{ {
/* shared Line-In */ /* shared Line-In */
snd_ac97_update_bits(ac97, AC97_CM9738_VENDOR_CTRL, 1 << 10, snd_ac97_update_bits(ac97, AC97_CM9738_VENDOR_CTRL, 1 << 10,
is_shared_linein(ac97) ? (1 << 10) : 0); is_shared_linein(ac97) ? (1 << 10) : 0);
} }
static const snd_kcontrol_new_t snd_ac97_cm9738_controls[] = { static const struct snd_kcontrol_new snd_ac97_cm9738_controls[] = {
AC97_SINGLE("Duplicate Front", AC97_CM9738_VENDOR_CTRL, 13, 1, 0), AC97_SINGLE("Duplicate Front", AC97_CM9738_VENDOR_CTRL, 13, 1, 0),
AC97_SURROUND_JACK_MODE_CTL, AC97_SURROUND_JACK_MODE_CTL,
AC97_CHANNEL_MODE_4CH_CTL, AC97_CHANNEL_MODE_4CH_CTL,
}; };
static int patch_cm9738_specific(ac97_t * ac97) static int patch_cm9738_specific(struct snd_ac97 * ac97)
{ {
return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls)); return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls));
} }
...@@ -2296,7 +2296,7 @@ static struct snd_ac97_build_ops patch_cm9738_ops = { ...@@ -2296,7 +2296,7 @@ static struct snd_ac97_build_ops patch_cm9738_ops = {
.update_jacks = cm9738_update_jacks .update_jacks = cm9738_update_jacks
}; };
int patch_cm9738(ac97_t * ac97) int patch_cm9738(struct snd_ac97 * ac97)
{ {
ac97->build_ops = &patch_cm9738_ops; ac97->build_ops = &patch_cm9738_ops;
/* FIXME: can anyone confirm below? */ /* FIXME: can anyone confirm below? */
...@@ -2307,7 +2307,7 @@ int patch_cm9738(ac97_t * ac97) ...@@ -2307,7 +2307,7 @@ int patch_cm9738(ac97_t * ac97)
return 0; return 0;
} }
static int snd_ac97_cmedia_spdif_playback_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_ac97_cmedia_spdif_playback_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[] = { "Analog", "Digital" }; static char *texts[] = { "Analog", "Digital" };
...@@ -2320,9 +2320,9 @@ static int snd_ac97_cmedia_spdif_playback_source_info(snd_kcontrol_t *kcontrol, ...@@ -2320,9 +2320,9 @@ static int snd_ac97_cmedia_spdif_playback_source_info(snd_kcontrol_t *kcontrol,
return 0; return 0;
} }
static int snd_ac97_cmedia_spdif_playback_source_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_cmedia_spdif_playback_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val; unsigned short val;
val = ac97->regs[AC97_CM9739_SPDIF_CTRL]; val = ac97->regs[AC97_CM9739_SPDIF_CTRL];
...@@ -2330,16 +2330,16 @@ static int snd_ac97_cmedia_spdif_playback_source_get(snd_kcontrol_t * kcontrol, ...@@ -2330,16 +2330,16 @@ static int snd_ac97_cmedia_spdif_playback_source_get(snd_kcontrol_t * kcontrol,
return 0; return 0;
} }
static int snd_ac97_cmedia_spdif_playback_source_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_ac97_cmedia_spdif_playback_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
return snd_ac97_update_bits(ac97, AC97_CM9739_SPDIF_CTRL, return snd_ac97_update_bits(ac97, AC97_CM9739_SPDIF_CTRL,
0x01 << 1, 0x01 << 1,
(ucontrol->value.enumerated.item[0] & 0x01) << 1); (ucontrol->value.enumerated.item[0] & 0x01) << 1);
} }
static const snd_kcontrol_new_t snd_ac97_cm9739_controls_spdif[] = { static const struct snd_kcontrol_new snd_ac97_cm9739_controls_spdif[] = {
/* BIT 0: SPDI_EN - always true */ /* BIT 0: SPDI_EN - always true */
{ /* BIT 1: SPDIFS */ { /* BIT 1: SPDIFS */
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
...@@ -2357,7 +2357,7 @@ static const snd_kcontrol_new_t snd_ac97_cm9739_controls_spdif[] = { ...@@ -2357,7 +2357,7 @@ static const snd_kcontrol_new_t snd_ac97_cm9739_controls_spdif[] = {
/* BIT 8: SPD32 - 32bit SPDIF - not supported yet */ /* BIT 8: SPD32 - 32bit SPDIF - not supported yet */
}; };
static void cm9739_update_jacks(ac97_t *ac97) static void cm9739_update_jacks(struct snd_ac97 *ac97)
{ {
/* shared Line-In */ /* shared Line-In */
snd_ac97_update_bits(ac97, AC97_CM9739_MULTI_CHAN, 1 << 10, snd_ac97_update_bits(ac97, AC97_CM9739_MULTI_CHAN, 1 << 10,
...@@ -2367,17 +2367,17 @@ static void cm9739_update_jacks(ac97_t *ac97) ...@@ -2367,17 +2367,17 @@ static void cm9739_update_jacks(ac97_t *ac97)
is_shared_micin(ac97) ? 0x1000 : 0x2000); is_shared_micin(ac97) ? 0x1000 : 0x2000);
} }
static const snd_kcontrol_new_t snd_ac97_cm9739_controls[] = { static const struct snd_kcontrol_new snd_ac97_cm9739_controls[] = {
AC97_SURROUND_JACK_MODE_CTL, AC97_SURROUND_JACK_MODE_CTL,
AC97_CHANNEL_MODE_CTL, AC97_CHANNEL_MODE_CTL,
}; };
static int patch_cm9739_specific(ac97_t * ac97) static int patch_cm9739_specific(struct snd_ac97 * ac97)
{ {
return patch_build_controls(ac97, snd_ac97_cm9739_controls, ARRAY_SIZE(snd_ac97_cm9739_controls)); return patch_build_controls(ac97, snd_ac97_cm9739_controls, ARRAY_SIZE(snd_ac97_cm9739_controls));
} }
static int patch_cm9739_post_spdif(ac97_t * ac97) static int patch_cm9739_post_spdif(struct snd_ac97 * ac97)
{ {
return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif)); return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif));
} }
...@@ -2388,7 +2388,7 @@ static struct snd_ac97_build_ops patch_cm9739_ops = { ...@@ -2388,7 +2388,7 @@ static struct snd_ac97_build_ops patch_cm9739_ops = {
.update_jacks = cm9739_update_jacks .update_jacks = cm9739_update_jacks
}; };
int patch_cm9739(ac97_t * ac97) int patch_cm9739(struct snd_ac97 * ac97)
{ {
unsigned short val; unsigned short val;
...@@ -2447,7 +2447,7 @@ int patch_cm9739(ac97_t * ac97) ...@@ -2447,7 +2447,7 @@ int patch_cm9739(ac97_t * ac97)
#define AC97_CM9761_FUNC 0x66 #define AC97_CM9761_FUNC 0x66
#define AC97_CM9761_SPDIF_CTRL 0x6c #define AC97_CM9761_SPDIF_CTRL 0x6c
static void cm9761_update_jacks(ac97_t *ac97) static void cm9761_update_jacks(struct snd_ac97 *ac97)
{ {
/* FIXME: check the bits for each model /* FIXME: check the bits for each model
* model 83 is confirmed to work * model 83 is confirmed to work
...@@ -2482,12 +2482,12 @@ static void cm9761_update_jacks(ac97_t *ac97) ...@@ -2482,12 +2482,12 @@ static void cm9761_update_jacks(ac97_t *ac97)
snd_ac97_update_bits(ac97, AC97_CM9761_MULTI_CHAN, 0x3c88, val); snd_ac97_update_bits(ac97, AC97_CM9761_MULTI_CHAN, 0x3c88, val);
} }
static const snd_kcontrol_new_t snd_ac97_cm9761_controls[] = { static const struct snd_kcontrol_new snd_ac97_cm9761_controls[] = {
AC97_SURROUND_JACK_MODE_CTL, AC97_SURROUND_JACK_MODE_CTL,
AC97_CHANNEL_MODE_CTL, AC97_CHANNEL_MODE_CTL,
}; };
static int cm9761_spdif_out_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int cm9761_spdif_out_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[] = { "AC-Link", "ADC", "SPDIF-In" }; static char *texts[] = { "AC-Link", "ADC", "SPDIF-In" };
...@@ -2500,9 +2500,9 @@ static int cm9761_spdif_out_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_i ...@@ -2500,9 +2500,9 @@ static int cm9761_spdif_out_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_i
return 0; return 0;
} }
static int cm9761_spdif_out_source_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int cm9761_spdif_out_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
if (ac97->regs[AC97_CM9761_FUNC] & 0x1) if (ac97->regs[AC97_CM9761_FUNC] & 0x1)
ucontrol->value.enumerated.item[0] = 2; /* SPDIF-loopback */ ucontrol->value.enumerated.item[0] = 2; /* SPDIF-loopback */
...@@ -2513,9 +2513,9 @@ static int cm9761_spdif_out_source_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_va ...@@ -2513,9 +2513,9 @@ static int cm9761_spdif_out_source_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_va
return 0; return 0;
} }
static int cm9761_spdif_out_source_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int cm9761_spdif_out_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol); struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
if (ucontrol->value.enumerated.item[0] == 2) if (ucontrol->value.enumerated.item[0] == 2)
return snd_ac97_update_bits(ac97, AC97_CM9761_FUNC, 0x1, 0x1); return snd_ac97_update_bits(ac97, AC97_CM9761_FUNC, 0x1, 0x1);
...@@ -2528,7 +2528,7 @@ static const char *cm9761_dac_clock[] = { "AC-Link", "SPDIF-In", "Both" }; ...@@ -2528,7 +2528,7 @@ static const char *cm9761_dac_clock[] = { "AC-Link", "SPDIF-In", "Both" };
static const struct ac97_enum cm9761_dac_clock_enum = static const struct ac97_enum cm9761_dac_clock_enum =
AC97_ENUM_SINGLE(AC97_CM9761_SPDIF_CTRL, 9, 3, cm9761_dac_clock); AC97_ENUM_SINGLE(AC97_CM9761_SPDIF_CTRL, 9, 3, cm9761_dac_clock);
static const snd_kcontrol_new_t snd_ac97_cm9761_controls_spdif[] = { static const struct snd_kcontrol_new snd_ac97_cm9761_controls_spdif[] = {
{ /* BIT 1: SPDIFS */ { /* BIT 1: SPDIFS */
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
...@@ -2546,12 +2546,12 @@ static const snd_kcontrol_new_t snd_ac97_cm9761_controls_spdif[] = { ...@@ -2546,12 +2546,12 @@ static const snd_kcontrol_new_t snd_ac97_cm9761_controls_spdif[] = {
AC97_ENUM("DAC Clock Source", cm9761_dac_clock_enum), AC97_ENUM("DAC Clock Source", cm9761_dac_clock_enum),
}; };
static int patch_cm9761_post_spdif(ac97_t * ac97) static int patch_cm9761_post_spdif(struct snd_ac97 * ac97)
{ {
return patch_build_controls(ac97, snd_ac97_cm9761_controls_spdif, ARRAY_SIZE(snd_ac97_cm9761_controls_spdif)); return patch_build_controls(ac97, snd_ac97_cm9761_controls_spdif, ARRAY_SIZE(snd_ac97_cm9761_controls_spdif));
} }
static int patch_cm9761_specific(ac97_t * ac97) static int patch_cm9761_specific(struct snd_ac97 * ac97)
{ {
return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls)); return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));
} }
...@@ -2562,7 +2562,7 @@ static struct snd_ac97_build_ops patch_cm9761_ops = { ...@@ -2562,7 +2562,7 @@ static struct snd_ac97_build_ops patch_cm9761_ops = {
.update_jacks = cm9761_update_jacks .update_jacks = cm9761_update_jacks
}; };
int patch_cm9761(ac97_t *ac97) int patch_cm9761(struct snd_ac97 *ac97)
{ {
unsigned short val; unsigned short val;
...@@ -2641,13 +2641,13 @@ int patch_cm9761(ac97_t *ac97) ...@@ -2641,13 +2641,13 @@ int patch_cm9761(ac97_t *ac97)
static const char *cm9780_ch_select[] = { "Front", "Side", "Center/LFE", "Rear" }; static const char *cm9780_ch_select[] = { "Front", "Side", "Center/LFE", "Rear" };
static const struct ac97_enum cm9780_ch_select_enum = static const struct ac97_enum cm9780_ch_select_enum =
AC97_ENUM_SINGLE(AC97_CM9780_MULTI_CHAN, 6, 4, cm9780_ch_select); AC97_ENUM_SINGLE(AC97_CM9780_MULTI_CHAN, 6, 4, cm9780_ch_select);
static const snd_kcontrol_new_t cm9780_controls[] = { static const struct snd_kcontrol_new cm9780_controls[] = {
AC97_DOUBLE("Side Playback Switch", AC97_CM9780_SIDE, 15, 7, 1, 1), AC97_DOUBLE("Side Playback Switch", AC97_CM9780_SIDE, 15, 7, 1, 1),
AC97_DOUBLE("Side Playback Volume", AC97_CM9780_SIDE, 8, 0, 31, 0), AC97_DOUBLE("Side Playback Volume", AC97_CM9780_SIDE, 8, 0, 31, 0),
AC97_ENUM("Side Playback Route", cm9780_ch_select_enum), AC97_ENUM("Side Playback Route", cm9780_ch_select_enum),
}; };
static int patch_cm9780_specific(ac97_t *ac97) static int patch_cm9780_specific(struct snd_ac97 *ac97)
{ {
return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls)); return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));
} }
...@@ -2657,7 +2657,7 @@ static struct snd_ac97_build_ops patch_cm9780_ops = { ...@@ -2657,7 +2657,7 @@ static struct snd_ac97_build_ops patch_cm9780_ops = {
.build_post_spdif = patch_cm9761_post_spdif /* identical with CM9761 */ .build_post_spdif = patch_cm9761_post_spdif /* identical with CM9761 */
}; };
int patch_cm9780(ac97_t *ac97) int patch_cm9780(struct snd_ac97 *ac97)
{ {
unsigned short val; unsigned short val;
...@@ -2677,14 +2677,14 @@ int patch_cm9780(ac97_t *ac97) ...@@ -2677,14 +2677,14 @@ int patch_cm9780(ac97_t *ac97)
/* /*
* VIA VT1616 codec * VIA VT1616 codec
*/ */
static const snd_kcontrol_new_t snd_ac97_controls_vt1616[] = { static const struct snd_kcontrol_new snd_ac97_controls_vt1616[] = {
AC97_SINGLE("DC Offset removal", 0x5a, 10, 1, 0), AC97_SINGLE("DC Offset removal", 0x5a, 10, 1, 0),
AC97_SINGLE("Alternate Level to Surround Out", 0x5a, 15, 1, 0), AC97_SINGLE("Alternate Level to Surround Out", 0x5a, 15, 1, 0),
AC97_SINGLE("Downmix LFE and Center to Front", 0x5a, 12, 1, 0), AC97_SINGLE("Downmix LFE and Center to Front", 0x5a, 12, 1, 0),
AC97_SINGLE("Downmix Surround to Front", 0x5a, 11, 1, 0), AC97_SINGLE("Downmix Surround to Front", 0x5a, 11, 1, 0),
}; };
static int patch_vt1616_specific(ac97_t * ac97) static int patch_vt1616_specific(struct snd_ac97 * ac97)
{ {
int err; int err;
...@@ -2700,7 +2700,7 @@ static struct snd_ac97_build_ops patch_vt1616_ops = { ...@@ -2700,7 +2700,7 @@ static struct snd_ac97_build_ops patch_vt1616_ops = {
.build_specific = patch_vt1616_specific .build_specific = patch_vt1616_specific
}; };
int patch_vt1616(ac97_t * ac97) int patch_vt1616(struct snd_ac97 * ac97)
{ {
ac97->build_ops = &patch_vt1616_ops; ac97->build_ops = &patch_vt1616_ops;
return 0; return 0;
...@@ -2709,7 +2709,7 @@ int patch_vt1616(ac97_t * ac97) ...@@ -2709,7 +2709,7 @@ int patch_vt1616(ac97_t * ac97)
/* /*
* VT1617A codec * VT1617A codec
*/ */
int patch_vt1617a(ac97_t * ac97) int patch_vt1617a(struct snd_ac97 * ac97)
{ {
ac97->ext_id |= AC97_EI_SPDIF; /* force the detection of spdif */ ac97->ext_id |= AC97_EI_SPDIF; /* force the detection of spdif */
ac97->rates[AC97_RATES_SPDIF] = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000; ac97->rates[AC97_RATES_SPDIF] = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000;
...@@ -2718,7 +2718,7 @@ int patch_vt1617a(ac97_t * ac97) ...@@ -2718,7 +2718,7 @@ int patch_vt1617a(ac97_t * ac97)
/* /*
*/ */
static void it2646_update_jacks(ac97_t *ac97) static void it2646_update_jacks(struct snd_ac97 *ac97)
{ {
/* shared Line-In */ /* shared Line-In */
snd_ac97_update_bits(ac97, 0x76, 1 << 9, snd_ac97_update_bits(ac97, 0x76, 1 << 9,
...@@ -2728,18 +2728,18 @@ static void it2646_update_jacks(ac97_t *ac97) ...@@ -2728,18 +2728,18 @@ static void it2646_update_jacks(ac97_t *ac97)
is_shared_micin(ac97) ? (1<<10) : 0); is_shared_micin(ac97) ? (1<<10) : 0);
} }
static const snd_kcontrol_new_t snd_ac97_controls_it2646[] = { static const struct snd_kcontrol_new snd_ac97_controls_it2646[] = {
AC97_SURROUND_JACK_MODE_CTL, AC97_SURROUND_JACK_MODE_CTL,
AC97_CHANNEL_MODE_CTL, AC97_CHANNEL_MODE_CTL,
}; };
static const snd_kcontrol_new_t snd_ac97_spdif_controls_it2646[] = { static const struct snd_kcontrol_new snd_ac97_spdif_controls_it2646[] = {
AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0x76, 11, 1, 0), AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0x76, 11, 1, 0),
AC97_SINGLE("Analog to IEC958 Output", 0x76, 12, 1, 0), AC97_SINGLE("Analog to IEC958 Output", 0x76, 12, 1, 0),
AC97_SINGLE("IEC958 Input Monitor", 0x76, 13, 1, 0), AC97_SINGLE("IEC958 Input Monitor", 0x76, 13, 1, 0),
}; };
static int patch_it2646_specific(ac97_t * ac97) static int patch_it2646_specific(struct snd_ac97 * ac97)
{ {
int err; int err;
if ((err = patch_build_controls(ac97, snd_ac97_controls_it2646, ARRAY_SIZE(snd_ac97_controls_it2646))) < 0) if ((err = patch_build_controls(ac97, snd_ac97_controls_it2646, ARRAY_SIZE(snd_ac97_controls_it2646))) < 0)
...@@ -2754,7 +2754,7 @@ static struct snd_ac97_build_ops patch_it2646_ops = { ...@@ -2754,7 +2754,7 @@ static struct snd_ac97_build_ops patch_it2646_ops = {
.update_jacks = it2646_update_jacks .update_jacks = it2646_update_jacks
}; };
int patch_it2646(ac97_t * ac97) int patch_it2646(struct snd_ac97 * ac97)
{ {
ac97->build_ops = &patch_it2646_ops; ac97->build_ops = &patch_it2646_ops;
/* full DAC volume */ /* full DAC volume */
...@@ -2770,11 +2770,11 @@ int patch_it2646(ac97_t * ac97) ...@@ -2770,11 +2770,11 @@ int patch_it2646(ac97_t * ac97)
#define AC97_SI3036_CHIP_ID 0x5a #define AC97_SI3036_CHIP_ID 0x5a
#define AC97_SI3036_LINE_CFG 0x5c #define AC97_SI3036_LINE_CFG 0x5c
static const snd_kcontrol_new_t snd_ac97_controls_si3036[] = { static const struct snd_kcontrol_new snd_ac97_controls_si3036[] = {
AC97_DOUBLE("Modem Speaker Volume", 0x5c, 14, 12, 3, 1) AC97_DOUBLE("Modem Speaker Volume", 0x5c, 14, 12, 3, 1)
}; };
static int patch_si3036_specific(ac97_t * ac97) static int patch_si3036_specific(struct snd_ac97 * ac97)
{ {
int idx, err; int idx, err;
for (idx = 0; idx < ARRAY_SIZE(snd_ac97_controls_si3036); idx++) for (idx = 0; idx < ARRAY_SIZE(snd_ac97_controls_si3036); idx++)
...@@ -2787,7 +2787,7 @@ static struct snd_ac97_build_ops patch_si3036_ops = { ...@@ -2787,7 +2787,7 @@ static struct snd_ac97_build_ops patch_si3036_ops = {
.build_specific = patch_si3036_specific, .build_specific = patch_si3036_specific,
}; };
int mpatch_si3036(ac97_t * ac97) int mpatch_si3036(struct snd_ac97 * ac97)
{ {
ac97->build_ops = &patch_si3036_ops; ac97->build_ops = &patch_si3036_ops;
snd_ac97_write_cache(ac97, 0x5c, 0xf210 ); snd_ac97_write_cache(ac97, 0x5c, 0xf210 );
......
sound/pci/ac97/ac97_patch.h
View file @ ee42381e
...@@ -22,40 +22,40 @@ ...@@ -22,40 +22,40 @@
* *
*/ */
int patch_yamaha_ymf753(ac97_t * ac97); int patch_yamaha_ymf753(struct snd_ac97 * ac97);
int patch_wolfson00(ac97_t * ac97); int patch_wolfson00(struct snd_ac97 * ac97);
int patch_wolfson03(ac97_t * ac97); int patch_wolfson03(struct snd_ac97 * ac97);
int patch_wolfson04(ac97_t * ac97); int patch_wolfson04(struct snd_ac97 * ac97);
int patch_wolfson05(ac97_t * ac97); int patch_wolfson05(struct snd_ac97 * ac97);
int patch_wolfson11(ac97_t * ac97); int patch_wolfson11(struct snd_ac97 * ac97);
int patch_wolfson13(ac97_t * ac97); int patch_wolfson13(struct snd_ac97 * ac97);
int patch_tritech_tr28028(ac97_t * ac97); int patch_tritech_tr28028(struct snd_ac97 * ac97);
int patch_sigmatel_stac9700(ac97_t * ac97); int patch_sigmatel_stac9700(struct snd_ac97 * ac97);
int patch_sigmatel_stac9708(ac97_t * ac97); int patch_sigmatel_stac9708(struct snd_ac97 * ac97);
int patch_sigmatel_stac9721(ac97_t * ac97); int patch_sigmatel_stac9721(struct snd_ac97 * ac97);
int patch_sigmatel_stac9744(ac97_t * ac97); int patch_sigmatel_stac9744(struct snd_ac97 * ac97);
int patch_sigmatel_stac9756(ac97_t * ac97); int patch_sigmatel_stac9756(struct snd_ac97 * ac97);
int patch_sigmatel_stac9758(ac97_t * ac97); int patch_sigmatel_stac9758(struct snd_ac97 * ac97);
int patch_cirrus_cs4299(ac97_t * ac97); int patch_cirrus_cs4299(struct snd_ac97 * ac97);
int patch_cirrus_spdif(ac97_t * ac97); int patch_cirrus_spdif(struct snd_ac97 * ac97);
int patch_conexant(ac97_t * ac97); int patch_conexant(struct snd_ac97 * ac97);
int patch_ad1819(ac97_t * ac97); int patch_ad1819(struct snd_ac97 * ac97);
int patch_ad1881(ac97_t * ac97); int patch_ad1881(struct snd_ac97 * ac97);
int patch_ad1885(ac97_t * ac97); int patch_ad1885(struct snd_ac97 * ac97);
int patch_ad1886(ac97_t * ac97); int patch_ad1886(struct snd_ac97 * ac97);
int patch_ad1888(ac97_t * ac97); int patch_ad1888(struct snd_ac97 * ac97);
int patch_ad1980(ac97_t * ac97); int patch_ad1980(struct snd_ac97 * ac97);
int patch_ad1981a(ac97_t * ac97); int patch_ad1981a(struct snd_ac97 * ac97);
int patch_ad1981b(ac97_t * ac97); int patch_ad1981b(struct snd_ac97 * ac97);
int patch_ad1985(ac97_t * ac97); int patch_ad1985(struct snd_ac97 * ac97);
int patch_alc650(ac97_t * ac97); int patch_alc650(struct snd_ac97 * ac97);
int patch_alc655(ac97_t * ac97); int patch_alc655(struct snd_ac97 * ac97);
int patch_alc850(ac97_t * ac97); int patch_alc850(struct snd_ac97 * ac97);
int patch_cm9738(ac97_t * ac97); int patch_cm9738(struct snd_ac97 * ac97);
int patch_cm9739(ac97_t * ac97); int patch_cm9739(struct snd_ac97 * ac97);
int patch_cm9761(ac97_t * ac97); int patch_cm9761(struct snd_ac97 * ac97);
int patch_cm9780(ac97_t * ac97); int patch_cm9780(struct snd_ac97 * ac97);
int patch_vt1616(ac97_t * ac97); int patch_vt1616(struct snd_ac97 * ac97);
int patch_vt1617a(ac97_t * ac97); int patch_vt1617a(struct snd_ac97 * ac97);
int patch_it2646(ac97_t * ac97); int patch_it2646(struct snd_ac97 * ac97);
int mpatch_si3036(ac97_t * ac97); int mpatch_si3036(struct snd_ac97 * ac97);
sound/pci/ac97/ac97_pcm.c
View file @ ee42381e
...@@ -170,7 +170,7 @@ static unsigned char get_slot_reg(struct ac97_pcm *pcm, unsigned short cidx, ...@@ -170,7 +170,7 @@ static unsigned char get_slot_reg(struct ac97_pcm *pcm, unsigned short cidx,
return rate_cregs[slot - 3]; return rate_cregs[slot - 3];
} }
static int set_spdif_rate(ac97_t *ac97, unsigned short rate) static int set_spdif_rate(struct snd_ac97 *ac97, unsigned short rate)
{ {
unsigned short old, bits, reg, mask; unsigned short old, bits, reg, mask;
unsigned int sbits; unsigned int sbits;
...@@ -254,7 +254,7 @@ static int set_spdif_rate(ac97_t *ac97, unsigned short rate) ...@@ -254,7 +254,7 @@ static int set_spdif_rate(ac97_t *ac97, unsigned short rate)
* *
* Returns zero if successful, or a negative error code on failure. * Returns zero if successful, or a negative error code on failure.
*/ */
int snd_ac97_set_rate(ac97_t *ac97, int reg, unsigned int rate) int snd_ac97_set_rate(struct snd_ac97 *ac97, int reg, unsigned int rate)
{ {
int dbl; int dbl;
unsigned int tmp; unsigned int tmp;
...@@ -315,7 +315,7 @@ int snd_ac97_set_rate(ac97_t *ac97, int reg, unsigned int rate) ...@@ -315,7 +315,7 @@ int snd_ac97_set_rate(ac97_t *ac97, int reg, unsigned int rate)
return 0; return 0;
} }
static unsigned short get_pslots(ac97_t *ac97, unsigned char *rate_table, unsigned short *spdif_slots) static unsigned short get_pslots(struct snd_ac97 *ac97, unsigned char *rate_table, unsigned short *spdif_slots)
{ {
if (!ac97_is_audio(ac97)) if (!ac97_is_audio(ac97))
return 0; return 0;
...@@ -390,7 +390,7 @@ static unsigned short get_pslots(ac97_t *ac97, unsigned char *rate_table, unsign ...@@ -390,7 +390,7 @@ static unsigned short get_pslots(ac97_t *ac97, unsigned char *rate_table, unsign
} }
} }
static unsigned short get_cslots(ac97_t *ac97) static unsigned short get_cslots(struct snd_ac97 *ac97)
{ {
unsigned short slots; unsigned short slots;
...@@ -437,7 +437,7 @@ static unsigned int get_rates(struct ac97_pcm *pcm, unsigned int cidx, unsigned ...@@ -437,7 +437,7 @@ static unsigned int get_rates(struct ac97_pcm *pcm, unsigned int cidx, unsigned
* some slots are available, pcm->xxx.slots and pcm->xxx.rslots[] members * some slots are available, pcm->xxx.slots and pcm->xxx.rslots[] members
* are reduced and might be zero. * are reduced and might be zero.
*/ */
int snd_ac97_pcm_assign(ac97_bus_t *bus, int snd_ac97_pcm_assign(struct snd_ac97_bus *bus,
unsigned short pcms_count, unsigned short pcms_count,
const struct ac97_pcm *pcms) const struct ac97_pcm *pcms)
{ {
...@@ -449,7 +449,7 @@ int snd_ac97_pcm_assign(ac97_bus_t *bus, ...@@ -449,7 +449,7 @@ int snd_ac97_pcm_assign(ac97_bus_t *bus,
unsigned short tmp, slots; unsigned short tmp, slots;
unsigned short spdif_slots[4]; unsigned short spdif_slots[4];
unsigned int rates; unsigned int rates;
ac97_t *codec; struct snd_ac97 *codec;
rpcms = kcalloc(pcms_count, sizeof(struct ac97_pcm), GFP_KERNEL); rpcms = kcalloc(pcms_count, sizeof(struct ac97_pcm), GFP_KERNEL);
if (rpcms == NULL) if (rpcms == NULL)
...@@ -560,7 +560,7 @@ int snd_ac97_pcm_assign(ac97_bus_t *bus, ...@@ -560,7 +560,7 @@ int snd_ac97_pcm_assign(ac97_bus_t *bus,
int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate, int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate,
enum ac97_pcm_cfg cfg, unsigned short slots) enum ac97_pcm_cfg cfg, unsigned short slots)
{ {
ac97_bus_t *bus; struct snd_ac97_bus *bus;
int i, cidx, r, ok_flag; int i, cidx, r, ok_flag;
unsigned int reg_ok[4] = {0,0,0,0}; unsigned int reg_ok[4] = {0,0,0,0};
unsigned char reg; unsigned char reg;
...@@ -639,7 +639,7 @@ int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate, ...@@ -639,7 +639,7 @@ int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate,
*/ */
int snd_ac97_pcm_close(struct ac97_pcm *pcm) int snd_ac97_pcm_close(struct ac97_pcm *pcm)
{ {
ac97_bus_t *bus; struct snd_ac97_bus *bus;
unsigned short slots = pcm->aslots; unsigned short slots = pcm->aslots;
int i, cidx; int i, cidx;
...@@ -656,31 +656,31 @@ int snd_ac97_pcm_close(struct ac97_pcm *pcm) ...@@ -656,31 +656,31 @@ int snd_ac97_pcm_close(struct ac97_pcm *pcm)
return 0; return 0;
} }
static int double_rate_hw_constraint_rate(snd_pcm_hw_params_t *params, static int double_rate_hw_constraint_rate(struct snd_pcm_hw_params *params,
snd_pcm_hw_rule_t *rule) struct snd_pcm_hw_rule *rule)
{ {
snd_interval_t *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
if (channels->min > 2) { if (channels->min > 2) {
static const snd_interval_t single_rates = { static const struct snd_interval single_rates = {
.min = 1, .min = 1,
.max = 48000, .max = 48000,
}; };
snd_interval_t *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE); struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
return snd_interval_refine(rate, &single_rates); return snd_interval_refine(rate, &single_rates);
} }
return 0; return 0;
} }
static int double_rate_hw_constraint_channels(snd_pcm_hw_params_t *params, static int double_rate_hw_constraint_channels(struct snd_pcm_hw_params *params,
snd_pcm_hw_rule_t *rule) struct snd_pcm_hw_rule *rule)
{ {
snd_interval_t *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE); struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
if (rate->min > 48000) { if (rate->min > 48000) {
static const snd_interval_t double_rate_channels = { static const struct snd_interval double_rate_channels = {
.min = 2, .min = 2,
.max = 2, .max = 2,
}; };
snd_interval_t *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
return snd_interval_refine(channels, &double_rate_channels); return snd_interval_refine(channels, &double_rate_channels);
} }
return 0; return 0;
...@@ -693,7 +693,7 @@ static int double_rate_hw_constraint_channels(snd_pcm_hw_params_t *params, ...@@ -693,7 +693,7 @@ static int double_rate_hw_constraint_channels(snd_pcm_hw_params_t *params,
* Installs the hardware constraint rules to prevent using double rates and * Installs the hardware constraint rules to prevent using double rates and
* more than two channels at the same time. * more than two channels at the same time.
*/ */
int snd_ac97_pcm_double_rate_rules(snd_pcm_runtime_t *runtime) int snd_ac97_pcm_double_rate_rules(struct snd_pcm_runtime *runtime)
{ {
int err; int err;
......
sound/pci/ac97/ac97_proc.c
View file @ ee42381e
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
* proc interface * proc interface
*/ */
static void snd_ac97_proc_read_functions(ac97_t *ac97, snd_info_buffer_t *buffer) static void snd_ac97_proc_read_functions(struct snd_ac97 *ac97, struct snd_info_buffer *buffer)
{ {
int header = 0, function; int header = 0, function;
unsigned short info, sense_info; unsigned short info, sense_info;
...@@ -68,7 +68,7 @@ static void snd_ac97_proc_read_functions(ac97_t *ac97, snd_info_buffer_t *buffer ...@@ -68,7 +68,7 @@ static void snd_ac97_proc_read_functions(ac97_t *ac97, snd_info_buffer_t *buffer
} }
} }
static void snd_ac97_proc_read_main(ac97_t *ac97, snd_info_buffer_t * buffer, int subidx) static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffer *buffer, int subidx)
{ {
char name[64]; char name[64];
unsigned short val, tmp, ext, mext; unsigned short val, tmp, ext, mext;
...@@ -80,7 +80,6 @@ static void snd_ac97_proc_read_main(ac97_t *ac97, snd_info_buffer_t * buffer, in ...@@ -80,7 +80,6 @@ static void snd_ac97_proc_read_main(ac97_t *ac97, snd_info_buffer_t * buffer, in
snd_ac97_get_name(NULL, ac97->id, name, 0); snd_ac97_get_name(NULL, ac97->id, name, 0);
snd_iprintf(buffer, "%d-%d/%d: %s\n\n", ac97->addr, ac97->num, subidx, name); snd_iprintf(buffer, "%d-%d/%d: %s\n\n", ac97->addr, ac97->num, subidx, name);
if ((ac97->scaps & AC97_SCAP_AUDIO) == 0) if ((ac97->scaps & AC97_SCAP_AUDIO) == 0)
goto __modem; goto __modem;
...@@ -299,9 +298,9 @@ static void snd_ac97_proc_read_main(ac97_t *ac97, snd_info_buffer_t * buffer, in ...@@ -299,9 +298,9 @@ static void snd_ac97_proc_read_main(ac97_t *ac97, snd_info_buffer_t * buffer, in
} }
} }
static void snd_ac97_proc_read(snd_info_entry_t *entry, snd_info_buffer_t * buffer) static void snd_ac97_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
{ {
ac97_t *ac97 = entry->private_data; struct snd_ac97 *ac97 = entry->private_data;
down(&ac97->page_mutex); down(&ac97->page_mutex);
if ((ac97->id & 0xffffff40) == AC97_ID_AD1881) { // Analog Devices AD1881/85/86 if ((ac97->id & 0xffffff40) == AC97_ID_AD1881) { // Analog Devices AD1881/85/86
...@@ -334,9 +333,9 @@ static void snd_ac97_proc_read(snd_info_entry_t *entry, snd_info_buffer_t * buff ...@@ -334,9 +333,9 @@ static void snd_ac97_proc_read(snd_info_entry_t *entry, snd_info_buffer_t * buff
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
/* direct register write for debugging */ /* direct register write for debugging */
static void snd_ac97_proc_regs_write(snd_info_entry_t *entry, snd_info_buffer_t *buffer) static void snd_ac97_proc_regs_write(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
{ {
ac97_t *ac97 = entry->private_data; struct snd_ac97 *ac97 = entry->private_data;
char line[64]; char line[64];
unsigned int reg, val; unsigned int reg, val;
down(&ac97->page_mutex); down(&ac97->page_mutex);
...@@ -351,7 +350,7 @@ static void snd_ac97_proc_regs_write(snd_info_entry_t *entry, snd_info_buffer_t ...@@ -351,7 +350,7 @@ static void snd_ac97_proc_regs_write(snd_info_entry_t *entry, snd_info_buffer_t
} }
#endif #endif
static void snd_ac97_proc_regs_read_main(ac97_t *ac97, snd_info_buffer_t * buffer, int subidx) static void snd_ac97_proc_regs_read_main(struct snd_ac97 *ac97, struct snd_info_buffer *buffer, int subidx)
{ {
int reg, val; int reg, val;
...@@ -361,10 +360,10 @@ static void snd_ac97_proc_regs_read_main(ac97_t *ac97, snd_info_buffer_t * buffe ...@@ -361,10 +360,10 @@ static void snd_ac97_proc_regs_read_main(ac97_t *ac97, snd_info_buffer_t * buffe
} }
} }
static void snd_ac97_proc_regs_read(snd_info_entry_t *entry, static void snd_ac97_proc_regs_read(struct snd_info_entry *entry,
snd_info_buffer_t * buffer) struct snd_info_buffer *buffer)
{ {
ac97_t *ac97 = entry->private_data; struct snd_ac97 *ac97 = entry->private_data;
down(&ac97->page_mutex); down(&ac97->page_mutex);
if ((ac97->id & 0xffffff40) == AC97_ID_AD1881) { // Analog Devices AD1881/85/86 if ((ac97->id & 0xffffff40) == AC97_ID_AD1881) { // Analog Devices AD1881/85/86
...@@ -385,9 +384,9 @@ static void snd_ac97_proc_regs_read(snd_info_entry_t *entry, ...@@ -385,9 +384,9 @@ static void snd_ac97_proc_regs_read(snd_info_entry_t *entry,
up(&ac97->page_mutex); up(&ac97->page_mutex);
} }
void snd_ac97_proc_init(ac97_t * ac97) void snd_ac97_proc_init(struct snd_ac97 * ac97)
{ {
snd_info_entry_t *entry; struct snd_info_entry *entry;
char name[32]; char name[32];
const char *prefix; const char *prefix;
...@@ -419,7 +418,7 @@ void snd_ac97_proc_init(ac97_t * ac97) ...@@ -419,7 +418,7 @@ void snd_ac97_proc_init(ac97_t * ac97)
ac97->proc_regs = entry; ac97->proc_regs = entry;
} }
void snd_ac97_proc_done(ac97_t * ac97) void snd_ac97_proc_done(struct snd_ac97 * ac97)
{ {
if (ac97->proc_regs) { if (ac97->proc_regs) {
snd_info_unregister(ac97->proc_regs); snd_info_unregister(ac97->proc_regs);
...@@ -431,9 +430,9 @@ void snd_ac97_proc_done(ac97_t * ac97) ...@@ -431,9 +430,9 @@ void snd_ac97_proc_done(ac97_t * ac97)
} }
} }
void snd_ac97_bus_proc_init(ac97_bus_t * bus) void snd_ac97_bus_proc_init(struct snd_ac97_bus * bus)
{ {
snd_info_entry_t *entry; struct snd_info_entry *entry;
char name[32]; char name[32];
sprintf(name, "codec97#%d", bus->num); sprintf(name, "codec97#%d", bus->num);
...@@ -447,7 +446,7 @@ void snd_ac97_bus_proc_init(ac97_bus_t * bus) ...@@ -447,7 +446,7 @@ void snd_ac97_bus_proc_init(ac97_bus_t * bus)
bus->proc = entry; bus->proc = entry;
} }
void snd_ac97_bus_proc_done(ac97_bus_t * bus) void snd_ac97_bus_proc_done(struct snd_ac97_bus * bus)
{ {
if (bus->proc) { if (bus->proc) {
snd_info_unregister(bus->proc); snd_info_unregister(bus->proc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7