diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-03-19 03:17:33 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:27 -0400 |
| commit | fa5d8106cb52e5df28673f59cc25af520dc83382 (patch) | |
| tree | b00c97309fddb285ff0ba5e61957ecaad4e46504 /sound/pci/oxygen/oxygen_lib.c | |
| parent | 33fa724e291d3cc6c319f7db487e6e084ef5d4b5 (diff) | |
[ALSA] oxygen: add monitor controls
Add controls to enable monitoring of the analog and digital inputs.
To allow monitoring after loading the driver when nothing has been
played back or recorded yet, the I2S input and outputs are initialized
to a valid configuration.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen_lib.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index 78c21155218e..a1abb50eedb5 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c | |||
| @@ -267,20 +267,20 @@ static void oxygen_init(struct oxygen *chip) | |||
| 267 | (OXYGEN_FORMAT_16 << OXYGEN_MULTICH_FORMAT_SHIFT)); | 267 | (OXYGEN_FORMAT_16 << OXYGEN_MULTICH_FORMAT_SHIFT)); |
| 268 | oxygen_write8(chip, OXYGEN_REC_CHANNELS, OXYGEN_REC_CHANNELS_2_2_2); | 268 | oxygen_write8(chip, OXYGEN_REC_CHANNELS, OXYGEN_REC_CHANNELS_2_2_2); |
| 269 | oxygen_write16(chip, OXYGEN_I2S_MULTICH_FORMAT, | 269 | oxygen_write16(chip, OXYGEN_I2S_MULTICH_FORMAT, |
| 270 | OXYGEN_RATE_48000 | OXYGEN_I2S_FORMAT_LJUST | | 270 | OXYGEN_RATE_48000 | chip->model->dac_i2s_format | |
| 271 | OXYGEN_I2S_MCLK_128 | OXYGEN_I2S_BITS_16 | | 271 | OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 | |
| 272 | OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64); | 272 | OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64); |
| 273 | oxygen_write16(chip, OXYGEN_I2S_A_FORMAT, | 273 | oxygen_write16(chip, OXYGEN_I2S_A_FORMAT, |
| 274 | OXYGEN_RATE_48000 | OXYGEN_I2S_FORMAT_LJUST | | 274 | OXYGEN_RATE_48000 | chip->model->adc_i2s_format | |
| 275 | OXYGEN_I2S_MCLK_128 | OXYGEN_I2S_BITS_16 | | 275 | OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 | |
| 276 | OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64); | 276 | OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64); |
| 277 | oxygen_write16(chip, OXYGEN_I2S_B_FORMAT, | 277 | oxygen_write16(chip, OXYGEN_I2S_B_FORMAT, |
| 278 | OXYGEN_RATE_48000 | OXYGEN_I2S_FORMAT_LJUST | | 278 | OXYGEN_RATE_48000 | chip->model->adc_i2s_format | |
| 279 | OXYGEN_I2S_MCLK_128 | OXYGEN_I2S_BITS_16 | | 279 | OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 | |
| 280 | OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64); | 280 | OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64); |
| 281 | oxygen_write16(chip, OXYGEN_I2S_C_FORMAT, | 281 | oxygen_write16(chip, OXYGEN_I2S_C_FORMAT, |
| 282 | OXYGEN_RATE_48000 | OXYGEN_I2S_FORMAT_LJUST | | 282 | OXYGEN_RATE_48000 | chip->model->adc_i2s_format | |
| 283 | OXYGEN_I2S_MCLK_128 | OXYGEN_I2S_BITS_16 | | 283 | OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 | |
| 284 | OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64); | 284 | OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64); |
| 285 | oxygen_write32_masked(chip, OXYGEN_SPDIF_CONTROL, | 285 | oxygen_write32_masked(chip, OXYGEN_SPDIF_CONTROL, |
| 286 | OXYGEN_SPDIF_SENSE_MASK | | 286 | OXYGEN_SPDIF_SENSE_MASK | |