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

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

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

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

@@ -19 +19 @@
 #include <sound/seq_device.h>
 #endif
+#include <sound/info.h>
 
 /*
@@ -48 +49 @@
         void (*get_port_info)(struct snd_rawmidi *rmidi, int number,
                               struct snd_seq_port_info *info);
+        long (*ioctl)(struct snd_rawmidi *rmidi, unsigned int cmd,
+                      void __user *argp);
+        void (*proc_read)(struct snd_info_entry *entry,
+                          struct snd_info_buffer *buf);
 };
 
@@ -62 +67 @@
         size_t avail;           /* max used buffer for wakeup */
         size_t xruns;           /* over/underruns counter */
+        size_t align;           /* alignment (0 = byte stream, 3 = UMP) */
         int buffer_ref;         /* buffer reference count */
         /* misc */
-        spinlock_t lock;
         wait_queue_head_t sleep;
         /* event handler (new bytes, input only) */
@@ -86 +91 @@
         int use_count;                  /* use counter (for output) */
         size_t bytes;
+        spinlock_t lock;
         struct snd_rawmidi *rmidi;
         struct snd_rawmidi_str *pstr;
@@ -130 +136 @@
         wait_queue_head_t open_wait;
 
-        struct device dev;
+        struct device *dev;
 
         struct snd_info_entry *proc_entry;
@@ -147 +153 @@
                          const struct snd_rawmidi_ops *ops);
 
+/* internal */
+int snd_rawmidi_init(struct snd_rawmidi *rmidi,
+                     struct snd_card *card, char *id, int device,
+                     int output_count, int input_count,
+                     unsigned int info_flags);
+int snd_rawmidi_free(struct snd_rawmidi *rmidi);
+
 /* callbacks */
 
@@ -157 +170 @@
 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);
 
@@ -166 +175 @@
 
 int snd_rawmidi_info_select(struct snd_card *card, struct snd_rawmidi_info *info);
-int snd_rawmidi_kernel_open(struct snd_card *card, int device, int subdevice,
+int snd_rawmidi_kernel_open(struct snd_rawmidi *rmidi, int subdevice,
                             int mode, struct snd_rawmidi_file *rfile);
 int snd_rawmidi_kernel_release(struct snd_rawmidi_file *rfile);