diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 15:56:52 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 15:56:52 +0100 |
| commit | 9e298f449e667833c4cafad040ce8025a8ba1eed (patch) | |
| tree | 5b05c9c36c305a99d4b6699427ab902b87db90fb /sound/pci/oxygen/oxygen.h | |
| parent | 2f703e7a2ea5f6d5ea14a7b2cd0d31be07839ac6 (diff) | |
| parent | 62428f7b8c873d43be8201e66392c3aad82fec93 (diff) | |
Merge branch 'topic/oxygen' into topic/hda
Diffstat (limited to 'sound/pci/oxygen/oxygen.h')
| -rw-r--r-- | sound/pci/oxygen/oxygen.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h index bd615dbffadb..6147216af744 100644 --- a/sound/pci/oxygen/oxygen.h +++ b/sound/pci/oxygen/oxygen.h @@ -78,12 +78,15 @@ struct oxygen_model { void (*resume)(struct oxygen *chip); void (*pcm_hardware_filter)(unsigned int channel, struct snd_pcm_hardware *hardware); + unsigned int (*get_i2s_mclk)(struct oxygen *chip, unsigned int channel, + struct snd_pcm_hw_params *hw_params); void (*set_dac_params)(struct oxygen *chip, struct snd_pcm_hw_params *params); void (*set_adc_params)(struct oxygen *chip, struct snd_pcm_hw_params *params); void (*update_dac_volume)(struct oxygen *chip); void (*update_dac_mute)(struct oxygen *chip); + void (*update_center_lfe_mix)(struct oxygen *chip, bool mixed); void (*gpio_changed)(struct oxygen *chip); void (*uart_input)(struct oxygen *chip); void (*ac97_switch)(struct oxygen *chip, @@ -162,6 +165,8 @@ void oxygen_update_spdif_source(struct oxygen *chip); /* oxygen_pcm.c */ int oxygen_pcm_init(struct oxygen *chip); +unsigned int oxygen_default_i2s_mclk(struct oxygen *chip, unsigned int channel, + struct snd_pcm_hw_params *hw_params); /* oxygen_io.c */ |