Skip to contentSkip to conversation

tools include uapi: Grab a copy of sound/asound.h

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Aug 10, 2017

Subsystems (2)
Sound perf events
lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  a215684e10484149313068e0a9ea1978ee36d4f7
Gitweb:     http://git.kernel.org/tip/a215684e10484149313068e0a9ea1978ee36d4f7
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Mon, 31 Jul 2017 16:45:32 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 1 Aug 2017 13:02:11 -0300

tools include uapi: Grab a copy of sound/asound.h

We will use it to generate tables for beautifying ioctl's 'cmd' arg.

Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 {include => tools/include}/uapi/sound/asound.h | 6 +++---
 tools/perf/MANIFEST                            | 1 +
 tools/perf/check-headers.sh                    | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)
tools/include/uapi/sound/asound.h renamed from include/uapi/sound/asound.h +3 -3
similarity index 99%
copy from include/uapi/sound/asound.h
copy to tools/include/uapi/sound/asound.h
index 1949923..87bf30b 100644
@@ -93,7 +93,7 @@ enum {
 	SNDRV_HWDEP_IFACE_VX,		/* Digigram VX cards */
 	SNDRV_HWDEP_IFACE_MIXART,	/* Digigram miXart cards */
 	SNDRV_HWDEP_IFACE_USX2Y,	/* Tascam US122, US224 & US428 usb */
-	SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */	
+	SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */
 	SNDRV_HWDEP_IFACE_BLUETOOTH,	/* Bluetooth audio */
 	SNDRV_HWDEP_IFACE_USX2Y_PCM,	/* Tascam US122, US224 & US428 rawusb pcm */
 	SNDRV_HWDEP_IFACE_PCXHR,	/* Digigram PCXHR */

@@ -383,7 +383,7 @@ struct snd_mask {
 
 struct snd_pcm_hw_params {
 	unsigned int flags;
-	struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - 
+	struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK -
 			       SNDRV_PCM_HW_PARAM_FIRST_MASK + 1];
 	struct snd_mask mres[5];	/* reserved masks */
 	struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL -

@@ -856,7 +856,7 @@ typedef int __bitwise snd_ctl_elem_iface_t;
 #define SNDRV_CTL_ELEM_ACCESS_INACTIVE		(1<<8)	/* control does actually nothing, but may be updated */
 #define SNDRV_CTL_ELEM_ACCESS_LOCK		(1<<9)	/* write lock */
 #define SNDRV_CTL_ELEM_ACCESS_OWNER		(1<<10)	/* write lock owner */
-#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK	(1<<28)	/* kernel use a TLV callback */ 
+#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK	(1<<28)	/* kernel use a TLV callback */
 #define SNDRV_CTL_ELEM_ACCESS_USER		(1<<29) /* user space element */
 /* bits 30 and 31 are obsoleted (for indirect access) */
tools/perf/MANIFEST +1 -0
index eb4ccd7..35a33ad 100644
@@ -84,6 +84,7 @@ tools/include/uapi/linux/mman.h
 tools/include/uapi/linux/perf_event.h
 tools/include/uapi/linux/sched.h
 tools/include/uapi/linux/stat.h
+tools/include/uapi/sound/asound.h
 tools/include/linux/poison.h
 tools/include/linux/rbtree.h
 tools/include/linux/rbtree_augmented.h
tools/perf/check-headers.sh +1 -0
index 0024525..1e07c9b 100755
@@ -7,6 +7,7 @@ include/uapi/linux/fcntl.h
 include/uapi/linux/perf_event.h
 include/uapi/linux/sched.h
 include/uapi/linux/stat.h
+include/uapi/sound/asound.h
 include/linux/hash.h
 include/uapi/linux/hw_breakpoint.h
 arch/x86/include/asm/disabled-features.h