Commit b9735006 authored by Namhyung Kim's avatar Namhyung Kim
Browse files

tools/include: Sync uapi/sound/asound.h with the kernel sources 



To pick up changes from:

  f05c1ffc ALSA: pcm: reinvent the stream synchronization ID API

This should be used to beautify sound syscall arguments and it addresses
these tools/perf build warnings:

  Warning: Kernel ABI header differences:
  diff -u tools/perf/trace/beauty/include/uapi/sound/asound.h include/uapi/sound/asound.h

Please see tools/include/uapi/README for details (it's in the first patch
of this series).

Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: linux-sound@vger.kernel.org
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 8ec9497d

tools/perf/trace/beauty/include/uapi/sound/asound.h

+5 −4
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image { 
 *                                                                           *

 *****************************************************************************/



#define SNDRV_PCM_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 17)

#define SNDRV_PCM_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 18)



typedef unsigned long snd_pcm_uframes_t;

typedef signed long snd_pcm_sframes_t;
@@ -334,7 +334,7 @@ union snd_pcm_sync_id { 
	unsigned char id[16];

	unsigned short id16[8];

	unsigned int id32[4];

};

} __attribute__((deprecated));



struct snd_pcm_info {

	unsigned int device;		/* RO/WR (control): device number */
@@ -348,7 +348,7 @@ struct snd_pcm_info { 
	int dev_subclass;		/* SNDRV_PCM_SUBCLASS_* */

	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... */

};
@@ -420,7 +420,8 @@ struct snd_pcm_hw_params { 
	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 */

};



enum {