commit 575d6b3f10c47e4d94e3408ca0418a059c0a88e0
author Iliyan Malchev <malchev@google.com> Fri Sep 03 10:09:37 2010 -0700
committer Iliyan Malchev <malchev@google.com> Fri Sep 03 10:09:37 2010 -0700
tree cb86e8eb31015d1542d04838b979748bdec93fef
parent 964a14d0dd494055d14e2b8ee35ed9394b991c28

bionic: update processed cpcap_audio.h

Change-Id: I6ef25c4c95aaebdf4efc2561a726a0ce1c90032e
Signed-off-by: Iliyan Malchev <malchev@google.com>

libc/kernel/common/linux/cpcap_audio.h

diff --git a/libc/kernel/common/linux/cpcap_audio.h b/libc/kernel/common/linux/cpcap_audio.h
index 33d8439..5879567 100644
--- a/libc/kernel/common/linux/cpcap_audio.h
+++ b/libc/kernel/common/linux/cpcap_audio.h
@@ -18,14 +18,15 @@
 
 #define CPCAP_AUDIO_OUT_SPEAKER 0
 #define CPCAP_AUDIO_OUT_HEADSET 1
-#define CPCAP_AUDIO_OUT_MAX 1
+#define CPCAP_AUDIO_OUT_HEADSET_AND_SPEAKER 2
+#define CPCAP_AUDIO_OUT_MAX 2
 
-struct cpcap_audio_output {
- int id;
+struct cpcap_audio_stream {
+ unsigned id;
  int on;
 };
 
-#define CPCAP_AUDIO_OUT_SET_OUTPUT _IOW(CPCAP_AUDIO_MAGIC, 0,   struct cpcap_audio_output *)
+#define CPCAP_AUDIO_OUT_SET_OUTPUT _IOW(CPCAP_AUDIO_MAGIC, 0,   const struct cpcap_audio_stream *)
 
 #define CPCAP_AUDIO_OUT_VOL_MIN 0
 #define CPCAP_AUDIO_OUT_VOL_MAX 15
@@ -39,9 +40,9 @@
 #define CPCAP_AUDIO_IN_MIC2 1
 #define CPCAP_AUDIO_IN_MAX 1
 
-#define CPCAP_AUDIO_IN_SET_INPUT _IOW(CPCAP_AUDIO_MAGIC, 4, unsigned int)
+#define CPCAP_AUDIO_IN_SET_INPUT _IOW(CPCAP_AUDIO_MAGIC, 4,   const struct cpcap_audio_stream *)
 
-#define CPCAP_AUDIO_IN_GET_INPUT _IOR(CPCAP_AUDIO_MAGIC, 5, unsigned int *)
+#define CPCAP_AUDIO_IN_GET_INPUT _IOR(CPCAP_AUDIO_MAGIC, 5,   struct cpcap_audio_stream *)
 
 #define CPCAP_AUDIO_IN_VOL_MIN 0
 #define CPCAP_AUDIO_IN_VOL_MAX 31