mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

uapi: Update rawmidi API to 2.0.4

Browse source 
Sync with the kernel change of rawmidi API for supporting UMP 1.1
features.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2023-03-22 14:02:15 +01:00
parent 2aefb5c41c
commit 517957a24b
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
include/sound/uapi/asound.h
View file

@ -706,7 +706,7 @@ enum {
* Raw MIDI section - /dev/snd/midi?? * Raw MIDI section - /dev/snd/midi??
*/ */
#define SNDRV_RAWMIDI_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 3) #define SNDRV_RAWMIDI_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 4)
enum { enum {
SNDRV_RAWMIDI_STREAM_OUTPUT = 0, SNDRV_RAWMIDI_STREAM_OUTPUT = 0,
@ -776,6 +776,9 @@ struct snd_rawmidi_status {
unsigned char reserved[16]; /* reserved for future use */ unsigned char reserved[16]; /* reserved for future use */
}; };
/* UMP EP info flags */
#define SNDRV_UMP_EP_INFO_STATIC_BLOCKS 0x01
/* UMP EP Protocol / JRTS capability bits */ /* UMP EP Protocol / JRTS capability bits */
#define SNDRV_UMP_EP_INFO_PROTO_MIDI_MASK 0x0300 #define SNDRV_UMP_EP_INFO_PROTO_MIDI_MASK 0x0300
#define SNDRV_UMP_EP_INFO_PROTO_MIDI1 0x0100 /* MIDI 1.0 */ #define SNDRV_UMP_EP_INFO_PROTO_MIDI1 0x0100 /* MIDI 1.0 */
@ -793,7 +796,11 @@ struct snd_ump_endpoint_info {
unsigned int protocol; /* current protocol */ unsigned int protocol; /* current protocol */
unsigned int num_blocks; /* # of function blocks */ unsigned int num_blocks; /* # of function blocks */
unsigned short version; /* UMP major/minor version */ unsigned short version; /* UMP major/minor version */
unsigned short padding[7]; unsigned short family_id; /* MIDI device family ID */
unsigned short model_id; /* MIDI family model ID */
unsigned int manufacturer_id; /* MIDI manufacturer ID */
unsigned char sw_revision[4]; /* software revision */
unsigned short padding;
unsigned char name[128]; /* endpoint name string */ unsigned char name[128]; /* endpoint name string */
unsigned char product_id[128]; /* unique product id string */ unsigned char product_id[128]; /* unique product id string */
unsigned char reserved[32]; unsigned char reserved[32];
@ -808,6 +815,12 @@ struct snd_ump_endpoint_info {
#define SNDRV_UMP_BLOCK_IS_MIDI1 (1U << 0) /* MIDI 1.0 port w/o restrict */ #define SNDRV_UMP_BLOCK_IS_MIDI1 (1U << 0) /* MIDI 1.0 port w/o restrict */
#define SNDRV_UMP_BLOCK_IS_LOWSPEED (1U << 1) /* 31.25Kbps B/W MIDI1 port */ #define SNDRV_UMP_BLOCK_IS_LOWSPEED (1U << 1) /* 31.25Kbps B/W MIDI1 port */
/* UMP block user-interface hint */
#define SNDRV_UMP_BLOCK_UI_HINT_UNKNOWN 0x00
#define SNDRV_UMP_BLOCK_UI_HINT_RECEIVER 0x01
#define SNDRV_UMP_BLOCK_UI_HINT_SENDER 0x02
#define SNDRV_UMP_BLOCK_UI_HINT_BOTH 0x03
/* UMP groups and blocks */ /* UMP groups and blocks */
#define SNDRV_UMP_MAX_GROUPS 16 #define SNDRV_UMP_MAX_GROUPS 16
#define SNDRV_UMP_MAX_BLOCKS 32 #define SNDRV_UMP_MAX_BLOCKS 32
@ -821,7 +834,9 @@ struct snd_ump_block_info {
unsigned char active; /* Activeness */ unsigned char active; /* Activeness */
unsigned char first_group; /* first group ID */ unsigned char first_group; /* first group ID */
unsigned char num_groups; /* number of groups */ unsigned char num_groups; /* number of groups */
unsigned char padding[3]; unsigned char midi_ci_version; /* MIDI-CI support version */
unsigned char sysex8_streams; /* max number of sysex8 streams */
unsigned char ui_hint; /* user interface hint */
unsigned int flags; /* various info flags */ unsigned int flags; /* various info flags */
unsigned char name[128]; /* block name string */ unsigned char name[128]; /* block name string */
unsigned char reserved[32]; unsigned char reserved[32];