Changeset 777 for GPL/trunk/alsa-kernel/pci/emu10k1/p16v.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/p16v.c (modified) (3 diffs)

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

@@ -175 +175 @@
                 return err;
 
-        runtime->sync.id32[0] = substream->pcm->card->number;
-        runtime->sync.id32[1] = 'P';
-        runtime->sync.id32[2] = 16;
-        runtime->sync.id32[3] = 'V';
-
         return 0;
 }
@@ -225 +220 @@
         // Only using channel 0 for now, but the card has 2 channels.
         return snd_p16v_pcm_open_capture_channel(substream, 0);
+}
+
+static int snd_p16v_pcm_ioctl_playback(struct snd_pcm_substream *substream,
+                                       unsigned int cmd, void *arg)
+{
+        if (cmd == SNDRV_PCM_IOCTL1_SYNC_ID) {
+                static const unsigned char id[4] = { 'P', '1', '6', 'V' };
+                snd_pcm_set_sync_per_card(substream, arg, id, 4);
+                return 0;
+        }
+        return snd_pcm_lib_ioctl(substream, cmd, arg);
 }
 
@@ -532 +538 @@
         .open =        snd_p16v_pcm_open_playback_front,
         .close =       snd_p16v_pcm_close_playback,
+        .ioctl =       snd_p16v_pcm_ioctl_playback,
         .prepare =     snd_p16v_pcm_prepare_playback,
         .trigger =     snd_p16v_pcm_trigger_playback,