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

Timestamp:

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

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/rawmidi.h (modified) (12 diffs)

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

@@ +1 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef __SOUND_RAWMIDI_H
 #define __SOUND_RAWMIDI_H
@@ -5 +6 @@
  *  Abstract layer for MIDI v1.0 stream
  *  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
- *
  */
 
@@ -28 +13 @@
 #include <linux/wait.h>
 #include <linux/mutex.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
 
-#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
-#include "seq_device.h"
+#if IS_ENABLED(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER)
+#include <sound/seq_device.h>
 #endif
 
@@ -64 +51 @@
 
 struct snd_rawmidi_runtime {
+        struct snd_rawmidi_substream *substream;
         unsigned int drain: 1,  /* drain stage */
                      oss: 1;    /* OSS compatible mode */
@@ -74 +62 @@
         size_t avail;           /* max used buffer for wakeup */
         size_t xruns;           /* over/underruns counter */
+        int buffer_ref;         /* buffer reference count */
         /* misc */
         spinlock_t lock;
@@ -80 +69 @@
         void (*event)(struct snd_rawmidi_substream *substream);
         /* defers calls to event [input] or ops->trigger [output] */
-        struct tasklet_struct tasklet;
+        struct work_struct event_work;
         /* private data */
         void *private_data;
@@ -90 +79 @@
         int stream;                     /* direction */
         int number;                     /* substream number */
-        unsigned int opened: 1,         /* open flag */
-                     append: 1,         /* append flag (merge more streams) */
-                     active_sensing: 1; /* send active sensing when close */
+        bool opened;                    /* open flag */
+        bool append;                    /* append flag (merge more streams) */
+        bool active_sensing;            /* send active sensing when close */
         int use_count;                  /* use counter (for output) */
         size_t bytes;
@@ -101 +90 @@
         struct pid *pid;
         /* hardware layer */
-        struct snd_rawmidi_ops *ops;
+        const struct snd_rawmidi_ops *ops;
 };
 
@@ -128 +117 @@
 #endif
 
-        struct snd_rawmidi_global_ops *ops;
+        const struct snd_rawmidi_global_ops *ops;
 
         struct snd_rawmidi_str streams[2];
@@ -138 +127 @@
         wait_queue_head_t open_wait;
 
-        struct snd_info_entry *dev;
+        struct device dev;
+
         struct snd_info_entry *proc_entry;
 
-#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
+#if IS_ENABLED(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER)
         struct snd_seq_device *seq_dev;
 #endif
@@ -152 +142 @@
                     struct snd_rawmidi **rmidi);
 void snd_rawmidi_set_ops(struct snd_rawmidi *rmidi, int stream,
-                         struct snd_rawmidi_ops *ops);
+                         const struct snd_rawmidi_ops *ops);
 
 /* callbacks */
 
-void snd_rawmidi_receive_reset(struct snd_rawmidi_substream *substream);
 int snd_rawmidi_receive(struct snd_rawmidi_substream *substream,
                         const unsigned char *buffer, int count);
-void snd_rawmidi_transmit_reset(struct snd_rawmidi_substream *substream);
 int snd_rawmidi_transmit_empty(struct snd_rawmidi_substream *substream);
 int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream,
@@ -166 +154 @@
 int snd_rawmidi_transmit(struct snd_rawmidi_substream *substream,
                          unsigned char *buffer, int count);
+int __snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream,
+                              unsigned char *buffer, int count);
+int __snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream,
+                               int count);
+int snd_rawmidi_proceed(struct snd_rawmidi_substream *substream);
 
 /* main midi functions */