Changeset 777 for GPL/trunk/alsa-kernel/include/sound/soc-dai.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/soc-dai.h (modified) (14 diffs)

GPL/trunk/alsa-kernel/include/sound/soc-dai.h

@@ -181 +181 @@
 
 /* Digital Audio interface formatting */
-int snd_soc_dai_get_fmt_max_priority(struct snd_soc_pcm_runtime *rtd);
-u64 snd_soc_dai_get_fmt(struct snd_soc_dai *dai, int priority);
+int snd_soc_dai_get_fmt_max_priority(const struct snd_soc_pcm_runtime *rtd);
+u64 snd_soc_dai_get_fmt(const struct snd_soc_dai *dai, int priority);
 int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt);
 
@@ -189 +189 @@
 
 int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai,
-        unsigned int tx_num, unsigned int *tx_slot,
-        unsigned int rx_num, unsigned int *rx_slot);
+        unsigned int tx_num, const unsigned int *tx_slot,
+        unsigned int rx_num, const unsigned int *rx_slot);
 
 int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate);
@@ -199 +199 @@
 
 
-int snd_soc_dai_get_channel_map(struct snd_soc_dai *dai,
+int snd_soc_dai_get_channel_map(const struct snd_soc_dai *dai,
                 unsigned int *tx_num, unsigned int *tx_slot,
                 unsigned int *rx_num, unsigned int *rx_slot);
 
-int snd_soc_dai_is_dummy(struct snd_soc_dai *dai);
+int snd_soc_dai_is_dummy(const struct snd_soc_dai *dai);
 
 int snd_soc_dai_hw_params(struct snd_soc_dai *dai,
@@ -219 +219 @@
 int snd_soc_dai_compress_new(struct snd_soc_dai *dai,
                              struct snd_soc_pcm_runtime *rtd, int num);
-bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream);
-void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link);
+bool snd_soc_dai_stream_valid(const struct snd_soc_dai *dai, int stream);
 void snd_soc_dai_action(struct snd_soc_dai *dai,
                         int stream, int action);
@@ -233 +232 @@
         snd_soc_dai_action(dai, stream, -1);
 }
-int snd_soc_dai_active(struct snd_soc_dai *dai);
+int snd_soc_dai_active(const struct snd_soc_dai *dai);
 
 int snd_soc_pcm_dai_probe(struct snd_soc_pcm_runtime *rtd, int order);
@@ -241 +240 @@
 int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, int cmd,
                             int rollback);
-int snd_soc_pcm_dai_bespoke_trigger(struct snd_pcm_substream *substream,
-                                    int cmd);
 void snd_soc_pcm_dai_delay(struct snd_pcm_substream *substream,
                            snd_pcm_sframes_t *cpu_delay, snd_pcm_sframes_t *codec_delay);
@@ -272 +269 @@
                                    struct snd_compr_metadata *metadata);
 
-const char *snd_soc_dai_name_get(struct snd_soc_dai *dai);
+const char *snd_soc_dai_name_get(const struct snd_soc_dai *dai);
 
 struct snd_soc_dai_ops {
@@ -306 +303 @@
                 int slots, int slot_width);
         int (*set_channel_map)(struct snd_soc_dai *dai,
-                unsigned int tx_num, unsigned int *tx_slot,
-                unsigned int rx_num, unsigned int *rx_slot);
-        int (*get_channel_map)(struct snd_soc_dai *dai,
+                unsigned int tx_num, const unsigned int *tx_slot,
+                unsigned int rx_num, const unsigned int *rx_slot);
+        int (*get_channel_map)(const struct snd_soc_dai *dai,
                         unsigned int *tx_num, unsigned int *tx_slot,
                         unsigned int *rx_num, unsigned int *rx_slot);
@@ -346 +343 @@
         int (*trigger)(struct snd_pcm_substream *, int,
                 struct snd_soc_dai *);
-        int (*bespoke_trigger)(struct snd_pcm_substream *, int,
-                struct snd_soc_dai *);
+
         /*
          * For hardware based FIFO caused delay reporting.
@@ -362 +358 @@
          *      snd_soc_dai_get_fmt()
          */
-        u64 *auto_selectable_formats;
+        const u64 *auto_selectable_formats;
         int num_auto_selectable_formats;
 
@@ -414 +410 @@
         unsigned int base;
         struct snd_soc_dobj dobj;
-        struct of_phandle_args *dai_args;
+        const struct of_phandle_args *dai_args;
 
         /* ops */
@@ -474 +470 @@
 };
 
-static inline struct snd_soc_pcm_stream *
+static inline const struct snd_soc_pcm_stream *
 snd_soc_dai_get_pcm_stream(const struct snd_soc_dai *dai, int stream)
 {
@@ -519 +515 @@
 }
 
-static inline unsigned int snd_soc_dai_tdm_mask_get(struct snd_soc_dai *dai, int stream)
+static inline unsigned int snd_soc_dai_tdm_mask_get(const struct snd_soc_dai *dai,
+                                                    int stream)
 {
         return dai->stream[stream].tdm_mask;
@@ -530 +527 @@
 }
 
-static inline unsigned int snd_soc_dai_stream_active(struct snd_soc_dai *dai, int stream)
+static inline unsigned int snd_soc_dai_stream_active(const struct snd_soc_dai *dai,
+                                                     int stream)
 {
         /* see snd_soc_dai_action() for setup */