Skip to content

Commit e9cc5d4

Browse files
committed
tools include UAPI: Sync sound/asound.h copy with the kernel sources
Picking the changes from: 55b71f6 ("ALSA: uapi: use C90 comment style instead of C99 style") fb6723d ("ALSA: pcm: comment about relation between msbits hw parameter and [S|U]32 formats") b456abe ("ALSA: pcm: introduce INFO_NO_REWINDS flag") 5aec579 ("ALSA: uapi: Fix a C++ style comment in asound.h") Which entails no changes in the tooling side as it doesn't introduce new SNDRV_PCM_IOCTL_ ioctls. To silence this perf tools build warning: Warning: Kernel ABI header at 'tools/include/uapi/sound/asound.h' differs from latest version at 'include/uapi/sound/asound.h' diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h Cc: Mark Brown <broonie@kernel.org> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Takashi Iwai <tiwai@suse.de> Cc: Takashi Sakamoto <o-takashi@sakamocchi.jp> Link: https://lore.kernel.org/all/YflN0j09T+6ODHIh@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 26291c5 commit e9cc5d4

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

tools/include/uapi/sound/asound.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,11 @@ typedef int __bitwise snd_pcm_format_t;
202202
#define SNDRV_PCM_FORMAT_S24_BE ((__force snd_pcm_format_t) 7) /* low three bytes */
203203
#define SNDRV_PCM_FORMAT_U24_LE ((__force snd_pcm_format_t) 8) /* low three bytes */
204204
#define SNDRV_PCM_FORMAT_U24_BE ((__force snd_pcm_format_t) 9) /* low three bytes */
205+
/*
206+
* For S32/U32 formats, 'msbits' hardware parameter is often used to deliver information about the
207+
* available bit count in most significant bit. It's for the case of so-called 'left-justified' or
208+
* `right-padding` sample which has less width than 32 bit.
209+
*/
205210
#define SNDRV_PCM_FORMAT_S32_LE ((__force snd_pcm_format_t) 10)
206211
#define SNDRV_PCM_FORMAT_S32_BE ((__force snd_pcm_format_t) 11)
207212
#define SNDRV_PCM_FORMAT_U32_LE ((__force snd_pcm_format_t) 12)
@@ -300,7 +305,7 @@ typedef int __bitwise snd_pcm_subformat_t;
300305
#define SNDRV_PCM_INFO_HAS_LINK_ESTIMATED_ATIME 0x04000000 /* report estimated link audio time */
301306
#define SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME 0x08000000 /* report synchronized audio/system time */
302307
#define SNDRV_PCM_INFO_EXPLICIT_SYNC 0x10000000 /* needs explicit sync of pointers and data */
303-
308+
#define SNDRV_PCM_INFO_NO_REWINDS 0x20000000 /* hardware can only support monotonic changes of appl_ptr */
304309
#define SNDRV_PCM_INFO_DRAIN_TRIGGER 0x40000000 /* internal kernel flag - trigger in drain */
305310
#define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */
306311

0 commit comments

Comments
 (0)