Changeset 717 for GPL/trunk/alsa-kernel/include/uapi

Timestamp:

Aug 7, 2022, 6:11:12 PM (3 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/uapi/sound/asound.h (modified) (3 diffs)

GPL/trunk/alsa-kernel/include/uapi/sound/asound.h

@@ -81 +81 @@
  ****************************************************************************/
 
+#define AES_IEC958_STATUS_SIZE          24
+
 struct snd_aes_iec958 {
-        unsigned char status[24];       /* AES/IEC958 channel status bits */
+        unsigned char status[AES_IEC958_STATUS_SIZE]; /* AES/IEC958 channel status bits */
         unsigned char subcode[147];     /* AES/IEC958 subcode bits */
         unsigned char pad;              /* nothing */
@@ -324 +326 @@
 #define SNDRV_PCM_INFO_HAS_LINK_ESTIMATED_ATIME    0x04000000  /* report estimated link audio time */
 #define SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME 0x08000000  /* report synchronized audio/system time */
+#define SNDRV_PCM_INFO_EXPLICIT_SYNC    0x10000000      /* needs explicit sync of pointers and data */
 
 #define SNDRV_PCM_INFO_DRAIN_TRIGGER    0x40000000              /* internal kernel flag - trigger in drain */
@@ -825 +828 @@
 #define SNDRV_RAWMIDI_IOCTL_PVERSION    _IOR('W', 0x00, int)
 #define SNDRV_RAWMIDI_IOCTL_INFO        _IOR('W', 0x01, struct snd_rawmidi_info)
+#define SNDRV_RAWMIDI_IOCTL_USER_PVERSION _IOW('W', 0x02, int)
 #define SNDRV_RAWMIDI_IOCTL_PARAMS      _IOWR('W', 0x10, struct snd_rawmidi_params)
 #define SNDRV_RAWMIDI_IOCTL_STATUS      _IOWR('W', 0x20, struct snd_rawmidi_status)