linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / media / audiochip.h

diff --git a/include/media/audiochip.h b/include/media/audiochip.h
index d3e9e30..295d256 100644 (file)
--- a/include/media/audiochip.h
+++ b/include/media/audiochip.h
@@ -1,12 +1,27 @@
+/*
+ */
+
 #ifndef AUDIOCHIP_H
 #define AUDIOCHIP_H
 
-/* ---------------------------------------------------------------------- */
+enum audiochip {
+       AUDIO_CHIP_NONE,
+       AUDIO_CHIP_UNKNOWN,
+       /* Provided by video chip */
+       AUDIO_CHIP_INTERNAL,
+       /* Provided by tvaudio.c */
+       AUDIO_CHIP_TDA8425,
+       AUDIO_CHIP_TEA6300,
+       AUDIO_CHIP_TEA6420,
+       AUDIO_CHIP_TDA9840,
+       AUDIO_CHIP_TDA985X,
+       AUDIO_CHIP_TDA9874,
+       AUDIO_CHIP_PIC16C54,
+       /* Provided by msp3400.c */
+       AUDIO_CHIP_MSP34XX
+};
 
-/* v4l device was opened in Radio mode */
-#define AUDC_SET_RADIO        _IO('m',2)
-/* select from TV,radio,extern,MUTE */
-#define AUDC_SET_INPUT        _IOW('m',17,int)
+/* ---------------------------------------------------------------------- */
 
 /* audio inputs */
 #define AUDIO_TUNER        0x00
@@ -20,16 +35,4 @@
 #define AUDIO_MUTE         0x80
 #define AUDIO_UNMUTE       0x81
 
-/* all the stuff below is obsolete and just here for reference.  I'll
- * remove it once the driver is tested and works fine.
- *
- * Instead creating alot of tiny API's for all kinds of different
- * chips, we'll just pass throuth the v4l ioctl structs (v4l2 not
- * yet...).  It is a bit less flexible, but most/all used i2c chips
- * make sense in v4l context only.  So I think that's acceptable...
- */
-
-/* misc stuff to pass around config info to i2c chips */
-#define AUDC_CONFIG_PINNACLE  _IOW('m',32,int)
-
 #endif /* AUDIOCHIP_H */