]> err.no Git - linux-2.6/blobdiff - sound/pci/oxygen/oxygen_pcm.c
Merge branch 'fb' into devel
[linux-2.6] / sound / pci / oxygen / oxygen_pcm.c
index 31b0ccdca9a88c97ae1d99aea62e96289d8b245e..b17c405e069df5349daceba5db00416de012eb1b 100644 (file)
 #include <sound/pcm_params.h>
 #include "oxygen.h"
 
-static struct snd_pcm_hardware oxygen_hardware[PCM_COUNT] = {
-       [PCM_A] = {
-               .info = SNDRV_PCM_INFO_MMAP |
-                       SNDRV_PCM_INFO_MMAP_VALID |
-                       SNDRV_PCM_INFO_INTERLEAVED |
-                       SNDRV_PCM_INFO_PAUSE |
-                       SNDRV_PCM_INFO_SYNC_START,
-               .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                          SNDRV_PCM_FMTBIT_S32_LE,
-               .rates = SNDRV_PCM_RATE_32000 |
-                        SNDRV_PCM_RATE_44100 |
-                        SNDRV_PCM_RATE_48000 |
-                        SNDRV_PCM_RATE_64000 |
-                        SNDRV_PCM_RATE_88200 |
-                        SNDRV_PCM_RATE_96000 |
-                        SNDRV_PCM_RATE_176400 |
-                        SNDRV_PCM_RATE_192000,
-               .rate_min = 32000,
-               .rate_max = 192000,
-               .channels_min = 2,
-               .channels_max = 2,
-               .buffer_bytes_max = 256 * 1024,
-               .period_bytes_min = 128,
-               .period_bytes_max = 128 * 1024,
-               .periods_min = 2,
-               .periods_max = 2048,
-       },
-       [PCM_B] = {
-               .info = SNDRV_PCM_INFO_MMAP |
-                       SNDRV_PCM_INFO_MMAP_VALID |
-                       SNDRV_PCM_INFO_INTERLEAVED |
-                       SNDRV_PCM_INFO_PAUSE |
-                       SNDRV_PCM_INFO_SYNC_START,
-               .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                          SNDRV_PCM_FMTBIT_S32_LE,
-               .rates = SNDRV_PCM_RATE_32000 |
-                        SNDRV_PCM_RATE_44100 |
-                        SNDRV_PCM_RATE_48000 |
-                        SNDRV_PCM_RATE_64000 |
-                        SNDRV_PCM_RATE_88200 |
-                        SNDRV_PCM_RATE_96000 |
-                        SNDRV_PCM_RATE_176400 |
-                        SNDRV_PCM_RATE_192000,
-               .rate_min = 32000,
-               .rate_max = 192000,
-               .channels_min = 2,
-               .channels_max = 2,
-               .buffer_bytes_max = 256 * 1024,
-               .period_bytes_min = 128,
-               .period_bytes_max = 128 * 1024,
-               .periods_min = 2,
-               .periods_max = 2048,
-       },
-       [PCM_C] = {
-               .info = SNDRV_PCM_INFO_MMAP |
-                       SNDRV_PCM_INFO_MMAP_VALID |
-                       SNDRV_PCM_INFO_INTERLEAVED |
-                       SNDRV_PCM_INFO_PAUSE |
-                       SNDRV_PCM_INFO_SYNC_START,
-               .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                          SNDRV_PCM_FMTBIT_S32_LE,
-               .rates = SNDRV_PCM_RATE_44100 |
-                        SNDRV_PCM_RATE_48000 |
-                        SNDRV_PCM_RATE_88200 |
-                        SNDRV_PCM_RATE_96000,
-               .rate_min = 44100,
-               .rate_max = 96000,
-               .channels_min = 2,
-               .channels_max = 2,
-               .buffer_bytes_max = 256 * 1024,
-               .period_bytes_min = 128,
-               .period_bytes_max = 128 * 1024,
-               .periods_min = 2,
-               .periods_max = 2048,
-       },
-       [PCM_SPDIF] = {
-               .info = SNDRV_PCM_INFO_MMAP |
-                       SNDRV_PCM_INFO_MMAP_VALID |
-                       SNDRV_PCM_INFO_INTERLEAVED |
-                       SNDRV_PCM_INFO_PAUSE |
-                       SNDRV_PCM_INFO_SYNC_START,
-               .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                          SNDRV_PCM_FMTBIT_S32_LE,
-               .rates = SNDRV_PCM_RATE_32000 |
-                        SNDRV_PCM_RATE_44100 |
-                        SNDRV_PCM_RATE_48000 |
-                        SNDRV_PCM_RATE_64000 |
-                        SNDRV_PCM_RATE_88200 |
-                        SNDRV_PCM_RATE_96000 |
-                        SNDRV_PCM_RATE_176400 |
-                        SNDRV_PCM_RATE_192000,
-               .rate_min = 32000,
-               .rate_max = 192000,
-               .channels_min = 2,
-               .channels_max = 2,
-               .buffer_bytes_max = 256 * 1024,
-               .period_bytes_min = 128,
-               .period_bytes_max = 128 * 1024,
-               .periods_min = 2,
-               .periods_max = 2048,
-       },
-       [PCM_MULTICH] = {
-               .info = SNDRV_PCM_INFO_MMAP |
-                       SNDRV_PCM_INFO_MMAP_VALID |
-                       SNDRV_PCM_INFO_INTERLEAVED |
-                       SNDRV_PCM_INFO_PAUSE |
-                       SNDRV_PCM_INFO_SYNC_START,
-               .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                          SNDRV_PCM_FMTBIT_S32_LE,
-               .rates = SNDRV_PCM_RATE_32000 |
-                        SNDRV_PCM_RATE_44100 |
-                        SNDRV_PCM_RATE_48000 |
-                        SNDRV_PCM_RATE_64000 |
-                        SNDRV_PCM_RATE_88200 |
-                        SNDRV_PCM_RATE_96000 |
-                        SNDRV_PCM_RATE_176400 |
-                        SNDRV_PCM_RATE_192000,
-               .rate_min = 32000,
-               .rate_max = 192000,
-               .channels_min = 2,
-               .channels_max = 8,
-               .buffer_bytes_max = 2048 * 1024,
-               .period_bytes_min = 128,
-               .period_bytes_max = 256 * 1024,
-               .periods_min = 2,
-               .periods_max = 16384,
-       },
-       [PCM_AC97] = {
-               .info = SNDRV_PCM_INFO_MMAP |
-                       SNDRV_PCM_INFO_MMAP_VALID |
-                       SNDRV_PCM_INFO_INTERLEAVED |
-                       SNDRV_PCM_INFO_PAUSE |
-                       SNDRV_PCM_INFO_SYNC_START,
-               .formats = SNDRV_PCM_FMTBIT_S16_LE,
-               .rates = SNDRV_PCM_RATE_48000,
-               .rate_min = 48000,
-               .rate_max = 48000,
-               .channels_min = 2,
-               .channels_max = 2,
-               .buffer_bytes_max = 256 * 1024,
-               .period_bytes_min = 128,
-               .period_bytes_max = 128 * 1024,
-               .periods_min = 2,
-               .periods_max = 2048,
-       },
+static const struct snd_pcm_hardware oxygen_stereo_hardware = {
+       .info = SNDRV_PCM_INFO_MMAP |
+               SNDRV_PCM_INFO_MMAP_VALID |
+               SNDRV_PCM_INFO_INTERLEAVED |
+               SNDRV_PCM_INFO_PAUSE |
+               SNDRV_PCM_INFO_SYNC_START,
+       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                  SNDRV_PCM_FMTBIT_S32_LE,
+       .rates = SNDRV_PCM_RATE_32000 |
+                SNDRV_PCM_RATE_44100 |
+                SNDRV_PCM_RATE_48000 |
+                SNDRV_PCM_RATE_64000 |
+                SNDRV_PCM_RATE_88200 |
+                SNDRV_PCM_RATE_96000 |
+                SNDRV_PCM_RATE_176400 |
+                SNDRV_PCM_RATE_192000,
+       .rate_min = 32000,
+       .rate_max = 192000,
+       .channels_min = 2,
+       .channels_max = 2,
+       .buffer_bytes_max = 256 * 1024,
+       .period_bytes_min = 128,
+       .period_bytes_max = 128 * 1024,
+       .periods_min = 2,
+       .periods_max = 2048,
+};
+static const struct snd_pcm_hardware oxygen_multichannel_hardware = {
+       .info = SNDRV_PCM_INFO_MMAP |
+               SNDRV_PCM_INFO_MMAP_VALID |
+               SNDRV_PCM_INFO_INTERLEAVED |
+               SNDRV_PCM_INFO_PAUSE |
+               SNDRV_PCM_INFO_SYNC_START,
+       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                  SNDRV_PCM_FMTBIT_S32_LE,
+       .rates = SNDRV_PCM_RATE_32000 |
+                SNDRV_PCM_RATE_44100 |
+                SNDRV_PCM_RATE_48000 |
+                SNDRV_PCM_RATE_64000 |
+                SNDRV_PCM_RATE_88200 |
+                SNDRV_PCM_RATE_96000 |
+                SNDRV_PCM_RATE_176400 |
+                SNDRV_PCM_RATE_192000,
+       .rate_min = 32000,
+       .rate_max = 192000,
+       .channels_min = 2,
+       .channels_max = 8,
+       .buffer_bytes_max = 2048 * 1024,
+       .period_bytes_min = 128,
+       .period_bytes_max = 256 * 1024,
+       .periods_min = 2,
+       .periods_max = 16384,
+};
+static const struct snd_pcm_hardware oxygen_ac97_hardware = {
+       .info = SNDRV_PCM_INFO_MMAP |
+               SNDRV_PCM_INFO_MMAP_VALID |
+               SNDRV_PCM_INFO_INTERLEAVED |
+               SNDRV_PCM_INFO_PAUSE |
+               SNDRV_PCM_INFO_SYNC_START,
+       .formats = SNDRV_PCM_FMTBIT_S16_LE,
+       .rates = SNDRV_PCM_RATE_48000,
+       .rate_min = 48000,
+       .rate_max = 48000,
+       .channels_min = 2,
+       .channels_max = 2,
+       .buffer_bytes_max = 256 * 1024,
+       .period_bytes_min = 128,
+       .period_bytes_max = 128 * 1024,
+       .periods_min = 2,
+       .periods_max = 2048,
+};
+
+static const struct snd_pcm_hardware *const oxygen_hardware[PCM_COUNT] = {
+       [PCM_A] = &oxygen_stereo_hardware,
+       [PCM_B] = &oxygen_stereo_hardware,
+       [PCM_C] = &oxygen_stereo_hardware,
+       [PCM_SPDIF] = &oxygen_stereo_hardware,
+       [PCM_MULTICH] = &oxygen_multichannel_hardware,
+       [PCM_AC97] = &oxygen_ac97_hardware,
 };
 
 static inline unsigned int
@@ -185,7 +118,21 @@ static int oxygen_open(struct snd_pcm_substream *substream,
        int err;
 
        runtime->private_data = (void *)(uintptr_t)channel;
-       runtime->hw = oxygen_hardware[channel];
+       if (channel == PCM_B && chip->has_ac97_1 &&
+           (chip->model->pcm_dev_cfg & CAPTURE_2_FROM_AC97_1))
+               runtime->hw = oxygen_ac97_hardware;
+       else
+               runtime->hw = *oxygen_hardware[channel];
+       switch (channel) {
+       case PCM_C:
+               runtime->hw.rates &= ~(SNDRV_PCM_RATE_32000 |
+                                      SNDRV_PCM_RATE_64000);
+               runtime->hw.rate_min = 44100;
+               break;
+       case PCM_MULTICH:
+               runtime->hw.channels_max = chip->model->dac_channels;
+               break;
+       }
        if (chip->model->pcm_hardware_filter)
                chip->model->pcm_hardware_filter(channel, &runtime->hw);
        err = snd_pcm_hw_constraint_step(runtime, 0,
@@ -310,8 +257,10 @@ static unsigned int oxygen_rate(struct snd_pcm_hw_params *hw_params)
 
 static unsigned int oxygen_i2s_mclk(struct snd_pcm_hw_params *hw_params)
 {
-       return params_rate(hw_params) <= 96000
-               ? OXYGEN_I2S_MCLK_256 : OXYGEN_I2S_MCLK_128;
+       if (params_rate(hw_params) <= 96000)
+               return OXYGEN_I2S_MCLK_256;
+       else
+               return OXYGEN_I2S_MCLK_128;
 }
 
 static unsigned int oxygen_i2s_bits(struct snd_pcm_hw_params *hw_params)
@@ -396,9 +345,6 @@ static int oxygen_rec_a_hw_params(struct snd_pcm_substream *substream,
                              OXYGEN_I2S_FORMAT_MASK |
                              OXYGEN_I2S_MCLK_MASK |
                              OXYGEN_I2S_BITS_MASK);
-       oxygen_write8_masked(chip, OXYGEN_REC_ROUTING,
-                            OXYGEN_REC_A_ROUTE_I2S_ADC_1,
-                            OXYGEN_REC_A_ROUTE_MASK);
        spin_unlock_irq(&chip->reg_lock);
 
        mutex_lock(&chip->mutex);
@@ -411,33 +357,37 @@ static int oxygen_rec_b_hw_params(struct snd_pcm_substream *substream,
                                  struct snd_pcm_hw_params *hw_params)
 {
        struct oxygen *chip = snd_pcm_substream_chip(substream);
+       int is_ac97;
        int err;
 
        err = oxygen_hw_params(substream, hw_params);
        if (err < 0)
                return err;
 
+       is_ac97 = chip->has_ac97_1 &&
+               (chip->model->pcm_dev_cfg & CAPTURE_2_FROM_AC97_1);
+
        spin_lock_irq(&chip->reg_lock);
        oxygen_write8_masked(chip, OXYGEN_REC_FORMAT,
                             oxygen_format(hw_params) << OXYGEN_REC_FORMAT_B_SHIFT,
                             OXYGEN_REC_FORMAT_B_MASK);
-       oxygen_write16_masked(chip, OXYGEN_I2S_B_FORMAT,
-                             oxygen_rate(hw_params) |
-                             oxygen_i2s_mclk(hw_params) |
-                             chip->model->adc_i2s_format |
-                             oxygen_i2s_bits(hw_params),
-                             OXYGEN_I2S_RATE_MASK |
-                             OXYGEN_I2S_FORMAT_MASK |
-                             OXYGEN_I2S_MCLK_MASK |
-                             OXYGEN_I2S_BITS_MASK);
-       oxygen_write8_masked(chip, OXYGEN_REC_ROUTING,
-                            OXYGEN_REC_B_ROUTE_I2S_ADC_2,
-                            OXYGEN_REC_B_ROUTE_MASK);
+       if (!is_ac97)
+               oxygen_write16_masked(chip, OXYGEN_I2S_B_FORMAT,
+                                     oxygen_rate(hw_params) |
+                                     oxygen_i2s_mclk(hw_params) |
+                                     chip->model->adc_i2s_format |
+                                     oxygen_i2s_bits(hw_params),
+                                     OXYGEN_I2S_RATE_MASK |
+                                     OXYGEN_I2S_FORMAT_MASK |
+                                     OXYGEN_I2S_MCLK_MASK |
+                                     OXYGEN_I2S_BITS_MASK);
        spin_unlock_irq(&chip->reg_lock);
 
-       mutex_lock(&chip->mutex);
-       chip->model->set_adc_params(chip, hw_params);
-       mutex_unlock(&chip->mutex);
+       if (!is_ac97) {
+               mutex_lock(&chip->mutex);
+               chip->model->set_adc_params(chip, hw_params);
+               mutex_unlock(&chip->mutex);
+       }
        return 0;
 }
 
@@ -455,9 +405,6 @@ static int oxygen_rec_c_hw_params(struct snd_pcm_substream *substream,
        oxygen_write8_masked(chip, OXYGEN_REC_FORMAT,
                             oxygen_format(hw_params) << OXYGEN_REC_FORMAT_C_SHIFT,
                             OXYGEN_REC_FORMAT_C_MASK);
-       oxygen_write8_masked(chip, OXYGEN_REC_ROUTING,
-                            OXYGEN_REC_C_ROUTE_SPDIF,
-                            OXYGEN_REC_C_ROUTE_MASK);
        spin_unlock_irq(&chip->reg_lock);
        return 0;
 }
@@ -510,11 +457,6 @@ static int oxygen_multich_hw_params(struct snd_pcm_substream *substream,
                              OXYGEN_I2S_RATE_MASK |
                              OXYGEN_I2S_FORMAT_MASK |
                              OXYGEN_I2S_BITS_MASK);
-       oxygen_write16_masked(chip, OXYGEN_PLAY_ROUTING,
-                             OXYGEN_PLAY_MULTICH_I2S_DAC,
-                             OXYGEN_PLAY_MUTE01 | OXYGEN_PLAY_MUTE23 |
-                             OXYGEN_PLAY_MUTE45 | OXYGEN_PLAY_MUTE67 |
-                             OXYGEN_PLAY_MULTICH_MASK);
        oxygen_update_dac_routing(chip);
        oxygen_update_spdif_source(chip);
        spin_unlock_irq(&chip->reg_lock);
@@ -692,40 +634,45 @@ static void oxygen_pcm_free(struct snd_pcm *pcm)
        snd_pcm_lib_preallocate_free_for_all(pcm);
 }
 
-int __devinit oxygen_pcm_init(struct oxygen *chip)
+int oxygen_pcm_init(struct oxygen *chip)
 {
        struct snd_pcm *pcm;
        int outs, ins;
        int err;
 
-       outs = 1; /* OXYGEN_CHANNEL_MULTICH is always used */
-       ins = !!(chip->model->used_channels & (OXYGEN_CHANNEL_A |
-                                              OXYGEN_CHANNEL_B));
-       err = snd_pcm_new(chip->card, "Analog", 0, outs, ins, &pcm);
-       if (err < 0)
-               return err;
-       snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &oxygen_multich_ops);
-       if (chip->model->used_channels & OXYGEN_CHANNEL_A)
-               snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
-                               &oxygen_rec_a_ops);
-       else if (chip->model->used_channels & OXYGEN_CHANNEL_B)
-               snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
-                               &oxygen_rec_b_ops);
-       pcm->private_data = chip;
-       pcm->private_free = oxygen_pcm_free;
-       strcpy(pcm->name, "Analog");
-       snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream,
-                                     SNDRV_DMA_TYPE_DEV,
-                                     snd_dma_pci_data(chip->pci),
-                                     512 * 1024, 2048 * 1024);
-       if (ins)
-               snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream,
-                                             SNDRV_DMA_TYPE_DEV,
-                                             snd_dma_pci_data(chip->pci),
-                                             128 * 1024, 256 * 1024);
-
-       outs = !!(chip->model->used_channels & OXYGEN_CHANNEL_SPDIF);
-       ins = !!(chip->model->used_channels & OXYGEN_CHANNEL_C);
+       outs = !!(chip->model->pcm_dev_cfg & PLAYBACK_0_TO_I2S);
+       ins = !!(chip->model->pcm_dev_cfg & (CAPTURE_0_FROM_I2S_1 |
+                                            CAPTURE_0_FROM_I2S_2));
+       if (outs | ins) {
+               err = snd_pcm_new(chip->card, "Analog", 0, outs, ins, &pcm);
+               if (err < 0)
+                       return err;
+               if (outs)
+                       snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
+                                       &oxygen_multich_ops);
+               if (chip->model->pcm_dev_cfg & CAPTURE_0_FROM_I2S_1)
+                       snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
+                                       &oxygen_rec_a_ops);
+               else if (chip->model->pcm_dev_cfg & CAPTURE_0_FROM_I2S_2)
+                       snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
+                                       &oxygen_rec_b_ops);
+               pcm->private_data = chip;
+               pcm->private_free = oxygen_pcm_free;
+               strcpy(pcm->name, "Analog");
+               if (outs)
+                       snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream,
+                                                     SNDRV_DMA_TYPE_DEV,
+                                                     snd_dma_pci_data(chip->pci),
+                                                     512 * 1024, 2048 * 1024);
+               if (ins)
+                       snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream,
+                                                     SNDRV_DMA_TYPE_DEV,
+                                                     snd_dma_pci_data(chip->pci),
+                                                     128 * 1024, 256 * 1024);
+       }
+
+       outs = !!(chip->model->pcm_dev_cfg & PLAYBACK_1_TO_SPDIF);
+       ins = !!(chip->model->pcm_dev_cfg & CAPTURE_1_FROM_SPDIF);
        if (outs | ins) {
                err = snd_pcm_new(chip->card, "Digital", 1, outs, ins, &pcm);
                if (err < 0)
@@ -744,25 +691,31 @@ int __devinit oxygen_pcm_init(struct oxygen *chip)
                                                      128 * 1024, 256 * 1024);
        }
 
-       outs = chip->has_ac97_1 &&
-               (chip->model->used_channels & OXYGEN_CHANNEL_AC97);
-       ins = (chip->model->used_channels & (OXYGEN_CHANNEL_A |
-                                            OXYGEN_CHANNEL_B))
-               == (OXYGEN_CHANNEL_A | OXYGEN_CHANNEL_B);
+       if (chip->has_ac97_1) {
+               outs = !!(chip->model->pcm_dev_cfg & PLAYBACK_2_TO_AC97_1);
+               ins = !!(chip->model->pcm_dev_cfg & CAPTURE_2_FROM_AC97_1);
+       } else {
+               outs = 0;
+               ins = !!(chip->model->pcm_dev_cfg & CAPTURE_2_FROM_I2S_2);
+       }
        if (outs | ins) {
-               err = snd_pcm_new(chip->card, ins ? "Analog2" : "AC97",
+               err = snd_pcm_new(chip->card, outs ? "AC97" : "Analog2",
                                  2, outs, ins, &pcm);
                if (err < 0)
                        return err;
-               if (outs)
+               if (outs) {
                        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
                                        &oxygen_ac97_ops);
+                       oxygen_write8_masked(chip, OXYGEN_REC_ROUTING,
+                                            OXYGEN_REC_B_ROUTE_AC97_1,
+                                            OXYGEN_REC_B_ROUTE_MASK);
+               }
                if (ins)
                        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
                                        &oxygen_rec_b_ops);
                pcm->private_data = chip;
                pcm->private_free = oxygen_pcm_free;
-               strcpy(pcm->name, ins ? "Analog 2" : "Front Panel");
+               strcpy(pcm->name, outs ? "Front Panel" : "Analog 2");
                snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
                                                      snd_dma_pci_data(chip->pci),
                                                      128 * 1024, 256 * 1024);