summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2023-06-21 14:06:39 +0300
committerTakashi Iwai <tiwai@suse.de>2023-06-21 14:06:43 +0300
commit6b164eaecd154930532afe8dce0d0562f629d23d (patch)
tree84d32f8e45a51be220caabd514ee2195d0bafa27 /include/sound
parent8d0cf150d299148a97653610c256f10c42f85ce0 (diff)
parent4dce2f076b7d0a0a99867b58eea7c212ff4e2be5 (diff)
downloadlinux-6b164eaecd154930532afe8dce0d0562f629d23d.tar.xz
Merge branch 'topic/midi20' into for-next
This is a small patch set to change the UMP core for the upcoming gadget driver support. Basically exporting a couple of helper functions and adding a flag to suppress the internal UMP handling. No functional changes by those alone. Link: https://lore.kernel.org/r/20230621110241.4751-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/ump.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/ump.h b/include/sound/ump.h
index 68478e7be3b4..44d2c2fd021d 100644
--- a/include/sound/ump.h
+++ b/include/sound/ump.h
@@ -28,6 +28,7 @@ struct snd_ump_endpoint {
u32 stream_wait_for; /* expected stream message status */
bool stream_finished; /* set when message has been processed */
bool parsed; /* UMP / FB parse finished? */
+ bool no_process_stream; /* suppress UMP stream messages handling */
wait_queue_head_t stream_wait;
struct snd_rawmidi_file stream_rfile;
@@ -108,6 +109,9 @@ static inline int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump,
}
#endif
+int snd_ump_receive_ump_val(struct snd_ump_endpoint *ump, u32 val);
+int snd_ump_switch_protocol(struct snd_ump_endpoint *ump, unsigned int protocol);
+
/*
* Some definitions for UMP
*/