Skip to content

Commit

Permalink
[ALSA] ac97 - Allow drivers to set static volume resolution table
Browse files Browse the repository at this point in the history
Modules: AC97 Codec

Add the pointer to a static volume resolution table to ac97 template,
so that the drivers can define the volume resolution, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Mar 22, 2006
1 parent 4ccb4a4 commit 7c5706b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
13 changes: 7 additions & 6 deletions include/sound/ac97_codec.h
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,12 @@ struct snd_ac97_bus {
struct snd_info_entry *proc;
};

/* static resolution table */
struct snd_ac97_res_table {
unsigned short reg; /* register */
unsigned short bits; /* resolution bitmask */
};

struct snd_ac97_template {
void *private_data;
void (*private_free) (struct snd_ac97 *ac97);
Expand All @@ -442,12 +448,7 @@ struct snd_ac97_template {
unsigned int scaps; /* driver capabilities */
unsigned int limited_regs; /* allow limited registers only */
DECLARE_BITMAP(reg_accessed, 0x80); /* bit flags */
};

/* static resolution table */
struct snd_ac97_res_table {
unsigned short reg; /* register */
unsigned short bits; /* resolution bitmask */
const struct snd_ac97_res_table *res_table; /* static resolution */
};

struct snd_ac97 {
Expand Down
1 change: 1 addition & 0 deletions sound/pci/ac97/ac97_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1868,6 +1868,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
ac97->scaps = template->scaps;
ac97->limited_regs = template->limited_regs;
memcpy(ac97->reg_accessed, template->reg_accessed, sizeof(ac97->reg_accessed));
ac97->res_table = template->res_table;
bus->codec[ac97->num] = ac97;
mutex_init(&ac97->reg_mutex);
mutex_init(&ac97->page_mutex);
Expand Down

0 comments on commit 7c5706b

Please sign in to comment.