Changeset 777 for GPL/trunk/alsa-kernel/pci/emu10k1/emupcm.c

Timestamp:

Apr 21, 2025, 7:17:25 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/emu10k1/emupcm.c (modified) (5 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/emupcm.c

@@ -148 +148 @@
 };
 
-static const unsigned int capture_rates[8] = {
-        8000, 11025, 16000, 22050, 24000, 32000, 44100, 48000
-};
-
-static const struct snd_pcm_hw_constraint_list hw_constraints_capture_rates = {
-        .count = 8,
-        .list = capture_rates,
-        .mask = 0
-};
-
 static unsigned int snd_emu10k1_capture_rate_reg(unsigned int rate)
 {
@@ -174 +164 @@
         }
 }
-
-static const unsigned int audigy_capture_rates[9] = {
-        8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000
-};
-
-static const struct snd_pcm_hw_constraint_list hw_constraints_audigy_capture_rates = {
-        .count = 9,
-        .list = audigy_capture_rates,
-        .mask = 0
-};
 
 static unsigned int snd_emu10k1_audigy_capture_rate_reg(unsigned int rate)
@@ -208 +188 @@
         if (emu->card_capabilities->emu_model &&
             emu->emu1010.word_clock == 44100) {
-                // This also sets the rate constraint by deleting SNDRV_PCM_RATE_KNOT
                 runtime->hw.rates = SNDRV_PCM_RATE_11025 | \
                                     SNDRV_PCM_RATE_22050 | \
@@ -214 +193 @@
                 runtime->hw.rate_min = 11025;
                 runtime->hw.rate_max = 44100;
-                return;
-        }
-        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-                                   emu->audigy ? &hw_constraints_audigy_capture_rates :
-                                                 &hw_constraints_capture_rates);
+        } else if (emu->audigy) {
+                runtime->hw.rates = SNDRV_PCM_RATE_8000_48000 |
+                                    SNDRV_PCM_RATE_12000 |
+                                    SNDRV_PCM_RATE_24000;
+        }
 }
 
@@ -1054 +1033 @@
                                  SNDRV_PCM_INFO_MMAP_VALID),
         .formats =              SNDRV_PCM_FMTBIT_S16_LE,
-        .rates =                SNDRV_PCM_RATE_8000_48000 | SNDRV_PCM_RATE_KNOT,
+        .rates =                SNDRV_PCM_RATE_8000_48000 | SNDRV_PCM_RATE_24000,
         .rate_min =             8000,
         .rate_max =             48000,