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/oxygen.c | |
| parent | [ALSA] oxygen: add monitor controls (diff) | |
| download | linux-dev-f009ad9b39e6484d8e36e9e5029c07eab8c12e8f.tar.xz linux-dev-f009ad9b39e6484d8e36e9e5029c07eab8c12e8f.zip | |
[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/oxygen.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 542752442a95..9faf43c949b2 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c @@ -303,12 +303,13 @@ static const struct oxygen_model model_generic = { .update_dac_mute = update_ak4396_mute, .ac97_switch_hook = cmi9780_switch_hook, .model_data_size = sizeof(struct generic_data), + .pcm_dev_cfg = PLAYBACK_0_TO_I2S | + PLAYBACK_1_TO_SPDIF | + PLAYBACK_2_TO_AC97_1 | + CAPTURE_0_FROM_I2S_1 | + CAPTURE_1_FROM_SPDIF | + CAPTURE_2_FROM_AC97_1, .dac_channels = 8, - .used_channels = OXYGEN_CHANNEL_A | - OXYGEN_CHANNEL_C | - OXYGEN_CHANNEL_SPDIF | - OXYGEN_CHANNEL_MULTICH | - OXYGEN_CHANNEL_AC97, .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, @@ -327,12 +328,13 @@ static const struct oxygen_model model_meridian = { .update_dac_mute = update_ak4396_mute, .ac97_switch_hook = cmi9780_switch_hook, .model_data_size = sizeof(struct generic_data), + .pcm_dev_cfg = PLAYBACK_0_TO_I2S | + PLAYBACK_1_TO_SPDIF | + PLAYBACK_2_TO_AC97_1 | + CAPTURE_0_FROM_I2S_2 | + CAPTURE_1_FROM_SPDIF | + CAPTURE_2_FROM_AC97_1, .dac_channels = 8, - .used_channels = OXYGEN_CHANNEL_B | - OXYGEN_CHANNEL_C | - OXYGEN_CHANNEL_SPDIF | - OXYGEN_CHANNEL_MULTICH | - OXYGEN_CHANNEL_AC97, .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |