From 39c8f369ef965e83e2a660b09221da94d54f1146 Mon Sep 17 00:00:00 2001 From: Iliyan Malchev Date: Wed, 5 Nov 2008 17:32:53 -0800 Subject: [PATCH] Update msm_audio.h with latest SND-driver API. Signed-off-by: Iliyan Malchev --- libc/kernel/common/linux/msm_audio.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libc/kernel/common/linux/msm_audio.h b/libc/kernel/common/linux/msm_audio.h index f314a8213..58dc6f3f9 100644 --- a/libc/kernel/common/linux/msm_audio.h +++ b/libc/kernel/common/linux/msm_audio.h @@ -50,30 +50,32 @@ struct msm_audio_stats { #define SND_MUTE_UNMUTED 0 #define SND_MUTE_MUTED 1 -struct snd_device_config { +struct msm_snd_device_config { uint32_t device; uint32_t ear_mute; uint32_t mic_mute; }; -#define SND_SET_DEVICE _IOW(SND_IOCTL_MAGIC, 2, struct device_config *) +#define SND_SET_DEVICE _IOW(SND_IOCTL_MAGIC, 2, struct msm_device_config *) #define SND_METHOD_VOICE 0 -struct snd_volume_config { +struct msm_snd_volume_config { uint32_t device; uint32_t method; uint32_t volume; }; -#define SND_SET_VOLUME _IOW(SND_IOCTL_MAGIC, 3, struct snd_volume_config *) +#define SND_SET_VOLUME _IOW(SND_IOCTL_MAGIC, 3, struct msm_snd_volume_config *) -struct snd_endpoint { - const char name[50]; +#define SND_GET_NUM_ENDPOINTS _IOR(SND_IOCTL_MAGIC, 4, unsigned *) + +struct msm_snd_endpoint { int id; + char name[64]; }; -#define SND_GET_ENDPOINTS _IOR(SND_IOCTL_MAGIC, 4, struct snd_endpoint *) +#define SND_GET_ENDPOINT _IOWR(SND_IOCTL_MAGIC, 5, struct msm_snd_endpoint *) #endif