Changeset 772 for GPL/trunk/alsa-kernel/pci/emu10k1/timer.c

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/emu10k1/timer.c (modified) (6 diffs)

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

@@ -3 +3 @@
  *  Copyright (c) by Lee Revell <rlrevell@joe-job.com>
  *                   Clemens Ladisch <clemens@ladisch.de>
+ *                   Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
+ *
  *  Routines for control of EMU10K1 chips
- *
- *  BUGS:
- *    --
- *
- *  TODO:
- *    --
  */
 
@@ -19 +15 @@
 {
         struct snd_emu10k1 *emu;
-        unsigned long flags;
         unsigned int delay;
 
@@ -26 +21 @@
         if (delay < 5 ) /* minimum time is 5 ticks */
                 delay = 5;
-        spin_lock_irqsave(&emu->reg_lock, flags);
         snd_emu10k1_intr_enable(emu, INTE_INTERVALTIMERENB);
         outw(delay & TIMER_RATE_MASK, emu->port + TIMER);
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return 0;
 }
@@ -36 +29 @@
 {
         struct snd_emu10k1 *emu;
-        unsigned long flags;
 
         emu = snd_timer_chip(timer);
-        spin_lock_irqsave(&emu->reg_lock, flags);
         snd_emu10k1_intr_disable(emu, INTE_INTERVALTIMERENB);
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return 0;
+}
+
+static unsigned long snd_emu10k1_timer_c_resolution(struct snd_timer *timer)
+{
+        struct snd_emu10k1 *emu = snd_timer_chip(timer);
+
+        if (emu->card_capabilities->emu_model &&
+            emu->emu1010.word_clock == 44100)
+                return 22676;  // 1 sample @ 44.1 kHz = 22.675736...us
+        else
+                return 20833;  // 1 sample @ 48 kHz = 20.833...us
 }
 
@@ -48 +49 @@
                                                unsigned long *num, unsigned long *den)
 {
+        struct snd_emu10k1 *emu = snd_timer_chip(timer);
+
         *num = 1;
-        *den = 48000;
+        if (emu->card_capabilities->emu_model)
+                *den = emu->emu1010.word_clock;
+        else
+                *den = 48000;
         return 0;
 }
@@ -55 +61 @@
 static const struct snd_timer_hardware snd_emu10k1_timer_hw = {
         .flags = SNDRV_TIMER_HW_AUTO,
-        .resolution = 20833, /* 1 sample @ 48KHZ = 20.833...us */
         .ticks = 1024,
         .start = snd_emu10k1_timer_start,
         .stop = snd_emu10k1_timer_stop,
+        .c_resolution = snd_emu10k1_timer_c_resolution,
         .precise_resolution = snd_emu10k1_timer_precise_resolution,
 };