Changeset 679 for GPL/trunk/alsa-kernel/include/sound/control.h

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/control.h (modified) (10 diffs)

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

@@ +1 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef __SOUND_CONTROL_H
 #define __SOUND_CONTROL_H
@@ -5 +6 @@
  *  Header file for control interface
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
- *
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- */
-
+ */
+
+#include <linux/wait.h>
+#include <linux/nospec.h>
 #include <sound/asound.h>
 
@@ -32 +19 @@
 typedef int (snd_kcontrol_put_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol);
 typedef int (snd_kcontrol_tlv_rw_t)(struct snd_kcontrol *kcontrol,
-                                    int op_flag, /* 0=read,1=write,-1=command */
+                                    int op_flag, /* SNDRV_CTL_TLV_OP_XXX */
                                     unsigned int size,
                                     unsigned int __user *tlv);
 
+/* internal flag for skipping validations */
+#ifdef CONFIG_SND_CTL_VALIDATION
+#define SNDRV_CTL_ELEM_ACCESS_SKIP_CHECK        (1 << 27)
+#define snd_ctl_skip_validation(info) \
+        ((info)->access & SNDRV_CTL_ELEM_ACCESS_SKIP_CHECK)
+#else
+#define SNDRV_CTL_ELEM_ACCESS_SKIP_CHECK        0
+#define snd_ctl_skip_validation(info)           true
+#endif
+
+enum {
+        SNDRV_CTL_TLV_OP_READ = 0,
+        SNDRV_CTL_TLV_OP_WRITE = 1,
+        SNDRV_CTL_TLV_OP_CMD = -1,
+};
 
 struct snd_kcontrol_new {
@@ -41 +43 @@
         unsigned int device;            /* device/client number */
         unsigned int subdevice;         /* subdevice (substream) number */
-        unsigned char *name;            /* ASCII name of item */
+        const char *name;               /* ASCII name of item */
         unsigned int index;             /* index of item */
         unsigned int access;            /* access rights */
@@ -72 +74 @@
         } tlv;
         unsigned long private_value;
-#ifdef TARGET_OS2
-        void *private_ptr;
-#endif
         void *private_data;
         void (*private_free)(struct snd_kcontrol *kcontrol);
-#ifndef TARGET_OS2
-        struct snd_kcontrol_volatile vd[0];     /* volatile data */
-#else
-        struct snd_kcontrol_volatile vd[1];     /* volatile data */
-#endif
+        struct snd_kcontrol_volatile vd[];      /* volatile data */
 };
 
@@ -96 +91 @@
 struct pid;
 
+enum {
+        SND_CTL_SUBDEV_PCM,
+        SND_CTL_SUBDEV_RAWMIDI,
+        SND_CTL_SUBDEV_ITEMS,
+};
+
 struct snd_ctl_file {
         struct list_head list;          /* list of all control files */
         struct snd_card *card;
         struct pid *pid;
-        int prefer_pcm_subdevice;
-        int prefer_rawmidi_subdevice;
+        int preferred_subdevice[SND_CTL_SUBDEV_ITEMS];
         wait_queue_head_t change_sleep;
         spinlock_t read_lock;
@@ -121 +121 @@
 int snd_ctl_add(struct snd_card * card, struct snd_kcontrol * kcontrol);
 int snd_ctl_remove(struct snd_card * card, struct snd_kcontrol * kcontrol);
+int snd_ctl_replace(struct snd_card *card, struct snd_kcontrol *kcontrol, bool add_on_replace);
 int snd_ctl_remove_id(struct snd_card * card, struct snd_ctl_elem_id *id);
 int snd_ctl_rename_id(struct snd_card * card, struct snd_ctl_elem_id *src_id, struct snd_ctl_elem_id *dst_id);
+int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id,
+                        int active);
 struct snd_kcontrol *snd_ctl_find_numid(struct snd_card * card, unsigned int numid);
 struct snd_kcontrol *snd_ctl_find_id(struct snd_card * card, struct snd_ctl_elem_id *id);
@@ -138 +141 @@
 #endif
 
+int snd_ctl_get_preferred_subdevice(struct snd_card *card, int type);
+
 static inline unsigned int snd_ctl_get_ioffnum(struct snd_kcontrol *kctl, struct snd_ctl_elem_id *id)
 {
-        return id->numid - kctl->id.numid;
+        unsigned int ioff = id->numid - kctl->id.numid;
+        return array_index_nospec(ioff, kctl->count);
 }
 
 static inline unsigned int snd_ctl_get_ioffidx(struct snd_kcontrol *kctl, struct snd_ctl_elem_id *id)
 {
-        return id->index - kctl->id.index;
+        unsigned int ioff = id->index - kctl->id.index;
+        return array_index_nospec(ioff, kctl->count);
 }
 
@@ -182 +189 @@
 struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,
                                                  const unsigned int *tlv);
-int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave,
-                       unsigned int flags);
-/* optional flags for slave */
-#define SND_CTL_SLAVE_NEED_UPDATE       (1 << 0)
+int _snd_ctl_add_follower(struct snd_kcontrol *master,
+                          struct snd_kcontrol *follower,
+                          unsigned int flags);
+/* optional flags for follower */
+#define SND_CTL_FOLLOWER_NEED_UPDATE    (1 << 0)
 
 /**
- * snd_ctl_add_slave - Add a virtual slave control
+ * snd_ctl_add_follower - Add a virtual follower control
  * @master: vmaster element
- * @slave: slave element to add
- *
- * Add a virtual slave control to the given master element created via
+ * @follower: follower element to add
+ *
+ * Add a virtual follower control to the given master element created via
  * snd_ctl_create_virtual_master() beforehand.
- * Returns zero if successful or a negative error code.
- *
- * All slaves must be the same type (returning the same information
- * via info callback).  The fucntion doesn't check it, so it's your
+ *
+ * All followers must be the same type (returning the same information
+ * via info callback).  The function doesn't check it, so it's your
  * responsibility.
  *
@@ -204 +211 @@
  * logarithmic volume control (dB level) thus no linear volume,
  * master can only attenuate the volume without gain
+ *
+ * Return: Zero if successful or a negative error code.
  */
 static inline int
-snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave)
-{
-        return _snd_ctl_add_slave(master, slave, 0);
+snd_ctl_add_follower(struct snd_kcontrol *master, struct snd_kcontrol *follower)
+{
+        return _snd_ctl_add_follower(master, follower, 0);
 }
 
 /**
- * snd_ctl_add_slave_uncached - Add a virtual slave control
+ * snd_ctl_add_follower_uncached - Add a virtual follower control
  * @master: vmaster element
- * @slave: slave element to add
- *
- * Add a virtual slave control to the given master.
- * Unlike snd_ctl_add_slave(), the element added via this function
+ * @follower: follower element to add
+ *
+ * Add a virtual follower control to the given master.
+ * Unlike snd_ctl_add_follower(), the element added via this function
  * is supposed to have volatile values, and get callback is called
- * at each time quried from the master.
+ * at each time queried from the master.
  *
  * When the control peeks the hardware values directly and the value
  * can be changed by other means than the put callback of the element,
  * this function should be used to keep the value always up-to-date.
+ *
+ * Return: Zero if successful or a negative error code.
  */
 static inline int
-snd_ctl_add_slave_uncached(struct snd_kcontrol *master,
-                           struct snd_kcontrol *slave)
-{
-        return _snd_ctl_add_slave(master, slave, SND_CTL_SLAVE_NEED_UPDATE);
-}
+snd_ctl_add_follower_uncached(struct snd_kcontrol *master,
+                              struct snd_kcontrol *follower)
+{
+        return _snd_ctl_add_follower(master, follower, SND_CTL_FOLLOWER_NEED_UPDATE);
+}
+
+int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kctl,
+                             void (*hook)(void *private_data, int),
+                             void *private_data);
+void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only);
+#define snd_ctl_sync_vmaster_hook(kctl) snd_ctl_sync_vmaster(kctl, true)
+int snd_ctl_apply_vmaster_followers(struct snd_kcontrol *kctl,
+                                    int (*func)(struct snd_kcontrol *vfollower,
+                                                struct snd_kcontrol *follower,
+                                                void *arg),
+                                    void *arg);
+
+/*
+ * Helper functions for jack-detection controls
+ */
+struct snd_kcontrol *
+snd_kctl_jack_new(const char *name, struct snd_card *card);
+void snd_kctl_jack_report(struct snd_card *card,
+                          struct snd_kcontrol *kctl, bool status);
 
 #endif  /* __SOUND_CONTROL_H */