diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-03-19 08:19:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 12:00:28 +0200 |
| commit | f009ad9b39e6484d8e36e9e5029c07eab8c12e8f (patch) | |
| tree | 79b4bc6bb9c9b9cbf5a410fc8e83120b46bdb310 /sound/pci/oxygen/virtuoso.c | |
| parent | fa5d8106cb52e5df28673f59cc25af520dc83382 (diff) | |
| download | op-kernel-dev-f009ad9b39e6484d8e36e9e5029c07eab8c12e8f.zip op-kernel-dev-f009ad9b39e6484d8e36e9e5029c07eab8c12e8f.tar.gz | |
[ALSA] oxygen: change model-specific PCM device configuration
When specifying which PCM devices to use, model drivers now use flags
that also specify the routing between PCM devices and DMA channels
instead of just DMA channel bits. This simplifies some code that checks
for these flags.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/virtuoso.c')
| -rw-r--r-- | sound/pci/oxygen/virtuoso.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index 127dd66..5cd1fac 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c @@ -348,11 +348,11 @@ static const struct oxygen_model model_xonar = { .ac97_switch_hook = xonar_ac97_switch_hook, .gpio_changed = xonar_gpio_changed, .model_data_size = sizeof(struct xonar_data), + .pcm_dev_cfg = PLAYBACK_0_TO_I2S | + PLAYBACK_1_TO_SPDIF | + CAPTURE_0_FROM_I2S_2 | + CAPTURE_1_FROM_SPDIF, .dac_channels = 8, - .used_channels = OXYGEN_CHANNEL_B | - OXYGEN_CHANNEL_C | - OXYGEN_CHANNEL_SPDIF | - OXYGEN_CHANNEL_MULTICH, .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
