diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-01-08 08:17:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-01-08 08:17:37 +0100 |
| commit | 821e2ac632ff77bf7abaf2dfad7214fe8563edf1 (patch) | |
| tree | 6d09654aed8ccd7f45f307191d350a0d7c236255 /tools | |
| parent | b6ce6e6c79e4ec650887f1fe391a70e54972001a (diff) | |
| parent | f90dffdce70ff724f9ee8b0bcc711e86e6663896 (diff) | |
Merge branch 'for-next' into for-linus
Prepare for 6.8 merge.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/include/uapi/sound/asound.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/include/uapi/sound/asound.h b/tools/include/uapi/sound/asound.h index f9939da41122..d5b9cfbd9cea 100644 --- a/tools/include/uapi/sound/asound.h +++ b/tools/include/uapi/sound/asound.h @@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image { * * *****************************************************************************/ -#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 15) +#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 16) typedef unsigned long snd_pcm_uframes_t; typedef signed long snd_pcm_sframes_t; @@ -267,7 +267,10 @@ typedef int __bitwise snd_pcm_format_t; 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 */ #define SNDRV_PCM_INFO_MMAP_VALID 0x00000002 /* period data are valid during transfer */ |