Changeset 777 for GPL/trunk/alsa-kernel/include/sound/pcm.h

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/include/sound/pcm.h (modified) (10 diffs)

GPL/trunk/alsa-kernel/include/sound/pcm.h

@@ -33 +33 @@
         unsigned int info;              /* SNDRV_PCM_INFO_* */
         u64 formats;                    /* SNDRV_PCM_FMTBIT_* */
+        u32 subformats;                 /* for S32_LE, SNDRV_PCM_SUBFMTBIT_* */
         unsigned int rates;             /* SNDRV_PCM_RATE_* */
         unsigned int rate_min;          /* min rate */
@@ -97 +98 @@
 /* 3 is absent slot. */
 #define SNDRV_PCM_IOCTL1_FIFO_SIZE      4
+#define SNDRV_PCM_IOCTL1_SYNC_ID        5
 
 #define SNDRV_PCM_TRIGGER_STOP          0
@@ -124 +126 @@
 #define SNDRV_PCM_RATE_352800           (1U<<13)        /* 352800Hz */
 #define SNDRV_PCM_RATE_384000           (1U<<14)        /* 384000Hz */
+#define SNDRV_PCM_RATE_705600           (1U<<15)        /* 705600Hz */
+#define SNDRV_PCM_RATE_768000           (1U<<16)        /* 768000Hz */
+/* extended rates since 6.12 */
+#define SNDRV_PCM_RATE_12000            (1U<<17)        /* 12000Hz */
+#define SNDRV_PCM_RATE_24000            (1U<<18)        /* 24000Hz */
+#define SNDRV_PCM_RATE_128000           (1U<<19)        /* 128000Hz */
 
 #define SNDRV_PCM_RATE_CONTINUOUS       (1U<<30)        /* continuous range */
-#define SNDRV_PCM_RATE_KNOT             (1U<<31)        /* supports more non-continuos rates */
+#define SNDRV_PCM_RATE_KNOT             (1U<<31)        /* supports more non-continuous rates */
 
 #define SNDRV_PCM_RATE_8000_44100       (SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_11025|\
@@ -139 +147 @@
                                          SNDRV_PCM_RATE_352800|\
                                          SNDRV_PCM_RATE_384000)
+#define SNDRV_PCM_RATE_8000_768000      (SNDRV_PCM_RATE_8000_384000|\
+                                         SNDRV_PCM_RATE_705600|\
+                                         SNDRV_PCM_RATE_768000)
 #define _SNDRV_PCM_FMTBIT(fmt)          (1ULL << (__force int)SNDRV_PCM_FORMAT_##fmt)
 #define SNDRV_PCM_FMTBIT_S8             _SNDRV_PCM_FMTBIT(S8)
@@ -222 +233 @@
 #endif
 
+#define _SNDRV_PCM_SUBFMTBIT(fmt)       BIT((__force int)SNDRV_PCM_SUBFORMAT_##fmt)
+#define SNDRV_PCM_SUBFMTBIT_STD         _SNDRV_PCM_SUBFMTBIT(STD)
+#define SNDRV_PCM_SUBFMTBIT_MSBITS_MAX  _SNDRV_PCM_SUBFMTBIT(MSBITS_MAX)
+#define SNDRV_PCM_SUBFMTBIT_MSBITS_20   _SNDRV_PCM_SUBFMTBIT(MSBITS_20)
+#define SNDRV_PCM_SUBFMTBIT_MSBITS_24   _SNDRV_PCM_SUBFMTBIT(MSBITS_24)
+
 struct snd_pcm_file {
         struct snd_pcm_substream *substream;
@@ -394 +411 @@
         snd_pcm_uframes_t silence_filled; /* already filled part of silence area */
 
-        union snd_pcm_sync_id sync;     /* hardware synchronization ID */
+        bool std_sync_id;               /* hardware synchronization - standard per card ID */
 
         /* -- mmap -- */
@@ -490 +507 @@
         unsigned int hw_opened: 1;
         unsigned int managed_buffer_alloc:1;
+#ifdef CONFIG_SND_PCM_XRUN_DEBUG
+        unsigned int xrun_counter; /* number of times xrun happens */
+#endif /* CONFIG_SND_PCM_XRUN_DEBUG */
 };
 
@@ -663 +683 @@
                 flags = _snd_pcm_stream_lock_irqsave_nested(substream); \
         } while (0)
+
+#ifndef TARGET_OS2
+/* definitions for guard(); use like guard(pcm_stream_lock) */
+DEFINE_LOCK_GUARD_1(pcm_stream_lock, struct snd_pcm_substream,
+                    snd_pcm_stream_lock(_T->lock),
+                    snd_pcm_stream_unlock(_T->lock))
+DEFINE_LOCK_GUARD_1(pcm_stream_lock_irq, struct snd_pcm_substream,
+                    snd_pcm_stream_lock_irq(_T->lock),
+                    snd_pcm_stream_unlock_irq(_T->lock))
+DEFINE_LOCK_GUARD_1(pcm_stream_lock_irqsave, struct snd_pcm_substream,
+                    snd_pcm_stream_lock_irqsave(_T->lock, _T->flags),
+                    snd_pcm_stream_unlock_irqrestore(_T->lock, _T->flags),
+                    unsigned long flags)
+#endif
 
 /**
@@ -1156 +1190 @@
 void snd_pcm_set_ops(struct snd_pcm * pcm, int direction,
                      const struct snd_pcm_ops *ops);
-void snd_pcm_set_sync(struct snd_pcm_substream *substream);
+void snd_pcm_set_sync_per_card(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params,
+                               const unsigned char *id, unsigned int len);
+/**
+ * snd_pcm_set_sync - set the PCM sync id
+ * @substream: the pcm substream
+ *
+ * Use the default PCM sync identifier for the specific card.
+ */
+static inline void snd_pcm_set_sync(struct snd_pcm_substream *substream)
+{
+        substream->runtime->std_sync_id = true;
+}
 int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream,
                       unsigned int cmd, void *arg);                      
@@ -1342 +1387 @@
 {
         return snd_pcm_set_managed_buffer_all(pcm, type, data, size, 0);
-}
-
-int _snd_pcm_lib_alloc_vmalloc_buffer(struct snd_pcm_substream *substream,
-                                      size_t size, gfp_t gfp_flags);
-int snd_pcm_lib_free_vmalloc_buffer(struct snd_pcm_substream *substream);
-struct page *snd_pcm_lib_get_vmalloc_page(struct snd_pcm_substream *substream,
-                                          unsigned long offset);
-/**
- * snd_pcm_lib_alloc_vmalloc_buffer - allocate virtual DMA buffer
- * @substream: the substream to allocate the buffer to
- * @size: the requested buffer size, in bytes
- *
- * Allocates the PCM substream buffer using vmalloc(), i.e., the memory is
- * contiguous in kernel virtual space, but not in physical memory.  Use this
- * if the buffer is accessed by kernel code but not by device DMA.
- *
- * Return: 1 if the buffer was changed, 0 if not changed, or a negative error
- * code.
- */
-static inline int snd_pcm_lib_alloc_vmalloc_buffer
-                        (struct snd_pcm_substream *substream, size_t size)
-{
-        return _snd_pcm_lib_alloc_vmalloc_buffer(substream, size,
-                                                 GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);
-}
-
-/**
- * snd_pcm_lib_alloc_vmalloc_32_buffer - allocate 32-bit-addressable buffer
- * @substream: the substream to allocate the buffer to
- * @size: the requested buffer size, in bytes
- *
- * This function works like snd_pcm_lib_alloc_vmalloc_buffer(), but uses
- * vmalloc_32(), i.e., the pages are allocated from 32-bit-addressable memory.
- *
- * Return: 1 if the buffer was changed, 0 if not changed, or a negative error
- * code.
- */
-static inline int snd_pcm_lib_alloc_vmalloc_32_buffer
-                        (struct snd_pcm_substream *substream, size_t size)
-{
-        return _snd_pcm_lib_alloc_vmalloc_buffer(substream, size,
-                                                 GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
 }