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

Timestamp:

Apr 21, 2025, 7:17:25 PM (5 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/uapi/sound/asequencer.h (modified) (5 diffs)
• alsa-kernel/include/uapi/sound/asoc.h (modified) (2 diffs)
• alsa-kernel/include/uapi/sound/asound.h (modified) (9 diffs)

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

@@ -11 +11 @@
 
 /** version of the sequencer */
-#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION(1, 0, 3)
+#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION(1, 0, 4)
 
 /**
@@ -209 +209 @@
         unsigned int len;       /* length of data */
         void *ptr;              /* pointer to data (note: maybe 64-bit) */
-} __attribute__((packed));
+} __packed;
 #else
 #pragma pack(1)
@@ -262 +262 @@
         unsigned short value;           /* optional data */
         struct snd_seq_event *event;            /* quoted event */
-} __attribute__((packed));
+} __packed;
 #else
 #pragma pack(1)
@@ -481 +481 @@
 #define SNDRV_SEQ_PORT_FLG_TIME_REAL    (1<<2)
 
+#define SNDRV_SEQ_PORT_FLG_IS_MIDI1     (1<<3)  /* Keep MIDI 1.0 protocol */
+
 /* port direction */
 #define SNDRV_SEQ_PORT_DIR_UNKNOWN      0
@@ -543 +545 @@
 struct snd_seq_queue_tempo {
         int queue;                      /* sequencer queue */
-        unsigned int tempo;             /* current tempo, us/tick */
+        unsigned int tempo;             /* current tempo, us/tick (or different time-base below) */
         int ppq;                        /* time resolution, ticks/quarter */
         unsigned int skew_value;        /* queue skew */
         unsigned int skew_base;         /* queue skew base */
-        char reserved[24];              /* for the future */
+        unsigned short tempo_base;      /* tempo base in nsec unit; either 10 or 1000 */
+        char reserved[22];              /* for the future */
 };
 

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

@@ -89 +89 @@
 /* ABI version */
 #define SND_SOC_TPLG_ABI_VERSION        0x5     /* current version */
-#define SND_SOC_TPLG_ABI_VERSION_MIN    0x4     /* oldest version supported */
+#define SND_SOC_TPLG_ABI_VERSION_MIN    0x5     /* oldest version supported */
 
 /* Max size of TLV data */
@@ -577 +577 @@
 } __attribute__((packed));
 
-/*
- * Old version of ABI structs, supported for backward compatibility.
- */
-
-/* Manifest v4 */
-struct snd_soc_tplg_manifest_v4 {
-        __le32 size;            /* in bytes of this structure */
-        __le32 control_elems;   /* number of control elements */
-        __le32 widget_elems;    /* number of widget elements */
-        __le32 graph_elems;     /* number of graph elements */
-        __le32 pcm_elems;       /* number of PCM elements */
-        __le32 dai_link_elems;  /* number of DAI link elements */
-        struct snd_soc_tplg_private priv;
-} __packed;
-
-/* Stream Capabilities v4 */
-struct snd_soc_tplg_stream_caps_v4 {
-        __le32 size;            /* in bytes of this structure */
-        char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-        __le64 formats; /* supported formats SNDRV_PCM_FMTBIT_* */
-        __le32 rates;           /* supported rates SNDRV_PCM_RATE_* */
-        __le32 rate_min;        /* min rate */
-        __le32 rate_max;        /* max rate */
-        __le32 channels_min;    /* min channels */
-        __le32 channels_max;    /* max channels */
-        __le32 periods_min;     /* min number of periods */
-        __le32 periods_max;     /* max number of periods */
-        __le32 period_size_min; /* min period size bytes */
-        __le32 period_size_max; /* max period size bytes */
-        __le32 buffer_size_min; /* min buffer size bytes */
-        __le32 buffer_size_max; /* max buffer size bytes */
-} __packed;
-
-/* PCM v4 */
-struct snd_soc_tplg_pcm_v4 {
-        __le32 size;            /* in bytes of this structure */
-        char pcm_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-        char dai_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-        __le32 pcm_id;          /* unique ID - used to match with DAI link */
-        __le32 dai_id;          /* unique ID - used to match */
-        __le32 playback;        /* supports playback mode */
-        __le32 capture;         /* supports capture mode */
-        __le32 compress;        /* 1 = compressed; 0 = PCM */
-        struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* for DAI link */
-        __le32 num_streams;     /* number of streams */
-        struct snd_soc_tplg_stream_caps_v4 caps[2]; /* playback and capture for DAI */
-} __packed;
-
-/* Physical link config v4 */
-struct snd_soc_tplg_link_config_v4 {
-        __le32 size;            /* in bytes of this structure */
-        __le32 id;              /* unique ID - used to match */
-        struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* supported configs playback and captrure */
-        __le32 num_streams;     /* number of streams */
-} __packed;
-
 #endif

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

@@ -171 +171 @@
  *****************************************************************************/
 
-#define SNDRV_PCM_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 15)
+#define SNDRV_PCM_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 18)
 
 typedef unsigned long snd_pcm_uframes_t;
@@ -296 +296 @@
 typedef int __bitwise snd_pcm_subformat_t;
 #define SNDRV_PCM_SUBFORMAT_STD         ((__force snd_pcm_subformat_t) 0)
-#define SNDRV_PCM_SUBFORMAT_LAST        SNDRV_PCM_SUBFORMAT_STD
+#define SNDRV_PCM_SUBFORMAT_MSBITS_MAX  ((__force snd_pcm_subformat_t) 1)
+#define SNDRV_PCM_SUBFORMAT_MSBITS_20   ((__force snd_pcm_subformat_t) 2)
+#define SNDRV_PCM_SUBFORMAT_MSBITS_24   ((__force snd_pcm_subformat_t) 3)
+#define SNDRV_PCM_SUBFORMAT_LAST        SNDRV_PCM_SUBFORMAT_MSBITS_24
 
 #define SNDRV_PCM_INFO_MMAP             0x00000001      /* hardware supports mmap */
@@ -360 +363 @@
         unsigned short id16[8];
         unsigned int id32[4];
-};
+} /*__attribute__((deprecated))*/;
 
 struct snd_pcm_info {
@@ -374 +377 @@
         unsigned int subdevices_count;
         unsigned int subdevices_avail;
-        union snd_pcm_sync_id sync;     /* hardware synchronization ID */
+        unsigned char pad1[16];         /* was: hardware synchronization ID */
         unsigned char reserved[64];     /* reserved for future... */
 };
@@ -445 +448 @@
         unsigned int cmask;             /* R: changed masks */
         unsigned int info;              /* R: Info flags for returned setup */
-        unsigned int msbits;            /* R: used most significant bits */
+        unsigned int msbits;            /* R: used most significant bits (in sample bit-width) */
         unsigned int rate_num;          /* R: rate numerator */
         unsigned int rate_den;          /* R: rate denominator */
         snd_pcm_uframes_t fifo_size;    /* R: chip FIFO size in frames */
-        unsigned char reserved[64];     /* reserved for future */
+        unsigned char sync[16];         /* R: synchronization ID (perfect sync - one clock source) */
+        unsigned char reserved[48];     /* reserved for future */
 };
 
@@ -911 +915 @@
  */
 
-#define SNDRV_TIMER_VERSION             SNDRV_PROTOCOL_VERSION(2, 0, 7)
+#define SNDRV_TIMER_VERSION             SNDRV_PROTOCOL_VERSION(2, 0, 8)
 
 enum {
@@ -936 +940 @@
 #define SNDRV_TIMER_GLOBAL_HPET         2
 #define SNDRV_TIMER_GLOBAL_HRTIMER      3
+#define SNDRV_TIMER_GLOBAL_UDRIVEN      4
 
 /* info flags */
@@ -1015 +1020 @@
 };
 #endif
+
+/*
+ * This structure describes the userspace-driven timer. Such timers are purely virtual,
+ * and can only be triggered from software (for instance, by userspace application).
+ */
+struct snd_timer_uinfo {
+        /* To pretend being a normal timer, we need to know the resolution in ns. */
+        __u64 resolution;
+        int fd;
+        unsigned int id;
+        unsigned char reserved[16];
+};
 
 #define SNDRV_TIMER_IOCTL_PVERSION      _IOR('T', 0x00, int)
@@ -1032 +1049 @@
 #define SNDRV_TIMER_IOCTL_PAUSE         _IO('T', 0xa3)
 #define SNDRV_TIMER_IOCTL_TREAD64       _IOW('T', 0xa4, int)
+#define SNDRV_TIMER_IOCTL_CREATE        _IOWR('T', 0xa5, struct snd_timer_uinfo)
+#define SNDRV_TIMER_IOCTL_TRIGGER       _IO('T', 0xa6)
 
 #if __BITS_PER_LONG == 64