Changeset 679 for GPL/trunk/alsa-kernel/include/sound/info.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/info.h (modified) (11 diffs)

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

@@ +1 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef __SOUND_INFO_H
 #define __SOUND_INFO_H
@@ -5 +6 @@
  *  Header file for info 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/poll.h>
+#include <linux/seq_file.h>
+#include <sound/core.h>
 
 /* buffer for information */
@@ -61 +48 @@
                          void *file_private_data, struct file *file,
                          loff_t offset, int orig);
-        unsigned int (*poll)(struct snd_info_entry *entry,
+        __poll_t (*poll)(struct snd_info_entry *entry,
                              void *file_private_data, struct file *file,
                              poll_table *wait);
@@ -73 +60 @@
 struct snd_info_entry {
         const char *name;
-        mode_t mode;
+        umode_t mode;
         long size;
         unsigned short content;
         union {
                 struct snd_info_entry_text text;
-                struct snd_info_entry_ops *ops;
+                const struct snd_info_entry_ops *ops;
         } c;
         struct snd_info_entry *parent;
-        struct snd_card *card;
         struct module *module;
         void *private_data;
@@ -91 +77 @@
 };
 
-#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
+#if (defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_SND_PROC_FS)) || defined(TARGET_OS2)
 int snd_info_minor_register(void);
-int snd_info_minor_unregister(void);
-#else
-#define snd_info_minor_register() /* NOP */
-#define snd_info_minor_unregister() /* NOP */
-#endif
-
-
-#ifdef CONFIG_PROC_FS
+#else
+#define snd_info_minor_register()       0
+#endif
+
+
+#if defined(CONFIG_SND_PROC_FS)
 
 extern struct snd_info_entry *snd_seq_root;
@@ -111 +95 @@
 #endif
 
+/**
+ * snd_iprintf - printf on the procfs buffer
+ * @buf: the procfs buffer
+ * @fmt: the printf format
+ *
+ * Outputs the string on the procfs buffer just like printf().
+ *
+ * Return: zero for success, or a negative error code.
+ */
 #ifndef TARGET_OS2
-int snd_iprintf(struct snd_info_buffer *buffer, const char *fmt, ...) \
-                                __attribute__ ((format (printf, 2, 3)));
-#else
-int snd_iprintf(struct snd_info_buffer * buffer, char *fmt,...);
-#endif
+#define snd_iprintf(buf, fmt, args...) \
+        seq_printf((struct seq_file *)(buf)->buffer, fmt, ##args)
+#else
+static inline int snd_iprintf(struct snd_info_buffer *buffer, char *fmt, ...) { return 0; }
+#endif
+
 int snd_info_init(void);
 int snd_info_done(void);
@@ -140 +134 @@
 
 /* for card drivers */
-int snd_card_proc_new(struct snd_card *card, const char *name,
-                      struct snd_info_entry **entryp);
+static inline int snd_card_proc_new(struct snd_card *card, const char *name,
+                                    struct snd_info_entry **entryp)
+{
+        *entryp = snd_info_create_card_entry(card, name, card->proc_root);
+        return *entryp ? 0 : -ENOMEM;
+}
 
 static inline void snd_info_set_text_ops(struct snd_info_entry *entry, 
@@ -150 +148 @@
         entry->c.text.read = read;
 }
+
+int snd_card_rw_proc_new(struct snd_card *card, const char *name,
+                         void *private_data,
+                         void (*read)(struct snd_info_entry *,
+                                      struct snd_info_buffer *),
+                         void (*write)(struct snd_info_entry *entry,
+                                       struct snd_info_buffer *buffer));
 
 int snd_info_check_reserved_words(const char *str);
@@ -177 +182 @@
 static inline int snd_card_proc_new(struct snd_card *card, const char *name,
                                     struct snd_info_entry **entryp) { return -EINVAL; }
-static inline void snd_info_set_text_ops(struct snd_info_entry *entry __attribute__((unused)),
+static inline void snd_info_set_text_ops(struct snd_info_entry *entry /*__attribute__((unused))*/,
                                          void *private_data,
                                          void (*read)(struct snd_info_entry *, struct snd_info_buffer *)) {}
-
+static inline int snd_card_rw_proc_new(struct snd_card *card, const char *name,
+                                       void *private_data,
+                                       void (*read)(struct snd_info_entry *,
+                                                    struct snd_info_buffer *),
+                                       void (*write)(struct snd_info_entry *entry,
+                                                     struct snd_info_buffer *buffer))
+{
+        return 0;
+}
 static inline int snd_info_check_reserved_words(const char *str) { return 1; }
 
 #endif
+
+/**
+ * snd_card_ro_proc_new - Create a read-only text proc file entry for the card
+ * @card: the card instance
+ * @name: the file name
+ * @private_data: the arbitrary private data
+ * @read: the read callback
+ *
+ * This proc file entry will be registered via snd_card_register() call, and
+ * it will be removed automatically at the card removal, too.
+ */
+static inline int
+snd_card_ro_proc_new(struct snd_card *card, const char *name,
+                     void *private_data,
+                     void (*read)(struct snd_info_entry *,
+                                  struct snd_info_buffer *))
+{
+        return snd_card_rw_proc_new(card, name, private_data, read, NULL);
+}
 
 /*
@@ -189 +221 @@
  */
 
-#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
+#if (defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_SND_PROC_FS)) || defined(TARGET_OS2)
 
 #define SNDRV_OSS_INFO_DEV_AUDIO        0
@@ -202 +234 @@
 #define snd_oss_info_unregister(dev, num) snd_oss_info_register(dev, num, NULL)
 
-#endif /* CONFIG_SND_OSSEMUL && CONFIG_PROC_FS */
+#endif /* CONFIG_SND_OSSEMUL && CONFIG_SND_PROC_FS */
 
 #endif /* __SOUND_INFO_H */